Rename VocabularyFactory to VocabularyRegistry

Author: justin-tay

src/main/java/com/networknt/schema/dialect/Dialect.java

@@ -35,7 +35,7 @@
 import com.networknt.schema.utils.Strings;
 import com.networknt.schema.vocabulary.Vocabularies;
 import com.networknt.schema.vocabulary.Vocabulary;
-import com.networknt.schema.vocabulary.VocabularyFactory;
+import com.networknt.schema.vocabulary.VocabularyRegistry;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -81,7 +81,7 @@ public static class Builder {
  private final Map<String, Format> formats = new HashMap<>();
  private final Map<String, Boolean> vocabularies = new HashMap<>();
  private FormatKeywordFactory formatKeywordFactory = null;
- private VocabularyFactory vocabularyFactory = null;
+ private VocabularyRegistry vocabularyRegistry = null;
  private KeywordFactory unknownKeywordFactory = null;
 
  public Builder(String id) {
@@ -124,13 +124,13 @@ public Builder formatKeywordFactory(FormatKeywordFactory formatKeywordFactory) {
  }
 
  /**
- * Sets the vocabulary factory for handling custom vocabularies.
+ * Sets the vocabulary registry for handling custom vocabularies.
  * 
- * @param vocabularyFactory the factory
+ * @param vocabularyRegistry the registry
  * @return the builder
  */
- public Builder vocabularyFactory(VocabularyFactory vocabularyFactory) {
- this.vocabularyFactory = vocabularyFactory;
+ public Builder vocabularyRegistry(VocabularyRegistry vocabularyRegistry) {
+ this.vocabularyRegistry = vocabularyRegistry;
  return this;
  }
 
@@ -293,8 +293,8 @@ public Dialect build() {
  for(Entry<String, Boolean> entry : this.vocabularies.entrySet()) {
  Vocabulary vocabulary = null;
  String id = entry.getKey();
- if (this.vocabularyFactory != null) {
- vocabulary = this.vocabularyFactory.getVocabulary(id);
+ if (this.vocabularyRegistry != null) {
+ vocabulary = this.vocabularyRegistry.getVocabulary(id);
  }
  if (vocabulary == null) {
  vocabulary = Vocabularies.getVocabulary(id);
@@ -385,7 +385,7 @@ public static Builder builder(Dialect blueprint) {
  .formats(blueprint.builder.formats.values())
  .specificationVersion(blueprint.getSpecificationVersion())
  .vocabularies(vocabularies)
- .vocabularyFactory(blueprint.builder.vocabularyFactory)
+ .vocabularyRegistry(blueprint.builder.vocabularyRegistry)
  .formatKeywordFactory(blueprint.builder.formatKeywordFactory)
  .unknownKeywordFactory(blueprint.builder.unknownKeywordFactory)
  ;

src/main/java/com/networknt/schema/vocabulary/VocabularyFactory.java renamed to src/main/java/com/networknt/schema/vocabulary/VocabularyRegistry.java

@@ -16,15 +16,15 @@
 package com.networknt.schema.vocabulary;
 
 /**
- * Factory for {@link Vocabulary}.
+ * Registry for {@link Vocabulary}.
  */
 @FunctionalInterface
-public interface VocabularyFactory {
+public interface VocabularyRegistry {
  /**
- * Gets the vocabulary given the vocabulary iri.
+ * Gets the vocabulary given the vocabulary id.
  * 
- * @param iri the vocabulary iri
+ * @param id the vocabulary id which is an iri
  * @return the vocabulary
  */
- Vocabulary getVocabulary(String iri);
+ Vocabulary getVocabulary(String id);
 }

src/test/java/com/networknt/schema/vocabulary/VocabularyTest.java

@@ -203,23 +203,23 @@ void customVocabulary() {
  + " }\r\n"
  + " }\r\n"
  + "}";
- VocabularyFactory vocabularyFactory = uri -> {
- if ("https://www.example.com/vocab/format".equals(uri)) {
+ VocabularyRegistry vocabularyRegistry = id -> {
+ if ("https://www.example.com/vocab/format".equals(id)) {
  return new Vocabulary("https://www.example.com/vocab/format", new AnnotationKeyword("hello"));
  }
  return null;
  };
 
  Dialect dialect = Dialect
  .builder("https://www.example.com/no-validation-no-format/schema", Dialects.getDraft202012())
- .vocabularyFactory(vocabularyFactory)
+ .vocabularyRegistry(vocabularyRegistry)
  .build();
- SchemaRegistry factory = SchemaRegistry
+ SchemaRegistry schemaRegistry = SchemaRegistry
  .withDefaultDialect(SpecificationVersion.DRAFT_2020_12,
  builder -> builder.dialectRegistry(new BasicDialectRegistry(dialect)).resourceLoaders(resourceLoaders -> resourceLoaders.resources(Collections
  .singletonMap("https://www.example.com/no-validation-no-format/schema",
  metaSchemaData))));
- Schema schema = factory.getSchema(schemaData);
+ Schema schema = schemaRegistry.getSchema(schemaData);
  OutputUnit outputUnit = schema.validate("{}", InputFormat.JSON, OutputFormat.HIERARCHICAL, executionContext -> {
  executionContext.executionConfig(executionConfig -> executionConfig
 .annotationCollectionEnabled(true).annotationCollectionFilter(keyword -> true));