BUG: Fix Sonar Issues 50/24150/2
authorClaudio D. Gasparini <cgaspari@cisco.com>
Wed, 15 Jul 2015 09:17:41 +0000 (11:17 +0200)
committerClaudio D. Gasparini <cgaspari@cisco.com>
Wed, 15 Jul 2015 11:57:45 +0000 (13:57 +0200)
Change-Id: Ie037f085b39da5a0e6743798695c372ebd604a9e
Signed-off-by: Claudio D. Gasparini <cgaspari@cisco.com>
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPReconnectPromise.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/ChannelPipelineInitializer.java [new file with mode: 0644]
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImpl.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPProtocolSessionPromise.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/AbstractPCCDispatcher.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCProtocolSessionPromise.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PccSessionListener.java

index 96bf3af781ea82f5765074798f506555d0ba4c3b..9bd2d00d93198ac434c572073b405d85aab916c2 100644 (file)
@@ -244,7 +244,7 @@ public abstract class AbstractBGPSessionNegotiator extends ChannelInboundHandler
         return this.state;
     }
 
-    private final void negotiationSuccessful(BGPSessionImpl session) {
+    private void negotiationSuccessful(BGPSessionImpl session) {
         LOG.debug("Negotiation on channel {} successful with session {}", this.channel, session);
         channel.pipeline().replace(this, "session", session);
         promise.setSuccess(session);
@@ -256,7 +256,7 @@ public abstract class AbstractBGPSessionNegotiator extends ChannelInboundHandler
         promise.setFailure(cause);
     }
 
-    private final void sendMessage(final Notification msg) {
+    private void sendMessage(final Notification msg) {
         channel.writeAndFlush(msg).addListener(new ChannelFutureListener() {
             @Override
             public void operationComplete(ChannelFuture f) {
index baa2073ead0d5d347043cb4a4ccd436288d46f75..ceb5702aed423a1bba57e68df2d1358375a33b9f 100644 (file)
@@ -31,6 +31,7 @@ import org.opendaylight.protocol.bgp.rib.impl.protocol.BGPReconnectPromise;
 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.BGPSessionValidator;
+import org.opendaylight.protocol.bgp.rib.impl.spi.ChannelPipelineInitializer;
 import org.opendaylight.protocol.bgp.rib.spi.BGPSessionNegotiatorFactory;
 import org.opendaylight.protocol.framework.ReconnectStrategy;
 import org.opendaylight.protocol.framework.ReconnectStrategyFactory;
@@ -47,6 +48,7 @@ import org.slf4j.LoggerFactory;
  */
 public class BGPDispatcherImpl implements BGPDispatcher, AutoCloseable {
     private static final Logger LOG = LoggerFactory.getLogger(BGPDispatcherImpl.class);
+    private static final int SOCKET_BACKLOG_SIZE = 128;
     private final MD5ServerChannelFactory<?> scf;
     private final MD5ChannelFactory<?> cf;
     private final BGPHandlerFactory hf;
@@ -123,7 +125,7 @@ public class BGPDispatcherImpl implements BGPDispatcher, AutoCloseable {
             (BGPDispatcherImpl.this.hf.getDecoders(), snf, BGPDispatcherImpl.this.hf.getEncoders());
         final ServerBootstrap b = new ServerBootstrap();
         b.childHandler(BGPChannel.createChannelInitializer(initializer, new DefaultPromise(BGPDispatcherImpl.this.executor)));
-        b.option(ChannelOption.SO_BACKLOG, Integer.valueOf(128));
+        b.option(ChannelOption.SO_BACKLOG, Integer.valueOf(SOCKET_BACKLOG_SIZE));
         b.childOption(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
         this.customizeBootstrap(b);
 
@@ -179,11 +181,7 @@ public class BGPDispatcherImpl implements BGPDispatcher, AutoCloseable {
         }
     }
 
-    public interface ChannelPipelineInitializer {
-        void initializeChannel(SocketChannel socketChannel, Promise<BGPSessionImpl> promise);
-    }
-
-    public static class BGPChannel {
+    public final static class BGPChannel {
         private static final String NEGOTIATOR = "negotiator";
 
         private BGPChannel() {
index 8da1d7481565aaafd0eaa6c9ebdeb51f390eb1b8..7adb1fb027adb5082fac54f4c26dec29db4457cb 100644 (file)
@@ -107,7 +107,7 @@ public class BGPProtocolSessionPromise<S extends BGPSession> extends DefaultProm
             }
         }
 
-        private class ReconnectingStrategyListener implements FutureListener<Void> {
+        private final class ReconnectingStrategyListener implements FutureListener<Void> {
             private ReconnectingStrategyListener() {
             }
 
index 9528d7fd1bb356b068896f65d1a24172dcd2907a..c467a6e9d6b246c576ec6df4979d5d8635ff2fd5 100644 (file)
@@ -21,6 +21,7 @@ import io.netty.util.concurrent.Promise;
 import java.net.InetSocketAddress;
 import org.opendaylight.protocol.bgp.rib.impl.BGPDispatcherImpl;
 import org.opendaylight.protocol.bgp.rib.impl.BGPSessionImpl;
+import org.opendaylight.protocol.bgp.rib.impl.spi.ChannelPipelineInitializer;
 import org.opendaylight.protocol.framework.ReconnectStrategy;
 import org.opendaylight.protocol.framework.ReconnectStrategyFactory;
 import org.slf4j.Logger;
@@ -32,13 +33,13 @@ public class BGPReconnectPromise extends DefaultPromise<Void> {
     private final InetSocketAddress address;
     private final ReconnectStrategyFactory strategyFactory;
     private final Bootstrap b;
-    private final BGPDispatcherImpl.ChannelPipelineInitializer initializer;
+    private final ChannelPipelineInitializer initializer;
     private final EventExecutor executor;
     private Future<BGPSessionImpl> pending;
 
     public BGPReconnectPromise(final EventExecutor executor, final InetSocketAddress address,
                                final ReconnectStrategyFactory connectStrategyFactory, final Bootstrap b,
-                               final BGPDispatcherImpl.ChannelPipelineInitializer initializer) {
+                               final ChannelPipelineInitializer initializer) {
         super(executor);
         this.executor = executor;
         this.b = b;
@@ -51,7 +52,7 @@ public class BGPReconnectPromise extends DefaultPromise<Void> {
         final ReconnectStrategy cs = this.strategyFactory.createReconnectStrategy();
 
         // Set up a client with pre-configured bootstrap, but add a closed channel handler into the pipeline to support reconnect attempts
-        pending = createClient(this.address, cs, b, new BGPDispatcherImpl.ChannelPipelineInitializer() {
+        pending = createClient(this.address, cs, b, new ChannelPipelineInitializer() {
             @Override
             public void initializeChannel(final SocketChannel channel, final Promise<BGPSessionImpl> promise) {
                 initializer.initializeChannel(channel, promise);
@@ -74,7 +75,7 @@ public class BGPReconnectPromise extends DefaultPromise<Void> {
     }
 
     public Future<BGPSessionImpl> createClient(final InetSocketAddress address, final ReconnectStrategy strategy, final Bootstrap bootstrap,
-                                               final BGPDispatcherImpl.ChannelPipelineInitializer initializer) {
+                                               final ChannelPipelineInitializer initializer) {
         final BGPProtocolSessionPromise p = new BGPProtocolSessionPromise(this.executor, address, strategy, bootstrap);
         final ChannelHandler chInit = BGPDispatcherImpl.BGPChannel.createChannelInitializer(initializer, p);
         bootstrap.handler(chInit);
diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/ChannelPipelineInitializer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/ChannelPipelineInitializer.java
new file mode 100644 (file)
index 0000000..3dd09cf
--- /dev/null
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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.spi;
+
+import io.netty.channel.socket.SocketChannel;
+import io.netty.util.concurrent.Promise;
+import org.opendaylight.protocol.bgp.rib.impl.BGPSessionImpl;
+
+public interface ChannelPipelineInitializer {
+    void initializeChannel(SocketChannel socketChannel, Promise<BGPSessionImpl> promise);
+}
index afd7daa0ec4b45e649208ff6bbdeb8863f333c9d..beea75a2713101e009ff1cde0e62f7a0ee7f4cab 100644 (file)
@@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory;
  */
 public class PCEPDispatcherImpl implements PCEPDispatcher, Closeable {
     private static final Logger LOG = LoggerFactory.getLogger(PCEPDispatcherImpl.class);
+    private static final Integer SOCKET_BACKLOG_SIZE = 128;
     private final PCEPSessionNegotiatorFactory snf;
     private final PCEPHandlerFactory hf;
 
@@ -108,7 +109,7 @@ public class PCEPDispatcherImpl implements PCEPDispatcher, Closeable {
                 initializer.initializeChannel(ch, new DefaultPromise(PCEPDispatcherImpl.this.executor));
             }
         });
-        b.option(ChannelOption.SO_BACKLOG, 128);
+        b.option(ChannelOption.SO_BACKLOG, SOCKET_BACKLOG_SIZE);
 
         b.childOption(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
         this.customizeBootstrap(b);
index 3047fbca997666c40d22db4b776652d78139a408..8d4b400abfadb660c18bfb8daaed0372cabcfa3c 100644 (file)
@@ -109,7 +109,7 @@ public final class PCEPProtocolSessionPromise<S extends PCEPSession> extends Def
             }
         }
 
-        private class ReconnectingStrategyListener implements FutureListener<Void> {
+        private final class ReconnectingStrategyListener implements FutureListener<Void> {
             private ReconnectingStrategyListener() {
             }
 
index e53ad898232ba780c1609924b153a9c18cf08db0..af07159635cfc7d2579dd73f285122e9fdc9e0b3 100644 (file)
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
 
 public abstract class AbstractPCCDispatcher implements Closeable {
     private static final Logger LOG = LoggerFactory.getLogger(AbstractPCCDispatcher.class);
+    private static final Integer SOCKET_BACKLOG_SIZE = 128;
     private final EventLoopGroup bossGroup;
     private final EventLoopGroup workerGroup;
     private final EventExecutor executor;
@@ -58,7 +59,7 @@ public abstract class AbstractPCCDispatcher implements Closeable {
                 initializer.initializeChannel(ch, new DefaultPromise(AbstractPCCDispatcher.this.executor));
             }
         });
-        b.option(ChannelOption.SO_BACKLOG, 128);
+        b.option(ChannelOption.SO_BACKLOG, SOCKET_BACKLOG_SIZE);
 
         b.childOption(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
         this.customizeBootstrap(b);
index bc800164ee57944055eb89af21dd20c63d22b0e8..ac573d9884ae031eba29b673bec2874d1756211b 100644 (file)
@@ -109,7 +109,7 @@ public class PCCProtocolSessionPromise<S extends PCEPSession> extends DefaultPro
             }
         }
 
-        private class ReconnectingStrategyListener implements FutureListener<Void> {
+        private final class ReconnectingStrategyListener implements FutureListener<Void> {
             private ReconnectingStrategyListener() {
             }
 
index 70b0b6574d407a1157f99133908857090fc4f242..855590e6c4bdb7745a36049fa79b31ec4f597563 100644 (file)
@@ -51,26 +51,34 @@ public class PccSessionListener implements PCEPSessionListener, PccSession {
             return;
         }
         if (message instanceof Pcupd) {
-            final Updates update = ((Pcupd) message).getPcupdMessage().getUpdates().get(0);
-            if (update.getLsp().isDelegate() != null && update.getLsp().isDelegate()) {
-                //regular LSP update
-                this.tunnelManager.reportToAll(update, this);
-            } else {
-                //returning LSP delegation
-                this.tunnelManager.returnDelegation(update, this);
-            }
+            handlePcupd((Pcupd) message);
         } else if (message instanceof Pcinitiate) {
-            final Requests request = ((Pcinitiate) message).getPcinitiateMessage().getRequests().get(0);
-            if (request.getSrp().getAugmentation(Srp1.class) != null && request.getSrp().getAugmentation(Srp1.class).isRemove()) {
-                //remove LSP
-                this.tunnelManager.removeTunnel(request, this);
-            } else if (request.getLsp().isDelegate() != null && request.getLsp().isDelegate() && request.getEndpointsObj() == null) {
-                //take LSP delegation
-                this.tunnelManager.takeDelegation(request, this);
-            } else {
-                //create LSP
-                this.tunnelManager.addTunnel(request, this);
-            }
+            handlePcinitiate((Pcinitiate) message);
+        }
+    }
+
+    private void handlePcupd(final Pcupd message) {
+        final Updates update = message.getPcupdMessage().getUpdates().get(0);
+        if (update.getLsp().isDelegate() != null && update.getLsp().isDelegate()) {
+            //regular LSP update
+            this.tunnelManager.reportToAll(update, this);
+        } else {
+            //returning LSP delegation
+            this.tunnelManager.returnDelegation(update, this);
+        }
+    }
+
+    private void handlePcinitiate(final Pcinitiate message) {
+        final Requests request = message.getPcinitiateMessage().getRequests().get(0);
+        if (request.getSrp().getAugmentation(Srp1.class) != null && request.getSrp().getAugmentation(Srp1.class).isRemove()) {
+            //remove LSP
+            this.tunnelManager.removeTunnel(request, this);
+        } else if (request.getLsp().isDelegate() != null && request.getLsp().isDelegate() && request.getEndpointsObj() == null) {
+            //take LSP delegation
+            this.tunnelManager.takeDelegation(request, this);
+        } else {
+            //create LSP
+            this.tunnelManager.addTunnel(request, this);
         }
     }