Merge pull request #290 from bogovicj/gson-2.14

ctrueden · web-flow · commit 82d58a2d385f · 2026-07-17T20:25:15.000-05:00
chore: bump gson to 2.14
diff --git a/scijava-ops-flim/pom.xml b/scijava-ops-flim/pom.xml
@@ -106,6 +106,8 @@
 		<scijava-taglets.version>1.0.1-SNAPSHOT</scijava-taglets.version>
 		<scijava-types.version>1.0.1-SNAPSHOT</scijava-types.version>
 
+        <gson.version>2.14.0</gson.version>
+
 		<scijava.ops.parse>true</scijava.ops.parse>
 
 		<flimlib.version>2.1.1</flimlib.version>
diff --git a/scijava-ops-flim/src/main/java/org/scijava/ops/flim/FitParams.java b/scijava-ops-flim/src/main/java/org/scijava/ops/flim/FitParams.java
@@ -31,7 +31,6 @@
 
 import com.google.gson.*;
 import com.google.gson.annotations.Expose;
-import com.google.gson.reflect.TypeToken;
 import flimlib.FitFunc;
 import flimlib.NoiseType;
 import flimlib.RestrainType;
@@ -309,8 +308,12 @@ public static <I extends RealType<I>> FitParams<I> fromJSON(
 		};
         var gson = new GsonBuilder().registerTypeAdapter(FitFunc.class,
 			fitfuncDeserializer).create();
-		return gson.fromJson(jsonString, new TypeToken<FitParams<I>>() {}
-			.getType());
+		// Deserialize to the raw FitParams type: the only field using the type
+		// variable I ({@link #transMap}) is not serialized (no @Expose), and
+		// recent Gson versions reject a TypeToken that contains a type variable.
+		@SuppressWarnings("unchecked")
+		FitParams<I> params = gson.fromJson(jsonString, FitParams.class);
+		return params;
 	}
 
 	@Override
