Skip to content

Commit 8f1c5f4

Browse files
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
}

0 commit comments

Comments
 (0)