Move Vocabulary to vocabulary package

Author: justin-tay

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

@@ -25,9 +25,6 @@
 import com.networknt.schema.SchemaException;
 import com.networknt.schema.SchemaLocation;
 import com.networknt.schema.SchemaContext;
-import com.networknt.schema.Vocabularies;
-import com.networknt.schema.Vocabulary;
-import com.networknt.schema.VocabularyFactory;
 import com.networknt.schema.SpecificationVersion;
 import com.networknt.schema.keyword.FormatKeyword;
 import com.networknt.schema.keyword.Keyword;
@@ -36,6 +33,10 @@
 import com.networknt.schema.keyword.UnknownKeywordFactory;
 import com.networknt.schema.keyword.KeywordType;
 import com.networknt.schema.utils.StringUtils;
+import com.networknt.schema.vocabulary.Vocabularies;
+import com.networknt.schema.vocabulary.Vocabulary;
+import com.networknt.schema.vocabulary.VocabularyFactory;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

…a/com/networknt/schema/Vocabularies.java …rknt/schema/vocabulary/Vocabularies.javasrc/main/java/com/networknt/schema/Vocabularies.java renamed to src/main/java/com/networknt/schema/vocabulary/Vocabularies.java src/main/java/com/networknt/schema/Vocabularies.java renamed to src/main/java/com/networknt/schema/vocabulary/Vocabularies.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.networknt.schema;
+package com.networknt.schema.vocabulary;
 
 import java.util.HashMap;
 import java.util.Map;

…ava/com/networknt/schema/Vocabulary.java …worknt/schema/vocabulary/Vocabulary.javasrc/main/java/com/networknt/schema/Vocabulary.java renamed to src/main/java/com/networknt/schema/vocabulary/Vocabulary.java src/main/java/com/networknt/schema/Vocabulary.java renamed to src/main/java/com/networknt/schema/vocabulary/Vocabulary.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.networknt.schema;
+package com.networknt.schema.vocabulary;
 
 import java.util.Arrays;
 import java.util.LinkedHashSet;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.networknt.schema;
+package com.networknt.schema.vocabulary;
 
 /**
  * Factory for {@link Vocabulary}.

src/test/java/com/networknt/schema/Issue994Test.java

@@ -25,6 +25,7 @@
 import com.networknt.schema.dialect.Dialect;
 import com.networknt.schema.dialect.Dialects;
 import com.networknt.schema.serialization.JsonMapperFactory;
+import com.networknt.schema.vocabulary.Vocabulary;
 
 class Issue994Test {
     @Test

…com/networknt/schema/VocabularyTest.java …nt/schema/vocabulary/VocabularyTest.javasrc/test/java/com/networknt/schema/VocabularyTest.java renamed to src/test/java/com/networknt/schema/vocabulary/VocabularyTest.java src/test/java/com/networknt/schema/VocabularyTest.java renamed to src/test/java/com/networknt/schema/vocabulary/VocabularyTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.networknt.schema;
+package com.networknt.schema.vocabulary;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -25,11 +25,20 @@
 
 import org.junit.jupiter.api.Test;
 
+import com.networknt.schema.Error;
+import com.networknt.schema.InputFormat;
+import com.networknt.schema.InvalidSchemaException;
+import com.networknt.schema.OutputFormat;
+import com.networknt.schema.Schema;
+import com.networknt.schema.SchemaRegistry;
+import com.networknt.schema.SpecificationVersion;
 import com.networknt.schema.dialect.BasicDialectRegistry;
 import com.networknt.schema.dialect.Dialect;
 import com.networknt.schema.dialect.Dialects;
 import com.networknt.schema.keyword.AnnotationKeyword;
 import com.networknt.schema.output.OutputUnit;
+import com.networknt.schema.vocabulary.Vocabulary;
+import com.networknt.schema.vocabulary.VocabularyFactory;
 
 /**
  * Tests for vocabulary support in meta schemas.