Slight cleanup before

Change-Id: I6bab41e87743d7e73cebea9dd9c0b452506f64dd
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/concepts/src/test/java/org/opendaylight/protocol/concepts/BandwidthTest.java b/concepts/src/test/java/org/opendaylight/protocol/concepts/BandwidthTest.java
index dfa552b126cdb2662a4d240ccd62531026c4f376..6fced21e9dae2ce2d8ce9e2be6d2d737f9b02cbe 100644 (file)
--- a/concepts/src/test/java/org/opendaylight/protocol/concepts/BandwidthTest.java
+++ b/concepts/src/test/java/org/opendaylight/protocol/concepts/BandwidthTest.java
@@ -18,7 +18,6 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nps.concepts.rev130930.Bandwidth;

diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/BundleActivator.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/BundleActivator.java
index 7a51170d8e5df730a3b9966dc7539d5f1a4ca7b6..9e38ec9a8cfda601c57c6362acb4ec611c841352 100644 (file)
--- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/BundleActivator.java
+++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/BundleActivator.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.bgpcep.pcep.topology.provider;
 
-import com.google.common.base.Preconditions;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.util.HashedWheelTimer;
@@ -30,8 +29,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.net.InetSocketAddress;
-import java.util.concurrent.ExecutionException;
+import com.google.common.base.Preconditions;
 
 public final class BundleActivator extends AbstractBindingAwareProvider {
        private static final Logger LOG = LoggerFactory.getLogger(BundleActivator.class);
@@ -46,7 +44,7 @@ public final class BundleActivator extends AbstractBindingAwareProvider {
                final Open prefs = spf.getSessionProposal(address, 0);
                final PCEPDispatcher dispatcher = new PCEPDispatcherImpl(PCEPExtensionProviderContextImpl
                                .getSingletonInstance().getMessageHandlerRegistry(), new DefaultPCEPSessionNegotiatorFactory(
-                               new HashedWheelTimer(), prefs, 5), new NioEventLoopGroup(), new NioEventLoopGroup());
+                                               new HashedWheelTimer(), prefs, 5), new NioEventLoopGroup(), new NioEventLoopGroup());
 
                final InstanceIdentifier<Topology> topology = InstanceIdentifier.builder().node(Topology.class).toInstance();
 

diff --git a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java
index ff6d7f0c33c27ab783c408dbf6056298e656e10d..8d939a28286c92dce007cb2a1c5106f88f058c84 100644 (file)
--- a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java
+++ b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java
@@ -83,10 +83,9 @@ final class NodeChangedListener implements DataChangeListener {
                }
        }
 
-       public static InstanceIdentifier<Link> linkIdentifier(
-                       final InstanceIdentifier<Topology> tii, final NodeId node, final SymbolicPathName name) {
-               final LinkId lid = new LinkId(node.getValue() + "/lsp/" + name);
-               return InstanceIdentifier.builder(tii).
-                               node(Link.class, new LinkKey(lid)).toInstance();
+       public static InstanceIdentifier<Link> linkIdentifier(final InstanceIdentifier<Topology> topology,
+                       final NodeId node, final SymbolicPathName name) {
+               return InstanceIdentifier.builder(topology).
+                               node(Link.class, new LinkKey(new LinkId(node.getValue() + "/lsp/" + name))).toInstance();
        }
 }