fixes for copilot review of 01/03

Signed-off-by: Laurent Arnal <laurent@clae.net>

Author: lo92fr

bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthConnector.java

@@ -93,7 +93,7 @@ public OAuthConnector(HttpClientFactory httpClientFactory, @Nullable Fields extr
         this.gson = getGson(gsonBuilder);
     }
 
-    public static Gson getGson(GsonBuilder gsonBuilder) {
+    static Gson getGson(GsonBuilder gsonBuilder) {
         return gsonBuilder.setDateFormat(DateTimeType.DATE_PATTERN_JSON_COMPAT)
                 .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
                 .registerTypeAdapter(OAuthResponseException.class,

bundles/org.openhab.core.auth.oauth2client/src/test/java/org/openhab/core/auth/oauth2client/internal/AccessTokenResponseExtraFieldTest.java

@@ -12,7 +12,7 @@
  */
 package org.openhab.core.auth.oauth2client.internal;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Map;
 
@@ -24,7 +24,7 @@
 import com.google.gson.GsonBuilder;
 
 /**
- * JUnit tests for {@link AccessTokenResponseExtraField}
+ * JUnit tests for {@link AccessTokenResponse}
  *
  * @author Laurent Arnal - Initial contribution
  */
@@ -39,14 +39,14 @@ public void testExtraFieldDeserialization() {
         String json = "{\"access_token\":\"AccessToken\",\"expires_in\":60,\"refresh_token\":\"RefreshToken\",\"app_client_id\":\"ApplicationClientId\"}";
         AccessTokenResponse atr = gson.fromJson(json, AccessTokenResponse.class);
 
-        assertEquals(atr.getAccessToken(), "AccessToken");
-        assertEquals(atr.getExpiresIn(), 60);
-        assertEquals(atr.getRefreshToken(), "RefreshToken");
+        assertEquals("AccessToken", atr.getAccessToken());
+        assertEquals(60, atr.getExpiresIn());
+        assertEquals("RefreshToken", atr.getRefreshToken());
 
         Map<String, String> extraFields = atr.getExtraFields();
 
-        assertEquals(extraFields.size(), 1);
-        assertEquals(extraFields.containsKey("app_client_id"), true);
-        assertEquals(extraFields.get("app_client_id"), "ApplicationClientId");
+        assertEquals(1, extraFields.size());
+        assertTrue(extraFields.containsKey("app_client_id"));
+        assertEquals("ApplicationClientId", extraFields.get("app_client_id"));
     }
 }

bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/AccessTokenResponse.java

@@ -133,7 +133,8 @@ public final class AccessTokenResponse implements Serializable, Cloneable {
     }
 
     public void setExtraFields(Map<@NonNull String, @NonNull String> extraFields) {
-        this.extraFields = extraFields != null ? extraFields : Collections.emptyMap();
+        this.extraFields = (extraFields == null || extraFields.isEmpty()) ? Collections.emptyMap()
+                : Map.copyOf(extraFields);
     }
 
     /**
@@ -245,6 +246,6 @@ public boolean equals(Object thatAuthTokenObj) {
     public String toString() {
         return "AccessTokenResponse [accessToken=" + accessToken + ", tokenType=" + tokenType + ", expiresIn="
                 + expiresIn + ", refreshToken=" + refreshToken + ", scope=" + scope + ", state=" + state
-                + ", createdOn=" + createdOn + "]";
+                + ", createdOn=" + createdOn + ", extraFields= " + extraFields + "]";
     }
 }

bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/AccessTokenResponseExtraFieldsAdapterFactory.java

@@ -30,7 +30,6 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 
-@NonNullByDefault
 /**
  * A {@link TypeAdapterFactory} that decorates the default {@link AccessTokenResponse} adapter in order to capture
  * additional fields returned by an OAuth 2.0 authorization server that are not part of the standard RFC 6749
@@ -39,10 +38,11 @@
  *
  * @author Laurent Arnal
  */
+@NonNullByDefault
 public final class AccessTokenResponseExtraFieldsAdapterFactory implements TypeAdapterFactory {
 
     private static final Set<String> KNOWN_FIELDS = Set.of("access_token", "token_type", "expires_in", "refresh_token",
-            "scope", "state");
+            "scope", "state", "created_on", "extra_fields");
 
     @Override
     public <T> @Nullable TypeAdapter<T> create(@Nullable Gson gson, @Nullable TypeToken<T> type) {
@@ -67,29 +67,32 @@ public void write(JsonWriter out, T value) throws IOException {
             @Override
             public T read(JsonReader in) throws IOException {
                 JsonElement tree = elementAdapter.read(in);
-                if (tree != null) {
-                    JsonObject obj = tree.getAsJsonObject();
-
-                    T parsed = delegate.fromJsonTree(tree);
-                    AccessTokenResponse response = (AccessTokenResponse) parsed;
-
-                    Map<String, String> extras = new HashMap<>();
-                    for (Map.Entry<String, JsonElement> entry : obj.entrySet()) {
-                        String key = entry.getKey();
-                        if (KNOWN_FIELDS.contains(key)) {
-                            continue;
-                        }
-                        extras.put(key, toStringValue(gson, entry.getValue()));
-                    }
+                if (tree == null) {
+                    return null;
+                }
 
-                    if (response != null) {
-                        response.setExtraFields(extras);
+                if (!tree.isJsonObject()) {
+                    return delegate.fromJsonTree(tree);
+                }
+
+                JsonObject obj = tree.getAsJsonObject();
+
+                T parsed = delegate.fromJsonTree(tree);
+                AccessTokenResponse response = (AccessTokenResponse) parsed;
+
+                Map<String, String> extras = new HashMap<>();
+                for (Map.Entry<String, JsonElement> entry : obj.entrySet()) {
+                    String key = entry.getKey();
+                    if (KNOWN_FIELDS.contains(key)) {
+                        continue;
                     }
-                    return parsed;
+                    extras.put(key, toStringValue(gson, entry.getValue()));
                 }
 
-                // Delegate adapter returned null; propagate null without extra fields
-                return null;
+                if (response != null) {
+                    response.setExtraFields(extras);
+                }
+                return parsed;
             }
         };
     }