From 56ff9897e2990bfe97334a48769e4df1e5f19a7d Mon Sep 17 00:00:00 2001 From: Igor Foltin Date: Fri, 18 Sep 2015 14:55:47 +0200 Subject: [PATCH] Fixed some major sonar issues in yang-data-codec-json. Change-Id: I31f2342a226fc68742f9f892d7e9fff712fef282 Signed-off-by: Igor Foltin --- .../yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java | 2 +- .../yangtools/yang/data/codec/gson/JsonParserStream.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java index 8e9537c790..e3913c8165 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java @@ -28,7 +28,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; * Values of leaf and leaf-list are NOT translated according to codecs. * */ -public class JSONNormalizedNodeStreamWriter implements NormalizedNodeStreamWriter { +public final class JSONNormalizedNodeStreamWriter implements NormalizedNodeStreamWriter { /** * RFC6020 deviation: we are not required to emit empty containers unless they * are marked as 'presence'. diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java index 68b6d16861..da5315bba1 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java @@ -69,7 +69,7 @@ public final class JsonParserStream implements Closeable, Flushable { return new JsonParserStream(writer, schemaContext, schemaContext); } - public JsonParserStream parse(final JsonReader reader) throws JsonIOException, JsonSyntaxException { + public JsonParserStream parse(final JsonReader reader) { // code copied from gson's JsonParser and Stream classes final boolean lenient = reader.isLenient(); @@ -83,11 +83,9 @@ public final class JsonParserStream implements Closeable, Flushable { compositeNodeDataWithSchema.write(writer); return this; - // return read(reader); } catch (final EOFException e) { if (isEmpty) { return this; - // return JsonNull.INSTANCE; } // The stream ended prematurely so it is likely a syntax error. throw new JsonSyntaxException(e); -- 2.36.6