Replace Types with Classes for TypeVariables

This prevents vacuous type parameters!

Author: gselzer

src/main/java/net/imglib2/labeling/DefaultLabelingIOService.java

@@ -42,6 +42,7 @@
 import net.imglib2.img.ImgView;
 import net.imglib2.labeling.data.Container;
 import net.imglib2.labeling.data.LabelingData;
+import net.imglib2.labeling.data.TypeTokenWrapper;
 import net.imglib2.labeling.utils.LabelingUtil;
 import net.imglib2.roi.labeling.ImgLabeling;
 import net.imglib2.roi.labeling.LabelingMapping;
@@ -73,16 +74,16 @@ public class DefaultLabelingIOService extends AbstractService implements Labelin
     private final Gson gson = new Gson();
 
     @Override
-    public <T, I extends IntegerType<I>> ImgLabeling<T, I> load(String file, Type typeToken) throws IOException {
-        return this.getImgLabeling(file, typeToken);
+    public <T, I extends IntegerType<I>> ImgLabeling<T, I> load(String file, Class<T> labelType, Class<I> backingType) throws IOException {
+        return this.getImgLabeling(file, labelType, backingType);
     }
 
     @Override
-    public <S, T, I extends IntegerType<I>> Container<S, T, I> loadWithMetadata(String file, Class<S> metadataClazz, Type typeToken) throws IOException {
-        LabelingData<T, S> labelingData = this.readLabelingDataFromJson(file, typeToken);
+    public <S, T, I extends IntegerType<I>> Container<S, T, I> loadWithMetadata(String file, Class<S> metadataType, Class<T> labelType, Class<I> backingType) throws IOException {
+        LabelingData<T, S> labelingData = this.readLabelingDataFromJson(file, labelType, metadataType);
         Container<S,T,I> container = new Container<>();
-        container.setImgLabeling(this.getImgLabeling(file, typeToken));
-        S metadata = this.gson.fromJson(this.gson.toJson(labelingData.getMetadata()), metadataClazz);
+        container.setImgLabeling(this.getImgLabeling(file, labelType, backingType));
+        S metadata = this.gson.fromJson(this.gson.toJson(labelingData.getMetadata()), metadataType);
         container.setMetadata(metadata);
         return container;
     }
@@ -116,18 +117,20 @@ public <S, T, I extends IntegerType<I>> void saveWithMetaData(ImgLabeling<T, I>
         throw new UnsupportedOperationException();
     }
 
-    private <T, I extends IntegerType<I>> ImgLabeling<T, I> getImgLabeling(String file, Type typeToken) throws IOException {
-        return this.buildImgLabelingAndImage(file, this.readLabelingDataFromJson(file, typeToken));
+    private <T, I extends IntegerType<I>> ImgLabeling<T, I> getImgLabeling(String file, Class<T> labelType, Class<I> backingType) throws IOException {
+        return this.buildImgLabelingAndImage(file, this.readLabelingDataFromJson(file, labelType, Object.class), backingType);
     }
 
-    private <T, S> LabelingData<T, S> readLabelingDataFromJson(String file, Type typeToken) throws IOException {
+    private <T, S> LabelingData<T, S> readLabelingDataFromJson(String file, Class<T> labelType, Class<S> metadataType) throws IOException {
         String path = LabelingUtil.getFilePathWithExtension(file, LabelingUtil.LBL_ENDING, Paths.get(file).getParent().toString());
         Reader reader = Files.newBufferedReader(Paths.get(path));
-        LabelingData labelingData = this.gson.fromJson(reader, typeToken);
-        return labelingData;
+        Type type = TypeToken //
+            .getParameterized(LabelingData.class, labelType, metadataType) //
+            .getType();
+        return this.gson.fromJson(reader, type);
     }
 
-    private <S, T, I extends IntegerType<I>> ImgLabeling<T, I> buildImgLabelingAndImage(String file, LabelingData<T,S> labelingData) throws IOException {
+    private <S, T, I extends IntegerType<I>> ImgLabeling<T, I> buildImgLabelingAndImage(String file, LabelingData<T,S> labelingData, Class<I> backingType) throws IOException {
         int numSets = labelingData.getNumSets();
         String indexImg = labelingData.getIndexImg();
         List<Set<T>> labelSets = this.readLabelsets(labelingData, numSets);

src/main/java/net/imglib2/labeling/LabelingIOService.java

@@ -39,7 +39,6 @@
 import net.imglib2.type.numeric.IntegerType;
 
 import java.io.IOException;
-import java.lang.reflect.Type;
 import java.util.function.LongFunction;
 import java.util.function.ToLongFunction;
 
@@ -52,7 +51,7 @@
  */
 public interface LabelingIOService extends ImageJService {
 
-    <T, I extends IntegerType<I>> ImgLabeling<T, I> load(String file, Type typeToken) throws IOException;
+    <T, I extends IntegerType<I>> ImgLabeling<T, I> load(String file, Class<T> labelType, Class<I> backingType) throws IOException;
 
     <T, I extends IntegerType<I>> void save(ImgLabeling<T, I> imgLabeling, String file) throws IOException;
 
@@ -61,14 +60,14 @@ public interface LabelingIOService extends ImageJService {
      * The file path must point to the bson file containing the labeling data.
      *
      * @param file          The path to the file
-     * @param metadataClazz the metadata class
+     * @param metadataType the metadata class
      * @param <T>           the label value
      * @param <I>           IntegerType for the pixel value
      * @param <S>           Class of the meta data
      * @return a container object holding the ImgLabeling (as well as an optional source mapping)
      * @throws IOException on file read fail
      */
-    <S, T, I extends IntegerType<I>> Container<S, T, I> loadWithMetadata(String file, Class<S> metadataClazz, Type typeToken) throws IOException;
+    <S, T, I extends IntegerType<I>> Container<S, T, I> loadWithMetadata(String file, Class<S> metadataType, Class<T> labelType, Class<I> backingType) throws IOException;
 
     /**
      * Load a labeling container from the given file path as string.

src/test/java/net/imglib2/labeling/LabelingIOTest.java

@@ -39,7 +39,6 @@
 import net.imglib2.img.array.ArrayImgs;
 import net.imglib2.labeling.data.Container;
 import net.imglib2.labeling.data.LabelingData;
-import net.imglib2.labeling.data.TypeTokenWrapper;
 import net.imglib2.roi.labeling.ImgLabeling;
 import net.imglib2.type.numeric.integer.IntType;
 import net.imglib2.type.numeric.integer.UnsignedByteType;
@@ -67,20 +66,18 @@ public void beforeTests() {
     @Test
     public void testEquality() throws IOException {
         LabelingIOService labelingIOService = context.getService(LabelingIOService.class);
-        Type type = new TypeTokenWrapper<LabelingData<Integer, Object>>() {}.getType();
-        ImgLabeling imgLabeling = labelingIOService.load("src/test/resources/labeling/labelSaveTestSimple",type);
+        ImgLabeling<Integer, IntType> imgLabeling = labelingIOService.load("src/test/resources/labeling/labelSaveTestSimple", Integer.class, IntType.class);
         labelingIOService.save(imgLabeling, "src/test/resources/labeling/example1_sav");
-        ImgLabeling imgLabeling2 = labelingIOService.load("src/test/resources/labeling/example1_sav", type);
+        ImgLabeling<Integer, IntType> imgLabeling2 = labelingIOService.load("src/test/resources/labeling/example1_sav", Integer.class, IntType.class);
         Assert.assertEquals(imgLabeling.getMapping().getLabels(), imgLabeling2.getMapping().getLabels());
     }
 
     @Test
     public void testEquality2() throws IOException {
         LabelingIOService labelingIOService = context.getService(LabelingIOService.class);
-        Type type = new TypeTokenWrapper<LabelingData<Integer, Object>>() {}.getType();
-        ImgLabeling imgLabeling = labelingIOService.load("src/test/resources/labeling/test", type);
+        ImgLabeling<Integer, IntType> imgLabeling = labelingIOService.load("src/test/resources/labeling/test", Integer.class, IntType.class);
         labelingIOService.save(imgLabeling, "src/test/resources/labeling/test2");
-        ImgLabeling imgLabeling2 = labelingIOService.load("src/test/resources/labeling/test2", type);
+        ImgLabeling<Integer, IntType> imgLabeling2 = labelingIOService.load("src/test/resources/labeling/test2", Integer.class, IntType.class);
         Assert.assertEquals(imgLabeling.getMapping().getLabels(), imgLabeling2.getMapping().getLabels());
     }
 
@@ -90,10 +87,10 @@ public void saveLabelingWithMetadataPrimitiveTest() throws IOException {
         context.getService(LabelingIOService.class).saveWithMetaData(labeling, new File("src/test/resources/labeling/labelSaveTestSimple.tif").getAbsolutePath(), new Example("a", 2.0, 1));
     }
 
-
     @Test
     public void loadLabelingWithMetadataPrimitiveTest() throws IOException {
-        Container<Example, Integer, IntType> container = context.getService(LabelingIOService.class).loadWithMetadata("src/test/resources/labeling/labelSaveTestSimpleMeta.tif", Example.class , new TypeTokenWrapper<LabelingData<Example, Example>>() {}.getType());
+        Container<Example, Integer, IntType>
+            container = context.getService(LabelingIOService.class).loadWithMetadata("src/test/resources/labeling/labelSaveTestSimpleMeta.tif", Example.class, Integer.class, IntType.class);
         ImgLabeling<Integer, IntType> mapping = container.getImgLabeling();
         Example e = container.getMetadata();
         Assert.assertNotNull(e);
@@ -110,20 +107,18 @@ public void saveLabelingWithMetadataComplexTest() throws IOException {
     @Test
     public void loadLabelingWithMetadataComplexWithCodecTest() throws IOException {
         LabelingIOService labelingIOService = context.getService(LabelingIOService.class);
-        Container<Example, Example, IntType> container = labelingIOService.loadWithMetadata("src/test/resources/labeling/labelSaveTestComplexMeta", Example.class, new TypeTokenWrapper<LabelingData<Example, Example>>() {}.getType());
+        Container<Example, Example, IntType> container = labelingIOService.loadWithMetadata("src/test/resources/labeling/labelSaveTestComplexMeta", Example.class, Example.class, IntType.class);
         ImgLabeling<Example, IntType> mapping = container.getImgLabeling();
         Example e = container.getMetadata();
         Assert.assertNotNull(e);
         Assert.assertEquals(getComplexImgLabeling().getMapping().getLabels(), mapping.getMapping().getLabels());
-
-
     }
 
     @Test
     public void t() throws IOException {
         GsonBuilder builder = new GsonBuilder();
-        Type labelingDataType = new TypeToken<LabelingData<Example,Example>>() {}.getType();
         Reader reader = Files.newBufferedReader(Paths.get("src/test/resources/labeling/labelSaveTestComplexMeta.lbl.json"));
+        Type labelingDataType = new TypeToken<LabelingData<Example,Example>>() {}.getType();
         LabelingData<Example,Example> labelingData = builder.create().fromJson(reader, labelingDataType);
     }
 

src/test/java/net/imglib2/labeling/tutorials/E01_LoadLabeling.java

@@ -65,9 +65,8 @@ public void loadBasicLabeling() throws IOException {
         // the container contains an ImgLabeling of that type as well as an optional sourcemap
         // the sourcemap is a mapping of a source img to a list of labels that where contained in it and added to 
         // the ImgLabeling
-        Type type = new TypeTokenWrapper<LabelingData<Integer, Object>>() {}.getType();
 
-        ImgLabeling<Integer, IntType> imgLabeling = labelingIOService.load("src/test/resources/labeling/labelSaveTestSimple.lbl.json", type);
+        ImgLabeling<Integer, IntType> imgLabeling = labelingIOService.load("src/test/resources/labeling/labelSaveTestSimple.lbl.json", Integer.class, IntType.class);
         Assert.assertNotNull(imgLabeling);
         Assert.assertNotNull(imgLabeling.getIndexImg());
         Assert.assertFalse(imgLabeling.getMapping().getLabels().isEmpty());
@@ -78,8 +77,7 @@ public void loadBasicLabeling() throws IOException {
     public void loadClassBasedLabeling() throws IOException {
         // get the LabelingIO service from the context
         LabelingIOService labelingIOService = context.getService(LabelingIOService.class);
-        Type type = new TypeTokenWrapper<LabelingData<Example, Example>>() {}.getType();
-        Container<Example, Example, IntType> container = labelingIOService.loadWithMetadata("src/test/resources/labeling/labelSaveTestComplex", Example.class, type);
+        Container<Example, Example, IntType> container = labelingIOService.loadWithMetadata("src/test/resources/labeling/labelSaveTestComplex", Example.class, Example.class, IntType.class);
         ImgLabeling<Example, IntType> mapping = container.getImgLabeling();
         Assert.assertNotNull(mapping);
     }