From a9f17edd9f73f0864a1e338f9f925642355fd8cc Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Wed, 8 Jul 2020 16:16:32 +0800 Subject: [PATCH] move AzureServiceClient to fluentcore --- .../AppPlatformManagementClient.java | 2 +- .../appservice/WebSiteManagementClient.java | 2 +- .../AuthorizationManagementClient.java | 2 +- .../GraphRbacManagementClient.java | 2 +- .../compute/ComputeManagementClient.java | 2 +- .../ContainerRegistryManagementClient.java | 2 +- .../ContainerServiceManagementClient.java | 2 +- .../cosmos/CosmosDBManagementClient.java | 2 +- .../dns/DnsManagementClient.java | 2 +- .../keyvault/KeyVaultManagementClient.java | 2 +- .../msi/ManagedServiceIdentityClient.java | 2 +- .../monitor/MonitorClient.java | 2 +- .../network/NetworkManagementClient.java | 2 +- .../azure/resourcemanager/package-info.java | 8 --- .../resources/FeatureClient.java | 2 +- .../resources/PolicyClient.java | 2 +- .../resources/ResourceManagementClient.java | 2 +- .../resources/SubscriptionClient.java | 2 +- .../fluentcore}/AzureServiceClient.java | 56 +------------------ .../resources/fluentcore/package-info.java | 7 +++ .../sql/SqlManagementClient.java | 2 +- .../storage/StorageManagementClient.java | 2 +- 22 files changed, 29 insertions(+), 80 deletions(-) delete mode 100644 sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/package-info.java rename sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/{ => resources/fluentcore}/AzureServiceClient.java (79%) create mode 100644 sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/fluentcore/package-info.java diff --git a/sdk/appplatform/mgmt/src/main/java/com/azure/resourcemanager/appplatform/AppPlatformManagementClient.java b/sdk/appplatform/mgmt/src/main/java/com/azure/resourcemanager/appplatform/AppPlatformManagementClient.java index 4954f555b43b7..9283a8306343f 100644 --- a/sdk/appplatform/mgmt/src/main/java/com/azure/resourcemanager/appplatform/AppPlatformManagementClient.java +++ b/sdk/appplatform/mgmt/src/main/java/com/azure/resourcemanager/appplatform/AppPlatformManagementClient.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.AzureEnvironment; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.appplatform.fluent.AppsClient; import com.azure.resourcemanager.appplatform.fluent.BindingsClient; import com.azure.resourcemanager.appplatform.fluent.CertificatesClient; diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/resourcemanager/appservice/WebSiteManagementClient.java b/sdk/appservice/mgmt/src/main/java/com/azure/resourcemanager/appservice/WebSiteManagementClient.java index cc535c6cd6a4b..0381c1d7c68c3 100644 --- a/sdk/appservice/mgmt/src/main/java/com/azure/resourcemanager/appservice/WebSiteManagementClient.java +++ b/sdk/appservice/mgmt/src/main/java/com/azure/resourcemanager/appservice/WebSiteManagementClient.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.AzureEnvironment; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.appservice.fluent.AppServiceCertificateOrdersClient; import com.azure.resourcemanager.appservice.fluent.AppServiceEnvironmentsClient; import com.azure.resourcemanager.appservice.fluent.AppServicePlansClient; diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/AuthorizationManagementClient.java b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/AuthorizationManagementClient.java index b066d4f1efc7d..771fd39411678 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/AuthorizationManagementClient.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/AuthorizationManagementClient.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.AzureEnvironment; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.authorization.fluent.ClassicAdministratorsClient; import com.azure.resourcemanager.authorization.fluent.GlobalAdministratorsClient; import com.azure.resourcemanager.authorization.fluent.PermissionsClient; diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/GraphRbacManagementClient.java b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/GraphRbacManagementClient.java index 06134b8541e79..4f970c456d802 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/GraphRbacManagementClient.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/GraphRbacManagementClient.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.AzureEnvironment; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.authorization.fluent.ApplicationsClient; import com.azure.resourcemanager.authorization.fluent.DeletedApplicationsClient; import com.azure.resourcemanager.authorization.fluent.DomainsClient; diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/ComputeManagementClient.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/ComputeManagementClient.java index 5b16ce322a013..c2c288d7c6fe2 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/ComputeManagementClient.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/ComputeManagementClient.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.AzureEnvironment; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.compute.fluent.AvailabilitySetsClient; import com.azure.resourcemanager.compute.fluent.ContainerServicesClient; import com.azure.resourcemanager.compute.fluent.DedicatedHostGroupsClient; diff --git a/sdk/containerregistry/mgmt/src/main/java/com/azure/resourcemanager/containerregistry/ContainerRegistryManagementClient.java b/sdk/containerregistry/mgmt/src/main/java/com/azure/resourcemanager/containerregistry/ContainerRegistryManagementClient.java index 4b9dcf1a63c45..18360da80224d 100644 --- a/sdk/containerregistry/mgmt/src/main/java/com/azure/resourcemanager/containerregistry/ContainerRegistryManagementClient.java +++ b/sdk/containerregistry/mgmt/src/main/java/com/azure/resourcemanager/containerregistry/ContainerRegistryManagementClient.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.AzureEnvironment; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.containerregistry.fluent.OperationsClient; import com.azure.resourcemanager.containerregistry.fluent.RegistriesClient; import com.azure.resourcemanager.containerregistry.fluent.ReplicationsClient; diff --git a/sdk/containerservice/mgmt/src/main/java/com/azure/resourcemanager/containerservice/ContainerServiceManagementClient.java b/sdk/containerservice/mgmt/src/main/java/com/azure/resourcemanager/containerservice/ContainerServiceManagementClient.java index 9903234e609c7..82e9c1d84092e 100644 --- a/sdk/containerservice/mgmt/src/main/java/com/azure/resourcemanager/containerservice/ContainerServiceManagementClient.java +++ b/sdk/containerservice/mgmt/src/main/java/com/azure/resourcemanager/containerservice/ContainerServiceManagementClient.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.AzureEnvironment; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.containerservice.fluent.AgentPoolsClient; import com.azure.resourcemanager.containerservice.fluent.ContainerServicesClient; import com.azure.resourcemanager.containerservice.fluent.ManagedClustersClient; diff --git a/sdk/cosmos/mgmt/src/main/java/com/azure/resourcemanager/cosmos/CosmosDBManagementClient.java b/sdk/cosmos/mgmt/src/main/java/com/azure/resourcemanager/cosmos/CosmosDBManagementClient.java index ec633089b9416..32bdc2f406e24 100644 --- a/sdk/cosmos/mgmt/src/main/java/com/azure/resourcemanager/cosmos/CosmosDBManagementClient.java +++ b/sdk/cosmos/mgmt/src/main/java/com/azure/resourcemanager/cosmos/CosmosDBManagementClient.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.AzureEnvironment; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.cosmos.fluent.CassandraResourcesClient; import com.azure.resourcemanager.cosmos.fluent.CollectionPartitionRegionsClient; import com.azure.resourcemanager.cosmos.fluent.CollectionPartitionsClient; diff --git a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/DnsManagementClient.java b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/DnsManagementClient.java index 8a82220944c3f..f1e04727b8965 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/DnsManagementClient.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/DnsManagementClient.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.AzureEnvironment; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.dns.fluent.RecordSetsClient; import com.azure.resourcemanager.dns.fluent.ZonesClient; diff --git a/sdk/keyvault/mgmt/src/main/java/com/azure/resourcemanager/keyvault/KeyVaultManagementClient.java b/sdk/keyvault/mgmt/src/main/java/com/azure/resourcemanager/keyvault/KeyVaultManagementClient.java index 7087cb2f411ff..08385e8b095c7 100644 --- a/sdk/keyvault/mgmt/src/main/java/com/azure/resourcemanager/keyvault/KeyVaultManagementClient.java +++ b/sdk/keyvault/mgmt/src/main/java/com/azure/resourcemanager/keyvault/KeyVaultManagementClient.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.AzureEnvironment; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.keyvault.fluent.OperationsClient; import com.azure.resourcemanager.keyvault.fluent.PrivateEndpointConnectionsClient; import com.azure.resourcemanager.keyvault.fluent.PrivateLinkResourcesClient; diff --git a/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/resourcemanager/msi/ManagedServiceIdentityClient.java b/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/resourcemanager/msi/ManagedServiceIdentityClient.java index 43a5c1f9c6eb8..fb7ecbe32f5b0 100644 --- a/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/resourcemanager/msi/ManagedServiceIdentityClient.java +++ b/sdk/managedserviceidentity/mgmt/src/main/java/com/azure/resourcemanager/msi/ManagedServiceIdentityClient.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.AzureEnvironment; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.msi.fluent.OperationsClient; import com.azure.resourcemanager.msi.fluent.SystemAssignedIdentitiesClient; import com.azure.resourcemanager.msi.fluent.UserAssignedIdentitiesClient; diff --git a/sdk/monitor/mgmt/src/main/java/com/azure/resourcemanager/monitor/MonitorClient.java b/sdk/monitor/mgmt/src/main/java/com/azure/resourcemanager/monitor/MonitorClient.java index f1181b9a9fedf..209b257180c24 100644 --- a/sdk/monitor/mgmt/src/main/java/com/azure/resourcemanager/monitor/MonitorClient.java +++ b/sdk/monitor/mgmt/src/main/java/com/azure/resourcemanager/monitor/MonitorClient.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.AzureEnvironment; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.monitor.fluent.ActionGroupsClient; import com.azure.resourcemanager.monitor.fluent.ActivityLogAlertsClient; import com.azure.resourcemanager.monitor.fluent.ActivityLogsClient; diff --git a/sdk/network/mgmt/src/main/java/com/azure/resourcemanager/network/NetworkManagementClient.java b/sdk/network/mgmt/src/main/java/com/azure/resourcemanager/network/NetworkManagementClient.java index 0a9c2bb1bf026..3eeb315c35510 100644 --- a/sdk/network/mgmt/src/main/java/com/azure/resourcemanager/network/NetworkManagementClient.java +++ b/sdk/network/mgmt/src/main/java/com/azure/resourcemanager/network/NetworkManagementClient.java @@ -33,7 +33,7 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.polling.PollerFlux; import com.azure.core.util.polling.SyncPoller; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.network.fluent.ApplicationGatewaysClient; import com.azure.resourcemanager.network.fluent.ApplicationSecurityGroupsClient; import com.azure.resourcemanager.network.fluent.AvailableDelegationsClient; diff --git a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/package-info.java b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/package-info.java deleted file mode 100644 index 5e7574c51433c..0000000000000 --- a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. - -/** - * This package contains the base classes for management sdk. - */ -package com.azure.resourcemanager; diff --git a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/FeatureClient.java b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/FeatureClient.java index ee1313e560467..d428e72304303 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/FeatureClient.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/FeatureClient.java @@ -28,7 +28,7 @@ import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.resources.fluent.FeaturesClient; import com.azure.resourcemanager.resources.fluent.inner.OperationInner; import com.azure.resourcemanager.resources.fluent.inner.OperationListResultInner; diff --git a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/PolicyClient.java b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/PolicyClient.java index eea782a9840a9..a4f8ceb91829f 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/PolicyClient.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/PolicyClient.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.AzureEnvironment; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.resources.fluent.PolicyAssignmentsClient; import com.azure.resourcemanager.resources.fluent.PolicyDefinitionsClient; import com.azure.resourcemanager.resources.fluent.PolicySetDefinitionsClient; diff --git a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/ResourceManagementClient.java b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/ResourceManagementClient.java index e1258f9b928d2..09f0cc3d76b56 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/ResourceManagementClient.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/ResourceManagementClient.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.AzureEnvironment; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.resources.fluent.DeploymentOperationsClient; import com.azure.resourcemanager.resources.fluent.DeploymentsClient; import com.azure.resourcemanager.resources.fluent.OperationsClient; diff --git a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/SubscriptionClient.java b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/SubscriptionClient.java index b790dbe353651..41589bc4bd2c8 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/SubscriptionClient.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/SubscriptionClient.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.AzureEnvironment; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.resources.fluent.SubscriptionsClient; import com.azure.resourcemanager.resources.fluent.TenantsClient; diff --git a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/AzureServiceClient.java b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/fluentcore/AzureServiceClient.java similarity index 79% rename from sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/AzureServiceClient.java rename to sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/fluentcore/AzureServiceClient.java index db8fe10693d92..9ec1a0f8ac038 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/AzureServiceClient.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/fluentcore/AzureServiceClient.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.resourcemanager; +package com.azure.resourcemanager.resources.fluentcore; import com.azure.core.http.HttpPipeline; import com.azure.core.http.rest.Response; @@ -28,20 +28,15 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import javax.xml.bind.annotation.adapters.HexBinaryAdapter; import java.io.IOException; import java.lang.reflect.Type; -import java.net.NetworkInterface; import java.nio.ByteBuffer; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import java.time.LocalDateTime; import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalQueries; -import java.util.Enumeration; /** * ServiceClient is the abstraction for accessing REST operations and their payload data types. @@ -54,20 +49,6 @@ protected AzureServiceClient(HttpPipeline httpPipeline, AzureEnvironment environ ((AzureJacksonAdapter) serializerAdapter).serializer().registerModule(DateTimeDeserializer.getModule()); } - /** - * The default User-Agent header. Override this method to override the user agent. - * - * @return the user agent string. - */ - public String userAgent() { - return String.format("Azure-SDK-For-Java/%s OS:%s MacAddressHash:%s Java:%s", - getClass().getPackage().getImplementationVersion(), - OS, - MAC_ADDRESS_HASH, - JAVA_VERSION); - } - - private static final String MAC_ADDRESS_HASH; private static final String OS; private static final String OS_NAME; private static final String OS_VERSION; @@ -78,22 +59,6 @@ public String userAgent() { OS_NAME = System.getProperty("os.name"); OS_VERSION = System.getProperty("os.version"); OS = OS_NAME + "/" + OS_VERSION; - String macAddress = "Unknown"; - try { - Enumeration networks = NetworkInterface.getNetworkInterfaces(); - while (networks.hasMoreElements()) { - NetworkInterface network = networks.nextElement(); - byte[] mac = network.getHardwareAddress(); - - if (mac != null) { - macAddress = getSha256(mac); - break; - } - } - } catch (Throwable t) { - // It's okay ignore mac address hash telemetry - } - MAC_ADDRESS_HASH = macAddress; String version = System.getProperty("java.version"); JAVA_VERSION = version != null ? version : "Unknown"; } @@ -148,7 +113,7 @@ public Context getContext() { * @param type of final result. * @return poller flux for poll result and final result. */ - public PollerFlux, U> getLroResultAsync(Mono>> lroInit, + public PollerFlux, U> getLroResultAsync(Mono>> lroInit, HttpPipeline httpPipeline, Type pollResultType, Type finalResultType) { return PollerFactory.create( @@ -157,25 +122,10 @@ public PollerFlux, U> getLroResultAsync(Mono>> activationOperation(Mono>> lroInit) { - return lroInit.flatMap(fluxSimpleResponse -> Mono.just(fluxSimpleResponse)); - } - - private static String getSha256(byte[] bytes) { - MessageDigest messageDigest; - try { - messageDigest = MessageDigest.getInstance("SHA-256"); - return new HexBinaryAdapter().marshal(messageDigest.digest(bytes)); - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - } - return "Unknown"; - } - /** * Gets the final result, or an error, based on last async poll response. * diff --git a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/fluentcore/package-info.java b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/fluentcore/package-info.java new file mode 100644 index 0000000000000..14e02d9495947 --- /dev/null +++ b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/fluentcore/package-info.java @@ -0,0 +1,7 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +/** + * This package contains the base classes for management sdk. + */ +package com.azure.resourcemanager.resources.fluentcore; diff --git a/sdk/sql/mgmt/src/main/java/com/azure/resourcemanager/sql/SqlManagementClient.java b/sdk/sql/mgmt/src/main/java/com/azure/resourcemanager/sql/SqlManagementClient.java index d67792b394e71..2468a97fc933b 100644 --- a/sdk/sql/mgmt/src/main/java/com/azure/resourcemanager/sql/SqlManagementClient.java +++ b/sdk/sql/mgmt/src/main/java/com/azure/resourcemanager/sql/SqlManagementClient.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.AzureEnvironment; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.sql.fluent.BackupLongTermRetentionPoliciesClient; import com.azure.resourcemanager.sql.fluent.BackupShortTermRetentionPoliciesClient; import com.azure.resourcemanager.sql.fluent.CapabilitiesClient; diff --git a/sdk/storage/mgmt/src/main/java/com/azure/resourcemanager/storage/StorageManagementClient.java b/sdk/storage/mgmt/src/main/java/com/azure/resourcemanager/storage/StorageManagementClient.java index 4613c657d02a5..1a25aea6004a7 100644 --- a/sdk/storage/mgmt/src/main/java/com/azure/resourcemanager/storage/StorageManagementClient.java +++ b/sdk/storage/mgmt/src/main/java/com/azure/resourcemanager/storage/StorageManagementClient.java @@ -8,7 +8,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.management.AzureEnvironment; import com.azure.core.util.logging.ClientLogger; -import com.azure.resourcemanager.AzureServiceClient; +import com.azure.resourcemanager.resources.fluentcore.AzureServiceClient; import com.azure.resourcemanager.storage.fluent.BlobContainersClient; import com.azure.resourcemanager.storage.fluent.BlobServicesClient; import com.azure.resourcemanager.storage.fluent.EncryptionScopesClient;