Skip to content

Commit 8f1c5f4

Browse files
CapstanCapstan
committed
Replace deprecated JsonNode.put with .set.
1 parent 5a00fb2 commit 8f1c5f4

25 files changed

+58
-58
lines changed

‎src/main/java/com/github/fge/jsonschema/keyword/digest/common/AdditionalPropertiesDigester.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public JsonNode digest(final JsonNode schema)
6464
* not be the case if and only if it has boolean value false.
6565
*/
6666
ret.put(keyword, true);
67-
ret.put("properties", properties);
68-
ret.put("patternProperties", patternProperties);
67+
ret.set("properties", properties);
68+
ret.set("patternProperties", patternProperties);
6969

7070
if (schema.get(keyword).asBoolean(true))
7171
return ret;

‎src/main/java/com/github/fge/jsonschema/keyword/digest/draftv3/DraftV3DependenciesDigester.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ public JsonNode digest(final JsonNode schema)
6161
final ObjectNode ret = FACTORY.objectNode();
6262

6363
final ObjectNode propertyDeps = FACTORY.objectNode();
64-
ret.put("propertyDeps", propertyDeps);
64+
ret.set("propertyDeps", propertyDeps);
6565

6666
final ArrayNode schemaDeps = FACTORY.arrayNode();
67-
ret.put("schemaDeps", schemaDeps);
67+
ret.set("schemaDeps", schemaDeps);
6868

6969
final List<String> list = Lists.newArrayList();
7070

@@ -86,10 +86,10 @@ public JsonNode digest(final JsonNode schema)
8686
case ARRAY:
8787
final JsonNode node = sortedSet(value);
8888
if (node.size() != 0)
89-
propertyDeps.put(key, node);
89+
propertyDeps.set(key, node);
9090
break;
9191
case STRING:
92-
propertyDeps.put(key, FACTORY.arrayNode()
92+
propertyDeps.set(key, FACTORY.arrayNode()
9393
.add(value.textValue()));
9494
break;
9595
default:

‎src/main/java/com/github/fge/jsonschema/keyword/digest/draftv3/DraftV3PropertiesDigester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public JsonNode digest(final JsonNode schema)
5656
// TODO: return an array directly (same for "required" in v4)
5757
final ObjectNode ret = FACTORY.objectNode();
5858
final ArrayNode required = FACTORY.arrayNode();
59-
ret.put("required", required);
59+
ret.set("required", required);
6060

6161
final JsonNode node = schema.get(keyword);
6262
final List<String> list = Lists.newArrayList(node.fieldNames());

‎src/main/java/com/github/fge/jsonschema/keyword/digest/draftv4/DraftV4DependenciesDigester.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ public JsonNode digest(final JsonNode schema)
6060
final ObjectNode ret = FACTORY.objectNode();
6161

6262
final ObjectNode propertyDeps = FACTORY.objectNode();
63-
ret.put("propertyDeps", propertyDeps);
63+
ret.set("propertyDeps", propertyDeps);
6464

6565
final ArrayNode schemaDeps = FACTORY.arrayNode();
66-
ret.put("schemaDeps", schemaDeps);
66+
ret.set("schemaDeps", schemaDeps);
6767

6868
final List<String> list = Lists.newArrayList();
6969

@@ -79,7 +79,7 @@ public JsonNode digest(final JsonNode schema)
7979
if (value.isObject()) // schema dep
8080
list.add(key);
8181
else // property dep
82-
propertyDeps.put(key, sortedSet(value));
82+
propertyDeps.set(key, sortedSet(value));
8383
}
8484

8585
for (final String s: Ordering.natural().sortedCopy(list))

‎src/main/java/com/github/fge/jsonschema/keyword/digest/draftv4/DraftV4TypeDigester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public JsonNode digest(final JsonNode schema)
5959
{
6060
final ObjectNode ret = FACTORY.objectNode();
6161
final ArrayNode allowedTypes = FACTORY.arrayNode();
62-
ret.put(keyword, allowedTypes);
62+
ret.set(keyword, allowedTypes);
6363

6464
final JsonNode node = schema.get(keyword);
6565

‎src/main/java/com/github/fge/jsonschema/keyword/digest/draftv4/RequiredDigester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public JsonNode digest(final JsonNode schema)
5757
{
5858
final ObjectNode ret = FACTORY.objectNode();
5959
final ArrayNode required = FACTORY.arrayNode();
60-
ret.put(keyword, required);
60+
ret.set(keyword, required);
6161

6262
final List<JsonNode> list = Lists.newArrayList(schema.get(keyword));
6363

‎src/main/java/com/github/fge/jsonschema/keyword/digest/helpers/DraftV3TypeKeywordDigester.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ public JsonNode digest(final JsonNode schema)
4949
{
5050
final ObjectNode ret = FACTORY.objectNode();
5151
final ArrayNode simpleTypes = FACTORY.arrayNode();
52-
ret.put(keyword, simpleTypes);
52+
ret.set(keyword, simpleTypes);
5353
final ArrayNode schemas = FACTORY.arrayNode();
54-
ret.put("schemas", schemas);
54+
ret.set("schemas", schemas);
5555

5656
final JsonNode node = schema.get(keyword);
5757

‎src/main/java/com/github/fge/jsonschema/keyword/digest/helpers/NumericDigester.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@ protected final ObjectNode digestedNumberNode(final JsonNode schema)
6767
ret.put("valueIsLong", isLong);
6868

6969
if (isLong) {
70-
ret.put(keyword, node.canConvertToInt()
70+
ret.set(keyword, node.canConvertToInt()
7171
? FACTORY.numberNode(node.intValue())
7272
: FACTORY.numberNode(node.longValue()));
7373
return ret;
7474
}
7575

7676
final BigDecimal decimal = node.decimalValue();
77-
ret.put(keyword, decimal.scale() == 0
77+
ret.set(keyword, decimal.scale() == 0
7878
? FACTORY.numberNode(decimal.toBigIntegerExact())
7979
: node);
8080

‎src/main/java/com/github/fge/jsonschema/keyword/digest/helpers/SimpleDigester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public SimpleDigester(final String keyword, final NodeType first,
4343
public JsonNode digest(final JsonNode schema)
4444
{
4545
final ObjectNode ret = FACTORY.objectNode();
46-
ret.put(keyword, schema.get(keyword));
46+
ret.set(keyword, schema.get(keyword));
4747
return ret;
4848
}
4949
}

‎src/main/java/com/github/fge/jsonschema/keyword/validator/draftv3/DisallowKeywordValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void validate(final Processor<FullData, FullData> processor,
7575
ptr = schemaPointer.append(JsonPointer.of(keyword, index));
7676
newData = data.withSchema(tree.setPointer(ptr));
7777
processor.process(subReport, newData);
78-
fullReport.put(ptr.toString(), subReport.asJson());
78+
fullReport.set(ptr.toString(), subReport.asJson());
7979
if (subReport.isSuccess())
8080
nrSuccess++;
8181
}

‎src/main/java/com/github/fge/jsonschema/keyword/validator/draftv3/DraftV3TypeValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void validate(final Processor<FullData, FullData> processor,
7979
ptr = schemaPointer.append(JsonPointer.of(keyword, index));
8080
newData = data.withSchema(tree.setPointer(ptr));
8181
processor.process(subReport, newData);
82-
fullReport.put(ptr.toString(), subReport.asJson());
82+
fullReport.set(ptr.toString(), subReport.asJson());
8383
if (subReport.isSuccess())
8484
nrSuccess++;
8585
}

‎src/main/java/com/github/fge/jsonschema/keyword/validator/draftv4/AllOfValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void validate(final Processor<FullData, FullData> processor,
6666
ptr = schemaPointer.append(JsonPointer.of(keyword, index));
6767
newData = data.withSchema(tree.setPointer(ptr));
6868
processor.process(subReport, newData);
69-
fullReport.put(ptr.toString(), subReport.asJson());
69+
fullReport.set(ptr.toString(), subReport.asJson());
7070
if (subReport.isSuccess())
7171
nrSuccess++;
7272
}

‎src/main/java/com/github/fge/jsonschema/keyword/validator/draftv4/AnyOfValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void validate(final Processor<FullData, FullData> processor,
6666
ptr = schemaPointer.append(JsonPointer.of(keyword, index));
6767
newData = data.withSchema(tree.setPointer(ptr));
6868
processor.process(subReport, newData);
69-
fullReport.put(ptr.toString(), subReport.asJson());
69+
fullReport.set(ptr.toString(), subReport.asJson());
7070
if (subReport.isSuccess())
7171
nrSuccess++;
7272
}

‎src/main/java/com/github/fge/jsonschema/keyword/validator/draftv4/OneOfValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void validate(final Processor<FullData, FullData> processor,
6666
ptr = schemaPointer.append(JsonPointer.of(keyword, index));
6767
newData = data.withSchema(tree.setPointer(ptr));
6868
processor.process(subReport, newData);
69-
fullReport.put(ptr.toString(), subReport.asJson());
69+
fullReport.set(ptr.toString(), subReport.asJson());
7070
if (subReport.isSuccess())
7171
nrSuccess++;
7272
}

‎src/main/java/com/github/fge/jsonschema/processors/validation/ObjectSchemaDigester.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ public JsonNode digest(final JsonNode schema)
5959
ArrayNode node;
6060

6161
node = FACTORY.arrayNode();
62-
ret.put("properties", node);
62+
ret.set("properties", node);
6363

6464
set = Sets.newHashSet(schema.path("properties").fieldNames());
6565
for (final String field: Ordering.natural().sortedCopy(set))
6666
node.add(field);
6767

6868
node = FACTORY.arrayNode();
69-
ret.put("patternProperties", node);
69+
ret.set("patternProperties", node);
7070

7171
set = Sets.newHashSet(schema.path("patternProperties").fieldNames());
7272
for (final String field: Ordering.natural().sortedCopy(set))

‎src/test/java/com/github/fge/jsonschema/keyword/special/ExtendsKeywordTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void initEnvironment()
8383
return;
8484

8585
final ObjectNode schema = FACTORY.objectNode();
86-
schema.put("extends", FACTORY.objectNode());
86+
schema.set("extends", FACTORY.objectNode());
8787
final SchemaTree tree
8888
= new CanonicalSchemaTree(SchemaKey.anonymousKey(), schema);
8989

‎src/test/java/com/github/fge/jsonschema/keyword/special/NotKeywordTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void initEnvironment()
8484
return;
8585

8686
final ObjectNode schema = FACTORY.objectNode();
87-
schema.put("not", FACTORY.objectNode());
87+
schema.set("not", FACTORY.objectNode());
8888

8989
final SchemaTree tree
9090
= new CanonicalSchemaTree(SchemaKey.anonymousKey(), schema);

‎src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv3/DisallowValidatorTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ protected void checkOkOk(final ProcessingReport report)
5454
final ObjectNode reports = FACTORY.objectNode();
5555

5656
final ArrayNode oneReport = FACTORY.arrayNode();
57-
reports.put(ptr1.toString(), oneReport);
58-
reports.put(ptr2.toString(), oneReport);
57+
reports.set(ptr1.toString(), oneReport);
58+
reports.set(ptr2.toString(), oneReport);
5959

6060
assertMessage(message)
6161
.isValidationError(keyword,
@@ -78,8 +78,8 @@ protected void checkOkKo(final ProcessingReport report)
7878

7979
final ArrayNode oneReport = FACTORY.arrayNode();
8080
oneReport.add(MSG.asJson());
81-
reports.put(ptr1.toString(), FACTORY.arrayNode());
82-
reports.put(ptr2.toString(), oneReport);
81+
reports.set(ptr1.toString(), FACTORY.arrayNode());
82+
reports.set(ptr2.toString(), oneReport);
8383

8484
assertMessage(message)
8585
.isValidationError(keyword,
@@ -102,7 +102,7 @@ protected JsonNode generateSchema()
102102
schemas.add(sub1);
103103
schemas.add(sub2);
104104
final ObjectNode ret = FACTORY.objectNode();
105-
ret.put(keyword, schemas);
105+
ret.set(keyword, schemas);
106106
return ret;
107107
}
108108

@@ -116,11 +116,11 @@ protected JsonNode generateInstance()
116116
protected JsonNode generateDigest()
117117
{
118118
final ObjectNode ret = FACTORY.objectNode();
119-
ret.put(keyword, FACTORY.arrayNode());
119+
ret.set(keyword, FACTORY.arrayNode());
120120
final ArrayNode schemas = FACTORY.arrayNode();
121121
schemas.add(0);
122122
schemas.add(1);
123-
ret.put("schemas", schemas);
123+
ret.set("schemas", schemas);
124124
return ret;
125125
}
126126
}

‎src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv3/DraftV3TypeValidatorTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ protected void checkKoKo(final ProcessingReport report)
6868

6969
final ArrayNode oneReport = FACTORY.arrayNode();
7070
oneReport.add(MSG.asJson());
71-
reports.put(ptr1.toString(), oneReport);
72-
reports.put(ptr2.toString(), oneReport);
71+
reports.set(ptr1.toString(), oneReport);
72+
reports.set(ptr2.toString(), oneReport);
7373

7474
assertMessage(message)
7575
.isValidationError(keyword,
@@ -84,7 +84,7 @@ protected JsonNode generateSchema()
8484
schemas.add(sub1);
8585
schemas.add(sub2);
8686
final ObjectNode ret = FACTORY.objectNode();
87-
ret.put(keyword, schemas);
87+
ret.set(keyword, schemas);
8888
return ret;
8989
}
9090

@@ -98,11 +98,11 @@ protected JsonNode generateInstance()
9898
protected JsonNode generateDigest()
9999
{
100100
final ObjectNode ret = FACTORY.objectNode();
101-
ret.put(keyword, FACTORY.arrayNode());
101+
ret.set(keyword, FACTORY.arrayNode());
102102
final ArrayNode schemas = FACTORY.arrayNode();
103103
schemas.add(0);
104104
schemas.add(1);
105-
ret.put("schemas", schemas);
105+
ret.set("schemas", schemas);
106106
return ret;
107107
}
108108
}

‎src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv3/ExtendsValidatorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ protected JsonNode generateSchema()
6666
schemas.add(sub1);
6767
schemas.add(sub2);
6868
final ObjectNode ret = FACTORY.objectNode();
69-
ret.put(keyword, schemas);
69+
ret.set(keyword, schemas);
7070
return ret;
7171
}
7272

‎src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/AllOfValidatorTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ protected void checkOkKo(final ProcessingReport report)
6161

6262
final ArrayNode oneReport = FACTORY.arrayNode();
6363
oneReport.add(MSG.asJson());
64-
reports.put(ptr1.toString(), FACTORY.arrayNode());
65-
reports.put(ptr2.toString(), oneReport);
64+
reports.set(ptr1.toString(), FACTORY.arrayNode());
65+
reports.set(ptr2.toString(), oneReport);
6666

6767
assertMessage(message)
6868
.isValidationError(keyword,
@@ -85,8 +85,8 @@ protected void checkKoKo(final ProcessingReport report)
8585

8686
final ArrayNode oneReport = FACTORY.arrayNode();
8787
oneReport.add(MSG.asJson());
88-
reports.put(ptr1.toString(), oneReport);
89-
reports.put(ptr2.toString(), oneReport);
88+
reports.set(ptr1.toString(), oneReport);
89+
reports.set(ptr2.toString(), oneReport);
9090

9191
assertMessage(message)
9292
.isValidationError(keyword,
@@ -102,7 +102,7 @@ protected JsonNode generateSchema()
102102
schemas.add(sub1);
103103
schemas.add(sub2);
104104
final ObjectNode ret = FACTORY.objectNode();
105-
ret.put(keyword, schemas);
105+
ret.set(keyword, schemas);
106106
return ret;
107107
}
108108

‎src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/AnyOfValidatorTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ protected void checkKoKo(final ProcessingReport report)
6868

6969
final ArrayNode oneReport = FACTORY.arrayNode();
7070
oneReport.add(MSG.asJson());
71-
reports.put(ptr1.toString(), oneReport);
72-
reports.put(ptr2.toString(), oneReport);
71+
reports.set(ptr1.toString(), oneReport);
72+
reports.set(ptr2.toString(), oneReport);
7373

7474
assertMessage(message)
7575
.isValidationError(keyword,
@@ -84,7 +84,7 @@ protected JsonNode generateSchema()
8484
schemas.add(sub1);
8585
schemas.add(sub2);
8686
final ObjectNode ret = FACTORY.objectNode();
87-
ret.put(keyword, schemas);
87+
ret.set(keyword, schemas);
8888
return ret;
8989
}
9090

‎src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/DependenciesValidatorTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ protected void checkKoKo(final ProcessingReport report)
6363
protected JsonNode generateSchema()
6464
{
6565
final ObjectNode value = FACTORY.objectNode();
66-
value.put("a", sub1);
67-
value.put("b", sub2);
66+
value.set("a", sub1);
67+
value.set("b", sub2);
6868

6969
final ObjectNode ret = FACTORY.objectNode();
70-
ret.put(keyword, value);
70+
ret.set(keyword, value);
7171
return ret;
7272
}
7373

@@ -88,8 +88,8 @@ protected JsonNode generateDigest()
8888
schemaDeps.add("b");
8989

9090
final ObjectNode ret = FACTORY.objectNode();
91-
ret.put("propertyDeps", FACTORY.objectNode());
92-
ret.put("schemaDeps", schemaDeps);
91+
ret.set("propertyDeps", FACTORY.objectNode());
92+
ret.set("schemaDeps", schemaDeps);
9393
return ret;
9494
}
9595
}

‎src/test/java/com/github/fge/jsonschema/keyword/validator/callback/draftv4/OneOfValidatorTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ protected void checkOkOk(final ProcessingReport report)
5353
final ObjectNode reports = FACTORY.objectNode();
5454

5555
final ArrayNode oneReport = FACTORY.arrayNode();
56-
reports.put(ptr1.toString(), oneReport);
57-
reports.put(ptr2.toString(), oneReport);
56+
reports.set(ptr1.toString(), oneReport);
57+
reports.set(ptr2.toString(), oneReport);
5858

5959
assertMessage(message)
6060
.isValidationError(keyword,
@@ -84,8 +84,8 @@ protected void checkKoKo(final ProcessingReport report)
8484

8585
final ArrayNode oneReport = FACTORY.arrayNode();
8686
oneReport.add(MSG.asJson());
87-
reports.put(ptr1.toString(), oneReport);
88-
reports.put(ptr2.toString(), oneReport);
87+
reports.set(ptr1.toString(), oneReport);
88+
reports.set(ptr2.toString(), oneReport);
8989

9090
assertMessage(message)
9191
.isValidationError(keyword,
@@ -101,7 +101,7 @@ protected JsonNode generateSchema()
101101
schemas.add(sub1);
102102
schemas.add(sub2);
103103
final ObjectNode ret = FACTORY.objectNode();
104-
ret.put(keyword, schemas);
104+
ret.set(keyword, schemas);
105105
return ret;
106106
}
107107

0 commit comments

Comments
 (0)