From 3119eaeee1e473e9e3d590abe73db1dded11724a Mon Sep 17 00:00:00 2001 From: Marian Dubai Date: Fri, 14 Nov 2014 16:46:20 +0100 Subject: [PATCH] Fix checkstyle warnings in netconf-api Change-Id: I174ea168e5b264cd99c2faa9ab182859806ef12f Signed-off-by: Marian Dubai --- .../controller/netconf/api/NetconfDocumentedException.java | 2 -- .../opendaylight/controller/netconf/api/NetconfSession.java | 1 - .../controller/netconf/api/jmx/CommitJMXNotification.java | 5 ++--- .../netconf/api/jmx/DefaultCommitOperationMXBean.java | 3 +-- .../controller/netconf/api/jmx/NetconfJMXNotification.java | 2 -- .../netconf/api/NetconfDocumentedExceptionTest.java | 5 +---- 6 files changed, 4 insertions(+), 14 deletions(-) diff --git a/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/NetconfDocumentedException.java b/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/NetconfDocumentedException.java index 0c365b9d30..e5f32653c5 100644 --- a/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/NetconfDocumentedException.java +++ b/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/NetconfDocumentedException.java @@ -21,10 +21,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; - import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; - import org.opendaylight.controller.config.api.ConflictingVersionException; import org.opendaylight.controller.config.api.ValidationException; import org.slf4j.Logger; diff --git a/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/NetconfSession.java b/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/NetconfSession.java index 0bd54979f8..ca91589d74 100644 --- a/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/NetconfSession.java +++ b/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/NetconfSession.java @@ -8,7 +8,6 @@ package org.opendaylight.controller.netconf.api; import io.netty.channel.ChannelFuture; - import org.opendaylight.protocol.framework.ProtocolSession; public interface NetconfSession extends ProtocolSession { diff --git a/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/jmx/CommitJMXNotification.java b/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/jmx/CommitJMXNotification.java index 74cd4a4e05..4e3954a24d 100644 --- a/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/jmx/CommitJMXNotification.java +++ b/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/jmx/CommitJMXNotification.java @@ -8,10 +8,9 @@ package org.opendaylight.controller.netconf.api.jmx; -import org.w3c.dom.Element; - -import javax.management.NotificationBroadcasterSupport; import java.util.Set; +import javax.management.NotificationBroadcasterSupport; +import org.w3c.dom.Element; public class CommitJMXNotification extends NetconfJMXNotification { diff --git a/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/jmx/DefaultCommitOperationMXBean.java b/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/jmx/DefaultCommitOperationMXBean.java index e45d3c38a2..edc0bc99c5 100644 --- a/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/jmx/DefaultCommitOperationMXBean.java +++ b/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/jmx/DefaultCommitOperationMXBean.java @@ -8,9 +8,8 @@ package org.opendaylight.controller.netconf.api.jmx; -import org.opendaylight.controller.config.api.jmx.ObjectNameUtil; - import javax.management.ObjectName; +import org.opendaylight.controller.config.api.jmx.ObjectNameUtil; public interface DefaultCommitOperationMXBean { diff --git a/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/jmx/NetconfJMXNotification.java b/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/jmx/NetconfJMXNotification.java index 5aa4bffce3..cba98ee435 100644 --- a/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/jmx/NetconfJMXNotification.java +++ b/opendaylight/netconf/netconf-api/src/main/java/org/opendaylight/controller/netconf/api/jmx/NetconfJMXNotification.java @@ -9,10 +9,8 @@ package org.opendaylight.controller.netconf.api.jmx; import java.util.Set; - import javax.management.Notification; import javax.management.NotificationBroadcasterSupport; - import org.w3c.dom.Element; public abstract class NetconfJMXNotification extends Notification { diff --git a/opendaylight/netconf/netconf-api/src/test/java/org/opendaylight/controller/netconf/api/NetconfDocumentedExceptionTest.java b/opendaylight/netconf/netconf-api/src/test/java/org/opendaylight/controller/netconf/api/NetconfDocumentedExceptionTest.java index cdf8b913ec..dc18b106bf 100644 --- a/opendaylight/netconf/netconf-api/src/test/java/org/opendaylight/controller/netconf/api/NetconfDocumentedExceptionTest.java +++ b/opendaylight/netconf/netconf-api/src/test/java/org/opendaylight/controller/netconf/api/NetconfDocumentedExceptionTest.java @@ -11,15 +11,14 @@ package org.opendaylight.controller.netconf.api; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import com.google.common.collect.ImmutableMap; import java.util.Collections; import java.util.Iterator; - import javax.xml.namespace.NamespaceContext; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; - import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.netconf.api.NetconfDocumentedException.ErrorSeverity; @@ -29,8 +28,6 @@ import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants; import org.w3c.dom.Document; import org.w3c.dom.Node; -import com.google.common.collect.ImmutableMap; - /** * Unit tests for NetconfDocumentedException. -- 2.36.6