Merge pull request #223 from crate-metadata/CacheSize

Configurable cache size for processing validations

Author: huggsboson

src/main/java/com/github/fge/jsonschema/cfg/ValidationConfiguration.java

@@ -70,6 +70,11 @@ public final class ValidationConfiguration
      * Whether to use {@code format} in the resulting factory
      */
     final boolean useFormat;
+    
+    /**
+     * Cache size for processing validations
+     */
+    final int cacheSize;
 
     /**
      * The set of syntax messages
@@ -113,6 +118,7 @@ public static ValidationConfiguration byDefault()
         libraries = ImmutableMap.copyOf(builder.libraries);
         defaultLibrary = builder.defaultLibrary;
         useFormat = builder.useFormat;
+        cacheSize = builder.cacheSize;
         syntaxMessages = builder.syntaxMessages;
         validationMessages = builder.validationMessages;
     }
@@ -146,6 +152,11 @@ public boolean getUseFormat()
     {
         return useFormat;
     }
+    
+    public int getCacheSize()
+    {
+    	return cacheSize;
+    }
 
     public MessageBundle getSyntaxMessages()
     {

src/main/java/com/github/fge/jsonschema/cfg/ValidationConfigurationBuilder.java

@@ -80,6 +80,11 @@ public final class ValidationConfigurationBuilder
      * Whether to use {@code format} ({@code true} by default)
      */
     boolean useFormat = true;
+    
+    /**
+     * Cache maximum size of 512 records by default
+     */
+    int cacheSize = 512;
 
     /**
      * The set of syntax messages
@@ -119,6 +124,7 @@ public final class ValidationConfigurationBuilder
         libraries = Maps.newHashMap(cfg.libraries);
         defaultLibrary = cfg.defaultLibrary;
         useFormat = cfg.useFormat;
+        cacheSize = cfg.cacheSize;
         syntaxMessages = cfg.syntaxMessages;
         validationMessages = cfg.validationMessages;
     }
@@ -217,6 +223,14 @@ public ValidationConfigurationBuilder setValidationMessages(
         return this;
     }
 
+    public ValidationConfigurationBuilder setCacheSize(
+            final int cacheSize)
+    {
+        BUNDLE.checkArgument(cacheSize >= -1, "invalidCacheSize");
+        this.cacheSize = cacheSize;
+        return this;
+    }
+
     /**
      * Return a frozen version of this configuration
      *

src/main/java/com/github/fge/jsonschema/main/JsonSchemaFactory.java

@@ -275,6 +275,6 @@ private Processor<SchemaContext, ValidatorList> buildProcessor()
         final Processor<SchemaContext, ValidatorList> processor
             = map.getProcessor();
         return new CachingProcessor<SchemaContext, ValidatorList>(processor,
-            SchemaContextEquivalence.getInstance());
+            SchemaContextEquivalence.getInstance(), validationCfg.getCacheSize());
     }
 }

src/main/java/com/github/fge/jsonschema/processors/validation/ValidationChain.java

@@ -71,7 +71,7 @@ public ValidationChain(final RefResolver refResolver,
             = ProcessorChain.startWith(refResolver).chainWith(syntaxProcessor);
 
         resolver = new CachingProcessor<ValueHolder<SchemaTree>, ValueHolder<SchemaTree>>(
-            chain1.getProcessor(), SchemaHolderEquivalence.INSTANCE
+            chain1.getProcessor(), SchemaHolderEquivalence.INSTANCE, cfg.getCacheSize()
         );
 
         final SchemaDigester digester = new SchemaDigester(library);
@@ -86,7 +86,7 @@ public ValidationChain(final RefResolver refResolver,
         }
 
         builder = new CachingProcessor<SchemaContext, ValidatorList>(
-            chain2.getProcessor(), SchemaContextEquivalence.getInstance()
+            chain2.getProcessor(), SchemaContextEquivalence.getInstance(), cfg.getCacheSize()
         );
     }
 

src/main/resources/com/github/fge/jsonschema/validator/configuration.properties

@@ -37,3 +37,4 @@ nullFormat = format attribute name cannot be null
 nullAttribute = attempt to register null implementation of format attribute "%s"
 nullKeyword = attempt to add null keyword to library
 nullType = null type argument to digester constructor
+invalidCacheSize = cache size must be greater than -1. -1 value sets a cache with unlimited records, zero-value disables the cache

src/test/java/com/github/fge/jsonschema/cfg/ValidationConfigurationTest.java

@@ -103,6 +103,18 @@ public void cannotPutNullValidationMessageBundle()
         }
     }
 
+    @Test
+    public void cannotPutInvalidCacheSize()
+    {
+        try {
+            cfg.setCacheSize(-2);
+            fail("No exception thrown!!");
+        } catch (IllegalArgumentException e) {
+            assertEquals(e.getMessage(),
+                BUNDLE.getMessage("invalidCacheSize"));
+        }
+    }
+
     @Test
     public void defaultLibraryIsDraftV4()
     {