Skip to content

Commit cfca9b1

Browse files
justin-tayjustin-tay
committed
Move JsonType and TypeFactory to utils package
1 parent ae7bb22 commit cfca9b1

21 files changed

+37
-34
lines changed

‎src/main/java/com/networknt/schema/format/Format.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020

2121
import com.fasterxml.jackson.databind.JsonNode;
2222
import com.networknt.schema.ExecutionContext;
23-
import com.networknt.schema.JsonType;
2423
import com.networknt.schema.MessageSourceError;
2524
import com.networknt.schema.SchemaContext;
26-
import com.networknt.schema.TypeFactory;
2725
import com.networknt.schema.keyword.FormatValidator;
2826
import com.networknt.schema.path.NodePath;
27+
import com.networknt.schema.utils.JsonType;
28+
import com.networknt.schema.utils.TypeFactory;
2929

3030
/**
3131
* Used to implement the various formats for the format keyword.

‎src/main/java/com/networknt/schema/keyword/AllOfValidator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121

2222
import com.fasterxml.jackson.databind.JsonNode;
2323
import com.networknt.schema.ExecutionContext;
24-
import com.networknt.schema.JsonType;
2524
import com.networknt.schema.Schema;
2625
import com.networknt.schema.SchemaContext;
2726
import com.networknt.schema.SchemaException;
2827
import com.networknt.schema.SchemaLocation;
29-
import com.networknt.schema.TypeFactory;
3028
import com.networknt.schema.path.NodePath;
29+
import com.networknt.schema.utils.JsonType;
30+
import com.networknt.schema.utils.TypeFactory;
3131

3232
/**
3333
* {@link KeywordValidator} for allOf.

‎src/main/java/com/networknt/schema/keyword/AnyOfValidator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
import com.fasterxml.jackson.databind.JsonNode;
2323
import com.networknt.schema.Error;
2424
import com.networknt.schema.ExecutionContext;
25-
import com.networknt.schema.JsonType;
2625
import com.networknt.schema.Schema;
2726
import com.networknt.schema.SchemaContext;
2827
import com.networknt.schema.SchemaException;
2928
import com.networknt.schema.SchemaLocation;
30-
import com.networknt.schema.TypeFactory;
3129
import com.networknt.schema.path.NodePath;
30+
import com.networknt.schema.utils.JsonType;
31+
import com.networknt.schema.utils.TypeFactory;
3232

3333
/**
3434
* {@link KeywordValidator} for anyOf.

‎src/main/java/com/networknt/schema/keyword/ContentEncodingValidator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import com.fasterxml.jackson.databind.JsonNode;
2020
import com.networknt.schema.ExecutionContext;
2121
import com.networknt.schema.Schema;
22-
import com.networknt.schema.JsonType;
2322
import com.networknt.schema.SchemaLocation;
24-
import com.networknt.schema.TypeFactory;
2523
import com.networknt.schema.path.NodePath;
24+
import com.networknt.schema.utils.JsonType;
25+
import com.networknt.schema.utils.TypeFactory;
2626
import com.networknt.schema.SchemaContext;
2727

2828
import java.util.Base64;

‎src/main/java/com/networknt/schema/keyword/ContentMediaTypeValidator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import com.fasterxml.jackson.databind.JsonNode;
2525
import com.networknt.schema.ExecutionContext;
2626
import com.networknt.schema.Schema;
27-
import com.networknt.schema.JsonType;
2827
import com.networknt.schema.SchemaLocation;
29-
import com.networknt.schema.TypeFactory;
3028
import com.networknt.schema.path.NodePath;
3129
import com.networknt.schema.SchemaContext;
3230
import com.networknt.schema.serialization.JsonMapperFactory;
31+
import com.networknt.schema.utils.JsonType;
32+
import com.networknt.schema.utils.TypeFactory;
3333

3434
/**
3535
* {@link KeywordValidator} for contentMediaType.

‎src/main/java/com/networknt/schema/keyword/EnumValidator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import com.fasterxml.jackson.databind.node.NullNode;
2323
import com.networknt.schema.ExecutionContext;
2424
import com.networknt.schema.Schema;
25-
import com.networknt.schema.JsonType;
2625
import com.networknt.schema.SchemaLocation;
27-
import com.networknt.schema.TypeFactory;
2826
import com.networknt.schema.path.NodePath;
27+
import com.networknt.schema.utils.JsonType;
28+
import com.networknt.schema.utils.TypeFactory;
2929
import com.networknt.schema.SchemaContext;
3030

3131
import java.math.BigDecimal;

‎src/main/java/com/networknt/schema/keyword/ExclusiveMaximumValidator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
import com.networknt.schema.ExecutionContext;
2121
import com.networknt.schema.Schema;
2222
import com.networknt.schema.SchemaException;
23-
import com.networknt.schema.JsonType;
2423
import com.networknt.schema.SchemaLocation;
2524
import com.networknt.schema.path.NodePath;
2625
import com.networknt.schema.SchemaContext;
2726
import com.networknt.schema.utils.JsonNodeUtil;
27+
import com.networknt.schema.utils.JsonType;
2828

2929
import java.math.BigDecimal;
3030
import java.math.BigInteger;

‎src/main/java/com/networknt/schema/keyword/ExclusiveMinimumValidator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
import com.networknt.schema.ExecutionContext;
2121
import com.networknt.schema.Schema;
2222
import com.networknt.schema.SchemaException;
23-
import com.networknt.schema.JsonType;
2423
import com.networknt.schema.SchemaLocation;
2524
import com.networknt.schema.path.NodePath;
2625
import com.networknt.schema.SchemaContext;
2726
import com.networknt.schema.utils.JsonNodeUtil;
27+
import com.networknt.schema.utils.JsonType;
2828

2929
import java.math.BigDecimal;
3030
import java.math.BigInteger;

‎src/main/java/com/networknt/schema/keyword/MaxLengthValidator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import com.fasterxml.jackson.databind.JsonNode;
2020
import com.networknt.schema.ExecutionContext;
2121
import com.networknt.schema.Schema;
22-
import com.networknt.schema.JsonType;
2322
import com.networknt.schema.SchemaLocation;
24-
import com.networknt.schema.TypeFactory;
2523
import com.networknt.schema.path.NodePath;
24+
import com.networknt.schema.utils.JsonType;
25+
import com.networknt.schema.utils.TypeFactory;
2626
import com.networknt.schema.SchemaContext;
2727

2828
/**

‎src/main/java/com/networknt/schema/keyword/MaximumValidator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
import com.networknt.schema.ExecutionContext;
2121
import com.networknt.schema.Schema;
2222
import com.networknt.schema.SchemaException;
23-
import com.networknt.schema.JsonType;
2423
import com.networknt.schema.SchemaLocation;
2524
import com.networknt.schema.path.NodePath;
2625
import com.networknt.schema.SchemaContext;
2726
import com.networknt.schema.utils.JsonNodeUtil;
27+
import com.networknt.schema.utils.JsonType;
2828

2929
import java.math.BigDecimal;
3030
import java.math.BigInteger;

0 commit comments

Comments
 (0)