BUG-731 Fix sonar warnings present in code for BUG-338

Change-Id: I9c3b34f0fbdefd6174ce59c97968746ba3886b98
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerAcceptorModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerAcceptorModule.java
index 327f93d0cd2529b3bb0d29ff842ea05386ee85bf..380bf406dc160776a951f418d765f78dbbfb82f2 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerAcceptorModule.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerAcceptorModule.java
@@ -8,7 +8,7 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import org.opendaylight.controller.config.api.JmxAttributeValidationException;
-import org.opendaylight.protocol.bgp.rib.impl.server.BGPServerSessionValidator;
+import org.opendaylight.protocol.bgp.rib.impl.BGPServerSessionValidator;
 
 /**
 * BGP peer acceptor that handles incomming bgp connections.
@@ -39,8 +39,8 @@ public class BGPPeerAcceptorModule extends org.opendaylight.controller.config.ya
         // Validate future success
         future.addListener(new GenericFutureListener<Future<Void>>() {
             @Override
-            public void operationComplete(Future<Void> future) throws Exception {
-                if(future.isSuccess() == false) {
+            public void operationComplete(Future<Void> future) {
+                if(!future.isSuccess()) {
                     throw new IllegalStateException(String.format("Unable to start bgp server on %s", getAddress()), future.cause());
                 }
             }
@@ -48,7 +48,7 @@ public class BGPPeerAcceptorModule extends org.opendaylight.controller.config.ya
 
         return new AutoCloseable() {
             @Override
-            public void close() throws Exception {
+            public void close() {
                 // This closes the acceptor and no new bgp connections will be accepted
                 // Connections already established will be preserved
                 future.cancel(true);

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModule.java
index c54c485468c5945ed034826c254bff9df945df60..47490ee124de903aeab77e7d9caa51393592f17f 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModule.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModule.java
@@ -111,9 +111,9 @@ public final class BGPPeerModule extends org.opendaylight.controller.config.yang
 
         getPeerRegistryBackwards().addPeer(getHostWithoutValue(), bgpClientPeer, prefs);
 
-        final AutoCloseable peerCloseable = new AutoCloseable() {
+        final CloseableNoEx peerCloseable = new CloseableNoEx() {
             @Override
-            public void close() throws Exception {
+            public void close() {
                 bgpClientPeer.close();
                 getPeerRegistryBackwards().removePeer(getHostWithoutValue());
             }
@@ -122,9 +122,9 @@ public final class BGPPeerModule extends org.opendaylight.controller.config.yang
         // Initiate connection
         if(getInitiateConnection()) {
             final Future<Void> cf = initiateConnection(createAddress(), password, remoteAs, getPeerRegistryBackwards());
-            return new AutoCloseable() {
+            return new CloseableNoEx() {
                 @Override
-                public void close() throws Exception {
+                public void close() {
                     cf.cancel(true);
                     peerCloseable.close();
                 }
@@ -134,6 +134,11 @@ public final class BGPPeerModule extends org.opendaylight.controller.config.yang
         }
     }
 
+    private static interface CloseableNoEx extends AutoCloseable {
+        @Override
+        void close();
+    }
+
     private String getPasswordOrNull() {
         final String password;
         if (getPassword() != null) {

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModule.java
index 8b8227988e5b66c6a2448640c6de5cecf24a4425..e6d454370712e469d4201fdee353057fbe53cbd3 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModule.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModule.java
@@ -69,7 +69,7 @@ public class StrictBgpPeerRegistryModule extends org.opendaylight.controller.con
         }
 
         @Override
-        public void close() throws Exception {
+        public void close() {
             // DO nothing, do not close the global instance
         }
 

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java
index 3eebcb1fcfaac1a81d946dac1ee3f2078ee445ed..bdcc81f76ea819f692049ebbdde8b5bd2a23a0ba 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java
@@ -95,7 +95,7 @@ public abstract class AbstractBGPSessionNegotiator extends AbstractSessionNegoti
         Preconditions.checkState(this.state == State.Idle);
 
         // Check if peer is configured in registry before retrieving preferences
-        if (registry.isPeerConfigured(getRemoteIp()) == false) {
+        if (!registry.isPeerConfigured(getRemoteIp())) {
             final BGPDocumentedException cause = new BGPDocumentedException(
                     "BGP peer with ip: " + getRemoteIp()
                             + " not configured, check configured peers in : "

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/client/BGPClientSessionNegotiator.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPClientSessionNegotiator.java
similarity index 97%
rename from bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/client/BGPClientSessionNegotiator.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPClientSessionNegotiator.java
index ff879af6182d5634da1a1f5018b7a96055e0ca3d..2c49463c150cd53c4707ba59b20e304b66fffa5e 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/client/BGPClientSessionNegotiator.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPClientSessionNegotiator.java
@@ -5,7 +5,7 @@
  * 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.protocol.bgp.rib.impl.client;
+package org.opendaylight.protocol.bgp.rib.impl;
 
 import io.netty.channel.Channel;
 import io.netty.util.Timer;

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/client/BGPClientSessionNegotiatorFactory.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPClientSessionNegotiatorFactory.java
similarity index 90%
rename from bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/client/BGPClientSessionNegotiatorFactory.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPClientSessionNegotiatorFactory.java
index a7bbb484d4191029740041b6580676636566a53a..1668425a189766894d51dec6126d13b2a8e642d3 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/client/BGPClientSessionNegotiatorFactory.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPClientSessionNegotiatorFactory.java
@@ -5,14 +5,13 @@
  * 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.protocol.bgp.rib.impl.client;
+package org.opendaylight.protocol.bgp.rib.impl;
 
 import com.google.common.base.Preconditions;
 import io.netty.channel.Channel;
 import io.netty.util.Timer;
 import io.netty.util.concurrent.Promise;
 import org.opendaylight.protocol.bgp.parser.BGPSessionListener;
-import org.opendaylight.protocol.bgp.rib.impl.BGPSessionImpl;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
 import org.opendaylight.protocol.framework.SessionListenerFactory;
 import org.opendaylight.protocol.framework.SessionNegotiator;
@@ -28,7 +27,7 @@ public final class BGPClientSessionNegotiatorFactory implements SessionNegotiato
     public BGPClientSessionNegotiatorFactory(final Timer timer, final AsNumber remoteAs, final BGPPeerRegistry peerRegistry) {
         this.peerRegistry = peerRegistry;
         this.timer = Preconditions.checkNotNull(timer);
-        this.validator = new BGPClientSessionValidator(remoteAs, peerRegistry);
+        this.validator = new BGPClientSessionValidator(remoteAs);
     }
 
     @Override

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/client/BGPClientSessionValidator.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPClientSessionValidator.java
similarity index 89%
rename from bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/client/BGPClientSessionValidator.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPClientSessionValidator.java
index 7a3b3d8bbf3592ff151c0cc68a6f1f09a754da7a..533d2da22c95031df270f45e9f24b34798fb3892 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/client/BGPClientSessionValidator.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPClientSessionValidator.java
@@ -6,13 +6,12 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.bgp.rib.impl.client;
+package org.opendaylight.protocol.bgp.rib.impl;
 
 import java.util.List;
 import org.opendaylight.protocol.bgp.parser.AsNumberUtil;
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
 import org.opendaylight.protocol.bgp.parser.BGPError;
-import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionValidator;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.AsNumber;
@@ -29,11 +28,9 @@ public class BGPClientSessionValidator implements BGPSessionValidator {
     private static final Logger LOG = LoggerFactory.getLogger(BGPClientSessionValidator.class);
 
     private final AsNumber remoteAs;
-    private final BGPPeerRegistry peerRegistry;
 
-    public BGPClientSessionValidator(final AsNumber remoteAs, final BGPPeerRegistry peerRegistry) {
+    public BGPClientSessionValidator(final AsNumber remoteAs) {
         this.remoteAs = remoteAs;
-        this.peerRegistry = peerRegistry;
     }
 
     /**

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java
index 9065f3cc00fcdff8b4f00c06c7d0078249b622f8..67f845dc9975275ab3e5091b436eba97a01c6c35 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java
@@ -23,8 +23,6 @@ import org.opendaylight.bgpcep.tcpmd5.netty.MD5ChannelOption;
 import org.opendaylight.bgpcep.tcpmd5.netty.MD5ServerChannelFactory;
 import org.opendaylight.protocol.bgp.parser.BGPSessionListener;
 import org.opendaylight.protocol.bgp.parser.spi.MessageRegistry;
-import org.opendaylight.protocol.bgp.rib.impl.client.BGPClientSessionNegotiatorFactory;
-import org.opendaylight.protocol.bgp.rib.impl.server.BGPServerSessionNegotiatorFactory;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPDispatcher;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPServerDispatcher;

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/server/BGPServerSessionNegotiator.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPServerSessionNegotiator.java
similarity index 97%
rename from bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/server/BGPServerSessionNegotiator.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPServerSessionNegotiator.java
index e21ca402159e6b154b7a119d5743d3288d111dee..f76c887b90adc8d1cfb28a20e8886c26f2a653fb 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/server/BGPServerSessionNegotiator.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPServerSessionNegotiator.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.bgp.rib.impl.server;
+package org.opendaylight.protocol.bgp.rib.impl;
 
 import io.netty.channel.Channel;
 import io.netty.util.Timer;

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/server/BGPServerSessionNegotiatorFactory.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPServerSessionNegotiatorFactory.java
similarity index 93%
rename from bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/server/BGPServerSessionNegotiatorFactory.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPServerSessionNegotiatorFactory.java
index e953edadcb64a316c1a0ad3cc19baabed2a0097f..6ef5177a1883f108f0ef1ee08a9fc005d4b9aa0d 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/server/BGPServerSessionNegotiatorFactory.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPServerSessionNegotiatorFactory.java
@@ -5,14 +5,15 @@
  * 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.protocol.bgp.rib.impl.server;
+package org.opendaylight.protocol.bgp.rib.impl;
 
 import com.google.common.base.Preconditions;
+
 import io.netty.channel.Channel;
 import io.netty.util.Timer;
 import io.netty.util.concurrent.Promise;
+
 import org.opendaylight.protocol.bgp.parser.BGPSessionListener;
-import org.opendaylight.protocol.bgp.rib.impl.BGPSessionImpl;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionValidator;
 import org.opendaylight.protocol.framework.SessionListenerFactory;

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/server/BGPServerSessionValidator.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPServerSessionValidator.java
similarity index 94%
rename from bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/server/BGPServerSessionValidator.java
rename to bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPServerSessionValidator.java
index b0c3977a5ce091ea9ad0785b4e93603b1b94878f..76f8da7222923e89cab551eb95f892c5adf166f4 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/server/BGPServerSessionValidator.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPServerSessionValidator.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.bgp.rib.impl.server;
+package org.opendaylight.protocol.bgp.rib.impl;
 
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java
index b3abe6a25db555a1850e04a8f21ada5ea6859f2f..a47ac9adf42e00b52e654601fe39410a5cb20629 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java
@@ -42,7 +42,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
     private static final Logger LOG = LoggerFactory.getLogger(StrictBGPPeerRegistry.class);
 
     // TODO remove backwards compatibility
-    public static StrictBGPPeerRegistry GLOBAL = new StrictBGPPeerRegistry();
+    public static final StrictBGPPeerRegistry GLOBAL = new StrictBGPPeerRegistry();
 
     @GuardedBy("this")
     private final Map<IpAddress, ReusableBGPPeer> peers = Maps.newHashMap();
@@ -54,7 +54,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
     @Override
     public synchronized void addPeer(final IpAddress ip, final ReusableBGPPeer peer, final BGPSessionPreferences preferences) {
         Preconditions.checkNotNull(ip);
-        Preconditions.checkArgument(peers.containsKey(ip) == false, "Peer for %s already present", ip);
+        Preconditions.checkArgument(!peers.containsKey(ip), "Peer for %s already present", ip);
         peers.put(ip, Preconditions.checkNotNull(peer));
         peerPreferences.put(ip, Preconditions.checkNotNull(preferences));
     }
@@ -93,7 +93,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
             final BGPSessionId previousConnection = sessionIds.get(ip);
 
             // Session reestablished with different ids
-            if (previousConnection.equals(currentConnection) == false) {
+            if (!previousConnection.equals(currentConnection)) {
                 LOG.warn("BGP session with {} {} has to be dropped. Same session already present {}", ip, currentConnection, previousConnection);
                 throw new BGPDocumentedException(
                         String.format("BGP session with %s %s has to be dropped. Same session already present %s",
@@ -157,7 +157,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
     }
 
     @Override
-    public synchronized void close() throws Exception {
+    public synchronized void close() {
         peers.clear();
         sessionIds.clear();
     }
@@ -185,21 +185,30 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
          */
         @Override
         public boolean equals(final Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
 
-            final BGPSessionId BGPSessionId = (BGPSessionId) o;
+            final BGPSessionId bGPSessionId = (BGPSessionId) o;
 
-            if (!from.equals(BGPSessionId.from) && !from.equals(BGPSessionId.to)) return false;
-            if (!to.equals(BGPSessionId.to) && !to.equals(BGPSessionId.from)) return false;
+            if (!from.equals(bGPSessionId.from) && !from.equals(bGPSessionId.to)) {
+                return false;
+            }
+            if (!to.equals(bGPSessionId.to) && !to.equals(bGPSessionId.from)) {
+                return false;
+            }
 
             return true;
         }
 
         @Override
         public int hashCode() {
+            final int prime = 31;
             int result = from.hashCode() + to.hashCode();
-            result = 31 * result;
+            result = prime * result;
             return result;
         }
 
@@ -207,7 +216,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry {
          * Check if this connection is equal to other and if it contains higher source bgp id
          */
         boolean isHigherDirection(final BGPSessionId other) {
-            Preconditions.checkState(this.isSameDirection(other) == false, "Equal sessions with same direction");
+            Preconditions.checkState(!this.isSameDirection(other), "Equal sessions with same direction");
             return toLong(from) > toLong(other.from);
         }
 

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java
index 3ea8c4b4b2d830cc441792af519a52c27a68da9b..1dfaaf34edc6f16b933fcdb5d0b1c60d7b97d1af 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java
@@ -37,8 +37,6 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.opendaylight.protocol.bgp.parser.BGPError;
 import org.opendaylight.protocol.bgp.parser.BgpTableTypeImpl;
-import org.opendaylight.protocol.bgp.rib.impl.client.BGPClientSessionNegotiator;
-import org.opendaylight.protocol.bgp.rib.impl.client.BGPClientSessionValidator;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.AsNumber;
@@ -99,7 +97,7 @@ public class FSMTest {
         final BGPPeerRegistry peerRegistry = new StrictBGPPeerRegistry();
         peerRegistry.addPeer(new IpAddress(new Ipv4Address(peerAddress.getHostAddress())), new SimpleSessionListener(), prefs);
 
-        this.clientSession = new BGPClientSessionNegotiator(new HashedWheelTimer(), new DefaultPromise<BGPSessionImpl>(GlobalEventExecutor.INSTANCE), this.speakerListener, peerRegistry, new BGPClientSessionValidator(new AsNumber(30L), peerRegistry));
+        this.clientSession = new BGPClientSessionNegotiator(new HashedWheelTimer(), new DefaultPromise<BGPSessionImpl>(GlobalEventExecutor.INSTANCE), this.speakerListener, peerRegistry, new BGPClientSessionValidator(new AsNumber(30L)));
         doAnswer(new Answer<Object>() {
             @Override
             public Object answer(final InvocationOnMock invocation) {

diff --git a/bgp/testtool/src/test/java/org/opendaylight/protocol/bgp/testtool/BGPSpeakerMock.java b/bgp/testtool/src/test/java/org/opendaylight/protocol/bgp/testtool/BGPSpeakerMock.java
index 7a93591617d29a2a092428825f7966e9c199a635..5166525d8720aed571e8b78e472f23ebb238368b 100644 (file)
--- a/bgp/testtool/src/test/java/org/opendaylight/protocol/bgp/testtool/BGPSpeakerMock.java
+++ b/bgp/testtool/src/test/java/org/opendaylight/protocol/bgp/testtool/BGPSpeakerMock.java
@@ -8,22 +8,25 @@
 package org.opendaylight.protocol.bgp.testtool;
 
 import com.google.common.base.Preconditions;
+
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.util.HashedWheelTimer;
 import io.netty.util.concurrent.DefaultPromise;
 import io.netty.util.concurrent.GlobalEventExecutor;
 import io.netty.util.concurrent.Promise;
+
 import java.net.InetSocketAddress;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
 import org.opendaylight.protocol.bgp.parser.BGPSessionListener;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.bgp.rib.impl.BGPHandlerFactory;
+import org.opendaylight.protocol.bgp.rib.impl.BGPServerSessionNegotiatorFactory;
 import org.opendaylight.protocol.bgp.rib.impl.BGPSessionImpl;
 import org.opendaylight.protocol.bgp.rib.impl.BGPSessionProposalImpl;
-import org.opendaylight.protocol.bgp.rib.impl.server.BGPServerSessionNegotiatorFactory;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionValidator;