From 47e8044625c5ee7b19f54cb5012ab84d53294497 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Fri, 17 Jul 2020 15:40:44 +0800 Subject: [PATCH 1/2] prepare for shared SerializerAdapter --- .../resources/fluentcore/AzureServiceClient.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/fluentcore/AzureServiceClient.java b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/fluentcore/AzureServiceClient.java index 27cc88d828cc..0dfb6c156107 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/fluentcore/AzureServiceClient.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/fluentcore/AzureServiceClient.java @@ -54,7 +54,7 @@ public abstract class AzureServiceClient { SDK_VERSION = PROPERTIES.getOrDefault("version", "UnknownVersion"); } - private final SerializerAdapter serializerAdapter = new AzureJacksonAdapter(); + private SerializerAdapter serializerAdapter = new AzureJacksonAdapter(); private final String sdkName; @@ -63,6 +63,14 @@ protected AzureServiceClient(HttpPipeline httpPipeline, AzureEnvironment environ ((AzureJacksonAdapter) serializerAdapter).serializer().registerModule(DateTimeDeserializer.getModule()); } + protected AzureServiceClient(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, AzureEnvironment environment) { + sdkName = this.getClass().getPackage().getName(); + this.serializerAdapter = serializerAdapter; + if (serializerAdapter instanceof AzureJacksonAdapter) { + ((AzureJacksonAdapter) serializerAdapter).serializer().registerModule(DateTimeDeserializer.getModule()); + } + } + /** * Gets serializer adapter for JSON serialization/de-serialization. * From 2e26af869fcb73067e9161a04cdbd22276841b81 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Mon, 20 Jul 2020 10:20:56 +0800 Subject: [PATCH 2/2] fix checkstyle --- .../resources/fluentcore/AzureServiceClient.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/fluentcore/AzureServiceClient.java b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/fluentcore/AzureServiceClient.java index 0dfb6c156107..78a2115bcc47 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/fluentcore/AzureServiceClient.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/fluentcore/AzureServiceClient.java @@ -54,17 +54,21 @@ public abstract class AzureServiceClient { SDK_VERSION = PROPERTIES.getOrDefault("version", "UnknownVersion"); } - private SerializerAdapter serializerAdapter = new AzureJacksonAdapter(); + private final SerializerAdapter serializerAdapter; private final String sdkName; protected AzureServiceClient(HttpPipeline httpPipeline, AzureEnvironment environment) { sdkName = this.getClass().getPackage().getName(); + + this.serializerAdapter = new AzureJacksonAdapter(); ((AzureJacksonAdapter) serializerAdapter).serializer().registerModule(DateTimeDeserializer.getModule()); } - protected AzureServiceClient(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, AzureEnvironment environment) { + protected AzureServiceClient(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, + AzureEnvironment environment) { sdkName = this.getClass().getPackage().getName(); + this.serializerAdapter = serializerAdapter; if (serializerAdapter instanceof AzureJacksonAdapter) { ((AzureJacksonAdapter) serializerAdapter).serializer().registerModule(DateTimeDeserializer.getModule());