From d41b116f0a177683a326a9d18c4f6aa1ece651de Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Wed, 31 Aug 2016 15:16:38 +0200 Subject: Fixing sonar issues #1 Change-Id: I4c27d0ad2fd1655db2237ae914361f029093084c Signed-off-by: Maros Marsalek --- .../java/io/fd/honeycomb/translate/util/JsonUtils.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/JsonUtils.java') diff --git a/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/JsonUtils.java b/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/JsonUtils.java index a26334454..d551802e4 100644 --- a/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/JsonUtils.java +++ b/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/JsonUtils.java @@ -40,13 +40,17 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeS import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class JsonUtils { + private static final Logger LOG = LoggerFactory.getLogger(JsonUtils.class); + private JsonUtils() {} /** - * Serialize normalized node root structure into provided output stream + * Serialize normalized node root structure into provided output stream. * * @throws IOException if serialized data cannot be written into provided output stream */ @@ -79,15 +83,18 @@ public final class JsonUtils { Builders.containerBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(schemaContext.getQName())); final NormalizedNodeStreamWriter writer = ImmutableNormalizedNodeStreamWriter.from(builder); - final JsonParserStream jsonParser = JsonParserStream.create(writer, schemaContext); - final JsonReader reader = new JsonReader(new InputStreamReader(stream, Charsets.UTF_8)); - jsonParser.parse(reader); + try (final JsonParserStream jsonParser = JsonParserStream.create(writer, schemaContext)) { + final JsonReader reader = new JsonReader(new InputStreamReader(stream, Charsets.UTF_8)); + jsonParser.parse(reader); + } catch (IOException e) { + LOG.warn("Unable to close json parser. Ignoring exception", e); + } return builder.build(); } private static void writeChildren(final NormalizedNodeWriter nnWriter, final ContainerNode data) throws IOException { - for(final DataContainerChild child : data.getValue()) { + for (final DataContainerChild child : data.getValue()) { nnWriter.write(child); } } -- cgit 1.2.3-korg