diff --git a/src/main/java/org/cobbzilla/util/reflect/ReflectionUtil.java b/src/main/java/org/cobbzilla/util/reflect/ReflectionUtil.java index 3530398..7c405f6 100644 --- a/src/main/java/org/cobbzilla/util/reflect/ReflectionUtil.java +++ b/src/main/java/org/cobbzilla/util/reflect/ReflectionUtil.java @@ -444,7 +444,7 @@ public class ReflectionUtil { return fieldsWithAnnotation(forName(className), aClass); } - private static Map> _fwaCache = new ExpirationMap<>(); + private static final Map> _fwaCache = new ExpirationMap<>(); public static List fieldsMatching(final Class clazz, Function matcher) { final String className = clazz.getName(); return _fwaCache.computeIfAbsent(className+":"+matcher.hashCode(), k -> { @@ -720,7 +720,7 @@ public class ReflectionUtil { */ public static Class getFirstTypeParam(Class clazz) { return getTypeParam(clazz, 0); } - private static Map typeParamCache = new ExpirationMap<>(ExpirationEvictionPolicy.atime); + private static final Map typeParamCache = new ExpirationMap<>(ExpirationEvictionPolicy.atime); public static Class getTypeParam(Class clazz, int index) { return (Class) typeParamCache.computeIfAbsent(clazz.getName()+":"+index, k -> { @@ -1046,7 +1046,6 @@ public class ReflectionUtil { return (Class) cls; } } - return null; }