From f259e3c802c86d6594c80cac863662bc0b9f47c8 Mon Sep 17 00:00:00 2001 From: Tanyi Chen Date: Tue, 28 Jul 2020 10:54:16 +0800 Subject: [PATCH 01/10] remove optional and resource plugin --- .../azure-resourcemanager-resources/pom.xml | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml b/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml index 025cea52983e..12a727f4f0f6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml @@ -60,7 +60,6 @@ com.github.spotbugs spotbugs-annotations 4.0.2 - true org.slf4j @@ -156,29 +155,6 @@ - - - org.codehaus.mojo - properties-maven-plugin - 1.0.0 - - - generate-resources - - write-project-properties - - - - ${project.build.outputDirectory}/maven.properties - - - - - From 768661bb9ea58fbc6419cda74b10cabc315a4e45 Mon Sep 17 00:00:00 2001 From: Tanyi Chen Date: Tue, 28 Jul 2020 13:29:50 +0800 Subject: [PATCH 02/10] fix some rbac type warning --- .../ActiveDirectoryApplicationImpl.java | 8 ++++---- .../implementation/CertificateCredentialImpl.java | 11 +++++------ .../implementation/PasswordCredentialImpl.java | 11 +++++------ .../implementation/RoleDefinitionImpl.java | 2 +- .../implementation/ServicePrincipalImpl.java | 4 ++-- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryApplicationImpl.java b/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryApplicationImpl.java index 367d4ced5e4e..57ebb0703cab 100644 --- a/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryApplicationImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryApplicationImpl.java @@ -77,7 +77,7 @@ Mono refreshCredentialsAsync() { .map( (Function) keyCredentialInner -> - new CertificateCredentialImpl(keyCredentialInner)) + new CertificateCredentialImpl(keyCredentialInner)) .collectMap(certificateCredential -> certificateCredential.name()) .map( stringCertificateCredentialMap -> { @@ -94,7 +94,7 @@ Mono refreshCredentialsAsync() { .map( (Function) passwordCredentialInner -> - new PasswordCredentialImpl(passwordCredentialInner)) + new PasswordCredentialImpl(passwordCredentialInner)) .collectMap(passwordCredential -> passwordCredential.name()) .map( stringPasswordCredentialMap -> { @@ -133,7 +133,7 @@ public Set identifierUris() { if (inner().identifierUris() == null) { return null; } - return Collections.unmodifiableSet(new HashSet(inner().identifierUris())); + return Collections.unmodifiableSet(new HashSet<>(inner().identifierUris())); } @Override @@ -141,7 +141,7 @@ public Set replyUrls() { if (inner().replyUrls() == null) { return null; } - return Collections.unmodifiableSet(new HashSet(inner().replyUrls())); + return Collections.unmodifiableSet(new HashSet<>(inner().replyUrls())); } @Override diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/CertificateCredentialImpl.java b/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/CertificateCredentialImpl.java index a643b1ae9121..0796f184246c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/CertificateCredentialImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/CertificateCredentialImpl.java @@ -19,11 +19,12 @@ import java.util.Base64; /** Implementation for ServicePrincipal and its parent interfaces. */ -class CertificateCredentialImpl extends IndexableRefreshableWrapperImpl +class CertificateCredentialImpl> + extends IndexableRefreshableWrapperImpl implements CertificateCredential, CertificateCredential.Definition, CertificateCredential.UpdateDefinition { private String name; - private HasCredential parent; + private HasCredential parent; private OutputStream authFile; private String privateKeyPath; private String privateKeyPassword; @@ -39,7 +40,7 @@ class CertificateCredentialImpl extends IndexableRefreshableWrapperImpl parent) { + CertificateCredentialImpl(String name, HasCredential parent) { super( new KeyCredentialInner() .withUsage("Verify") @@ -76,10 +77,8 @@ public String value() { } @Override - @SuppressWarnings("unchecked") public T attach() { - parent.withCertificateCredential(this); - return (T) parent; + return parent.withCertificateCredential(this); } @Override diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/PasswordCredentialImpl.java b/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/PasswordCredentialImpl.java index c08a31425683..e065fd4ff998 100644 --- a/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/PasswordCredentialImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/PasswordCredentialImpl.java @@ -18,11 +18,12 @@ import java.util.Base64; /** Implementation for ServicePrincipal and its parent interfaces. */ -class PasswordCredentialImpl extends IndexableRefreshableWrapperImpl +class PasswordCredentialImpl> + extends IndexableRefreshableWrapperImpl implements PasswordCredential, PasswordCredential.Definition, PasswordCredential.UpdateDefinition { private String name; - private HasCredential parent; + private HasCredential parent; OutputStream authFile; private String subscriptionId; private final ClientLogger logger = new ClientLogger(PasswordCredentialImpl.class); @@ -39,7 +40,7 @@ class PasswordCredentialImpl extends IndexableRefreshableWrapperImpl parent) { + PasswordCredentialImpl(String name, HasCredential parent) { super( new PasswordCredentialInner() .withCustomKeyIdentifier(Base64.getEncoder().encode(name.getBytes(StandardCharsets.UTF_8))) @@ -75,10 +76,8 @@ public String value() { } @Override - @SuppressWarnings("unchecked") public T attach() { - parent.withPasswordCredential(this); - return (T) parent; + return parent.withPasswordCredential(this); } @Override diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleDefinitionImpl.java b/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleDefinitionImpl.java index f279be4b7504..37839cf9fb85 100644 --- a/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleDefinitionImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleDefinitionImpl.java @@ -55,7 +55,7 @@ public Set permissions() { @Override public Set assignableScopes() { - return Collections.unmodifiableSet(new HashSet(inner().assignableScopes())); + return Collections.unmodifiableSet(new HashSet<>(inner().assignableScopes())); } @Override diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/ServicePrincipalImpl.java b/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/ServicePrincipalImpl.java index 1e1a07d6a5a9..2e697e8abb9b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/ServicePrincipalImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/ServicePrincipalImpl.java @@ -277,13 +277,13 @@ public Mono refreshAsync() { } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) public CertificateCredentialImpl defineCertificateCredential(String name) { return new CertificateCredentialImpl<>(name, this); } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) public PasswordCredentialImpl definePasswordCredential(String name) { return new PasswordCredentialImpl<>(name, this); } From 553dfaac0d33d7321bac826e799d77a3cfba4ddd Mon Sep 17 00:00:00 2001 From: Tanyi Chen Date: Tue, 28 Jul 2020 13:43:26 +0800 Subject: [PATCH 03/10] suppress unchecked and rawtypes --- .../ApplicationGatewaysImpl.java | 5 ++-- .../ExpressRouteCircuitImpl.java | 4 +-- .../ExpressRouteCircuitPeeringImpl.java | 5 ++++ .../ExpressRouteCircuitPeeringsImpl.java | 25 +++++++++++++------ .../implementation/RouteFilterImpl.java | 2 +- .../models/PointToSiteConfiguration.java | 8 ++---- .../network/LoadBalancerTests.java | 2 +- .../NetworkInterfaceOperationsTests.java | 3 ++- 8 files changed, 33 insertions(+), 21 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewaysImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewaysImpl.java index abc62248a8aa..a16c5ac27465 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewaysImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewaysImpl.java @@ -83,6 +83,7 @@ public Flux stopAsync(String... applicationGatewayResourceIds) { } @Override + @SuppressWarnings({"unchecked", "rawtypes"}) public Flux startAsync(Collection applicationGatewayResourceIds) { if (applicationGatewayResourceIds == null) { return Flux.empty(); @@ -95,11 +96,11 @@ public Flux startAsync(Collection applicationGatewayResourceIds) Mono o = ReactorMapper.map(this.inner().startAsync(resourceGroupName, name), id); observables.add(o); } - return Flux.mergeDelayError(32, observables.toArray(new Mono[observables.size()])); + return Flux.mergeDelayError(32, observables.toArray(new Mono[0])); } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) public Flux stopAsync(Collection applicationGatewayResourceIds) { if (applicationGatewayResourceIds == null) { return Flux.empty(); diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitImpl.java index 26680811a6b2..71000cd79bd8 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitImpl.java @@ -104,8 +104,8 @@ protected void initializeChildrenFromInner() { expressRouteCircuitPeerings .put( peering.name(), - new ExpressRouteCircuitPeeringImpl( - this, peering, manager().inner().getExpressRouteCircuitPeerings(), peering.peeringType())); + new ExpressRouteCircuitPeeringImpl<>(this, peering, + manager().inner().getExpressRouteCircuitPeerings(), peering.peeringType())); } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringImpl.java index 5ed2db5a5758..8cd412672462 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringImpl.java @@ -42,6 +42,7 @@ class ExpressRouteCircuitPeeringImpl } @Override + @SuppressWarnings("rawtypes") public ExpressRouteCircuitPeeringImpl withAdvertisedPublicPrefixes(String publicPrefix) { ensureMicrosoftPeeringConfig().withAdvertisedPublicPrefixes(Arrays.asList(publicPrefix)); return this; @@ -55,24 +56,28 @@ private ExpressRouteCircuitPeeringConfig ensureMicrosoftPeeringConfig() { } @Override + @SuppressWarnings("rawtypes") public ExpressRouteCircuitPeeringImpl withPrimaryPeerAddressPrefix(String addressPrefix) { inner().withPrimaryPeerAddressPrefix(addressPrefix); return this; } @Override + @SuppressWarnings("rawtypes") public ExpressRouteCircuitPeeringImpl withSecondaryPeerAddressPrefix(String addressPrefix) { inner().withSecondaryPeerAddressPrefix(addressPrefix); return this; } @Override + @SuppressWarnings("rawtypes") public ExpressRouteCircuitPeeringImpl withVlanId(int vlanId) { inner().withVlanId(vlanId); return this; } @Override + @SuppressWarnings("rawtypes") public ExpressRouteCircuitPeeringImpl withPeerAsn(long peerASN) { inner().withPeerAsn(peerASN); return this; diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringsImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringsImpl.java index 5edfd6074d6a..7ad120e651e1 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringsImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringsImpl.java @@ -6,6 +6,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.resourcemanager.network.NetworkManager; import com.azure.resourcemanager.network.fluent.ExpressRouteCircuitPeeringsClient; +import com.azure.resourcemanager.network.fluent.inner.ExpressRouteCircuitInner; import com.azure.resourcemanager.network.fluent.inner.ExpressRouteCircuitPeeringInner; import com.azure.resourcemanager.network.models.ExpressRouteCircuit; import com.azure.resourcemanager.network.models.ExpressRouteCircuitPeering; @@ -18,7 +19,7 @@ class ExpressRouteCircuitPeeringsImpl extends IndependentChildrenImpl< ExpressRouteCircuitPeering, - ExpressRouteCircuitPeeringImpl, + ExpressRouteCircuitPeeringImpl, ExpressRouteCircuitPeeringInner, ExpressRouteCircuitPeeringsClient, NetworkManager, @@ -48,30 +49,38 @@ public PagedFlux listAsync() { } @Override - protected ExpressRouteCircuitPeeringImpl wrapModel(String name) { - return new ExpressRouteCircuitPeeringImpl( + @SuppressWarnings("rawtypes") + protected ExpressRouteCircuitPeeringImpl + wrapModel(String name) { + return new ExpressRouteCircuitPeeringImpl<>( parent, new ExpressRouteCircuitPeeringInner(), inner(), ExpressRoutePeeringType.fromString(name)); } - protected ExpressRouteCircuitPeeringImpl wrapModel(ExpressRouteCircuitPeeringInner inner) { - return (inner == null) ? null : new ExpressRouteCircuitPeeringImpl(parent, inner, inner(), inner.peeringType()); + @SuppressWarnings("rawtypes") + protected ExpressRouteCircuitPeeringImpl + wrapModel(ExpressRouteCircuitPeeringInner inner) { + return (inner == null) ? null + : new ExpressRouteCircuitPeeringImpl<>(parent, inner, inner(), inner.peeringType()); } @Override + @SuppressWarnings("rawtypes") public ExpressRouteCircuitPeeringImpl defineAzurePrivatePeering() { - return new ExpressRouteCircuitPeeringImpl( + return new ExpressRouteCircuitPeeringImpl<>( parent, new ExpressRouteCircuitPeeringInner(), inner(), ExpressRoutePeeringType.AZURE_PRIVATE_PEERING); } @Override + @SuppressWarnings("rawtypes") public ExpressRouteCircuitPeeringImpl defineAzurePublicPeering() { - return new ExpressRouteCircuitPeeringImpl( + return new ExpressRouteCircuitPeeringImpl<>( parent, new ExpressRouteCircuitPeeringInner(), inner(), ExpressRoutePeeringType.AZURE_PUBLIC_PEERING); } @Override + @SuppressWarnings("rawtypes") public ExpressRouteCircuitPeeringImpl defineMicrosoftPeering() { - return new ExpressRouteCircuitPeeringImpl( + return new ExpressRouteCircuitPeeringImpl<>( parent, new ExpressRouteCircuitPeeringInner(), inner(), ExpressRoutePeeringType.MICROSOFT_PEERING); } diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteFilterImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteFilterImpl.java index 467126862415..e140c60906a0 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteFilterImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteFilterImpl.java @@ -52,7 +52,7 @@ protected void initializeChildrenFromInner() { if (this.inner().peerings() != null) { this.peerings = this.inner().peerings().stream().collect(Collectors.toMap( ExpressRouteCircuitPeeringInner::name, - peering -> new ExpressRouteCircuitPeeringImpl(this, peering, + peering -> new ExpressRouteCircuitPeeringImpl<>(this, peering, manager().inner().getExpressRouteCircuitPeerings(), peering.peeringType()) )); } else { diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/PointToSiteConfiguration.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/PointToSiteConfiguration.java index b41dbe957169..81c2a51948d6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/PointToSiteConfiguration.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/PointToSiteConfiguration.java @@ -139,10 +139,8 @@ interface Definition interface UpdateStages { /** * The stage of the point-to-site configuration definition allowing to specify address pool. - * - * @param the stage of the parent definition to return to after attaching this definition */ - interface WithAddressPool { + interface WithAddressPool { /** * Specifies address pool. * @@ -210,10 +208,8 @@ interface WithRevokedCertificate { /** * The stage of a point-to-site configuration definition allowing to specify which tunnel type will be used. - * - * @param the stage of the parent definition to return to after attaching this definition */ - interface WithTunnelType { + interface WithTunnelType { /** * Specifies that only SSTP tunnel type will be used. * diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/LoadBalancerTests.java b/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/LoadBalancerTests.java index 2a61aacfa89c..b07c9d7ff233 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/LoadBalancerTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/LoadBalancerTests.java @@ -38,7 +38,7 @@ public void canCRUDProbe() throws Exception { .withSubnet(SUBNET_NAME, "172.18.0.0/28") .create(); - LoadBalancer loadBalancer = this.createLoadBalancer(networkManager, resourceGroup, network, lbName); + LoadBalancer loadBalancer = createLoadBalancer(networkManager, resourceGroup, network, lbName); // verify created probes Assertions.assertEquals(2, loadBalancer.loadBalancingRules().size()); diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/NetworkInterfaceOperationsTests.java b/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/NetworkInterfaceOperationsTests.java index 06ff527cea97..774094b87b73 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/NetworkInterfaceOperationsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/NetworkInterfaceOperationsTests.java @@ -29,6 +29,7 @@ public class NetworkInterfaceOperationsTests extends NetworkManagementTest { @Test + @SuppressWarnings({"unchecked", "rawtypes"}) public void canUseMultipleIPConfigs() throws Exception { String networkName = sdkContext.randomResourceName("net", 15); String[] nicNames = new String[3]; @@ -177,7 +178,7 @@ public void canUseMultipleIPConfigs() throws Exception { List updatedNics = Flux - .mergeDelayError(32, (Mono[]) nicUpdates.toArray(new Mono[nicUpdates.size()])) + .mergeDelayError(32, (Mono[]) nicUpdates.toArray(new Mono[0])) .collectList() .block(); From 1d299242dca5a95b975b26c75f2a3f7ddbdadf66 Mon Sep 17 00:00:00 2001 From: Tanyi Chen Date: Tue, 28 Jul 2020 14:06:12 +0800 Subject: [PATCH 04/10] suppress compute warning --- .../compute/implementation/GalleriesImpl.java | 2 +- .../implementation/VirtualMachineExtensionImpl.java | 2 ++ .../VirtualMachineScaleSetExtensionImpl.java | 3 +++ .../compute/implementation/VirtualMachineScaleSetImpl.java | 7 +++---- .../VirtualMachineScaleSetVMInstanceExtensionImpl.java | 1 + .../WindowsVolumeLegacyEncryptionMonitorImpl.java | 1 + .../VirtualMachineAvailabilityZoneOperationsTests.java | 2 ++ .../compute/VirtualMachineScaleSetOperationsTests.java | 2 +- 8 files changed, 14 insertions(+), 6 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/GalleriesImpl.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/GalleriesImpl.java index 9e3d60d592c3..ecec54c25b22 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/GalleriesImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/GalleriesImpl.java @@ -38,7 +38,7 @@ protected Mono deleteInnerAsync(String resourceGroupName, String name) { } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) public Flux deleteByIdsAsync(Collection ids) { if (ids == null || ids.isEmpty()) { return Flux.empty(); diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImpl.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImpl.java index a2b170625b66..335f21a05cd2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImpl.java @@ -231,6 +231,7 @@ public Mono createResourceAsync() { } @Override + @SuppressWarnings("unchecked") public Mono updateResourceAsync() { this.nullifySettingsIfEmpty(); if (this.isReference()) { @@ -294,6 +295,7 @@ private void nullifySettingsIfEmpty() { } } + @SuppressWarnings("unchecked") private void initializeSettings() { if (this.inner().settings() == null) { this.publicSettings = new LinkedHashMap<>(); diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineScaleSetExtensionImpl.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineScaleSetExtensionImpl.java index 76008d0124e5..71079ee775b0 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineScaleSetExtensionImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineScaleSetExtensionImpl.java @@ -55,6 +55,7 @@ public boolean autoUpgradeMinorVersionEnabled() { } @Override + @SuppressWarnings("unchecked") public Map publicSettings() { if (this.inner().settings() == null) { return Collections.unmodifiableMap(new LinkedHashMap()); @@ -160,6 +161,7 @@ public VirtualMachineScaleSetImpl attach() { // are used to ensure we initialize settings/protectedSettings of an extension only if user choose to update // it. // + @SuppressWarnings("unchecked") private HashMap ensurePublicSettings() { if (this.inner().settings() == null) { this.inner().withSettings(new LinkedHashMap()); @@ -167,6 +169,7 @@ private HashMap ensurePublicSettings() { return (LinkedHashMap) this.inner().settings(); } + @SuppressWarnings("unchecked") private HashMap ensureProtectedSettings() { if (this.inner().protectedSettings() == null) { this.inner().withProtectedSettings(new LinkedHashMap()); diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineScaleSetImpl.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineScaleSetImpl.java index 3beea9dd50ec..a88d6142202b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineScaleSetImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineScaleSetImpl.java @@ -86,6 +86,7 @@ import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -2211,10 +2212,8 @@ private static void removeInboundNatPoolsFromIpConfiguration( } } - private static void addToList(List list, T... items) { - for (T item : items) { - list.add(item); - } + private static void addToList(List list, T[] items) { + list.addAll(Arrays.asList(items)); } private static String mergePath(String... segments) { diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineScaleSetVMInstanceExtensionImpl.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineScaleSetVMInstanceExtensionImpl.java index d27b5216ae79..63fb38efd520 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineScaleSetVMInstanceExtensionImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineScaleSetVMInstanceExtensionImpl.java @@ -79,6 +79,7 @@ public Map tags() { return Collections.unmodifiableMap(this.inner().tags()); } + @SuppressWarnings("unchecked") private void initializeSettings() { if (this.inner().settings() == null) { this.publicSettings = new LinkedHashMap<>(); diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeLegacyEncryptionMonitorImpl.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeLegacyEncryptionMonitorImpl.java index f8e78ecbafa8..cfb6a8142a4f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeLegacyEncryptionMonitorImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeLegacyEncryptionMonitorImpl.java @@ -80,6 +80,7 @@ public EncryptionStatus osDiskStatus() { } @Override + @SuppressWarnings("unchecked") public EncryptionStatus dataDiskStatus() { if (!hasEncryptionDetails()) { return EncryptionStatus.NOT_ENCRYPTED; diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineAvailabilityZoneOperationsTests.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineAvailabilityZoneOperationsTests.java index 6356e4bc45d7..d71b93438a86 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineAvailabilityZoneOperationsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineAvailabilityZoneOperationsTests.java @@ -269,6 +269,7 @@ public void canCreateZonedVirtualMachineWithZoneResilientPublicIP() throws Excep @Test @Disabled("Though valid scenario, ignoring it due to network service bug") + @SuppressWarnings("unchecked") public void canCreateRegionalNonAvailSetVirtualMachinesAndAssociateThemWithSingleBackendPoolOfZoneResilientLoadBalancer() throws Exception { @@ -423,6 +424,7 @@ public void canCreateZonedVirtualMachineWithZoneResilientPublicIP() throws Excep @Test @Disabled("Though valid scenario, ignoring it due to network service bug") + @SuppressWarnings("unchecked") public void canCreateZonedVirtualMachinesAndAssociateThemWithSingleBackendPoolOfZoneResilientLoadBalancer() throws Exception { final String networkName = generateRandomResourceName("net", 10); diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetOperationsTests.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetOperationsTests.java index 8e141e94f75c..16e98bc1035d 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetOperationsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetOperationsTests.java @@ -207,7 +207,7 @@ public void canUpdateVirtualMachineScaleSetWithExtensionProtectedSettings() thro Assertions.assertNotNull(extension.publicSettingsAsJsonString()); // Update VMSS capacity // - int newCapacity = (int) (scaleSet.capacity() + 1); + int newCapacity = scaleSet.capacity() + 1; virtualMachineScaleSet.update().withCapacity(newCapacity).apply(); // Validate extensions after update // From cb94e411336d649796229339a6b2db6ea405d968 Mon Sep 17 00:00:00 2001 From: Tanyi Chen Date: Tue, 28 Jul 2020 14:14:50 +0800 Subject: [PATCH 05/10] fix app service warning --- .../appservice/implementation/WebAppBaseImpl.java | 6 ++---- .../appservice/implementation/WebAppMsiHandler.java | 2 ++ .../azure/resourcemanager/appservice/HostnameSslTests.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppBaseImpl.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppBaseImpl.java index 082a1d64a78e..d6c58738a3c1 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppBaseImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppBaseImpl.java @@ -199,8 +199,7 @@ public String resourceId() { }; } - @SuppressWarnings("unchecked") - private FluentT normalizeProperties() { + private void normalizeProperties() { this.hostNameBindingsToCreate = new TreeMap<>(); this.hostNameBindingsToDelete = new ArrayList<>(); this.appSettingsToAdd = new HashMap<>(); @@ -238,7 +237,6 @@ private FluentT normalizeProperties() { } } this.webAppMsiHandler.clear(); - return (FluentT) this; } @Override @@ -843,7 +841,7 @@ public Mono createResourceAsync() { @Override @SuppressWarnings("unchecked") public Mono updateResourceAsync() { - SiteInner siteInner = (SiteInner) this.inner(); + SiteInner siteInner = this.inner(); SitePatchResourceInner siteUpdate = new SitePatchResourceInner(); siteUpdate.withHostnameSslStates(siteInner.hostnameSslStates()); siteUpdate.withKind(siteInner.kind()); diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppMsiHandler.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppMsiHandler.java index fcb90bc24220..f459a2932237 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppMsiHandler.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppMsiHandler.java @@ -27,6 +27,7 @@ * Utility class to set Managed Service Identity (MSI) property on a web app, install or update MSI extension and create * role assignments for the service principal associated with the web app. */ +@SuppressWarnings("rawtypes") public class WebAppMsiHandler extends RoleAssignmentHelper { private final ClientLogger logger = new ClientLogger(getClass()); @@ -43,6 +44,7 @@ public class WebAppMsiHandler extends RoleAssignmentHelper { * @param webAppBase the web app to which MSI extension needs to be installed and for which role assignments needs * to be created */ + @SuppressWarnings("rawtypes") WebAppMsiHandler(final AuthorizationManager authorizationManager, WebAppBaseImpl webAppBase) { super(authorizationManager, webAppBase.taskGroup(), webAppBase.idProvider()); this.webAppBase = webAppBase; diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/HostnameSslTests.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/HostnameSslTests.java index 3a2239b69325..970936b02f07 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/HostnameSslTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/test/java/com/azure/resourcemanager/appservice/HostnameSslTests.java @@ -58,7 +58,7 @@ public void canBindHostnameAndSsl() throws Exception { // hostname binding shortcut webApp.update().withManagedHostnameBindings(domain, webappName + "-1", webappName + "-2").apply(); if (!isPlaybackMode()) { - Response response = curl("http://" + webappName + "-1." + domainName); + Response response = curl("http://" + webappName + "-1." + domainName); Assertions.assertEquals(200, response.getStatusCode()); Assertions.assertNotNull(response.getValue()); response = curl("http://" + webappName + "-2." + domainName); From 786324652c0d4ed578c59d3e6d28e8405985cfd5 Mon Sep 17 00:00:00 2001 From: Tanyi Chen Date: Tue, 28 Jul 2020 14:16:43 +0800 Subject: [PATCH 06/10] fix cosmos warning --- .../cosmos/implementation/CosmosDBAccountImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-cosmos/src/main/java/com/azure/resourcemanager/cosmos/implementation/CosmosDBAccountImpl.java b/sdk/resourcemanager/azure-resourcemanager-cosmos/src/main/java/com/azure/resourcemanager/cosmos/implementation/CosmosDBAccountImpl.java index 99fc1c3bebd1..5e4c39c497d7 100644 --- a/sdk/resourcemanager/azure-resourcemanager-cosmos/src/main/java/com/azure/resourcemanager/cosmos/implementation/CosmosDBAccountImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-cosmos/src/main/java/com/azure/resourcemanager/cosmos/implementation/CosmosDBAccountImpl.java @@ -389,7 +389,7 @@ public CosmosDBAccountImpl withoutReadReplication(Region region) { this.ensureFailoverIsInitialized(); for (int i = 1; i < this.failoverPolicies.size(); i++) { if (this.failoverPolicies.get(i).locationName() != null) { - String locName = this.formatLocationName(this.failoverPolicies.get(i).locationName()); + String locName = formatLocationName(this.failoverPolicies.get(i).locationName()); if (locName.equals(region.name())) { this.failoverPolicies.remove(i); } From 012ff628448926141c5439f007a57fca4a55d1d0 Mon Sep 17 00:00:00 2001 From: Tanyi Chen Date: Tue, 28 Jul 2020 14:32:06 +0800 Subject: [PATCH 07/10] fix aks warning --- .../implementation/KubernetesClusterAgentPoolImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/KubernetesClusterAgentPoolImpl.java b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/KubernetesClusterAgentPoolImpl.java index e84bfcc403b2..4daf21391310 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/KubernetesClusterAgentPoolImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/KubernetesClusterAgentPoolImpl.java @@ -15,7 +15,8 @@ /** The implementation for KubernetesClusterAgentPool and its create and update interfaces. */ public class KubernetesClusterAgentPoolImpl extends ChildResourceImpl - implements KubernetesClusterAgentPool, KubernetesClusterAgentPool.Definition { + implements KubernetesClusterAgentPool, + KubernetesClusterAgentPool.Definition { private String subnetName; @@ -101,7 +102,7 @@ public KubernetesClusterAgentPoolImpl withAgentPoolTypeName(String agentPoolType } @Override - public DefinitionStages.WithAttach withAgentPoolVirtualMachineCount(int count) { + public KubernetesClusterAgentPoolImpl withAgentPoolVirtualMachineCount(int count) { this.inner().withCount(count); return this; } @@ -121,7 +122,7 @@ public KubernetesClusterAgentPoolImpl withVirtualNetwork(String virtualNetworkId } @Override - public KubernetesCluster.Definition attach() { + public KubernetesClusterImpl attach() { this.parent().inner().agentPoolProfiles().add(this.inner()); return this.parent(); } From 89d6d3add56e5e43666e4100735ee2690319bfe4 Mon Sep 17 00:00:00 2001 From: Tanyi Chen Date: Tue, 28 Jul 2020 14:55:37 +0800 Subject: [PATCH 08/10] fix monitor warning --- .../monitor/implementation/ActionGroupImpl.java | 1 + .../monitor/implementation/DiagnosticSettingsImpl.java | 2 +- .../monitor/implementation/MetricAlertConditionBaseImpl.java | 5 ++++- .../azure/resourcemanager/monitor/models/ActionGroup.java | 5 ++++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/implementation/ActionGroupImpl.java b/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/implementation/ActionGroupImpl.java index b66ed8145fe9..e56443cbb972 100644 --- a/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/implementation/ActionGroupImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/implementation/ActionGroupImpl.java @@ -139,6 +139,7 @@ public ActionGroupImpl withoutReceiver(String actionNamePrefix) { } @Override + @SuppressWarnings("unchecked") public ActionGroupImpl defineReceiver(String actionNamePrefix) { return this.updateReceiver(actionNamePrefix); } diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/implementation/DiagnosticSettingsImpl.java b/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/implementation/DiagnosticSettingsImpl.java index 37dc60420a2e..b7264ebbe8e5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/implementation/DiagnosticSettingsImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/implementation/DiagnosticSettingsImpl.java @@ -160,7 +160,7 @@ public Mono deleteByIdAsync(String id) { } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) public Flux deleteByIdsAsync(Collection ids) { if (ids == null || ids.isEmpty()) { return Flux.empty(); diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/implementation/MetricAlertConditionBaseImpl.java b/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/implementation/MetricAlertConditionBaseImpl.java index d3ee3f5c517a..fc69e7c167f5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/implementation/MetricAlertConditionBaseImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/implementation/MetricAlertConditionBaseImpl.java @@ -63,6 +63,7 @@ public MetricAlertImpl parent() { return this.parent; } + @SuppressWarnings("unchecked") public SubclassT withMetricName(String metricName) { this.inner().withMetricName(metricName); return (SubclassT) this; @@ -70,9 +71,10 @@ public SubclassT withMetricName(String metricName) { public SubclassT withMetricName(String metricName, String metricNamespace) { this.inner().withMetricNamespace(metricNamespace); - return (SubclassT) this.withMetricName(metricName); + return this.withMetricName(metricName); } + @SuppressWarnings("unchecked") public SubclassT withDimension(String dimensionName, String... values) { if (this.dimensions.containsKey(dimensionName)) { dimensions.remove(dimensionName); @@ -85,6 +87,7 @@ public SubclassT withDimension(String dimensionName, String... values) { return (SubclassT) this; } + @SuppressWarnings("unchecked") public SubclassT withoutDimension(String dimensionName) { if (this.dimensions.containsKey(dimensionName)) { dimensions.remove(dimensionName); diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/models/ActionGroup.java b/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/models/ActionGroup.java index 9dc569e750cf..3aa57e915d4a 100644 --- a/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/models/ActionGroup.java +++ b/sdk/resourcemanager/azure-resourcemanager-monitor/src/main/java/com/azure/resourcemanager/monitor/models/ActionGroup.java @@ -191,7 +191,10 @@ ActionDefinition withAzureFunction( } /** The entirety of a Action Group definition. */ - interface Definition extends DefinitionStages.Blank, ActionDefinition, DefinitionStages.WithCreate { + @SuppressWarnings("rawtypes") + interface Definition extends DefinitionStages.Blank, + ActionDefinition, + DefinitionStages.WithCreate { } /** Grouping of Action Group definition stages. */ From 14e4bc8e1239004519386d66fb544bcaa5895a49 Mon Sep 17 00:00:00 2001 From: Tanyi Chen Date: Tue, 28 Jul 2020 15:15:50 +0800 Subject: [PATCH 09/10] change msi handler to generic type rather than suppress rawtypes --- .../implementation/WebAppBaseImpl.java | 4 +-- .../implementation/WebAppMsiHandler.java | 30 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppBaseImpl.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppBaseImpl.java index d6c58738a3c1..77f4821687a8 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppBaseImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppBaseImpl.java @@ -134,7 +134,7 @@ abstract class WebAppBaseImpl webAppMsiHandler; WebAppBaseImpl( String name, @@ -151,7 +151,7 @@ abstract class WebAppBaseImpl(logConfig, this); } - webAppMsiHandler = new WebAppMsiHandler(manager.authorizationManager(), this); + webAppMsiHandler = new WebAppMsiHandler<>(manager.authorizationManager(), this); normalizeProperties(); isInCreateMode = inner() == null || inner().id() == null; if (!isInCreateMode) { diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppMsiHandler.java b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppMsiHandler.java index f459a2932237..eb30591253b3 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppMsiHandler.java +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/WebAppMsiHandler.java @@ -9,6 +9,7 @@ import com.azure.resourcemanager.appservice.models.ManagedServiceIdentityUserAssignedIdentities; import com.azure.resourcemanager.appservice.fluent.inner.SiteInner; import com.azure.resourcemanager.appservice.fluent.inner.SitePatchResourceInner; +import com.azure.resourcemanager.appservice.models.WebAppBase; import com.azure.resourcemanager.authorization.AuthorizationManager; import com.azure.resourcemanager.authorization.implementation.RoleAssignmentHelper; import com.azure.resourcemanager.msi.models.Identity; @@ -27,12 +28,12 @@ * Utility class to set Managed Service Identity (MSI) property on a web app, install or update MSI extension and create * role assignments for the service principal associated with the web app. */ -@SuppressWarnings("rawtypes") -public class WebAppMsiHandler extends RoleAssignmentHelper { +public class WebAppMsiHandler> + extends RoleAssignmentHelper { private final ClientLogger logger = new ClientLogger(getClass()); - private WebAppBaseImpl webAppBase; + private WebAppBaseImpl webAppBase; private List creatableIdentityKeys; private Map userAssignedIdentities; @@ -44,8 +45,7 @@ public class WebAppMsiHandler extends RoleAssignmentHelper { * @param webAppBase the web app to which MSI extension needs to be installed and for which role assignments needs * to be created */ - @SuppressWarnings("rawtypes") - WebAppMsiHandler(final AuthorizationManager authorizationManager, WebAppBaseImpl webAppBase) { + WebAppMsiHandler(final AuthorizationManager authorizationManager, WebAppBaseImpl webAppBase) { super(authorizationManager, webAppBase.taskGroup(), webAppBase.idProvider()); this.webAppBase = webAppBase; this.creatableIdentityKeys = new ArrayList<>(); @@ -58,7 +58,7 @@ public class WebAppMsiHandler extends RoleAssignmentHelper { * * @return WebAppMsiHandler */ - WebAppMsiHandler withLocalManagedServiceIdentity() { + WebAppMsiHandler withLocalManagedServiceIdentity() { this.initSiteIdentity(ManagedServiceIdentityType.SYSTEM_ASSIGNED); return this; } @@ -68,8 +68,8 @@ WebAppMsiHandler withLocalManagedServiceIdentity() { * * @return WebAppMsiHandler */ - WebAppMsiHandler withoutLocalManagedServiceIdentity() { - SiteInner siteInner = (SiteInner) this.webAppBase.inner(); + WebAppMsiHandler withoutLocalManagedServiceIdentity() { + SiteInner siteInner = this.webAppBase.inner(); if (siteInner.identity() == null || siteInner.identity().type() == null @@ -90,7 +90,7 @@ WebAppMsiHandler withoutLocalManagedServiceIdentity() { * @param creatableIdentity yet-to-be-created identity to be associated with the virtual machine * @return WebAppMsiHandler */ - WebAppMsiHandler withNewExternalManagedServiceIdentity(Creatable creatableIdentity) { + WebAppMsiHandler withNewExternalManagedServiceIdentity(Creatable creatableIdentity) { this.initSiteIdentity(ManagedServiceIdentityType.USER_ASSIGNED); TaskGroup.HasTaskGroup dependency = (TaskGroup.HasTaskGroup) creatableIdentity; @@ -108,7 +108,7 @@ WebAppMsiHandler withNewExternalManagedServiceIdentity(Creatable creat * @param identity an identity to associate * @return WebAppMsiHandler */ - WebAppMsiHandler withExistingExternalManagedServiceIdentity(Identity identity) { + WebAppMsiHandler withExistingExternalManagedServiceIdentity(Identity identity) { this.initSiteIdentity(ManagedServiceIdentityType.USER_ASSIGNED); this.userAssignedIdentities.put(identity.id(), new ManagedServiceIdentityUserAssignedIdentities()); return this; @@ -121,7 +121,7 @@ WebAppMsiHandler withExistingExternalManagedServiceIdentity(Identity identity) { * @param identityId resource id of the identity * @return WebAppMsiHandler */ - WebAppMsiHandler withoutExternalManagedServiceIdentity(String identityId) { + WebAppMsiHandler withoutExternalManagedServiceIdentity(String identityId) { this.userAssignedIdentities.put(identityId, null); return this; } @@ -136,7 +136,7 @@ void processCreatedExternalIdentities() { } void handleExternalIdentities() { - SiteInner siteInner = (SiteInner) this.webAppBase.inner(); + SiteInner siteInner = this.webAppBase.inner(); if (!this.userAssignedIdentities.isEmpty()) { siteInner.identity().withUserAssignedIdentities(this.userAssignedIdentities); } @@ -159,7 +159,7 @@ void handleExternalIdentities(SitePatchResourceInner siteUpdate) { // 4. User want to add and remove (all or subset) some identities in 'Site.Identity.userAssignedIdentities' // [this.userAssignedIdentities.empty() == false and this.webAppBase.inner().identity() != null] // - SiteInner siteInner = (SiteInner) this.webAppBase.inner(); + SiteInner siteInner = this.webAppBase.inner(); ManagedServiceIdentity currentIdentity = siteInner.identity(); siteUpdate.withIdentity(currentIdentity); if (!this.userAssignedIdentities.isEmpty()) { @@ -189,7 +189,7 @@ void clear() { * @return true if user indented to remove all the identities. */ private boolean handleRemoveAllExternalIdentitiesCase(SitePatchResourceInner siteUpdate) { - SiteInner siteInner = (SiteInner) this.webAppBase.inner(); + SiteInner siteInner = this.webAppBase.inner(); if (!this.userAssignedIdentities.isEmpty()) { int rmCount = 0; for (ManagedServiceIdentityUserAssignedIdentities v : this.userAssignedIdentities.values()) { @@ -262,7 +262,7 @@ private void initSiteIdentity(ManagedServiceIdentityType identityType) { throw logger.logExceptionAsError(new IllegalArgumentException("Invalid argument: " + identityType)); } - SiteInner siteInner = (SiteInner) this.webAppBase.inner(); + SiteInner siteInner = this.webAppBase.inner(); if (siteInner.identity() == null) { siteInner.withIdentity(new ManagedServiceIdentity()); } From 9aaed9047af6a0cad6a5f3b8570f5edc5339c496 Mon Sep 17 00:00:00 2001 From: Tanyi Chen Date: Tue, 28 Jul 2020 15:19:54 +0800 Subject: [PATCH 10/10] change ExpressRouteCircuitPeering to generic type --- .../ExpressRouteCircuitPeeringImpl.java | 20 +++++++++---------- .../ExpressRouteCircuitPeeringsImpl.java | 14 ++++++------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringImpl.java index 8cd412672462..11292ca9f27f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringImpl.java @@ -42,8 +42,8 @@ class ExpressRouteCircuitPeeringImpl } @Override - @SuppressWarnings("rawtypes") - public ExpressRouteCircuitPeeringImpl withAdvertisedPublicPrefixes(String publicPrefix) { + public ExpressRouteCircuitPeeringImpl + withAdvertisedPublicPrefixes(String publicPrefix) { ensureMicrosoftPeeringConfig().withAdvertisedPublicPrefixes(Arrays.asList(publicPrefix)); return this; } @@ -56,29 +56,29 @@ private ExpressRouteCircuitPeeringConfig ensureMicrosoftPeeringConfig() { } @Override - @SuppressWarnings("rawtypes") - public ExpressRouteCircuitPeeringImpl withPrimaryPeerAddressPrefix(String addressPrefix) { + public ExpressRouteCircuitPeeringImpl + withPrimaryPeerAddressPrefix(String addressPrefix) { inner().withPrimaryPeerAddressPrefix(addressPrefix); return this; } @Override - @SuppressWarnings("rawtypes") - public ExpressRouteCircuitPeeringImpl withSecondaryPeerAddressPrefix(String addressPrefix) { + public ExpressRouteCircuitPeeringImpl + withSecondaryPeerAddressPrefix(String addressPrefix) { inner().withSecondaryPeerAddressPrefix(addressPrefix); return this; } @Override - @SuppressWarnings("rawtypes") - public ExpressRouteCircuitPeeringImpl withVlanId(int vlanId) { + public ExpressRouteCircuitPeeringImpl + withVlanId(int vlanId) { inner().withVlanId(vlanId); return this; } @Override - @SuppressWarnings("rawtypes") - public ExpressRouteCircuitPeeringImpl withPeerAsn(long peerASN) { + public ExpressRouteCircuitPeeringImpl + withPeerAsn(long peerASN) { inner().withPeerAsn(peerASN); return this; } diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringsImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringsImpl.java index 7ad120e651e1..1c92cd794852 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringsImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringsImpl.java @@ -49,14 +49,12 @@ public PagedFlux listAsync() { } @Override - @SuppressWarnings("rawtypes") protected ExpressRouteCircuitPeeringImpl wrapModel(String name) { return new ExpressRouteCircuitPeeringImpl<>( parent, new ExpressRouteCircuitPeeringInner(), inner(), ExpressRoutePeeringType.fromString(name)); } - @SuppressWarnings("rawtypes") protected ExpressRouteCircuitPeeringImpl wrapModel(ExpressRouteCircuitPeeringInner inner) { return (inner == null) ? null @@ -64,22 +62,22 @@ public PagedFlux listAsync() { } @Override - @SuppressWarnings("rawtypes") - public ExpressRouteCircuitPeeringImpl defineAzurePrivatePeering() { + public ExpressRouteCircuitPeeringImpl + defineAzurePrivatePeering() { return new ExpressRouteCircuitPeeringImpl<>( parent, new ExpressRouteCircuitPeeringInner(), inner(), ExpressRoutePeeringType.AZURE_PRIVATE_PEERING); } @Override - @SuppressWarnings("rawtypes") - public ExpressRouteCircuitPeeringImpl defineAzurePublicPeering() { + public ExpressRouteCircuitPeeringImpl + defineAzurePublicPeering() { return new ExpressRouteCircuitPeeringImpl<>( parent, new ExpressRouteCircuitPeeringInner(), inner(), ExpressRoutePeeringType.AZURE_PUBLIC_PEERING); } @Override - @SuppressWarnings("rawtypes") - public ExpressRouteCircuitPeeringImpl defineMicrosoftPeering() { + public ExpressRouteCircuitPeeringImpl + defineMicrosoftPeering() { return new ExpressRouteCircuitPeeringImpl<>( parent, new ExpressRouteCircuitPeeringInner(), inner(), ExpressRoutePeeringType.MICROSOFT_PEERING); }