Skip to content

Commit 30d3e9d

Browse files
committed
ValidationProcessor: receive the cached processor directly from the factory
There is no point in building it into the processor itself. Signed-off-by: Francis Galiegue <[email protected]>
1 parent 3b2654e commit 30d3e9d

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import com.github.fge.jsonschema.core.load.SchemaLoader;
3131
import com.github.fge.jsonschema.core.load.configuration.LoadingConfiguration;
3232
import com.github.fge.jsonschema.core.messages.JsonSchemaCoreMessageBundle;
33+
import com.github.fge.jsonschema.core.processing.CachingProcessor;
3334
import com.github.fge.jsonschema.core.processing.Processor;
3435
import com.github.fge.jsonschema.core.processing.ProcessorMap;
3536
import com.github.fge.jsonschema.core.ref.JsonRef;
@@ -40,6 +41,7 @@
4041
import com.github.fge.jsonschema.processors.data.SchemaContext;
4142
import com.github.fge.jsonschema.processors.data.ValidatorList;
4243
import com.github.fge.jsonschema.processors.syntax.SyntaxValidator;
44+
import com.github.fge.jsonschema.processors.validation.SchemaContextEquivalence;
4345
import com.github.fge.jsonschema.processors.validation.ValidationChain;
4446
import com.github.fge.jsonschema.processors.validation.ValidationProcessor;
4547
import com.github.fge.msgsimple.bundle.MessageBundle;
@@ -270,6 +272,9 @@ private Processor<SchemaContext, ValidatorList> buildProcessor()
270272
map.addEntry(ref, chain);
271273
}
272274

273-
return map.getProcessor();
275+
final Processor<SchemaContext, ValidatorList> processor
276+
= map.getProcessor();
277+
return new CachingProcessor<SchemaContext, ValidatorList>(processor,
278+
SchemaContextEquivalence.getInstance());
274279
}
275280
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ public ValidationProcessor(final ValidationConfiguration cfg,
5858
{
5959
syntaxMessages = cfg.getSyntaxMessages();
6060
validationMessages = cfg.getValidationMessages();
61-
this.processor = new CachingProcessor<SchemaContext, ValidatorList>(
62-
processor, SchemaContextEquivalence.getInstance()
63-
);
61+
this.processor = processor;
6462
}
6563

6664
@Override

0 commit comments

Comments
 (0)