Upgrade GSON to 2.11.0

Author: seratch

bolt-http4k/pom.xml

@@ -10,7 +10,7 @@
     </parent>
 
     <properties>
-        <http4k.version>5.19.0.0</http4k.version>
+        <http4k.version>5.20.0.0</http4k.version>
     </properties>
 
     <artifactId>bolt-http4k</artifactId>

pom.xml

@@ -50,7 +50,7 @@
         <!-- We don't change the versions of servlet API interface to keep the backward compatibility with older versions of them -->
         <jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version>
         <okhttp.version>4.12.0</okhttp.version>
-        <gson.version>2.10.1</gson.version>
+        <gson.version>2.11.0</gson.version>
         <kotlin.version>1.9.24</kotlin.version>
         <!-- Allow use by clients on earlier versions of Kotlin-->
         <kotlin.compiler.apiVersion>1.6</kotlin.compiler.apiVersion>

slack-api-model/src/main/java/com/slack/api/util/json/UnknownPropertyDetectionAdapterFactory.java

@@ -26,34 +26,37 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
         // Check if the type adapter is a reflective, cause this solution only work for reflection.
         if (delegate instanceof ReflectiveTypeAdapterFactory.Adapter) {
 
+            // This code is only compatible with GSON 2.11.0+
             try {
-                // Get reference to the existing boundFields.
                 Class<?> adaptorClass = delegate.getClass();
-                Field boundFieldsField = null;
-                while (boundFieldsField == null && !adaptorClass.equals(Object.class)) {
+                Field fieldsDataField = null;
+                while (fieldsDataField == null && !adaptorClass.equals(Object.class)) {
                     try {
-                        boundFieldsField = adaptorClass.getDeclaredField("boundFields");
+                        fieldsDataField = adaptorClass.getDeclaredField("fieldsData");
                     } catch (NoSuchFieldException _ignore) {
-                        // Since GSON v3.10, the internal class hierarchy has been changed
+                        // Since GSON v2.10, the internal class hierarchy has been changed
                         // 1) com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$FieldReflectionAdapter
                         // 2) com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$Adapter
                         adaptorClass = adaptorClass.getSuperclass();
                     }
                 }
-                if (boundFieldsField == null) {
-                    String message = "Failed to find bound fields inside GSON";
+                if (fieldsDataField == null) {
+                    String message = "Failed to access fieldsData inside the GSON library";
                     throw new IllegalStateException(message);
                 }
-                boundFieldsField.setAccessible(true);
-                Map boundFields = (Map) boundFieldsField.get(delegate);
+                fieldsDataField.setAccessible(true);
+                Object fieldData = fieldsDataField.get(delegate);
+                Field deserializedFieldsField = fieldData.getClass().getDeclaredField("deserializedFields");
+                deserializedFieldsField.setAccessible(true);
+                Map<String, ?> deserializedFields = (Map<String, ?>) deserializedFieldsField.get(fieldData);
                 StringBuilder sb = new StringBuilder();
-                for (Object key : boundFields.keySet()) {
+                for (String key : deserializedFields.keySet()) {
                     sb.append(key + ", ");
                 }
-                final String boundFieldsStr = sb.append("...").toString();
+                final String boundFieldsStr = sb.append("... (" + type.getType().getTypeName() + ")").toString();
 
                 // Then replace it with our implementation throwing exception if the value is null.
-                boundFields = new LinkedHashMap(boundFields) {
+                deserializedFields = new LinkedHashMap<String, Object>(deserializedFields) {
 
                     @Override
                     public Object get(Object key) {
@@ -68,7 +71,7 @@ public Object get(Object key) {
 
                 };
                 // Finally, push our custom map back using reflection.
-                boundFieldsField.set(delegate, boundFields);
+                deserializedFieldsField.set(fieldData, deserializedFields);
 
             } catch (Exception e) {
                 // Should never happen if the implementation doesn't change.