Move field declarations to the top of JarCacheStorage

ansell · ansell · commit 33a48bb26f15 · 2015-11-19T09:49:53.000+11:00
diff --git a/core/src/main/java/com/github/jsonldjava/utils/JarCacheStorage.java b/core/src/main/java/com/github/jsonldjava/utils/JarCacheStorage.java
@@ -51,6 +51,16 @@ public class JarCacheStorage implements HttpCacheStorage {
      */
     private HttpCacheStorage delegate;
 
+    ObjectMapper mapper = new ObjectMapper();
+
+    /**
+     * Map from uri of jarcache.json (e.g. jar://blab.jar!jarcache.json) to a
+     * SoftReference to its content as JsonNode.
+     *
+     * @see #getJarCache(URL)
+     */
+    protected ConcurrentMap<URI, SoftReference<JsonNode>> jarCaches = new ConcurrentHashMap<URI, SoftReference<JsonNode>>();
+
     public ClassLoader getClassLoader() {
         if (classLoader != null) {
             return classLoader;
@@ -102,8 +112,6 @@ public void putEntry(String key, HttpCacheEntry entry) throws IOException {
         delegate.putEntry(key, entry);
     }
 
-    ObjectMapper mapper = new ObjectMapper();
-
     @Override
     public HttpCacheEntry getEntry(String key) throws IOException {
         log.trace("Requesting " + key);
@@ -151,14 +159,6 @@ private Enumeration<URL> getResources() throws IOException {
         }
     }
 
-    /**
-     * Map from uri of jarcache.json (e.g. jar://blab.jar!jarcache.json) to a
-     * SoftReference to its content as JsonNode.
-     *
-     * @see #getJarCache(URL)
-     */
-    protected ConcurrentMap<URI, SoftReference<JsonNode>> jarCaches = new ConcurrentHashMap<URI, SoftReference<JsonNode>>();
-
     protected JsonNode getJarCache(URL url) throws IOException, JsonProcessingException {
 
         URI uri;
