[extension-azure] Fix JSON serialization of Azure inner objects

The root cause is Azure/azure-sdk-for-java@bf82b20#diff-f9966c32cd440a243d000cba9e1061cc421866f77ccf428466dc4197cbd7f355 (Azure/azure-sdk-for-java#23441) and Azure/azure-sdk-for-java@e68f02a#diff-f9966c32cd440a243d000cba9e1061cc421866f77ccf428466dc4197cbd7f355 (Azure/azure-sdk-for-java#24138)
vividus-framework · Oct 20, 2021 · 77e053e · 77e053e
1 parent 1e10666
commit 77e053e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/vividus-extension-azure/build.gradle b/vividus-extension-azure/build.gradle
@@ -1,7 +1,7 @@
 project.description = 'Vividus extension for Azure Cloud'
 
 dependencies {
-    api(group: 'com.azure', name: 'azure-identity', version: '1.3.6')
+    api(group: 'com.azure', name: 'azure-identity', version: '1.4.0')
 
     testImplementation platform(group: 'org.junit', name: 'junit-bom', version: versions.junit)
     testImplementation(group: 'org.junit.jupiter', name: 'junit-jupiter')

diff --git a/vividus-extension-azure/src/main/java/org/vividus/azure/util/InnersJacksonAdapter.java b/vividus-extension-azure/src/main/java/org/vividus/azure/util/InnersJacksonAdapter.java
@@ -18,19 +18,14 @@
 
 import com.azure.core.util.serializer.JacksonAdapter;
 import com.fasterxml.jackson.annotation.JsonProperty.Access;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.introspect.Annotated;
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
 
 public class InnersJacksonAdapter extends JacksonAdapter
 {
-    private ObjectMapper objectMapper;
-
-    @Override
-    protected ObjectMapper simpleMapper()
+    public InnersJacksonAdapter()
     {
-        if (this.objectMapper == null)
-        {
+        super((outer, inner) -> {
             JacksonAnnotationIntrospector annotationIntrospector = new JacksonAnnotationIntrospector()
             {
                 @Override
@@ -40,8 +35,8 @@ public Access findPropertyAccess(Annotated annotated)
                     return access == Access.WRITE_ONLY ? Access.AUTO : access;
                 }
             };
-            this.objectMapper = super.simpleMapper().setAnnotationIntrospector(annotationIntrospector);
-        }
-        return objectMapper;
+            outer.setAnnotationIntrospector(annotationIntrospector);
+            inner.setAnnotationIntrospector(annotationIntrospector);
+        });
     }
 }