Skip to content

Commit 076a538

Browse files
committed
Refactor and update code
1 parent 07fcfc0 commit 076a538

40 files changed

+261
-257
lines changed

src/main/java/com/relogiclabs/json/schema/JsonSchema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.relogiclabs.json.schema;
22

3+
import com.relogiclabs.json.schema.internal.util.DebugUtils;
34
import com.relogiclabs.json.schema.message.MessageFormatter;
45
import com.relogiclabs.json.schema.tree.JsonTree;
56
import com.relogiclabs.json.schema.tree.RuntimeContext;
67
import com.relogiclabs.json.schema.tree.SchemaTree;
7-
import com.relogiclabs.json.schema.util.DebugUtils;
88
import lombok.Getter;
99

1010
import java.util.Queue;

src/main/java/com/relogiclabs/json/schema/exception/CommonException.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import lombok.Getter;
55

66
public class CommonException extends RuntimeException {
7-
87
@Getter
98
private String code;
109

@@ -26,4 +25,4 @@ public CommonException(ErrorDetail detail, Throwable cause) {
2625
public CommonException(ErrorDetail detail) {
2726
this(detail, null);
2827
}
29-
}
28+
}

src/main/java/com/relogiclabs/json/schema/exception/JsonSchemaException.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
import com.relogiclabs.json.schema.message.ErrorDetail;
55
import com.relogiclabs.json.schema.message.ExpectedDetail;
66
import com.relogiclabs.json.schema.tree.Context;
7+
import lombok.Getter;
78

89
import static com.relogiclabs.json.schema.internal.util.MiscellaneousHelper.nonNull;
910

11+
@Getter
1012
public class JsonSchemaException extends CommonException {
1113

1214
private final ExpectedDetail expected;

src/main/java/com/relogiclabs/json/schema/function/CoreFunctions3.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import com.relogiclabs.json.schema.exception.DateTimeLexerException;
44
import com.relogiclabs.json.schema.exception.InvalidDateTimeException;
55
import com.relogiclabs.json.schema.exception.JsonSchemaException;
6+
import com.relogiclabs.json.schema.internal.time.DateTimeType;
7+
import com.relogiclabs.json.schema.internal.time.DateTimeValidator;
68
import com.relogiclabs.json.schema.message.ActualDetail;
79
import com.relogiclabs.json.schema.message.ErrorDetail;
810
import com.relogiclabs.json.schema.message.ExpectedDetail;
9-
import com.relogiclabs.json.schema.time.DateTimeType;
10-
import com.relogiclabs.json.schema.time.DateTimeValidator;
1111
import com.relogiclabs.json.schema.tree.RuntimeContext;
1212
import com.relogiclabs.json.schema.types.JArray;
1313
import com.relogiclabs.json.schema.types.JNode;

src/main/java/com/relogiclabs/json/schema/internal/antlr/SchemaLexer.interp

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/main/java/com/relogiclabs/json/schema/internal/antlr/SchemaLexer.java

Lines changed: 178 additions & 174 deletions
Large diffs are not rendered by default.

src/main/java/com/relogiclabs/json/schema/grammar/SchemaLexer.g4 renamed to src/main/java/com/relogiclabs/json/schema/internal/grammar/SchemaLexer.g4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ fragment WHITE_SPC: [\n\r\t ]+;
6767
mode DIRECTIVE_VERSION1;
6868

6969
COLON1: ':';
70-
VERSION_NUMBER1: DIGIT ('.' DIGIT+)* -> popMode;
70+
VERSION_NUMBER1: DIGIT+ ('.' DIGIT+)* -> popMode;
7171
WHITE_SPACE1: WHITE_SPC -> channel(HIDDEN);
7272
MULTILINE_COMMENT1: MULTILINE_CMT -> channel(HIDDEN);
7373
LINE_COMMENT1: LINE_CMT -> channel(HIDDEN);

0 commit comments

Comments
 (0)