Use Static ObjectMappers Instead of Instances (Azure#23639)

Use Static ObjectMappers Instead of Instances

Author: alzimmermsft

sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/ConfigurationAsyncClient.java

@@ -21,6 +21,7 @@
 import com.azure.core.util.CoreUtils;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.serializer.JacksonAdapter;
+import com.azure.core.util.serializer.SerializerAdapter;
 import com.azure.data.appconfiguration.implementation.ConfigurationSettingJsonDeserializer;
 import com.azure.data.appconfiguration.implementation.ConfigurationSettingJsonSerializer;
 import com.azure.data.appconfiguration.implementation.SyncTokenPolicy;
@@ -60,13 +61,23 @@ public final class ConfigurationAsyncClient {
     // Please see <a href=https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/azure-services-resource-providers>here</a>
     // for more information on Azure resource provider namespaces.
     private static final String APP_CONFIG_TRACING_NAMESPACE_VALUE = "Microsoft.AppConfiguration";
-
     private static final String ETAG_ANY = "*";
+
+    private static final SerializerAdapter SERIALIZER_ADAPTER;
+
     private final String serviceEndpoint;
     private final ConfigurationService service;
     private final String apiVersion;
     private final SyncTokenPolicy syncTokenPolicy;
 
+    static {
+        JacksonAdapter jacksonAdapter = new JacksonAdapter();
+        jacksonAdapter.serializer().registerModule(ConfigurationSettingJsonSerializer.getModule());
+        jacksonAdapter.serializer().registerModule(ConfigurationSettingJsonDeserializer.getModule());
+
+        SERIALIZER_ADAPTER = jacksonAdapter;
+    }
+
     /**
      * Creates a ConfigurationAsyncClient that sends requests to the configuration service at {@code serviceEndpoint}.
      * Each service call goes through the {@code pipeline}.
@@ -79,11 +90,7 @@ public final class ConfigurationAsyncClient {
     ConfigurationAsyncClient(String serviceEndpoint, HttpPipeline pipeline, ConfigurationServiceVersion version,
         SyncTokenPolicy syncTokenPolicy) {
 
-        final JacksonAdapter jacksonAdapter = new JacksonAdapter();
-        jacksonAdapter.serializer().registerModule(ConfigurationSettingJsonSerializer.getModule());
-        jacksonAdapter.serializer().registerModule(ConfigurationSettingJsonDeserializer.getModule());
-
-        this.service = RestProxy.create(ConfigurationService.class, pipeline, jacksonAdapter);
+        this.service = RestProxy.create(ConfigurationService.class, pipeline, SERIALIZER_ADAPTER);
         this.serviceEndpoint = serviceEndpoint;
         this.apiVersion = version.getVersion();
         this.syncTokenPolicy = syncTokenPolicy;

sdk/appconfiguration/azure-data-appconfiguration/src/main/java/com/azure/data/appconfiguration/implementation/ConfigurationSettingJsonDeserializer.java

@@ -57,7 +57,7 @@ public final class ConfigurationSettingJsonDeserializer extends JsonDeserializer
     private static final JacksonAdapter MAPPER;
     private static final SimpleModule MODULE;
     static {
-        MAPPER = new JacksonAdapter();
+        MAPPER = (JacksonAdapter) JacksonAdapter.createDefaultSerializerAdapter();
         MODULE = new SimpleModule()
                      .addDeserializer(ConfigurationSetting.class, new ConfigurationSettingJsonDeserializer())
                      .addDeserializer(SecretReferenceConfigurationSetting.class,

sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/config/web/pushbusrefresh/AppConfigurationBusRefreshEndpoint.java

@@ -38,7 +38,7 @@ public final class AppConfigurationBusRefreshEndpoint extends AbstractBusEndpoin
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AppConfigurationBusRefreshEndpoint.class);
 
-    private final ObjectMapper objectmapper = new ObjectMapper();
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
     private final AppConfigurationProperties appConfiguration;
 
@@ -60,10 +60,10 @@ public AppConfigurationBusRefreshEndpoint(ApplicationEventPublisher context, Str
     /**
      * Checks a HttpServletRequest to see if it is a refresh event. Validates token information. If request is a
      * validation request returns validation code.
-     * 
+     *
      * @param request Request checked for refresh.
      * @param response Response for request.
-     * @param allRequestParams request parameters needs to contain validation token. 
+     * @param allRequestParams request parameters needs to contain validation token.
      * @return 200 if refresh event triggered. 500 if invalid for any reason. Validation response if requested.
      * @throws IOException Unable to parse request info for validation.
      */
@@ -73,7 +73,7 @@ public String refresh(HttpServletRequest request, HttpServletResponse response,
         @RequestParam Map<String, String> allRequestParams) throws IOException {
         String reference = request.getReader().lines().collect(Collectors.joining(System.lineSeparator()));
 
-        JsonNode kvReference = objectmapper.readTree(reference);
+        JsonNode kvReference = OBJECT_MAPPER.readTree(reference);
 
         AppConfigurationEndpoint validation;
         try {

sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/config/web/pushrefresh/AppConfigurationRefreshEndpoint.java

@@ -37,7 +37,7 @@ public final class AppConfigurationRefreshEndpoint implements ApplicationEventPu
 
     private final ContextRefresher contextRefresher;
 
-    private final ObjectMapper objectmapper = new ObjectMapper();
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
     private final AppConfigurationProperties appConfiguration;
 
@@ -59,10 +59,10 @@ public AppConfigurationRefreshEndpoint(ContextRefresher contextRefresher,
     /**
      * Checks a HttpServletRequest to see if it is a refresh event. Validates token information. If request is a
      * validation request returns validation code.
-     * 
+     *
      * @param request Request checked for refresh.
      * @param response Response for request.
-     * @param allRequestParams request parameters needs to contain validation token. 
+     * @param allRequestParams request parameters needs to contain validation token.
      * @return 200 if refresh event triggered. 500 if invalid for any reason. Validation response if requested.
      * @throws IOException Unable to parse request info for validation.
      */
@@ -73,7 +73,7 @@ public String refresh(HttpServletRequest request, HttpServletResponse response,
 
         String reference = request.getReader().lines().collect(Collectors.joining(System.lineSeparator()));
 
-        JsonNode kvReference = objectmapper.readTree(reference);
+        JsonNode kvReference = OBJECT_MAPPER.readTree(reference);
         AppConfigurationEndpoint validation = new AppConfigurationEndpoint(kvReference, appConfiguration.getStores(),
             allRequestParams);
 

sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/src/main/java/com/azure/spring/cloud/config/AppConfigurationPropertySource.java

@@ -2,31 +2,6 @@
 // Licensed under the MIT License.
 package com.azure.spring.cloud.config;
 
-import static com.azure.spring.cloud.config.AppConfigurationConstants.FEATURE_FLAG_PREFIX;
-import static com.azure.spring.cloud.config.AppConfigurationConstants.FEATURE_MANAGEMENT_KEY;
-import static java.util.Collections.emptyList;
-import static java.util.stream.Collectors.toMap;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.stream.IntStream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.env.EnumerablePropertySource;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.util.StringUtils;
-
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.data.appconfiguration.ConfigurationClient;
 import com.azure.data.appconfiguration.models.ConfigurationSetting;
@@ -47,13 +22,35 @@
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.env.EnumerablePropertySource;
+import org.springframework.util.ReflectionUtils;
+import org.springframework.util.StringUtils;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.stream.IntStream;
+
+import static com.azure.spring.cloud.config.AppConfigurationConstants.FEATURE_FLAG_PREFIX;
+import static com.azure.spring.cloud.config.AppConfigurationConstants.FEATURE_MANAGEMENT_KEY;
+import static java.util.Collections.emptyList;
+import static java.util.stream.Collectors.toMap;
 
 /**
  * Azure App Configuration PropertySource unique per Store Label(Profile) combo.
- * 
- * <p>
- * i.e. If connecting to 2 stores and have 2 labels set 4 AppConfigurationPropertySources need to be created.
- * </p>
+ *
+ * <p>i.e. If connecting to 2 stores and have 2 labels set 4 AppConfigurationPropertySources need to be created.</p>
  */
 public final class AppConfigurationPropertySource extends EnumerablePropertySource<ConfigurationClient> {
 
@@ -78,6 +75,9 @@ public final class AppConfigurationPropertySource extends EnumerablePropertySour
     private static final ObjectMapper CASE_INSENSITIVE_MAPPER = new ObjectMapper()
         .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
 
+    private static final ObjectMapper FEATURE_MAPPER = new ObjectMapper()
+        .setPropertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE);
+
     private final AppConfigurationStoreSelects selectedKeys;
 
     private final List<String> profiles;
@@ -212,7 +212,7 @@ FeatureSet initProperties(FeatureSet featureSet) throws IOException {
     /**
      * Given a Setting's Key Vault Reference stored in the Settings value, it will get its entry in Key Vault.
      *
-     * @param value {"uri": "&lt;your-vault-url&gt;/secret/&lt;secret&gt;/&lt;version&gt;"}
+     * @param secretReference {"uri": "&lt;your-vault-url&gt;/secret/&lt;secret&gt;/&lt;version&gt;"}
      * @return Key Vault Secret Value
      */
     private String getKeyVaultEntry(SecretReferenceConfigurationSetting secretReference) {
@@ -254,10 +254,8 @@ private String getKeyVaultEntry(SecretReferenceConfigurationSetting secretRefere
      * @param featureSet Feature Flag info to be set to this property source.
      */
     void initFeatures(FeatureSet featureSet) {
-        ObjectMapper featureMapper = new ObjectMapper();
-        featureMapper.setPropertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE);
         properties.put(FEATURE_MANAGEMENT_KEY,
-            featureMapper.convertValue(featureSet.getFeatureManagement(), LinkedHashMap.class));
+            FEATURE_MAPPER.convertValue(featureSet.getFeatureManagement(), LinkedHashMap.class));
     }
 
     private FeatureSet addToFeatureSet(FeatureSet featureSet, PagedIterable<ConfigurationSetting> features, Date date)
@@ -282,10 +280,9 @@ private FeatureSet addToFeatureSet(FeatureSet featureSet, PagedIterable<Configur
      *
      * @param item Used to create Features before being converted to be set into properties.
      * @return Feature created from KeyValueItem
-     * @throws IOException - If a ConfigurationSetting isn't of the feature flag content type.
      */
     @SuppressWarnings("unchecked")
-    private Object createFeature(FeatureFlagConfigurationSetting item) throws IOException {
+    private Object createFeature(FeatureFlagConfigurationSetting item) {
         String key = getFeatureSimpleName(item);
         Feature feature = new Feature(key, item);
         Map<Integer, FeatureFlagFilter> featureEnabledFor = feature.getEnabledFor();

sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/src/main/java/com/azure/spring/cloud/config/JsonConfigurationParser.java

@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 final class JsonConfigurationParser {
+    private static final ObjectMapper MAPPER = new ObjectMapper();
 
     static boolean isJsonContentType(String contentType) {
         String acceptedMainType = "application";
@@ -45,8 +46,7 @@ static boolean isJsonContentType(String contentType) {
     static HashMap<String, Object> parseJsonSetting(ConfigurationSetting setting)
         throws JsonMappingException, JsonProcessingException {
         HashMap<String, Object> settings = new HashMap<String, Object>();
-        ObjectMapper jsonMapper = new ObjectMapper();
-        JsonNode json = jsonMapper.readTree(setting.getValue());
+        JsonNode json = MAPPER.readTree(setting.getValue());
         parseSetting(setting.getKey(), json, settings);
         return settings;
     }

sdk/appconfiguration/azure-spring-cloud-feature-management/src/main/java/com/azure/spring/cloud/feature/manager/FeatureManager.java

@@ -45,13 +45,13 @@ public class FeatureManager extends HashMap<String, Object> {
 
     private Map<String, Boolean> onOff;
 
-    private ObjectMapper mapper = new ObjectMapper();
+    private static final ObjectMapper MAPPER = new ObjectMapper()
+        .setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE);
 
     public FeatureManager(FeatureManagementConfigProperties properties) {
         this.properties = properties;
         featureManagement = new HashMap<>();
         onOff = new HashMap<>();
-        mapper.setPropertyNamingStrategy(PropertyNamingStrategy.KEBAB_CASE);
     }
 
     /**
@@ -116,7 +116,7 @@ private void addToFeatures(Map<? extends String, ? extends Object> features, Str
         } else {
             Feature feature = null;
             try {
-                feature = mapper.convertValue(featureKey, Feature.class);
+                feature = MAPPER.convertValue(featureKey, Feature.class);
             } catch (IllegalArgumentException e) {
                 LOGGER.error("Found invalid feature {} with value {}.", combined + key, featureKey.toString());
             }

sdk/attestation/azure-security-attestation/src/main/java/com/azure/security/attestation/implementation/models/AttestationSignerImpl.java

@@ -26,6 +26,7 @@
  */
 @Fluent
 public class AttestationSignerImpl implements AttestationSigner {
+    private static final ObjectMapper MAPPER = new ObjectMapper();
 
      /**
      * Sets the signing certificate.
@@ -135,8 +136,7 @@ public static AttestationSigner fromJWK(JWK jwk) throws Error {
 
         JsonWebKey jsonWebKey;
         try {
-            ObjectMapper om = new ObjectMapper();
-            jsonWebKey = om.readValue(serializedKey, JsonWebKey.class);
+            jsonWebKey = MAPPER.readValue(serializedKey, JsonWebKey.class);
         } catch (JsonProcessingException e) {
             throw logger.logExceptionAsError(new RuntimeException(e.getMessage()));
         }

sdk/attestation/azure-security-attestation/src/main/java/com/azure/security/attestation/implementation/models/AttestationTokenImpl.java

@@ -60,6 +60,7 @@
 @Fluent
 @Immutable
 public class AttestationTokenImpl implements AttestationToken {
+    private static final SerializerAdapter SERIALIZER_ADAPTER = JacksonAdapter.createDefaultSerializerAdapter();
 
     /**
      * Creates a new instance of an AttestationToken object.
@@ -102,15 +103,11 @@ public AttestationTokenImpl(String serializedToken) {
         if (payload.toString().length() == 0) {
             return null;
         } else {
-            SerializerAdapter serializerAdapter = new JacksonAdapter();
-            T t;
-
             try {
-                t = serializerAdapter.deserialize(payload.toString(), returnType, SerializerEncoding.JSON);
+                return SERIALIZER_ADAPTER.deserialize(payload.toString(), returnType, SerializerEncoding.JSON);
             } catch (IOException e) {
                 throw logger.logExceptionAsError(new RuntimeException(e.getMessage()));
             }
-            return t;
         }
     }
 

sdk/containerregistry/azure-containers-containerregistry/src/main/java/com/azure/containers/containerregistry/implementation/authentication/JsonWebToken.java

@@ -14,6 +14,7 @@
 import java.util.Base64;
 
 class JsonWebToken {
+    private static final ObjectMapper MAPPER = new ObjectMapper();
 
     /**
      * Retrieves the expiration date from the specified JWT value.
@@ -42,11 +43,9 @@ public static OffsetDateTime retrieveExpiration(String jwtValue) {
 
         byte[] jwtPayloadDecodedData = Base64.getDecoder().decode(jwtPayloadEncoded);
 
-        ObjectMapper mapper = new ObjectMapper();
-
         JsonNode rootNode;
         try {
-            rootNode = mapper.readTree(jwtPayloadDecodedData);
+            rootNode = MAPPER.readTree(jwtPayloadDecodedData);
         } catch (IOException exception) {
             return null;
         }