From ba4afc1ce2f3e73a83f43f54864bb23c5188250a Mon Sep 17 00:00:00 2001
From: John Bogovic <bogovicj@janelia.hhmi.org>
Date: Fri, 17 Jul 2026 20:08:30 -0400
Subject: [PATCH] chore: bump gson to 2.14

* fix FitParams
---
 scijava-ops-flim/pom.xml                                 | 2 ++
 .../src/main/java/org/scijava/ops/flim/FitParams.java    | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/scijava-ops-flim/pom.xml b/scijava-ops-flim/pom.xml
index 4fb431015..09b7e233e 100644
--- 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
index 39084f3ac..9a39e2560 100644
--- 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