Skip to content

Commit b5f9004

Browse files
justin-tayjustin-tay
committed
Rename JsonNodeAnnotation to Annotation
1 parent c0d2d9c commit b5f9004

16 files changed

+89
-89
lines changed

‎src/main/java/com/networknt/schema/ExecutionContext.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.networknt.schema;
1818

19-
import com.networknt.schema.annotation.JsonNodeAnnotations;
19+
import com.networknt.schema.annotation.Annotations;
2020
import com.networknt.schema.result.JsonNodeResults;
2121
import com.networknt.schema.walk.WalkConfig;
2222

@@ -34,7 +34,7 @@ public class ExecutionContext {
3434
private CollectorContext collectorContext = null;
3535

3636
private Stack<DiscriminatorContext> discriminatorContexts = null;
37-
private JsonNodeAnnotations annotations = null;
37+
private Annotations annotations = null;
3838
private JsonNodeResults results = null;
3939
private List<Error> errors = new ArrayList<>();
4040

@@ -141,9 +141,9 @@ public void setExecutionConfig(ExecutionConfig executionConfig) {
141141
this.executionConfig = executionConfig;
142142
}
143143

144-
public JsonNodeAnnotations getAnnotations() {
144+
public Annotations getAnnotations() {
145145
if (this.annotations == null) {
146-
this.annotations = new JsonNodeAnnotations();
146+
this.annotations = new Annotations();
147147
}
148148
return annotations;
149149
}

‎src/main/java/com/networknt/schema/annotation/JsonNodeAnnotation.java‎ renamed to ‎src/main/java/com/networknt/schema/annotation/Annotation.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
/**
2525
* The annotation.
2626
*/
27-
public class JsonNodeAnnotation {
27+
public class Annotation {
2828
private final String keyword;
2929
private final NodePath instanceLocation;
3030
private final SchemaLocation schemaLocation;
3131
private final NodePath evaluationPath;
3232
private final Object value;
3333

34-
public JsonNodeAnnotation(String keyword, NodePath instanceLocation, SchemaLocation schemaLocation,
34+
public Annotation(String keyword, NodePath instanceLocation, SchemaLocation schemaLocation,
3535
NodePath evaluationPath, Object value) {
3636
super();
3737
this.keyword = keyword;
@@ -92,7 +92,7 @@ public <T> T getValue() {
9292

9393
@Override
9494
public String toString() {
95-
return "JsonNodeAnnotation [evaluationPath=" + evaluationPath + ", schemaLocation=" + schemaLocation
95+
return "Annotation [evaluationPath=" + evaluationPath + ", schemaLocation=" + schemaLocation
9696
+ ", instanceLocation=" + instanceLocation + ", keyword=" + keyword + ", value=" + value + "]";
9797
}
9898

@@ -109,7 +109,7 @@ public boolean equals(Object obj) {
109109
return false;
110110
if (getClass() != obj.getClass())
111111
return false;
112-
JsonNodeAnnotation other = (JsonNodeAnnotation) obj;
112+
Annotation other = (Annotation) obj;
113113
return Objects.equals(evaluationPath, other.evaluationPath)
114114
&& Objects.equals(instanceLocation, other.instanceLocation) && Objects.equals(keyword, other.keyword)
115115
&& Objects.equals(schemaLocation, other.schemaLocation) && Objects.equals(value, other.value);
@@ -156,8 +156,8 @@ public Builder value(Object value) {
156156
return this;
157157
}
158158

159-
public JsonNodeAnnotation build() {
160-
return new JsonNodeAnnotation(keyword, instanceLocation, schemaLocation, evaluationPath, value);
159+
public Annotation build() {
160+
return new Annotation(keyword, instanceLocation, schemaLocation, evaluationPath, value);
161161
}
162162
}
163163

‎src/main/java/com/networknt/schema/annotation/JsonNodeAnnotationPredicate.java‎ renamed to ‎src/main/java/com/networknt/schema/annotation/AnnotationPredicate.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/**
2424
* A predicate for filtering annotations.
2525
*/
26-
public class JsonNodeAnnotationPredicate implements Predicate<JsonNodeAnnotation> {
26+
public class AnnotationPredicate implements Predicate<Annotation> {
2727
final Predicate<NodePath> instanceLocationPredicate;
2828
final Predicate<NodePath> evaluationPathPredicate;
2929
final Predicate<SchemaLocation> schemaLocationPredicate;
@@ -39,7 +39,7 @@ public class JsonNodeAnnotationPredicate implements Predicate<JsonNodeAnnotation
3939
* @param keywordPredicate for keyword
4040
* @param valuePredicate for value
4141
*/
42-
protected JsonNodeAnnotationPredicate(Predicate<NodePath> instanceLocationPredicate,
42+
protected AnnotationPredicate(Predicate<NodePath> instanceLocationPredicate,
4343
Predicate<NodePath> evaluationPathPredicate, Predicate<SchemaLocation> schemaLocationPredicate,
4444
Predicate<String> keywordPredicate, Predicate<Object> valuePredicate) {
4545
super();
@@ -51,7 +51,7 @@ protected JsonNodeAnnotationPredicate(Predicate<NodePath> instanceLocationPredic
5151
}
5252

5353
@Override
54-
public boolean test(JsonNodeAnnotation t) {
54+
public boolean test(Annotation t) {
5555
return ((valuePredicate == null || valuePredicate.test(t.getValue()))
5656
&& (keywordPredicate == null || keywordPredicate.test(t.getKeyword()))
5757
&& (instanceLocationPredicate == null || instanceLocationPredicate.test(t.getInstanceLocation()))
@@ -114,7 +114,7 @@ public static Builder builder() {
114114
}
115115

116116
/**
117-
* Builder for building a {@link JsonNodeAnnotationPredicate}.
117+
* Builder for building a {@link AnnotationPredicate}.
118118
*/
119119
public static class Builder {
120120
Predicate<NodePath> instanceLocationPredicate;
@@ -148,8 +148,8 @@ public Builder value(Predicate<Object> valuePredicate) {
148148
return this;
149149
}
150150

151-
public JsonNodeAnnotationPredicate build() {
152-
return new JsonNodeAnnotationPredicate(instanceLocationPredicate, evaluationPathPredicate,
151+
public AnnotationPredicate build() {
152+
return new AnnotationPredicate(instanceLocationPredicate, evaluationPathPredicate,
153153
schemaLocationPredicate, keywordPredicate, valuePredicate);
154154
}
155155
}

‎src/main/java/com/networknt/schema/annotation/JsonNodeAnnotations.java‎ renamed to ‎src/main/java/com/networknt/schema/annotation/Annotations.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
* "https://github.com/json-schema-org/json-schema-spec/issues/530">Details
3232
* of annotation collection</a>
3333
*/
34-
public class JsonNodeAnnotations {
34+
public class Annotations {
3535

3636
/**
3737
* Stores the annotations.
3838
* <p>
3939
* instancePath to annotation
4040
*/
41-
private final Map<NodePath, List<JsonNodeAnnotation>> values = new LinkedHashMap<>();
41+
private final Map<NodePath, List<Annotation>> values = new LinkedHashMap<>();
4242

4343
/**
4444
* Gets the annotations.
@@ -47,7 +47,7 @@ public class JsonNodeAnnotations {
4747
*
4848
* @return the annotations
4949
*/
50-
public Map<NodePath, List<JsonNodeAnnotation>> asMap() {
50+
public Map<NodePath, List<Annotation>> asMap() {
5151
return this.values;
5252
}
5353

@@ -56,7 +56,7 @@ public Map<NodePath, List<JsonNodeAnnotation>> asMap() {
5656
*
5757
* @param annotation the annotation
5858
*/
59-
public void put(JsonNodeAnnotation annotation) {
59+
public void put(Annotation annotation) {
6060
this.values.computeIfAbsent(annotation.getInstanceLocation(), (k) -> new ArrayList<>()).add(annotation);
6161

6262
}
@@ -76,10 +76,10 @@ public static class Formatter {
7676
* @param annotations the annotations
7777
* @return the formatted JSON
7878
*/
79-
public static String format(Map<NodePath, List<JsonNodeAnnotation>> annotations) {
79+
public static String format(Map<NodePath, List<Annotation>> annotations) {
8080
Map<String, Map<String, Map<String, Object>>> results = new LinkedHashMap<>();
81-
for (List<JsonNodeAnnotation> list : annotations.values()) {
82-
for (JsonNodeAnnotation annotation : list) {
81+
for (List<Annotation> list : annotations.values()) {
82+
for (Annotation annotation : list) {
8383
String keyword = annotation.getKeyword();
8484
String instancePath = annotation.getInstanceLocation().toString();
8585
String evaluationPath = annotation.getEvaluationPath().toString();

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.networknt.schema.ExecutionContext;
2323
import com.networknt.schema.NodePath;
2424
import com.networknt.schema.SchemaLocation;
25-
import com.networknt.schema.annotation.JsonNodeAnnotation;
25+
import com.networknt.schema.annotation.Annotation;
2626

2727
/**
2828
* Abstract {@link KeywordValidator}.
@@ -116,8 +116,8 @@ protected boolean collectAnnotations(ExecutionContext executionContext, String k
116116
* @param executionContext the execution context
117117
* @param customizer to customize the annotation
118118
*/
119-
protected void putAnnotation(ExecutionContext executionContext, Consumer<JsonNodeAnnotation.Builder> customizer) {
120-
JsonNodeAnnotation.Builder builder = JsonNodeAnnotation.builder().evaluationPath(this.evaluationPath)
119+
protected void putAnnotation(ExecutionContext executionContext, Consumer<Annotation.Builder> customizer) {
120+
Annotation.Builder builder = Annotation.builder().evaluationPath(this.evaluationPath)
121121
.schemaLocation(this.schemaLocation).keyword(getKeyword());
122122
customizer.accept(builder);
123123
executionContext.getAnnotations().put(builder.build());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.networknt.schema.Schema;
2323
import com.networknt.schema.SchemaLocation;
2424
import com.networknt.schema.SchemaContext;
25-
import com.networknt.schema.annotation.JsonNodeAnnotation;
25+
import com.networknt.schema.annotation.Annotation;
2626
import com.networknt.schema.regex.RegularExpression;
2727

2828
import java.util.ArrayList;
@@ -134,7 +134,7 @@ protected void validate(ExecutionContext executionContext, JsonNode node, JsonNo
134134
}
135135
}
136136
if (collectAnnotations) {
137-
executionContext.getAnnotations().put(JsonNodeAnnotation.builder().instanceLocation(instanceLocation)
137+
executionContext.getAnnotations().put(Annotation.builder().instanceLocation(instanceLocation)
138138
.evaluationPath(this.evaluationPath).schemaLocation(this.schemaLocation).keyword(getKeyword())
139139
.value(matchedInstancePropertyNames != null ? matchedInstancePropertyNames : Collections.emptySet())
140140
.build());

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.networknt.schema.Schema;
2424
import com.networknt.schema.SchemaLocation;
2525
import com.networknt.schema.SchemaContext;
26-
import com.networknt.schema.annotation.JsonNodeAnnotation;
26+
import com.networknt.schema.annotation.Annotation;
2727

2828
import static com.networknt.schema.keyword.VersionCode.MinV201909;
2929

@@ -139,12 +139,12 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
139139
if (actual == i) {
140140
// evaluated all
141141
executionContext.getAnnotations()
142-
.put(JsonNodeAnnotation.builder().instanceLocation(instanceLocation)
142+
.put(Annotation.builder().instanceLocation(instanceLocation)
143143
.evaluationPath(this.evaluationPath).schemaLocation(this.schemaLocation)
144144
.keyword("contains").value(true).build());
145145
} else {
146146
executionContext.getAnnotations()
147-
.put(JsonNodeAnnotation.builder().instanceLocation(instanceLocation)
147+
.put(Annotation.builder().instanceLocation(instanceLocation)
148148
.evaluationPath(this.evaluationPath).schemaLocation(this.schemaLocation)
149149
.keyword("contains").value(indexes).build());
150150
}
@@ -158,7 +158,7 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
158158
// in the section for contains, the absence of this keyword's annotation causes
159159
// contains to assume a minimum value of 1.
160160
executionContext.getAnnotations()
161-
.put(JsonNodeAnnotation.builder().instanceLocation(instanceLocation)
161+
.put(Annotation.builder().instanceLocation(instanceLocation)
162162
.evaluationPath(this.evaluationPath.append(minContainsKeyword))
163163
.schemaLocation(this.schemaLocation.append(minContainsKeyword))
164164
.keyword(minContainsKeyword).value(this.min).build());
@@ -169,7 +169,7 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
169169
String maxContainsKeyword = "maxContains";
170170
if (collectAnnotations || collectAnnotations(executionContext, maxContainsKeyword)) {
171171
executionContext.getAnnotations()
172-
.put(JsonNodeAnnotation.builder().instanceLocation(instanceLocation)
172+
.put(Annotation.builder().instanceLocation(instanceLocation)
173173
.evaluationPath(this.evaluationPath.append(maxContainsKeyword))
174174
.schemaLocation(this.schemaLocation.append(maxContainsKeyword))
175175
.keyword(maxContainsKeyword).value(this.max).build());

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.networknt.schema.SchemaRef;
2525
import com.networknt.schema.SchemaLocation;
2626
import com.networknt.schema.SchemaContext;
27-
import com.networknt.schema.annotation.JsonNodeAnnotation;
27+
import com.networknt.schema.annotation.Annotation;
2828
import com.networknt.schema.utils.SchemaRefs;
2929

3030
import java.util.*;
@@ -102,7 +102,7 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
102102
if (this.schema != null) {
103103
// Applies to all
104104
executionContext.getAnnotations()
105-
.put(JsonNodeAnnotation.builder().instanceLocation(instanceLocation)
105+
.put(Annotation.builder().instanceLocation(instanceLocation)
106106
.evaluationPath(this.evaluationPath).schemaLocation(this.schemaLocation)
107107
.keyword(getKeyword()).value(true).build());
108108
} else if (this.tupleSchema != null) {
@@ -112,13 +112,13 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
112112
if (items > schemas) {
113113
// More items than schemas so the keyword only applied to the number of schemas
114114
executionContext.getAnnotations()
115-
.put(JsonNodeAnnotation.builder().instanceLocation(instanceLocation)
115+
.put(Annotation.builder().instanceLocation(instanceLocation)
116116
.evaluationPath(this.evaluationPath).schemaLocation(this.schemaLocation)
117117
.keyword(getKeyword()).value(schemas).build());
118118
} else {
119119
// Applies to all
120120
executionContext.getAnnotations()
121-
.put(JsonNodeAnnotation.builder().instanceLocation(instanceLocation)
121+
.put(Annotation.builder().instanceLocation(instanceLocation)
122122
.evaluationPath(this.evaluationPath).schemaLocation(this.schemaLocation)
123123
.keyword(getKeyword()).value(true).build());
124124
}
@@ -143,7 +143,7 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
143143
if (hasAdditionalItem) {
144144
if (collectAnnotations || collectAnnotations(executionContext, "additionalItems")) {
145145
executionContext.getAnnotations()
146-
.put(JsonNodeAnnotation.builder().instanceLocation(instanceLocation)
146+
.put(Annotation.builder().instanceLocation(instanceLocation)
147147
.evaluationPath(this.additionalItemsEvaluationPath)
148148
.schemaLocation(this.additionalItemsSchemaLocation)
149149
.keyword("additionalItems").value(true).build());
@@ -202,7 +202,7 @@ public void walk(ExecutionContext executionContext, JsonNode node, JsonNode root
202202
if (this.schema != null) {
203203
// Applies to all
204204
executionContext.getAnnotations()
205-
.put(JsonNodeAnnotation.builder().instanceLocation(instanceLocation)
205+
.put(Annotation.builder().instanceLocation(instanceLocation)
206206
.evaluationPath(this.evaluationPath).schemaLocation(this.schemaLocation)
207207
.keyword(getKeyword()).value(true).build());
208208
} else if (this.tupleSchema != null) {
@@ -212,13 +212,13 @@ public void walk(ExecutionContext executionContext, JsonNode node, JsonNode root
212212
if (items > schemas) {
213213
// More items than schemas so the keyword only applied to the number of schemas
214214
executionContext.getAnnotations()
215-
.put(JsonNodeAnnotation.builder().instanceLocation(instanceLocation)
215+
.put(Annotation.builder().instanceLocation(instanceLocation)
216216
.evaluationPath(this.evaluationPath).schemaLocation(this.schemaLocation)
217217
.keyword(getKeyword()).value(schemas).build());
218218
} else {
219219
// Applies to all
220220
executionContext.getAnnotations()
221-
.put(JsonNodeAnnotation.builder().instanceLocation(instanceLocation)
221+
.put(Annotation.builder().instanceLocation(instanceLocation)
222222
.evaluationPath(this.evaluationPath).schemaLocation(this.schemaLocation)
223223
.keyword(getKeyword()).value(true).build());
224224
}
@@ -306,7 +306,7 @@ else if (this.tupleSchema != null) {
306306
if (hasAdditionalItem) {
307307
if (collectAnnotations || collectAnnotations(executionContext, "additionalItems")) {
308308
executionContext.getAnnotations()
309-
.put(JsonNodeAnnotation.builder().instanceLocation(instanceLocation)
309+
.put(Annotation.builder().instanceLocation(instanceLocation)
310310
.evaluationPath(this.additionalItemsEvaluationPath)
311311
.schemaLocation(this.additionalItemsSchemaLocation)
312312
.keyword("additionalItems").value(true).build());

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.networknt.schema.SchemaRef;
2525
import com.networknt.schema.SchemaLocation;
2626
import com.networknt.schema.SchemaContext;
27-
import com.networknt.schema.annotation.JsonNodeAnnotation;
27+
import com.networknt.schema.annotation.Annotation;
2828
import com.networknt.schema.utils.SchemaRefs;
2929

3030
/**
@@ -87,7 +87,7 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
8787
if (collectAnnotations() || collectAnnotations(executionContext)) {
8888
// Applies to all
8989
executionContext.getAnnotations()
90-
.put(JsonNodeAnnotation.builder().instanceLocation(instanceLocation)
90+
.put(Annotation.builder().instanceLocation(instanceLocation)
9191
.evaluationPath(this.evaluationPath).schemaLocation(this.schemaLocation)
9292
.keyword(getKeyword()).value(true).build());
9393
}
@@ -122,7 +122,7 @@ public void walk(ExecutionContext executionContext, JsonNode node, JsonNode root
122122
if (collectAnnotations() || collectAnnotations(executionContext)) {
123123
// Applies to all
124124
executionContext.getAnnotations()
125-
.put(JsonNodeAnnotation.builder().instanceLocation(instanceLocation)
125+
.put(Annotation.builder().instanceLocation(instanceLocation)
126126
.evaluationPath(this.evaluationPath).schemaLocation(this.schemaLocation)
127127
.keyword(getKeyword()).value(true).build());
128128
}

0 commit comments

Comments
 (0)