Place a deprecation marker, make test methods static, reorder imports.
Change-Id: I0979f9f15d231debc53b978ef2534c2f3cf8f14e
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
import org.opendaylight.yangtools.concepts.Codec;
interface JSONCodec<T> extends Codec<String, T> {
- // FIXME: Unused, remove once we are sure we do not need this anymore.
+ /**
+ * @deprecated Unused, remove once we are sure we do not need this anymore.
+ */
+ @Deprecated
boolean needQuotes();
-
/**
* Serialize specified value with specified JsonWriter.
*
import com.google.common.base.Preconditions;
import com.google.gson.stream.JsonWriter;
-
-
/**
* A virtual recursion level in {@link JSONNormalizedNodeStreamWriter}, used for nodes
* which are not emitted in the JSON representation.
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
final class JSONStringInstanceIdentifierCodec extends AbstractModuleStringInstanceIdentifierCodec implements JSONCodec<YangInstanceIdentifier> {
- private final SchemaContext context;
private final DataSchemaContextTree dataContextTree;
private final JSONCodecFactory codecFactory;
+ private final SchemaContext context;
JSONStringInstanceIdentifierCodec(final SchemaContext context, final JSONCodecFactory jsonCodecFactory) {
this.context = Preconditions.checkNotNull(context);
this.dataContextTree = DataSchemaContextTree.from(context);
- this.codecFactory = jsonCodecFactory;
+ this.codecFactory = Preconditions.checkNotNull(jsonCodecFactory);
}
@Override
}
@Override
- protected Object deserializeKeyValue(DataSchemaNode schemaNode, String value) {
+ protected Object deserializeKeyValue(final DataSchemaNode schemaNode, final String value) {
Preconditions.checkNotNull(schemaNode, "schemaNode cannot be null");
Preconditions.checkArgument(schemaNode instanceof LeafSchemaNode, "schemaNode must be of type LeafSchemaNode");
final JSONCodec<Object> objectJSONCodec = codecFactory.codecFor(schemaNode);
* @param value YangInstanceIdentifier
*/
@Override
- public void serializeToWriter(JsonWriter writer, YangInstanceIdentifier value) throws IOException {
+ public void serializeToWriter(final JsonWriter writer, final YangInstanceIdentifier value) throws IOException {
writer.value(serialize(value));
}
}
private final SchemaContext schema;
private final DataSchemaNode parentNode;
- private JsonParserStream(final NormalizedNodeStreamWriter writer, final SchemaContext schemaContext, final DataSchemaNode parentNode) {
+ private JsonParserStream(final NormalizedNodeStreamWriter writer, final SchemaContext schemaContext,
+ final DataSchemaNode parentNode) {
this.schema = Preconditions.checkNotNull(schemaContext);
this.writer = DataSchemaNodeAwareAdaptor.forWriter(writer);
this.codecs = JSONCodecFactory.create(schemaContext);
this.parentNode = parentNode;
}
- public static JsonParserStream create(final NormalizedNodeStreamWriter writer, final SchemaContext schemaContext, final SchemaNode parentNode ) {
- if(parentNode instanceof RpcDefinition) {
+ public static JsonParserStream create(final NormalizedNodeStreamWriter writer, final SchemaContext schemaContext,
+ final SchemaNode parentNode ) {
+ if (parentNode instanceof RpcDefinition) {
return new JsonParserStream(writer, schemaContext, new RpcAsContainer((RpcDefinition) parentNode));
}
Preconditions.checkArgument(parentNode instanceof DataSchemaNode, "Instance of DataSchemaNode class awaited.");
*/
@Beta
public final class JsonWriterFactory {
-
private JsonWriterFactory() {
+ throw new UnsupportedOperationException();
}
+
/**
* Create a new JsonWriter, which writes to the specified output writer.
*
* @param writer Output writer
* @return A JsonWriter instance
*/
- public static JsonWriter createJsonWriter(Writer writer) {
+ public static JsonWriter createJsonWriter(final Writer writer) {
return new JsonWriter(writer);
}
* @param indentSize size of the indent
* @return A JsonWriter instance
*/
- public static JsonWriter createJsonWriter(Writer writer, int indentSize) {
+ public static JsonWriter createJsonWriter(final Writer writer, final int indentSize) {
JsonWriter jsonWriter = new JsonWriter(writer);
final String indent = Strings.repeat(" ", indentSize);
jsonWriter.setIndent(indent);
return jsonWriter;
}
-
}
import static org.opendaylight.yangtools.yang.data.impl.schema.Builders.choiceBuilder;
import static org.opendaylight.yangtools.yang.data.impl.schema.Builders.containerBuilder;
import static org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes.leafNode;
-
import com.google.common.collect.Sets;
import com.google.gson.stream.JsonReader;
import java.io.IOException;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
-import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
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;
assertEquals(cont1Normalized, transformedInput);
}
- private void verifyTransformationToNormalizedNode(final String inputJson,
+ private static void verifyTransformationToNormalizedNode(final String inputJson,
final NormalizedNode<?, ?> awaitedStructure) {
final NormalizedNodeResult result = new NormalizedNodeResult();
final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
import static org.opendaylight.yangtools.yang.data.impl.schema.Builders.choiceBuilder;
import static org.opendaylight.yangtools.yang.data.impl.schema.Builders.containerBuilder;
import static org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes.leafNode;
-
import com.google.common.collect.Sets;
import com.google.gson.stream.JsonReader;
-
import java.io.IOException;
import java.io.StringReader;
import java.net.URISyntaxException;
-
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
assertEquals(cont1Normalized, transformedInput);
}
- private void verifyTransformationToNormalizedNode(final String inputJson,
+ private static void verifyTransformationToNormalizedNode(final String inputJson,
final NormalizedNode<?, ?> awaitedStructure) {
final NormalizedNodeResult result = new NormalizedNodeResult();
final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
import static org.opendaylight.yangtools.yang.data.codec.gson.retest.TestUtils.childPrimitive;
import static org.opendaylight.yangtools.yang.data.codec.gson.retest.TestUtils.loadModules;
import static org.opendaylight.yangtools.yang.data.codec.gson.retest.TestUtils.resolveCont1;
-
-import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactory;
-import org.opendaylight.yangtools.yang.data.codec.gson.JsonWriterFactory;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
-
import com.google.common.collect.Sets;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter;
+import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactory;
import org.opendaylight.yangtools.yang.data.codec.gson.JSONNormalizedNodeStreamWriter;
+import org.opendaylight.yangtools.yang.data.codec.gson.JsonWriterFactory;
import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
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;
/**
assertTrue(emptyObj.getAsJsonArray().get(0) instanceof JsonNull);
}
- private String normalizedNodeToJsonStreamTransformation(final Writer writer,
+ private static String normalizedNodeToJsonStreamTransformation(final Writer writer,
final NormalizedNode<?, ?> inputStructure) throws IOException {
final NormalizedNodeStreamWriter jsonStream = JSONNormalizedNodeStreamWriter.