Fix raw uses of parameterized classes

Replace raw types with properly parameterized generics:
- ConcurrentHashMap<Class, CachedConstructor> → ConcurrentHashMap<Class<?>, CachedConstructor<?>>
- CacheKey → CacheKey<?>
- Map t → Map<String, Object> t

Add type-safe helper method getCachedConstructor() to encapsulate necessary
unchecked cast with clear documentation of safety invariant.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: oschwald

sample/Benchmark.java

@@ -45,7 +45,7 @@ private static void bench(Reader r, int count, int seed) throws IOException {
         for (int i = 0; i < count; i++) {
             random.nextBytes(address);
             InetAddress ip = InetAddress.getByAddress(address);
-            Map t = r.get(ip, Map.class);
+            Map<String, Object> t = r.get(ip, Map.class);
             if (TRACE) {
                 if (i % 50000 == 0) {
                     System.out.println(i + " " + ip);

src/main/java/com/maxmind/db/CHMCache.java

@@ -13,7 +13,7 @@ public class CHMCache implements NodeCache {
     private static final int DEFAULT_CAPACITY = 4096;
 
     private final int capacity;
-    private final ConcurrentHashMap<CacheKey, DecodedValue> cache;
+    private final ConcurrentHashMap<CacheKey<?>, DecodedValue> cache;
     private boolean cacheFull = false;
 
     /**
@@ -36,7 +36,7 @@ public CHMCache(int capacity) {
     }
 
     @Override
-    public DecodedValue get(CacheKey key, Loader loader) throws IOException {
+    public DecodedValue get(CacheKey<?> key, Loader loader) throws IOException {
         DecodedValue value = cache.get(key);
         if (value == null) {
             value = loader.load(key);

src/main/java/com/maxmind/db/Decoder.java

@@ -36,7 +36,7 @@ class Decoder {
 
     private final ByteBuffer buffer;
 
-    private final ConcurrentHashMap<Class, CachedConstructor> constructors;
+    private final ConcurrentHashMap<Class<?>, CachedConstructor<?>> constructors;
 
     Decoder(NodeCache cache, ByteBuffer buffer, long pointerBase) {
         this(
@@ -51,7 +51,7 @@ class Decoder {
         NodeCache cache,
         ByteBuffer buffer,
         long pointerBase,
-        ConcurrentHashMap<Class, CachedConstructor> constructors
+        ConcurrentHashMap<Class<?>, CachedConstructor<?>> constructors
     ) {
         this.cache = cache;
         this.pointerBase = pointerBase;
@@ -135,7 +135,7 @@ DecodedValue decodePointer(long pointer, Class<?> cls, java.lang.reflect.Type ge
         int targetOffset = (int) pointer;
         int position = buffer.position();
 
-        CacheKey key = new CacheKey(targetOffset, cls, genericType);
+        CacheKey<?> key = new CacheKey<>(targetOffset, cls, genericType);
         DecodedValue o = cache.get(key, cacheLoader);
 
         buffer.position(position);
@@ -371,7 +371,7 @@ private <T, V> Map<String, V> decodeMapIntoMap(
 
     private <T> Object decodeMapIntoObject(int size, Class<T> cls)
         throws IOException {
-        CachedConstructor<T> cachedConstructor = this.constructors.get(cls);
+        CachedConstructor<T> cachedConstructor = getCachedConstructor(cls);
         Constructor<T> constructor;
         Class<?>[] parameterTypes;
         java.lang.reflect.Type[] parameterGenericTypes;
@@ -392,7 +392,7 @@ private <T> Object decodeMapIntoObject(int size, Class<T> cls)
 
             this.constructors.put(
                 cls,
-                new CachedConstructor(
+                new CachedConstructor<>(
                     constructor,
                     parameterTypes,
                     parameterGenericTypes,
@@ -445,6 +445,13 @@ private <T> Object decodeMapIntoObject(int size, Class<T> cls)
         }
     }
 
+    private <T> CachedConstructor<T> getCachedConstructor(Class<T> cls) {
+        // This cast is safe because we only put CachedConstructor<T> for Class<T> as the key
+        @SuppressWarnings("unchecked")
+        CachedConstructor<T> result = (CachedConstructor<T>) this.constructors.get(cls);
+        return result;
+    }
+
     private static <T> Constructor<T> findConstructor(Class<T> cls)
         throws ConstructorNotFoundException {
         Constructor<?>[] constructors = cls.getConstructors();

src/main/java/com/maxmind/db/NoCache.java

@@ -13,7 +13,7 @@ private NoCache() {
     }
 
     @Override
-    public DecodedValue get(CacheKey key, Loader loader) throws IOException {
+    public DecodedValue get(CacheKey<?> key, Loader loader) throws IOException {
         return loader.load(key);
     }
 

src/main/java/com/maxmind/db/NodeCache.java

@@ -18,7 +18,7 @@ interface Loader {
          * @throws IOException
          *             if there is an error loading the value
          */
-        DecodedValue load(CacheKey key) throws IOException;
+        DecodedValue load(CacheKey<?> key) throws IOException;
     }
 
     /**
@@ -33,6 +33,6 @@ interface Loader {
      * @throws IOException
      *             if there is an error loading the value
      */
-    DecodedValue get(CacheKey key, Loader loader) throws IOException;
+    DecodedValue get(CacheKey<?> key, Loader loader) throws IOException;
 
 }

src/main/java/com/maxmind/db/Reader.java

@@ -26,7 +26,7 @@ public final class Reader implements Closeable {
     private final Metadata metadata;
     private final AtomicReference<BufferHolder> bufferHolderReference;
     private final NodeCache cache;
-    private final ConcurrentHashMap<Class, CachedConstructor> constructors;
+    private final ConcurrentHashMap<Class<?>, CachedConstructor<?>> constructors;
 
     /**
      * The file mode to use when opening a MaxMind DB.