Annotations: remove unneeded subclass helpers

ctrueden · ctrueden · commit eae40f49a0be · 2024-05-24T12:16:17.000-05:00
diff --git a/scijava-common3/src/main/java/org/scijava/common3/Annotations.java b/scijava-common3/src/main/java/org/scijava/common3/Annotations.java
@@ -65,7 +65,7 @@ private Annotations() {
 	 * @see <a href="https://github.com/scijava/scijava-common/issues/142">issue
 	 *      #142</a>
 	 */
-	private static final FieldCache fieldCache = new FieldCache();
+	private static final CacheMap<Field> fieldCache = new CacheMap<>();
 
 	/**
 	 * This maps a base class (key1) to a map of annotation classes (key2), which
@@ -79,7 +79,7 @@ private Annotations() {
 	 * @see <a href="https://github.com/scijava/scijava-common/issues/142">issue
 	 *      #142</a>
 	 */
-	private static final MethodCache methodCache = new MethodCache();
+	private static final CacheMap<Method> methodCache = new CacheMap<>();
 
 	// -- Class loading, querying and reflection --
 
@@ -348,22 +348,6 @@ private static <T extends AnnotatedElement> void populateCache(
 
 	// -- Helper classes --
 
-	/**
-	 * Convenience class for a {@link CacheMap} that stores annotated
-	 * {@link Field}s.
-	 */
-	private static class FieldCache extends CacheMap<Field> {
-		// Trivial subclass to narrow generic params
-	}
-
-	/**
-	 * Convenience class for a {@link CacheMap} that stores annotated
-	 * {@link Method}s.
-	 */
-	private static class MethodCache extends CacheMap<Method> {
-		// Trivial subclass to narrow generic params
-	}
-
 	/**
 	 * Convenience class for {@code Map > Map > List} hierarchy. Cleans up
 	 * generics and contains helper methods for traversing the two map levels.
