Clean-up

Author: jaaufauvre

library/src/main/java/com/mastercard/developer/oauth2/http/UserAgent.java

@@ -12,28 +12,22 @@ public final class UserAgent {
     private static final String PRODUCT = "Mastercard-OAuth2-Client";
     private static final String UNKNOWN_VERSION = "0.0.0-unknown";
     private static final String VERSION = readVersionFile();
-    // Cache the user-agent string to avoid rebuilding it on every call
-    private static final String CACHED_USER_AGENT = buildUserAgent();
 
     private UserAgent() {}
 
     /**
-     * Returns a stable, pre-built user-agent string:
+     * Builds a stable user-agent string:
      *   Product/Version (Runtime; OS [OS Version])
      * Example:
      *   Mastercard-OAuth2-Client/1.0.0 (Java/17.0.2; Linux 5.15)
      */
     public static String get() {
-        return CACHED_USER_AGENT;
-    }
-
-    private static String buildUserAgent() {
         String javaVer = System.getProperty("java.version", "unknown");
         String osName = System.getProperty("os.name", "unknown");
         String osVer = System.getProperty("os.version", "").trim();
         String runtime = "Java/" + javaVer;
         String osPart = osName + (osVer.isEmpty() ? "" : " " + osVer);
-        return PRODUCT + "/" + VERSION + " (" + runtime + "; " + osPart + ")";
+        return String.format("%s/%s (%s; %s)", PRODUCT, VERSION, runtime, osPart);
     }
 
     private static String readVersionFile() {

library/src/main/java/com/mastercard/developer/oauth2/internal/json/GsonJsonProvider.java

@@ -1,7 +1,6 @@
 package com.mastercard.developer.oauth2.internal.json;
 
 import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import com.mastercard.developer.oauth2.internal.json.exception.OAuth2ClientJsonException;
 import java.lang.reflect.Type;
@@ -10,12 +9,7 @@
 
 public class GsonJsonProvider implements JsonProvider {
 
-    // Use a configured Gson instance and cache the Map type to avoid allocating a new TypeToken on each parse.
-    private static final Gson gson = new GsonBuilder()
-        .disableHtmlEscaping()
-        .serializeNulls()
-        .create();
-
+    private static final Gson gson = new Gson();
     private static final Type MAP_TYPE = new TypeToken<Map<String, Object>>() {}.getType();
 
     @Override

library/src/main/java/com/mastercard/developer/oauth2/internal/json/JacksonJsonProvider.java

@@ -9,9 +9,7 @@
 public class JacksonJsonProvider implements JsonProvider {
 
     private static final ObjectMapper mapper = new ObjectMapper();
-
-    // Cache the TypeReference to avoid creating a new anonymous subclass on each parse call.
-    private static final TypeReference<Map<String, Object>> MAP_TYPE_REFERENCE = new TypeReference<Map<String, Object>>() {};
+    private static final TypeReference<Map<String, Object>> MAP_TYPE_REFERENCE = new TypeReference<>() {};
 
     @Override
     public Map<String, Object> parse(String json) throws OAuth2ClientJsonException {