Move Format and Formats to format package

justin-tay · justin-tay · commit bf90251bbd71 · 2025-09-25T20:56:51.000+08:00
diff --git a/src/main/java/com/networknt/schema/dialect/Dialect.java b/src/main/java/com/networknt/schema/dialect/Dialect.java
@@ -18,14 +18,14 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.networknt.schema.Error;
-import com.networknt.schema.Format;
 import com.networknt.schema.InvalidSchemaException;
 import com.networknt.schema.NodePath;
 import com.networknt.schema.Schema;
 import com.networknt.schema.SchemaException;
 import com.networknt.schema.SchemaLocation;
 import com.networknt.schema.SchemaContext;
 import com.networknt.schema.SpecificationVersion;
+import com.networknt.schema.format.Format;
 import com.networknt.schema.keyword.FormatKeyword;
 import com.networknt.schema.keyword.Keyword;
 import com.networknt.schema.keyword.KeywordFactory;
diff --git a/src/main/java/com/networknt/schema/dialect/Draft201909.java b/src/main/java/com/networknt/schema/dialect/Draft201909.java
@@ -4,8 +4,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.networknt.schema.Formats;
 import com.networknt.schema.SpecificationVersion;
+import com.networknt.schema.format.Formats;
 import com.networknt.schema.keyword.NonValidationKeyword;
 import com.networknt.schema.keyword.KeywordType;
 
diff --git a/src/main/java/com/networknt/schema/dialect/Draft202012.java b/src/main/java/com/networknt/schema/dialect/Draft202012.java
@@ -4,8 +4,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.networknt.schema.Formats;
 import com.networknt.schema.SpecificationVersion;
+import com.networknt.schema.format.Formats;
 import com.networknt.schema.keyword.NonValidationKeyword;
 import com.networknt.schema.keyword.KeywordType;
 
diff --git a/src/main/java/com/networknt/schema/dialect/Draft4.java b/src/main/java/com/networknt/schema/dialect/Draft4.java
@@ -2,8 +2,8 @@
 
 import java.util.Arrays;
 
-import com.networknt.schema.Formats;
 import com.networknt.schema.SpecificationVersion;
+import com.networknt.schema.format.Formats;
 import com.networknt.schema.keyword.AnnotationKeyword;
 import com.networknt.schema.keyword.NonValidationKeyword;
 import com.networknt.schema.keyword.KeywordType;
diff --git a/src/main/java/com/networknt/schema/dialect/Draft6.java b/src/main/java/com/networknt/schema/dialect/Draft6.java
@@ -2,8 +2,8 @@
 
 import java.util.Arrays;
 
-import com.networknt.schema.Formats;
 import com.networknt.schema.SpecificationVersion;
+import com.networknt.schema.format.Formats;
 import com.networknt.schema.keyword.AnnotationKeyword;
 import com.networknt.schema.keyword.NonValidationKeyword;
 import com.networknt.schema.keyword.KeywordType;
diff --git a/src/main/java/com/networknt/schema/dialect/Draft7.java b/src/main/java/com/networknt/schema/dialect/Draft7.java
@@ -2,8 +2,8 @@
 
 import java.util.Arrays;
 
-import com.networknt.schema.Formats;
 import com.networknt.schema.SpecificationVersion;
+import com.networknt.schema.format.Formats;
 import com.networknt.schema.keyword.AnnotationKeyword;
 import com.networknt.schema.keyword.NonValidationKeyword;
 import com.networknt.schema.keyword.KeywordType;
diff --git a/src/main/java/com/networknt/schema/dialect/OpenApi30.java b/src/main/java/com/networknt/schema/dialect/OpenApi30.java
@@ -2,8 +2,8 @@
 
 import java.util.Arrays;
 
-import com.networknt.schema.Formats;
 import com.networknt.schema.SpecificationVersion;
+import com.networknt.schema.format.Formats;
 import com.networknt.schema.keyword.AnnotationKeyword;
 import com.networknt.schema.keyword.NonValidationKeyword;
 import com.networknt.schema.keyword.KeywordType;
diff --git a/src/main/java/com/networknt/schema/dialect/OpenApi31.java b/src/main/java/com/networknt/schema/dialect/OpenApi31.java
@@ -4,8 +4,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.networknt.schema.Formats;
 import com.networknt.schema.SpecificationVersion;
+import com.networknt.schema.format.Formats;
 import com.networknt.schema.keyword.NonValidationKeyword;
 import com.networknt.schema.keyword.KeywordType;
 
diff --git a/src/main/java/com/networknt/schema/format/AbstractRFC3986Format.java b/src/main/java/com/networknt/schema/format/AbstractRFC3986Format.java
@@ -5,7 +5,6 @@
 import java.util.regex.Pattern;
 
 import com.networknt.schema.ExecutionContext;
-import com.networknt.schema.Format;
 
 /**
  * {@link AbstractFormat} for RFC 3986.
diff --git a/src/main/java/com/networknt/schema/format/BaseFormat.java b/src/main/java/com/networknt/schema/format/BaseFormat.java
@@ -16,8 +16,6 @@
 
 package com.networknt.schema.format;
 
-import com.networknt.schema.Format;
-
 /**
  * Base implementation of {@link Format}.
  */
diff --git a/src/main/java/com/networknt/schema/format/DateFormat.java b/src/main/java/com/networknt/schema/format/DateFormat.java
@@ -4,7 +4,6 @@
 import java.time.format.DateTimeParseException;
 
 import com.networknt.schema.ExecutionContext;
-import com.networknt.schema.Format;
 
 /**
  * Format for date.
diff --git a/src/main/java/com/networknt/schema/format/DateTimeFormat.java b/src/main/java/com/networknt/schema/format/DateTimeFormat.java
@@ -10,7 +10,6 @@
 import com.ethlo.time.ITU;
 import com.ethlo.time.LeapSecondException;
 import com.networknt.schema.ExecutionContext;
-import com.networknt.schema.Format;
 import com.networknt.schema.utils.Classes;
 
 /**
diff --git a/src/main/java/com/networknt/schema/format/DurationFormat.java b/src/main/java/com/networknt/schema/format/DurationFormat.java
@@ -4,7 +4,6 @@
 import java.util.regex.Pattern;
 
 import com.networknt.schema.ExecutionContext;
-import com.networknt.schema.Format;
 import com.networknt.schema.SchemaContext;
 
 /**
diff --git a/src/main/java/com/networknt/schema/format/EmailFormat.java b/src/main/java/com/networknt/schema/format/EmailFormat.java
@@ -18,7 +18,6 @@
 
 import com.networknt.org.apache.commons.validator.routines.EmailValidator;
 import com.networknt.schema.ExecutionContext;
-import com.networknt.schema.Format;
 
 /**
  * Format for email.
diff --git a/src/main/java/com/networknt/schema/format/Format.java b/src/main/java/com/networknt/schema/format/Format.java
@@ -14,11 +14,18 @@
  * limitations under the License.
  */
 
-package com.networknt.schema;
+package com.networknt.schema.format;
 
 import java.util.function.Supplier;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.networknt.schema.ExecutionContext;
+import com.networknt.schema.JsonType;
+import com.networknt.schema.MessageSourceError;
+import com.networknt.schema.NodePath;
+import com.networknt.schema.SchemaContext;
+import com.networknt.schema.TypeFactory;
+import com.networknt.schema.MessageSourceError.Builder;
 import com.networknt.schema.keyword.FormatValidator;
 
 /**
diff --git a/src/main/java/com/networknt/schema/format/Formats.java b/src/main/java/com/networknt/schema/format/Formats.java
@@ -13,27 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.networknt.schema;
+package com.networknt.schema.format;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import com.networknt.schema.format.DateFormat;
-import com.networknt.schema.format.DateTimeFormat;
-import com.networknt.schema.format.DurationFormat;
-import com.networknt.schema.format.EmailFormat;
-import com.networknt.schema.format.IPv6Format;
-import com.networknt.schema.format.IdnEmailFormat;
-import com.networknt.schema.format.IdnHostnameFormat;
-import com.networknt.schema.format.IriFormat;
-import com.networknt.schema.format.IriReferenceFormat;
-import com.networknt.schema.format.PatternFormat;
-import com.networknt.schema.format.RegexFormat;
-import com.networknt.schema.format.TimeFormat;
-import com.networknt.schema.format.UriFormat;
-import com.networknt.schema.format.UriReferenceFormat;
-
 /**
  * Formats.
  */
diff --git a/src/main/java/com/networknt/schema/format/IPv6Format.java b/src/main/java/com/networknt/schema/format/IPv6Format.java
@@ -3,7 +3,6 @@
 import java.util.regex.Pattern;
 
 import com.networknt.schema.ExecutionContext;
-import com.networknt.schema.Format;
 
 /**
  * Format for ipv6.
diff --git a/src/main/java/com/networknt/schema/format/IdnEmailFormat.java b/src/main/java/com/networknt/schema/format/IdnEmailFormat.java
@@ -2,7 +2,6 @@
 
 import com.networknt.org.apache.commons.validator.routines.EmailValidator;
 import com.networknt.schema.ExecutionContext;
-import com.networknt.schema.Format;
 
 /**
  * Format for idn-email.
diff --git a/src/main/java/com/networknt/schema/format/IdnHostnameFormat.java b/src/main/java/com/networknt/schema/format/IdnHostnameFormat.java
@@ -1,7 +1,6 @@
 package com.networknt.schema.format;
 
 import com.networknt.schema.ExecutionContext;
-import com.networknt.schema.Format;
 import com.networknt.schema.utils.RFC5892;
 
 /**
diff --git a/src/main/java/com/networknt/schema/format/PatternFormat.java b/src/main/java/com/networknt/schema/format/PatternFormat.java
@@ -19,7 +19,6 @@
 import java.util.regex.Pattern;
 
 import com.networknt.schema.ExecutionContext;
-import com.networknt.schema.Format;
 
 /**
  * Format using a regex pattern.
diff --git a/src/main/java/com/networknt/schema/format/RegexFormat.java b/src/main/java/com/networknt/schema/format/RegexFormat.java
@@ -14,7 +14,6 @@
 package com.networknt.schema.format;
 
 import com.networknt.schema.ExecutionContext;
-import com.networknt.schema.Format;
 import com.networknt.schema.SchemaContext;
 import com.networknt.schema.regex.RegularExpression;
 
diff --git a/src/main/java/com/networknt/schema/format/TimeFormat.java b/src/main/java/com/networknt/schema/format/TimeFormat.java
@@ -20,7 +20,6 @@
 import java.time.temporal.TemporalAccessor;
 
 import com.networknt.schema.ExecutionContext;
-import com.networknt.schema.Format;
 
 import static java.time.format.DateTimeFormatter.ISO_LOCAL_TIME;
 import static java.time.temporal.ChronoField.*;
diff --git a/src/main/java/com/networknt/schema/keyword/FormatKeyword.java b/src/main/java/com/networknt/schema/keyword/FormatKeyword.java
@@ -17,10 +17,10 @@
 package com.networknt.schema.keyword;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.networknt.schema.Format;
 import com.networknt.schema.NodePath;
 import com.networknt.schema.Schema;
 import com.networknt.schema.SchemaLocation;
+import com.networknt.schema.format.Format;
 import com.networknt.schema.SchemaContext;
 
 import java.util.Collection;
diff --git a/src/main/java/com/networknt/schema/keyword/FormatValidator.java b/src/main/java/com/networknt/schema/keyword/FormatValidator.java
@@ -18,12 +18,12 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.networknt.schema.ExecutionContext;
-import com.networknt.schema.Format;
 import com.networknt.schema.NodePath;
 import com.networknt.schema.Schema;
 import com.networknt.schema.SchemaLocation;
 import com.networknt.schema.SchemaContext;
 import com.networknt.schema.format.BaseFormatValidator;
+import com.networknt.schema.format.Format;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/test/java/com/networknt/schema/CollectorContextTest.java b/src/test/java/com/networknt/schema/CollectorContextTest.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.networknt.schema.dialect.Dialect;
 import com.networknt.schema.dialect.Dialects;
+import com.networknt.schema.format.Format;
 import com.networknt.schema.keyword.AbstractKeywordValidator;
 import com.networknt.schema.keyword.Keyword;
 import com.networknt.schema.keyword.KeywordValidator;
diff --git a/src/test/java/com/networknt/schema/FormatKeywordFactoryTest.java b/src/test/java/com/networknt/schema/FormatKeywordFactoryTest.java
@@ -24,6 +24,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.networknt.schema.dialect.Dialect;
 import com.networknt.schema.dialect.Dialects;
+import com.networknt.schema.format.Format;
 import com.networknt.schema.keyword.FormatKeyword;
 import com.networknt.schema.keyword.KeywordValidator;
 
diff --git a/src/test/java/com/networknt/schema/FormatValidatorTest.java b/src/test/java/com/networknt/schema/FormatValidatorTest.java
@@ -30,6 +30,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.networknt.schema.dialect.Dialect;
 import com.networknt.schema.dialect.Dialects;
+import com.networknt.schema.format.Format;
 import com.networknt.schema.format.PatternFormat;
 import com.networknt.schema.output.OutputUnit;
 
diff --git a/src/test/java/com/networknt/schema/Issue784Test.java b/src/test/java/com/networknt/schema/Issue784Test.java
@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.networknt.schema.dialect.Dialect;
 import com.networknt.schema.dialect.Dialects;
+import com.networknt.schema.format.Format;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/networknt/schema/Issue832Test.java b/src/test/java/com/networknt/schema/Issue832Test.java
@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.networknt.schema.dialect.Dialect;
 import com.networknt.schema.dialect.Dialects;
+import com.networknt.schema.format.Format;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
