From 8be073a1372e4526ddd843cead10b8fd2468bad9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 3 Aug 2017 11:33:30 +0200 Subject: [PATCH] Cleanup JSONCodecFactory.create() users JSONCodecFactory.create() is deprecated, use getShared() instead. Change-Id: I2abf0350391e067e3668760f88776130cf14f74e Signed-off-by: Robert Varga --- .../yangtools/yang/data/codec/gson/AnyXmlSupportTest.java | 4 ++-- .../yangtools/yang/data/codec/gson/Bug5446Test.java | 2 +- .../yang/data/codec/gson/NormalizedNodeToJsonStreamTest.java | 3 ++- .../yang/data/codec/gson/StreamToNormalizedNodeTest.java | 5 ++--- .../yang/data/codec/gson/YangModeledAnyXmlSupportTest.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/AnyXmlSupportTest.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/AnyXmlSupportTest.java index 1cc22e3ca7..f64661b412 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/AnyXmlSupportTest.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/AnyXmlSupportTest.java @@ -87,7 +87,7 @@ public class AnyXmlSupportTest { // serialization final Writer writer = new StringWriter(); final NormalizedNodeStreamWriter jsonStream = JSONNormalizedNodeStreamWriter. - createExclusiveWriter(JSONCodecFactory.create(schemaContext), SchemaPath.ROOT, null, + createExclusiveWriter(JSONCodecFactory.getShared(schemaContext), SchemaPath.ROOT, null, JsonWriterFactory.createJsonWriter(writer, 2)); final NormalizedNodeWriter nodeWriter = NormalizedNodeWriter.forStreamWriter(jsonStream); nodeWriter.write(transformedInput); @@ -129,7 +129,7 @@ public class AnyXmlSupportTest { // serialization final Writer writer = new StringWriter(); final NormalizedNodeStreamWriter jsonStream = JSONNormalizedNodeStreamWriter. - createExclusiveWriter(JSONCodecFactory.create(schemaContext), SchemaPath.ROOT, null, + createExclusiveWriter(JSONCodecFactory.getShared(schemaContext), SchemaPath.ROOT, null, JsonWriterFactory.createJsonWriter(writer, 2)); final NormalizedNodeWriter nodeWriter = NormalizedNodeWriter.forStreamWriter(jsonStream); nodeWriter.write(transformedInput); diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java index 6bfa175f28..4c937f2fcb 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java @@ -77,7 +77,7 @@ public class Bug5446Test { final NormalizedNode inputStructure) throws IOException { final NormalizedNodeStreamWriter jsonStream = JSONNormalizedNodeStreamWriter.createExclusiveWriter( - JSONCodecFactory.create(schemaContext), SchemaPath.ROOT, null, + JSONCodecFactory.getShared(schemaContext), SchemaPath.ROOT, null, JsonWriterFactory.createJsonWriter(writer, 2)); final NormalizedNodeWriter nodeWriter = NormalizedNodeWriter.forStreamWriter(jsonStream); nodeWriter.write(inputStructure); diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/NormalizedNodeToJsonStreamTest.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/NormalizedNodeToJsonStreamTest.java index 6777a4b05e..fcba4f921b 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/NormalizedNodeToJsonStreamTest.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/NormalizedNodeToJsonStreamTest.java @@ -14,6 +14,7 @@ import static org.junit.Assert.assertTrue; import static org.opendaylight.yangtools.yang.data.codec.gson.TestUtils.childArray; import static org.opendaylight.yangtools.yang.data.codec.gson.TestUtils.childPrimitive; import static org.opendaylight.yangtools.yang.data.codec.gson.TestUtils.resolveCont1; + import com.google.common.collect.Sets; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -349,7 +350,7 @@ public class NormalizedNodeToJsonStreamTest { final NormalizedNode inputStructure) throws IOException { final NormalizedNodeStreamWriter jsonStream = JSONNormalizedNodeStreamWriter. - createExclusiveWriter(JSONCodecFactory.create(schemaContext), SchemaPath.ROOT, null, + createExclusiveWriter(JSONCodecFactory.getShared(schemaContext), SchemaPath.ROOT, null, JsonWriterFactory.createJsonWriter(writer, 2)); final NormalizedNodeWriter nodeWriter = NormalizedNodeWriter.forStreamWriter(jsonStream); nodeWriter.write(inputStructure); diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/StreamToNormalizedNodeTest.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/StreamToNormalizedNodeTest.java index 7af0cb752a..3585cf5643 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/StreamToNormalizedNodeTest.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/StreamToNormalizedNodeTest.java @@ -9,8 +9,6 @@ package org.opendaylight.yangtools.yang.data.codec.gson; import static org.opendaylight.yangtools.yang.data.codec.gson.TestUtils.loadTextFile; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; - import com.google.gson.stream.JsonReader; import java.io.File; import java.io.IOException; @@ -29,6 +27,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWrit import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; import org.slf4j.Logger; @@ -106,7 +105,7 @@ public class StreamToNormalizedNodeTest { // StreamWriter which outputs JSON strings // StreamWriter which outputs JSON strings final NormalizedNodeStreamWriter jsonStream = JSONNormalizedNodeStreamWriter. - createExclusiveWriter(JSONCodecFactory.create(schemaContext), SchemaPath.ROOT, null, + createExclusiveWriter(JSONCodecFactory.getShared(schemaContext), SchemaPath.ROOT, null, JsonWriterFactory.createJsonWriter(writer, 2)); // NormalizedNode -> StreamWriter diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YangModeledAnyXmlSupportTest.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YangModeledAnyXmlSupportTest.java index 5eb6782a54..d491495957 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YangModeledAnyXmlSupportTest.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/YangModeledAnyXmlSupportTest.java @@ -110,7 +110,7 @@ public class YangModeledAnyXmlSupportTest { final NormalizedNode inputStructure) throws IOException { final NormalizedNodeStreamWriter jsonStream = JSONNormalizedNodeStreamWriter.createExclusiveWriter( - JSONCodecFactory.create(schemaContext), SchemaPath.ROOT, null, + JSONCodecFactory.getShared(schemaContext), SchemaPath.ROOT, null, JsonWriterFactory.createJsonWriter(writer, 2)); final NormalizedNodeWriter nodeWriter = NormalizedNodeWriter.forStreamWriter(jsonStream); nodeWriter.write(inputStructure); -- 2.36.6