From 969970dd2adca27782553ff25d2d8291b88bb5b2 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 9 Jul 2018 12:47:09 +0200 Subject: [PATCH] Fix warnings in mdsal-netconf-connector - potentially-static methods - deprecated use of Throwables.propagate() - raw use of NormalizedNode Change-Id: I06bc1f56c90d7c4fddce262ef2c63eec72492274 Signed-off-by: Robert Varga --- .../netconf/mdsal/connector/ops/get/AbstractGet.java | 12 +++++------- .../ops/get/UniversalNamespaceContextImpl.java | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java index eb6c095020..7624d14236 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java @@ -5,12 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.mdsal.connector.ops.get; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; -import com.google.common.base.Throwables; import com.google.common.collect.Iterables; import java.io.IOException; import javax.xml.stream.XMLOutputFactory; @@ -75,7 +73,7 @@ public abstract class AbstractGet extends AbstractSingletonNetconfOperation { return result.getNode(); } - private XMLStreamWriter getXmlStreamWriter(final DOMResult result) { + private static XMLStreamWriter getXmlStreamWriter(final DOMResult result) { try { return XML_OUTPUT_FACTORY.createXMLStreamWriter(result); } catch (final XMLStreamException e) { @@ -83,12 +81,12 @@ public abstract class AbstractGet extends AbstractSingletonNetconfOperation { } } - private SchemaPath getSchemaPath(final YangInstanceIdentifier dataRoot) { + private static SchemaPath getSchemaPath(final YangInstanceIdentifier dataRoot) { return SchemaPath.create( Iterables.transform(dataRoot.getPathArguments(), PathArgument::getNodeType), dataRoot.equals(ROOT)); } - private void writeRootElement(final XMLStreamWriter xmlWriter, final NormalizedNodeWriter nnWriter, + private static void writeRootElement(final XMLStreamWriter xmlWriter, final NormalizedNodeWriter nnWriter, final ContainerNode data) { try { if (data.getNodeType().equals(SchemaContext.NAME)) { @@ -101,12 +99,12 @@ public abstract class AbstractGet extends AbstractSingletonNetconfOperation { nnWriter.flush(); xmlWriter.flush(); } catch (XMLStreamException | IOException e) { - Throwables.propagate(e); + throw new RuntimeException(e); } } protected Element serializeNodeWithParentStructure(final Document document, final YangInstanceIdentifier dataRoot, - final NormalizedNode node) { + final NormalizedNode node) { if (!dataRoot.equals(ROOT)) { return (Element) transformNormalizedNode(document, ImmutableNodes.fromInstanceId(schemaContext.getCurrentContext(), dataRoot, node), diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/UniversalNamespaceContextImpl.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/UniversalNamespaceContextImpl.java index 3fa27d94b6..479a94b216 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/UniversalNamespaceContextImpl.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/UniversalNamespaceContextImpl.java @@ -112,7 +112,7 @@ public class UniversalNamespaceContextImpl implements NamespaceContext { } @Override - public Iterator getPrefixes(final String namespaceURI) { + public Iterator getPrefixes(final String namespaceURI) { // Not implemented return null; } -- 2.36.6