Skip to content

Commit

Permalink
Enable Spotless on Resource Manager (#42597)
Browse files Browse the repository at this point in the history
  • Loading branch information
@alzimmermsft
alzimmermsft authored Oct 25, 2024
1 parent 7facff4 commit 38715cf
Show file tree
Hide file tree
Showing 1,319 changed files with 33,925 additions and 42,346 deletions.
1 change: 1 addition & 0 deletions sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
--add-opens com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED
</javaModulesSurefireArgLine>
<doclintMissingInclusion>-</doclintMissingInclusion>
<spotless.skip>false</spotless.skip>
</properties>

<developers>
Expand Down
8 changes: 3 additions & 5 deletions ...r-appplatform/src/main/java/com/azure/resourcemanager/appplatform/AppPlatformManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
public final class AppPlatformManager extends Manager<AppPlatformManagementClient> {
// Collections
private SpringServices springServices;

/**
* Get a Configurable instance that can be used to create AppPlatformManager with optional configuration.
*
Expand Down Expand Up @@ -76,11 +77,8 @@ public AppPlatformManager authenticate(TokenCredential credential, AzureProfile
}

private AppPlatformManager(HttpPipeline httpPipeline, AzureProfile profile) {
super(
httpPipeline,
profile,
new AppPlatformManagementClientBuilder()
.pipeline(httpPipeline)
super(httpPipeline, profile,
new AppPlatformManagementClientBuilder().pipeline(httpPipeline)
.endpoint(profile.getEnvironment().getResourceManagerEndpoint())
.subscriptionId(profile.getSubscriptionId())
.buildClient());
Expand Down
4 changes: 2 additions & 2 deletions ...om/azure/resourcemanager/appplatform/implementation/CustomizedAcceleratorsClientImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ public Mono<CustomizedAcceleratorResourceInner> createOrUpdateAsync(String resou
CustomizedAcceleratorResourceInner customizedAcceleratorResource) {
return beginCreateOrUpdateAsync(resourceGroupName, serviceName, applicationAcceleratorName,
customizedAcceleratorName, customizedAcceleratorResource).last()
.flatMap(this.client::getLroFinalResultOrError);
.flatMap(this.client::getLroFinalResultOrError);
}

/**
Expand All @@ -714,7 +714,7 @@ private Mono<CustomizedAcceleratorResourceInner> createOrUpdateAsync(String reso
CustomizedAcceleratorResourceInner customizedAcceleratorResource, Context context) {
return beginCreateOrUpdateAsync(resourceGroupName, serviceName, applicationAcceleratorName,
customizedAcceleratorName, customizedAcceleratorResource, context).last()
.flatMap(this.client::getLroFinalResultOrError);
.flatMap(this.client::getLroFinalResultOrError);
}

/**
Expand Down
208 changes: 97 additions & 111 deletions ...in/java/com/azure/resourcemanager/appplatform/implementation/SpringAppDeploymentImpl.java
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions ...n/java/com/azure/resourcemanager/appplatform/implementation/SpringAppDeploymentsImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@
import reactor.core.publisher.Mono;
import com.azure.resourcemanager.resources.fluentcore.utils.PagedConverter;

public class SpringAppDeploymentsImpl
extends ExternalChildResourcesNonCachedImpl<
SpringAppDeploymentImpl, SpringAppDeployment, DeploymentResourceInner, SpringAppImpl, SpringApp>
public class SpringAppDeploymentsImpl extends
ExternalChildResourcesNonCachedImpl<SpringAppDeploymentImpl, SpringAppDeployment, DeploymentResourceInner, SpringAppImpl, SpringApp>
implements SpringAppDeployments<SpringAppDeploymentImpl> {

SpringAppDeploymentsImpl(SpringAppImpl parent) {
Expand Down Expand Up @@ -78,8 +77,8 @@ public void deleteByName(String name) {

@Override
public Mono<Void> deleteByNameAsync(String name) {
return inner().deleteAsync(
parent().parent().resourceGroupName(), parent().parent().name(), parent().name(), name);
return inner().deleteAsync(parent().parent().resourceGroupName(), parent().parent().name(), parent().name(),
name);
}

@Override
Expand All @@ -89,7 +88,8 @@ public PagedIterable<SpringAppDeployment> list() {

@Override
public PagedFlux<SpringAppDeployment> listAsync() {
return PagedConverter.mapPage(inner().listAsync(parent().parent().resourceGroupName(), parent().parent().name(), parent().name()),
return PagedConverter.mapPage(
inner().listAsync(parent().parent().resourceGroupName(), parent().parent().name(), parent().name()),
this::wrapModel);
}

Expand Down
19 changes: 10 additions & 9 deletions ...c/main/java/com/azure/resourcemanager/appplatform/implementation/SpringAppDomainImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ public class SpringAppDomainImpl

@Override
public Mono<SpringAppDomain> createResourceAsync() {
return manager().serviceClient().getCustomDomains().createOrUpdateAsync(
parent().parent().resourceGroupName(), parent().parent().name(), parent().name(), name(), innerModel()
)
return manager().serviceClient()
.getCustomDomains()
.createOrUpdateAsync(parent().parent().resourceGroupName(), parent().parent().name(), parent().name(),
name(), innerModel())
.map(inner -> {
setInner(inner);
return this;
Expand All @@ -36,16 +37,16 @@ public Mono<SpringAppDomain> updateResourceAsync() {

@Override
public Mono<Void> deleteResourceAsync() {
return manager().serviceClient().getBindings().deleteAsync(
parent().parent().resourceGroupName(), parent().parent().name(), parent().name(), name()
);
return manager().serviceClient()
.getBindings()
.deleteAsync(parent().parent().resourceGroupName(), parent().parent().name(), parent().name(), name());
}

@Override
protected Mono<CustomDomainResourceInner> getInnerAsync() {
return manager().serviceClient().getCustomDomains().getAsync(
parent().parent().resourceGroupName(), parent().parent().name(), parent().name(), name()
);
return manager().serviceClient()
.getCustomDomains()
.getAsync(parent().parent().resourceGroupName(), parent().parent().name(), parent().name(), name());
}

@Override
Expand Down
18 changes: 10 additions & 8 deletions .../main/java/com/azure/resourcemanager/appplatform/implementation/SpringAppDomainsImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@
import reactor.core.publisher.Mono;
import com.azure.resourcemanager.resources.fluentcore.utils.PagedConverter;

public class SpringAppDomainsImpl
extends ExternalChildResourcesNonCachedImpl<
SpringAppDomainImpl, SpringAppDomain, CustomDomainResourceInner, SpringAppImpl, SpringApp>
public class SpringAppDomainsImpl extends
ExternalChildResourcesNonCachedImpl<SpringAppDomainImpl, SpringAppDomain, CustomDomainResourceInner, SpringAppImpl, SpringApp>
implements SpringAppDomains {
SpringAppDomainsImpl(SpringAppImpl parent) {
super(parent, parent.taskGroup(), "SpringAppDomain");
Expand Down Expand Up @@ -79,8 +78,8 @@ public void deleteByName(String name) {

@Override
public Mono<Void> deleteByNameAsync(String name) {
return inner().deleteAsync(
parent().parent().resourceGroupName(), parent().parent().name(), parent().name(), name);
return inner().deleteAsync(parent().parent().resourceGroupName(), parent().parent().name(), parent().name(),
name);
}

@Override
Expand All @@ -90,7 +89,8 @@ public PagedIterable<SpringAppDomain> list() {

@Override
public PagedFlux<SpringAppDomain> listAsync() {
return PagedConverter.mapPage(inner().listAsync(parent().parent().resourceGroupName(), parent().parent().name(), parent().name()),
return PagedConverter.mapPage(
inner().listAsync(parent().parent().resourceGroupName(), parent().parent().name(), parent().name()),
this::wrapModel);
}

Expand All @@ -105,8 +105,10 @@ public CustomDomainValidateResult validate(String domain) {

@Override
public Mono<CustomDomainValidateResult> validateAsync(String domain) {
return manager().serviceClient().getApps().validateDomainAsync(
parent().parent().resourceGroupName(), parent().parent().name(), parent().name(), new CustomDomainValidatePayload().withName(domain));
return manager().serviceClient()
.getApps()
.validateDomainAsync(parent().parent().resourceGroupName(), parent().parent().name(), parent().name(),
new CustomDomainValidatePayload().withName(domain));
}

SpringAppDomain prepareCreateOrUpdate(String name, CustomDomainProperties properties) {
Expand Down
55 changes: 33 additions & 22 deletions ...orm/src/main/java/com/azure/resourcemanager/appplatform/implementation/SpringAppImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ public ManagedIdentityProperties identity() {
@Override
public String activeDeploymentName() {
// get the first active deployment
Optional<SpringAppDeployment> deployment = deployments.list().stream().filter(SpringAppDeployment::isActive).findFirst();
Optional<SpringAppDeployment> deployment
= deployments.list().stream().filter(SpringAppDeployment::isActive).findFirst();
return deployment.map(SpringAppDeployment::appName).orElse(null);
}

Expand Down Expand Up @@ -134,8 +135,9 @@ public SpringAppDomains customDomains() {

@Override
public Mono<ResourceUploadDefinition> getResourceUploadUrlAsync() {
return manager().serviceClient().getApps().getResourceUploadUrlAsync(
parent().resourceGroupName(), parent().name(), name());
return manager().serviceClient()
.getApps()
.getResourceUploadUrlAsync(parent().resourceGroupName(), parent().name(), name());
}

@Override
Expand All @@ -160,7 +162,9 @@ public boolean hasConfigurationServiceBinding() {
return false;
}
return addonConfigs.get(Constants.APPLICATION_CONFIGURATION_SERVICE_KEY) != null
&& configurationService.id().equalsIgnoreCase((String) addonConfigs.get(Constants.APPLICATION_CONFIGURATION_SERVICE_KEY).get(Constants.BINDING_RESOURCE_ID));
&& configurationService.id()
.equalsIgnoreCase((String) addonConfigs.get(Constants.APPLICATION_CONFIGURATION_SERVICE_KEY)
.get(Constants.BINDING_RESOURCE_ID));
}

@Override
Expand All @@ -174,7 +178,9 @@ public boolean hasServiceRegistryBinding() {
return false;
}
return addonConfigs.get(Constants.SERVICE_REGISTRY_KEY) != null
&& serviceRegistry.id().equalsIgnoreCase((String) addonConfigs.get(Constants.SERVICE_REGISTRY_KEY).get(Constants.BINDING_RESOURCE_ID));
&& serviceRegistry.id()
.equalsIgnoreCase(
(String) addonConfigs.get(Constants.SERVICE_REGISTRY_KEY).get(Constants.BINDING_RESOURCE_ID));
}

@Override
Expand Down Expand Up @@ -226,16 +232,16 @@ public SpringAppImpl withoutHttpsOnly() {
@Override
public SpringAppImpl withTemporaryDisk(int sizeInGB, String mountPath) {
ensureProperty();
innerModel().properties().withTemporaryDisk(
new TemporaryDisk().withSizeInGB(sizeInGB).withMountPath(mountPath));
innerModel().properties()
.withTemporaryDisk(new TemporaryDisk().withSizeInGB(sizeInGB).withMountPath(mountPath));
return this;
}

@Override
public SpringAppImpl withPersistentDisk(int sizeInGB, String mountPath) {
ensureProperty();
innerModel().properties().withPersistentDisk(
new PersistentDisk().withSizeInGB(sizeInGB).withMountPath(mountPath));
innerModel().properties()
.withPersistentDisk(new PersistentDisk().withSizeInGB(sizeInGB).withMountPath(mountPath));
return this;
}

Expand All @@ -244,10 +250,11 @@ public SpringAppImpl withActiveDeployment(String name) {
if (CoreUtils.isNullOrEmpty(name)) {
return this;
}
this.setActiveDeploymentTask =
context -> manager().serviceClient().getApps()
.setActiveDeploymentsAsync(parent().resourceGroupName(), parent().name(), name(), new ActiveDeploymentCollection().withActiveDeploymentNames(Arrays.asList(name)))
.then(context.voidMono());
this.setActiveDeploymentTask = context -> manager().serviceClient()
.getApps()
.setActiveDeploymentsAsync(parent().resourceGroupName(), parent().name(), name(),
new ActiveDeploymentCollection().withActiveDeploymentNames(Arrays.asList(name)))
.then(context.voidMono());
return this;
}

Expand All @@ -264,8 +271,9 @@ public Mono<SpringApp> createResourceAsync() {
if (springAppDeploymentToCreate == null) {
withDefaultActiveDeployment();
}
return manager().serviceClient().getApps().createOrUpdateAsync(
parent().resourceGroupName(), parent().name(), name(), innerModel())
return manager().serviceClient()
.getApps()
.createOrUpdateAsync(parent().resourceGroupName(), parent().name(), name(), innerModel())
.map(inner -> {
setInner(inner);
return this;
Expand All @@ -276,8 +284,9 @@ public Mono<SpringApp> createResourceAsync() {

@Override
public Mono<SpringApp> updateResourceAsync() {
return manager().serviceClient().getApps().updateAsync(
parent().resourceGroupName(), parent().name(), name(), innerModel())
return manager().serviceClient()
.getApps()
.updateAsync(parent().resourceGroupName(), parent().name(), name(), innerModel())
.map(inner -> {
setInner(inner);
return this;
Expand Down Expand Up @@ -332,8 +341,7 @@ public SpringAppImpl withDefaultActiveDeployment() {

@Override
@SuppressWarnings("unchecked")
public <T extends
SpringAppDeployment.DefinitionStages.WithAttach<? extends SpringApp.DefinitionStages.WithCreate, T>>
public <T extends SpringAppDeployment.DefinitionStages.WithAttach<? extends SpringApp.DefinitionStages.WithCreate, T>>
SpringAppDeployment.DefinitionStages.Blank<T> defineActiveDeployment(String name) {
return (SpringAppDeployment.DefinitionStages.Blank<T>) deployments.define(name).withActivation();
}
Expand All @@ -353,7 +361,8 @@ public SpringAppImpl withConfigurationServiceBinding() {
}
SpringConfigurationService configurationService = parent().getDefaultConfigurationService();
if (configurationService != null) {
Map<String, Object> configurationServiceConfigs = addonConfigs.computeIfAbsent(Constants.APPLICATION_CONFIGURATION_SERVICE_KEY, k -> new HashMap<>());
Map<String, Object> configurationServiceConfigs
= addonConfigs.computeIfAbsent(Constants.APPLICATION_CONFIGURATION_SERVICE_KEY, k -> new HashMap<>());
configurationServiceConfigs.put(Constants.BINDING_RESOURCE_ID, configurationService.id());
}
return this;
Expand All @@ -368,7 +377,8 @@ public SpringAppImpl withoutConfigurationServiceBinding() {
if (addonConfigs == null) {
return this;
}
Map<String, Object> configurationServiceConfigs = addonConfigs.get(Constants.APPLICATION_CONFIGURATION_SERVICE_KEY);
Map<String, Object> configurationServiceConfigs
= addonConfigs.get(Constants.APPLICATION_CONFIGURATION_SERVICE_KEY);
if (configurationServiceConfigs == null) {
return this;
}
Expand All @@ -386,7 +396,8 @@ public SpringAppImpl withServiceRegistryBinding() {
}
SpringServiceRegistry serviceRegistry = parent().getDefaultServiceRegistry();
if (serviceRegistry != null) {
Map<String, Object> serviceRegistryConfigs = addonConfigs.computeIfAbsent(Constants.SERVICE_REGISTRY_KEY, k -> new HashMap<>());
Map<String, Object> serviceRegistryConfigs
= addonConfigs.computeIfAbsent(Constants.SERVICE_REGISTRY_KEY, k -> new HashMap<>());
serviceRegistryConfigs.put(Constants.BINDING_RESOURCE_ID, serviceRegistry.id());
}
return this;
Expand Down
19 changes: 10 additions & 9 deletions ...ava/com/azure/resourcemanager/appplatform/implementation/SpringAppServiceBindingImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ public class SpringAppServiceBindingImpl

@Override
public Mono<SpringAppServiceBinding> createResourceAsync() {
return manager().serviceClient().getBindings().createOrUpdateAsync(
parent().parent().resourceGroupName(), parent().parent().name(), parent().name(), name(), innerModel()
)
return manager().serviceClient()
.getBindings()
.createOrUpdateAsync(parent().parent().resourceGroupName(), parent().parent().name(), parent().name(),
name(), innerModel())
.map(inner -> {
setInner(inner);
return this;
Expand All @@ -36,16 +37,16 @@ public Mono<SpringAppServiceBinding> updateResourceAsync() {

@Override
public Mono<Void> deleteResourceAsync() {
return manager().serviceClient().getBindings().deleteAsync(
parent().parent().resourceGroupName(), parent().parent().name(), parent().name(), name()
);
return manager().serviceClient()
.getBindings()
.deleteAsync(parent().parent().resourceGroupName(), parent().parent().name(), parent().name(), name());
}

@Override
protected Mono<BindingResourceInner> getInnerAsync() {
return manager().serviceClient().getBindings().getAsync(
parent().parent().resourceGroupName(), parent().parent().name(), parent().name(), name()
);
return manager().serviceClient()
.getBindings()
.getAsync(parent().parent().resourceGroupName(), parent().parent().name(), parent().name(), name());
}

@Override
Expand Down
12 changes: 6 additions & 6 deletions ...va/com/azure/resourcemanager/appplatform/implementation/SpringAppServiceBindingsImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
import reactor.core.publisher.Mono;
import com.azure.resourcemanager.resources.fluentcore.utils.PagedConverter;

public class SpringAppServiceBindingsImpl
extends ExternalChildResourcesNonCachedImpl<
SpringAppServiceBindingImpl, SpringAppServiceBinding, BindingResourceInner, SpringAppImpl, SpringApp>
public class SpringAppServiceBindingsImpl extends
ExternalChildResourcesNonCachedImpl<SpringAppServiceBindingImpl, SpringAppServiceBinding, BindingResourceInner, SpringAppImpl, SpringApp>
implements SpringAppServiceBindings {
SpringAppServiceBindingsImpl(SpringAppImpl parent) {
super(parent, parent.taskGroup(), "SpringAppServiceBinding");
Expand Down Expand Up @@ -77,8 +76,8 @@ public void deleteByName(String name) {

@Override
public Mono<Void> deleteByNameAsync(String name) {
return inner().deleteAsync(
parent().parent().resourceGroupName(), parent().parent().name(), parent().name(), name);
return inner().deleteAsync(parent().parent().resourceGroupName(), parent().parent().name(), parent().name(),
name);
}

@Override
Expand All @@ -88,7 +87,8 @@ public PagedIterable<SpringAppServiceBinding> list() {

@Override
public PagedFlux<SpringAppServiceBinding> listAsync() {
return PagedConverter.mapPage(inner().listAsync(parent().parent().resourceGroupName(), parent().parent().name(), parent().name()),
return PagedConverter.mapPage(
inner().listAsync(parent().parent().resourceGroupName(), parent().parent().name(), parent().name()),
this::wrapModel);
}

Expand Down
Loading

0 comments on commit 38715cf

Please sign in to comment.