Merge "BUG-2448 : added more defensive lookup to node & link attributes"
authorRobert Varga <rovarga@cisco.com>
Mon, 1 Dec 2014 16:48:57 +0000 (16:48 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 1 Dec 2014 16:48:57 +0000 (16:48 +0000)
42 files changed:
bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java
bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParser.java
bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateNlriParser.java
bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/OriginAttributeParser.java
bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/ServiceLoaderBGPExtensionProviderContext.java
bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleAttributeRegistry.java
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/BGPSessionImpl.java
bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImplTest.java
bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImplTest.java
bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java
bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java
bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java
pcep/api/src/main/java/org/opendaylight/protocol/pcep/TerminationReason.java
pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/crabbe/initiated00/PcinitiateMessageParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/CInitiated00PCInitiateMessageParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07ErrorMessageParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCReportMessageParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCUpdateRequestMessageParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPErrorMessageParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPNotificationMessageParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPRequestMessageParser.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/ServerSessionMock.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/SimpleSessionListener.java
pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/SrEroSubobjectParser.java
pcep/spi/src/main/java/org/opendaylight/controller/config/yang/pcep/spi/SimplePCEPExtensionProviderContextModule.java
pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/ServiceLoaderPCEPExtensionProviderContext.java
pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java
pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java
pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java
pcep/topology-spi/src/main/java/org/opendaylight/bgpcep/pcep/topology/spi/AbstractInstructionExecutor.java
pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgramming.java
programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/InstructionImpl.java
programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImpl.java
util/src/main/java/org/opendaylight/protocol/util/ByteArray.java
util/src/main/java/org/opendaylight/protocol/util/NoopReferenceCache.java

index d79561b57ff8a5a1e2debcc6c840f5505adf4853..a1456d73abdc716c9306cd1fbcef265154c870ce 100644 (file)
@@ -113,7 +113,7 @@ final class LinkstateAdjRIBsIn extends AbstractAdjRIBs<CLinkstateDestination, Li
 
     LinkstateAdjRIBsIn(final KeyedInstanceIdentifier<Tables, TablesKey> basePath) {
         super(basePath);
-        routesBasePath = basePath.builder().child((Class)LinkstateRoutes.class).build();
+        this.routesBasePath = basePath.builder().child((Class)LinkstateRoutes.class).build();
     }
 
     @Override
@@ -129,7 +129,7 @@ final class LinkstateAdjRIBsIn extends AbstractAdjRIBs<CLinkstateDestination, Li
     public KeyedInstanceIdentifier<LinkstateRoute, LinkstateRouteKey> identifierForKey(final CLinkstateDestination key) {
         final ByteBuf keyBuf = Unpooled.buffer();
         LinkstateNlriParser.serializeNlri(key, keyBuf);
-        return routesBasePath.child(LinkstateRoute.class,
+        return this.routesBasePath.child(LinkstateRoute.class,
             new LinkstateRouteKey(ByteArray.readAllBytes(keyBuf)));
     }
 
@@ -217,6 +217,8 @@ final class LinkstateAdjRIBsIn extends AbstractAdjRIBs<CLinkstateDestination, Li
                     }
                 };
                 break;
+            default:
+                break;
             }
             super.add(trans, peer, key, data);
         }
index a623f234ea9caf18f4ebab6bea99f7f80403084d..44c40d0de1b0f0a95035fdcb20956798d78773c9 100644 (file)
@@ -120,7 +120,7 @@ public class LinkstateAttributeParser implements AttributeParser, AttributeSeria
     }
 
     public int getType() {
-        return type;
+        return this.type;
     }
 
     private NlriType getNlriType(final PathAttributesBuilder pab) {
@@ -185,8 +185,9 @@ public class LinkstateAttributeParser implements AttributeParser, AttributeSeria
         case Node:
             builder.setLinkStateAttribute(parseNodeAttributes(map));
             return builder.build();
+        default:
+            throw new IllegalStateException("Unhandled NLRI type " + nlri);
         }
-        throw new IllegalStateException("Unhandled NLRI type " + nlri);
     }
 
     /**
index 723d52c479c24335486546c1b94d3d9e5693644a..16b93c2aeeb53dde69fa9c5096f38e011713780e 100644 (file)
@@ -334,6 +334,8 @@ public final class LinkstateNlriParser implements NlriParser, NlriSerializer {
             case Node:
                 // node nlri is already parsed as it contains only the common fields for node and link nlri
                 break;
+            default:
+                break;
             }
             nlri.skipBytes(restLength);
             dests.add(builder.build());
index bd1d33d79199c51f6dfb120bdd8a414294aae6eb..7ceef2dd55fcbb691eb554922717273976dd1edb 100644 (file)
@@ -48,6 +48,8 @@ public final class OriginAttributeParser implements AttributeParser, AttributeSe
         case Incomplete:
             builder.setOrigin(INC);
             return;
+        default:
+            return;
         }
     }
 
index b83b011bd5ff0a944e46b4a49965f5b1ee41b985..267d167c4e8f75c743de14fab5d91e012d7bf13b 100644 (file)
@@ -15,6 +15,9 @@ public final class ServiceLoaderBGPExtensionProviderContext {
     private static final class Holder {
         private static final BGPExtensionProviderContext INSTANCE;
 
+        private Holder() {
+        }
+
         static {
             try {
                 INSTANCE = create();
@@ -28,7 +31,7 @@ public final class ServiceLoaderBGPExtensionProviderContext {
         final BGPExtensionProviderContext ctx = new SimpleBGPExtensionProviderContext();
 
         final ServiceLoader<BGPExtensionProviderActivator> loader = ServiceLoader.load(BGPExtensionProviderActivator.class);
-        for (BGPExtensionProviderActivator a : loader) {
+        for (final BGPExtensionProviderActivator a : loader) {
             a.start(ctx);
         }
 
index 69cb204abcadba191b63fd818ffd0582eb13bf45..2eb80af484173e4d8a66f7b0edd77385afd183a9 100644 (file)
@@ -102,7 +102,7 @@ final class SimpleAttributeRegistry implements AttributeRegistry {
 
     @Override
     public PathAttributes parseAttributes(final ByteBuf buffer) throws BGPDocumentedException, BGPParsingException {
-        final TreeMap<Integer, RawAttribute> attributes = new TreeMap<>();
+        final Map<Integer, RawAttribute> attributes = new TreeMap<>();
         while (buffer.isReadable()) {
             addAttribute(buffer, attributes);
         }
@@ -122,7 +122,7 @@ final class SimpleAttributeRegistry implements AttributeRegistry {
 
     @Override
     public void serializeAttribute(final DataObject attribute,final ByteBuf byteAggregator) {
-        for (AttributeSerializer serializer : this.roSerializers.get()) {
+        for (final AttributeSerializer serializer : this.roSerializers.get()) {
             serializer.serializeAttribute(attribute, byteAggregator);
         }
     }
index 2050898160a91209be8a4d0b960338df28cb74c9..ba3085462b91549e311ec67573af5dd2a6e95a4a 100644 (file)
@@ -52,20 +52,20 @@ public abstract class AbstractBGPSessionNegotiator extends AbstractSessionNegoti
         /**
          * Negotiation has not started yet.
          */
-        Idle,
+        IDLE,
         /**
          * We have sent our Open message, and are waiting for the peer's Open message.
          */
-        OpenSent,
+        OPEN_SENT,
         /**
          * We have received the peer's Open message, which is acceptable, and we're waiting the acknowledgement of our
          * Open message.
          */
-        OpenConfirm,
+        OPEN_CONFIRM,
         /**
          * The negotiation finished.
          */
-        Finished,
+        FINISHED,
     }
 
     private static final Logger LOG = LoggerFactory.getLogger(AbstractBGPSessionNegotiator.class);
@@ -73,7 +73,7 @@ public abstract class AbstractBGPSessionNegotiator extends AbstractSessionNegoti
     private final BGPSessionValidator sessionValidator;
 
     @GuardedBy("this")
-    private State state = State.Idle;
+    private State state = State.IDLE;
 
     @GuardedBy("this")
     private BGPSessionImpl session;
@@ -87,7 +87,7 @@ public abstract class AbstractBGPSessionNegotiator extends AbstractSessionNegoti
 
     @Override
     protected synchronized void startNegotiation() {
-        Preconditions.checkState(this.state == State.Idle);
+        Preconditions.checkState(this.state == State.IDLE);
 
         // Check if peer is configured in registry before retrieving preferences
         if (!this.registry.isPeerConfigured(getRemoteIp())) {
@@ -108,16 +108,16 @@ public abstract class AbstractBGPSessionNegotiator extends AbstractSessionNegoti
         }
         this.sendMessage(new OpenBuilder().setMyAsNumber(as).setHoldTimer(preferences.getHoldTime()).setBgpIdentifier(
                 preferences.getBgpId()).setBgpParameters(preferences.getParams()).build());
-        if (this.state != State.Finished) {
-            this.state = State.OpenSent;
+        if (this.state != State.FINISHED) {
+            this.state = State.OPEN_SENT;
 
             this.channel.eventLoop().schedule(new Runnable() {
                 @Override
                 public void run() {
-                    if (AbstractBGPSessionNegotiator.this.state != State.Finished) {
+                    if (AbstractBGPSessionNegotiator.this.state != State.FINISHED) {
                         AbstractBGPSessionNegotiator.this.sendMessage(buildErrorNotify(BGPError.HOLD_TIMER_EXPIRED));
                         negotiationFailed(new BGPDocumentedException("HoldTimer expired", BGPError.FSM_ERROR));
-                        AbstractBGPSessionNegotiator.this.state = State.Finished;
+                        AbstractBGPSessionNegotiator.this.state = State.FINISHED;
                     }
                 }
             }, INITIAL_HOLDTIMER, TimeUnit.MINUTES);
@@ -137,11 +137,11 @@ public abstract class AbstractBGPSessionNegotiator extends AbstractSessionNegoti
         LOG.debug("Channel {} handling message in state {}", this.channel, this.state);
 
         switch (this.state) {
-        case Finished:
-        case Idle:
+        case FINISHED:
+        case IDLE:
             this.sendMessage(buildErrorNotify(BGPError.FSM_ERROR));
             return;
-        case OpenConfirm:
+        case OPEN_CONFIRM:
             if (msg instanceof Keepalive) {
                 negotiationSuccessful(this.session);
                 LOG.info("BGP Session with peer {} established successfully.", this.channel);
@@ -149,22 +149,24 @@ public abstract class AbstractBGPSessionNegotiator extends AbstractSessionNegoti
                 final Notify ntf = (Notify) msg;
                 negotiationFailed(new BGPDocumentedException("Peer refusal", BGPError.forValue(ntf.getErrorCode(), ntf.getErrorSubcode())));
             }
-            this.state = State.Finished;
+            this.state = State.FINISHED;
             return;
-        case OpenSent:
+        case OPEN_SENT:
             if (msg instanceof Open) {
                 final Open openObj = (Open) msg;
                 handleOpen(openObj);
                 return;
             }
             break;
+        default:
+            break;
         }
 
         // Catch-all for unexpected message
         LOG.warn("Channel {} state {} unexpected message {}", this.channel, this.state, msg);
         this.sendMessage(buildErrorNotify(BGPError.FSM_ERROR));
         negotiationFailed(new BGPDocumentedException("Unexpected message", BGPError.FSM_ERROR));
-        this.state = State.Finished;
+        this.state = State.FINISHED;
     }
 
     private static Notify buildErrorNotify(final BGPError err) {
@@ -191,7 +193,7 @@ public abstract class AbstractBGPSessionNegotiator extends AbstractSessionNegoti
             final BGPSessionListener peer = this.registry.getPeer(getRemoteIp(), getSourceId(openObj, getPreferences()), getDestinationId(openObj, getPreferences()));
             this.sendMessage(new KeepaliveBuilder().build());
             this.session = new BGPSessionImpl(peer, this.channel, openObj, getPreferences());
-            this.state = State.OpenConfirm;
+            this.state = State.OPEN_CONFIRM;
             LOG.debug("Channel {} moved to OpenConfirm state with remote proposal {}", this.channel, openObj);
         } catch (final BGPDocumentedException e) {
             LOG.warn("Channel {} negotiation failed", this.channel, e);
@@ -209,7 +211,7 @@ public abstract class AbstractBGPSessionNegotiator extends AbstractSessionNegoti
         }
         this.registry.removePeerSession(getRemoteIp());
         super.negotiationFailed(e);
-        this.state = State.Finished;
+        this.state = State.FINISHED;
     }
 
     /**
index 7d924de27cf7fbcbb9e9b1100cbc9fcd9c8d6bdf..38abcf2637545fd911ae8b1a5b9daf7f3b48d413 100644 (file)
@@ -38,6 +38,7 @@ public final class BGPDispatcherImpl extends AbstractDispatcher<BGPSessionImpl,
     private final MD5ChannelFactory<?> cf;
     private final BGPHandlerFactory hf;
     private KeyMapping keys;
+    private static final String NEGOTIATOR = "negotiator";
 
     public BGPDispatcherImpl(final MessageRegistry messageRegistry, final EventLoopGroup bossGroup, final EventLoopGroup workerGroup) {
         this(messageRegistry, bossGroup, workerGroup, null, null);
@@ -58,7 +59,7 @@ public final class BGPDispatcherImpl extends AbstractDispatcher<BGPSessionImpl,
             @Override
             public void initializeChannel(final SocketChannel ch, final Promise<BGPSessionImpl> promise) {
                 ch.pipeline().addLast(BGPDispatcherImpl.this.hf.getDecoders());
-                ch.pipeline().addLast("negotiator", snf.getSessionNegotiator(null, ch, promise));
+                ch.pipeline().addLast(NEGOTIATOR, snf.getSessionNegotiator(null, ch, promise));
                 ch.pipeline().addLast(BGPDispatcherImpl.this.hf.getEncoders());
             }
         });
@@ -87,7 +88,7 @@ public final class BGPDispatcherImpl extends AbstractDispatcher<BGPSessionImpl,
             @Override
             public void initializeChannel(final SocketChannel ch, final Promise<BGPSessionImpl> promise) {
                 ch.pipeline().addLast(BGPDispatcherImpl.this.hf.getDecoders());
-                ch.pipeline().addLast("negotiator", snf.getSessionNegotiator(null, ch, promise));
+                ch.pipeline().addLast(NEGOTIATOR, snf.getSessionNegotiator(null, ch, promise));
                 ch.pipeline().addLast(BGPDispatcherImpl.this.hf.getEncoders());
             }
         });
@@ -110,7 +111,7 @@ public final class BGPDispatcherImpl extends AbstractDispatcher<BGPSessionImpl,
             @Override
             public void initializeChannel(final SocketChannel ch, final Promise<BGPSessionImpl> promise) {
                 ch.pipeline().addLast(BGPDispatcherImpl.this.hf.getDecoders());
-                ch.pipeline().addLast("negotiator", snf.getSessionNegotiator(null, ch, promise));
+                ch.pipeline().addLast(NEGOTIATOR, snf.getSessionNegotiator(null, ch, promise));
                 ch.pipeline().addLast(BGPDispatcherImpl.this.hf.getEncoders());
             }
         });
index 5a72df52cac8696a3bd73bdd82638fe9e55a9126..5d91d3ed2791ec56d4d189fcb04bec638611e10d 100644 (file)
@@ -67,15 +67,15 @@ public class BGPSessionImpl extends AbstractProtocolSession<Notification> implem
          * is half-alive, e.g. the timers are running, but the session is not completely up, e.g. it has not been
          * announced to the listener. If the session is torn down in this state, we do not inform the listener.
          */
-        OpenConfirm,
+        OPEN_CONFIRM,
         /**
          * The session has been completely established.
          */
-        Up,
+        UP,
         /**
          * The session has been closed. It will not be resurrected.
          */
-        Idle,
+        IDLE,
     }
 
     /**
@@ -98,7 +98,7 @@ public class BGPSessionImpl extends AbstractProtocolSession<Notification> implem
     private final Channel channel;
 
     @GuardedBy("this")
-    private State state = State.OpenConfirm;
+    private State state = State.OPEN_CONFIRM;
 
     private final Set<BgpTableType> tableTypes;
     private final int holdTimerValue;
@@ -163,11 +163,11 @@ public class BGPSessionImpl extends AbstractProtocolSession<Notification> implem
     @Override
     public synchronized void close() {
         LOG.info("Closing session: {}", this);
-        if (this.state != State.Idle) {
+        if (this.state != State.IDLE) {
             this.sendMessage(new NotifyBuilder().setErrorCode(BGPError.CEASE.getCode()).setErrorSubcode(
                     BGPError.CEASE.getSubcode()).build());
             this.channel.close();
-            this.state = State.Idle;
+            this.state = State.IDLE;
         }
     }
 
@@ -211,7 +211,7 @@ public class BGPSessionImpl extends AbstractProtocolSession<Notification> implem
 
     @Override
     public synchronized void endOfInput() {
-        if (this.state == State.Up) {
+        if (this.state == State.UP) {
             this.listener.onSessionDown(this, new IOException("End of input detected. Close the session."));
         }
     }
@@ -244,7 +244,7 @@ public class BGPSessionImpl extends AbstractProtocolSession<Notification> implem
     private synchronized void closeWithoutMessage() {
         LOG.debug("Closing session: {}", this);
         this.channel.close();
-        this.state = State.Idle;
+        this.state = State.IDLE;
     }
 
     /**
@@ -267,7 +267,7 @@ public class BGPSessionImpl extends AbstractProtocolSession<Notification> implem
      * state will become IDLE), then rescheduling won't occur.
      */
     private synchronized void handleHoldTimer() {
-        if (this.state == State.Idle) {
+        if (this.state == State.IDLE) {
             return;
         }
 
@@ -294,7 +294,7 @@ public class BGPSessionImpl extends AbstractProtocolSession<Notification> implem
      * starts to execute (the session state will become IDLE), that rescheduling won't occur.
      */
     private synchronized void handleKeepaliveTimer() {
-        if (this.state == State.Idle) {
+        if (this.state == State.IDLE) {
             return;
         }
 
@@ -333,7 +333,7 @@ public class BGPSessionImpl extends AbstractProtocolSession<Notification> implem
     @Override
     protected synchronized void sessionUp() {
         this.sessionStats.startSessionStopwatch();
-        this.state = State.Up;
+        this.state = State.UP;
         this.listener.onSessionUp(this);
     }
 
index e1f07b809df2460d5008007f4f3abdc806c0c9ae..4b93060e5fb7b5052a7cd591ab0a802e7d491a7b 100644 (file)
@@ -104,7 +104,7 @@ public class BGPDispatcherImplTest {
     public void testCreateClient() throws InterruptedException, ExecutionException {
         final BGPSessionImpl session = this.dispatcher.createClient(ADDRESS, AS_NUMBER, this.registry, new NeverReconnectStrategy(GlobalEventExecutor.INSTANCE, TIMEOUT)).get();
         Assert.assertTrue(this.sessionListener.up);
-        Assert.assertEquals(BGPSessionImpl.State.Up, session.getState());
+        Assert.assertEquals(BGPSessionImpl.State.UP, session.getState());
         Assert.assertEquals(AS_NUMBER, session.getAsNumber());
         Assert.assertEquals(IPV4, session.getBgpId());
         Assert.assertEquals(Sets.newHashSet(this.ipv4tt), session.getAdvertisedTableTypes());
index 9e198ac93af10aaf5adf0f643bea2bc50f8ec309..286bae6b3b10af5fcdf795629f4cae2f45965838 100644 (file)
@@ -119,7 +119,7 @@ public class BGPSessionImplTest {
         doReturn(this.eventLoop).when(this.speakerListener).eventLoop();
         doAnswer(new Answer<Void>() {
             @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
+            public Void answer(final InvocationOnMock invocation) throws Throwable {
                 final Runnable command = (Runnable) invocation.getArguments()[0];
                 final long delay = (long) invocation.getArguments()[1];
                 final TimeUnit unit = (TimeUnit) invocation.getArguments()[2];
@@ -140,16 +140,16 @@ public class BGPSessionImplTest {
     @Test
     public void testBGPSession() {
         this.bgpSession.sessionUp();
-        assertEquals(BGPSessionImpl.State.Up, this.bgpSession.getState());
+        assertEquals(BGPSessionImpl.State.UP, this.bgpSession.getState());
         assertEquals(AS_NUMBER, this.bgpSession.getAsNumber());
         assertEquals(BGP_ID, this.bgpSession.getBgpId());
         assertEquals(1, this.bgpSession.getAdvertisedTableTypes().size());
         assertTrue(this.listener.up);
         //test stats
-        BgpSessionState state = this.bgpSession.getBgpSesionState();
+        final BgpSessionState state = this.bgpSession.getBgpSesionState();
         assertEquals(HOLD_TIMER, state.getHoldtimeCurrent().intValue());
         assertEquals(1, state.getKeepaliveCurrent().intValue());
-        assertEquals("Up", state.getSessionState());
+        assertEquals(BGPSessionImpl.State.UP.name(), state.getSessionState());
         assertEquals(BGP_ID.getValue(), state.getPeerPreferences().getAddress());
         assertEquals(AS_NUMBER.getValue(), state.getPeerPreferences().getAs());
         assertEquals(BGP_ID.getValue(), state.getPeerPreferences().getBgpId());
@@ -175,7 +175,7 @@ public class BGPSessionImplTest {
         assertEquals(0, state.getMessagesStats().getKeepAliveMsgs().getSent().getCount().longValue());
 
         this.bgpSession.close();
-        assertEquals(BGPSessionImpl.State.Idle, this.bgpSession.getState());
+        assertEquals(BGPSessionImpl.State.IDLE, this.bgpSession.getState());
         assertEquals(1, this.receivedMsgs.size());
         assertTrue(this.receivedMsgs.get(0) instanceof Notify);
         final Notify error = (Notify) this.receivedMsgs.get(0);
@@ -197,7 +197,7 @@ public class BGPSessionImplTest {
     @Test
     public void testHandleOpenMsg() {
         this.bgpSession.handleMessage(this.classicOpen);
-        Assert.assertEquals(BGPSessionImpl.State.Idle, this.bgpSession.getState());
+        Assert.assertEquals(BGPSessionImpl.State.IDLE, this.bgpSession.getState());
         Assert.assertEquals(1, this.receivedMsgs.size());
         Assert.assertTrue(this.receivedMsgs.get(0) instanceof Notify);
         final Notify error = (Notify) this.receivedMsgs.get(0);
@@ -212,7 +212,7 @@ public class BGPSessionImplTest {
         assertEquals(1, this.bgpSession.getBgpSesionState().getMessagesStats().getErrorMsgs().getErrorReceived().getCount().longValue());
         assertEquals(BGPError.BAD_BGP_ID.getCode(), this.bgpSession.getBgpSesionState().getMessagesStats().getErrorMsgs().getErrorReceived().getCode().shortValue());
         assertEquals(BGPError.BAD_BGP_ID.getSubcode(), this.bgpSession.getBgpSesionState().getMessagesStats().getErrorMsgs().getErrorReceived().getSubCode().shortValue());
-        Assert.assertEquals(BGPSessionImpl.State.Idle, this.bgpSession.getState());
+        Assert.assertEquals(BGPSessionImpl.State.IDLE, this.bgpSession.getState());
         Mockito.verify(this.speakerListener).close();
     }
 
@@ -228,7 +228,7 @@ public class BGPSessionImplTest {
     public void testHoldTimerExpire() throws InterruptedException {
         this.bgpSession.sessionUp();
         Thread.sleep(3500);
-        Assert.assertEquals(BGPSessionImpl.State.Idle, this.bgpSession.getState());
+        Assert.assertEquals(BGPSessionImpl.State.IDLE, this.bgpSession.getState());
         Assert.assertEquals(3, this.receivedMsgs.size());
         Assert.assertTrue(this.receivedMsgs.get(2) instanceof Notify);
         final Notify error = (Notify) this.receivedMsgs.get(2);
index 5369403ab56ea87d1225520a38e6f2cb5b3bfdf3..a4688cc90b83b794148f319ab507ec7a0b456222 100644 (file)
@@ -148,7 +148,7 @@ public class FSMTest {
         assertEquals(2, this.receivedMsgs.size());
         assertTrue(this.receivedMsgs.get(1) instanceof Keepalive);
         this.clientSession.handleMessage(new KeepaliveBuilder().build());
-        assertEquals(this.clientSession.getState(), BGPClientSessionNegotiator.State.Finished);
+        assertEquals(this.clientSession.getState(), BGPClientSessionNegotiator.State.FINISHED);
         Thread.sleep(1000);
         Thread.sleep(100);
     }
@@ -191,7 +191,7 @@ public class FSMTest {
         this.clientSession.channelActive(null);
         this.clientSession.handleMessage(this.classicOpen);
         this.clientSession.handleMessage(new KeepaliveBuilder().build());
-        assertEquals(this.clientSession.getState(), BGPClientSessionNegotiator.State.Finished);
+        assertEquals(this.clientSession.getState(), BGPClientSessionNegotiator.State.FINISHED);
         this.clientSession.handleMessage(new OpenBuilder().setMyAsNumber(30).setHoldTimer(3).setVersion(new ProtocolVersion((short) 4)).build());
         assertEquals(3, this.receivedMsgs.size());
         assertTrue(this.receivedMsgs.get(2) instanceof Notify);
index 4f453d9c51a7d238ef94d876580c84d9cede4627..6b54314bf7d24662c24a50e5b36258c84ac9fcfb 100644 (file)
@@ -111,7 +111,7 @@ public abstract class AbstractTopologyBuilder<T extends Route> implements AutoCl
     }
 
     @Override
-    public synchronized final void onLocRIBChange(final ReadWriteTransaction trans,
+    public final synchronized void onLocRIBChange(final ReadWriteTransaction trans,
             final AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> event) {
         LOG.debug("Received data change {} event with transaction {}", event, trans.getIdentifier());
         if (this.closed) {
@@ -164,7 +164,7 @@ public abstract class AbstractTopologyBuilder<T extends Route> implements AutoCl
     }
 
     @Override
-    public synchronized final void close() throws TransactionCommitFailedException {
+    public final synchronized void close() throws TransactionCommitFailedException {
         LOG.info("Shutting down builder for {}", getInstanceIdentifier());
         final WriteTransaction trans = this.chain.newWriteOnlyTransaction();
         trans.delete(LogicalDatastoreType.OPERATIONAL, getInstanceIdentifier());
index 355f5015434c2816771e51f89293383e0dc2243b..9dfb6715aef966b4dcfcc15ae6bb41269b59c29d 100644 (file)
@@ -497,6 +497,8 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
             break;
         default:
             break;
+        default:
+            break;
         }
 
         final LinkBuilder lb = new LinkBuilder();
index 76f7d35896f2b4366e7cad82a6f0589d71bb7faf..ba29184ff17867589e4f7d5d6c9e849ca7960c13 100644 (file)
@@ -11,7 +11,7 @@ import com.google.common.collect.Maps;
 import java.util.Map;
 
 public enum TerminationReason {
-    Unknown((short) 1), ExpDeadtimer((short) 2), MalformedMsg((short) 3), TooManyUnknownReqRep((short) 4), TooManyUnknownMsg((short) 5);
+    UNKNOWN((short) 1), EXP_DEADTIMER((short) 2), MALFORMED_MSG((short) 3), TOO_MANY_UNKNWN_REQS((short) 4), TOO_MANY_UNKNOWN_MSGS((short) 5);
 
     private short value;
     private static final Map<Short, TerminationReason> VALUE_MAP;
index de93e54d28dd5f8204353dfe4ad9fc527c956eb8..61d6b0d2c90347600745afc4968a203ca70faa27 100644 (file)
@@ -84,37 +84,39 @@ public class PcinitiateMessageParser extends AbstractMessageParser {
         final List<Metrics> metrics = Lists.newArrayList();
 
         Object obj;
-        State state = State.Init;
-        while (!objects.isEmpty() && !state.equals(State.End)) {
+        State state = State.INIT;
+        while (!objects.isEmpty() && !state.equals(State.END)) {
             obj = objects.get(0);
 
             switch (state) {
-            case Init:
-                state = State.EroIn;
+            case INIT:
+                state = State.ERO_IN;
                 if (obj instanceof Ero) {
                     builder.setEro((Ero) obj);
                     break;
                 }
-            case EroIn:
-                state = State.BandwidthIn;
+            case ERO_IN:
+                state = State.BANDWIDTH_IN;
                 if (obj instanceof Bandwidth) {
                     builder.setBandwidth((Bandwidth) obj);
                     break;
                 }
-            case BandwidthIn:
-                state = State.MetricIn;
+            case BANDWIDTH_IN:
+                state = State.METRIC_IN;
                 if (obj instanceof Metric) {
                     metrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
-                    state = State.BandwidthIn;
+                    state = State.BANDWIDTH_IN;
                     break;
                 }
-            case MetricIn:
-                state = State.End;
+            case METRIC_IN:
+                state = State.END;
                 break;
-            case End:
+            case END:
+                break;
+            default:
                 break;
             }
-            if (!state.equals(State.End)) {
+            if (!state.equals(State.END)) {
                 objects.remove(0);
             }
         }
@@ -123,6 +125,6 @@ public class PcinitiateMessageParser extends AbstractMessageParser {
     }
 
     private enum State {
-        Init, EroIn, BandwidthIn, MetricIn, End
+        INIT, ERO_IN, BANDWIDTH_IN, METRIC_IN, END
     }
 }
index d1e3ba32bc0f6768a0ff6faa186fd85073fd10f5..a86ddf6483ede5e5447e065d3b2e31e695ca7378 100644 (file)
@@ -96,55 +96,57 @@ public class CInitiated00PCInitiateMessageParser extends AbstractMessageParser {
         final List<Metrics> metrics = Lists.newArrayList();
 
         Object obj;
-        State state = State.Init;
-        while (!objects.isEmpty() && !state.equals(State.End)) {
+        State state = State.INIT;
+        while (!objects.isEmpty() && !state.equals(State.END)) {
             obj = objects.get(0);
 
             switch (state) {
-            case Init:
-                state = State.EndpointsIn;
+            case INIT:
+                state = State.ENDPOINTS_IN;
                 if (obj instanceof EndpointsObj) {
                     builder.setEndpointsObj((EndpointsObj) obj);
                     break;
                 }
-            case EndpointsIn:
-                state = State.EroIn;
+            case ENDPOINTS_IN:
+                state = State.ERO_IN;
                 if (obj instanceof Ero) {
                     builder.setEro((Ero) obj);
                     break;
                 }
-            case EroIn:
-                state = State.LspaIn;
+            case ERO_IN:
+                state = State.LSPA_IN;
                 if (obj instanceof Lspa) {
                     builder.setLspa((Lspa) obj);
                     break;
                 }
-            case LspaIn:
-                state = State.BandwidthIn;
+            case LSPA_IN:
+                state = State.BANDWIDTH_IN;
                 if (obj instanceof Bandwidth) {
                     builder.setBandwidth((Bandwidth) obj);
                     break;
                 }
-            case BandwidthIn:
-                state = State.MetricIn;
+            case BANDWIDTH_IN:
+                state = State.METRIC_IN;
                 if (obj instanceof Metric) {
                     metrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
-                    state = State.BandwidthIn;
+                    state = State.BANDWIDTH_IN;
                     break;
                 }
-            case MetricIn:
-                state = State.IroIn;
+            case METRIC_IN:
+                state = State.IRO_IN;
                 if (obj instanceof Iro) {
                     builder.setIro((Iro) obj);
                     break;
                 }
-            case IroIn:
-                state = State.End;
+            case IRO_IN:
+                state = State.END;
                 break;
-            case End:
+            case END:
+                break;
+            default:
                 break;
             }
-            if (!state.equals(State.End)) {
+            if (!state.equals(State.END)) {
                 objects.remove(0);
             }
         }
@@ -153,6 +155,6 @@ public class CInitiated00PCInitiateMessageParser extends AbstractMessageParser {
     }
 
     private enum State {
-        Init, EndpointsIn, EroIn, LspaIn, BandwidthIn, MetricIn, IroIn, End
+        INIT, ENDPOINTS_IN, ERO_IN, LSPA_IN, BANDWIDTH_IN, METRIC_IN, IRO_IN, END
     }
 }
index 339af2146d2842106319e0949679f9f39e1a13af..3a0703e4b476c1cac580c17745101bcdecdcf6be 100644 (file)
@@ -97,11 +97,11 @@ public final class Stateful07ErrorMessageParser extends PCEPErrorMessageParser {
         final List<Errors> errorObjects = new ArrayList<>();
         final PcerrMessageBuilder b = new PcerrMessageBuilder();
         Object obj = objects.get(0);
-        State state = State.Init;
+        State state = State.INIT;
         if (obj instanceof ErrorObject) {
             final ErrorObject o = (ErrorObject) obj;
             errorObjects.add(new ErrorsBuilder().setErrorObject(o).build());
-            state = State.ErrorIn;
+            state = State.ERROR_IN;
         } else if (obj instanceof Rp) {
             final Rp o = (Rp) obj;
             if (o.isProcessingRule()) {
@@ -109,13 +109,13 @@ public final class Stateful07ErrorMessageParser extends PCEPErrorMessageParser {
                 return null;
             }
             requestParameters.add(new RpsBuilder().setRp(o).build());
-            state = State.RpIn;
+            state = State.RP_IN;
         } else if (obj instanceof Srp) {
             final Srp s = (Srp) obj;
             srps.add(new SrpsBuilder().setSrp(s).build());
-            state = State.SrpIn;
+            state = State.SRP_IN;
         }
-        if (!state.equals(State.Init)) {
+        if (!state.equals(State.INIT)) {
             objects.remove(0);
         }
         while (!objects.isEmpty()) {
@@ -124,53 +124,53 @@ public final class Stateful07ErrorMessageParser extends PCEPErrorMessageParser {
                 return new PcerrBuilder().setPcerrMessage(b.setErrors(((UnknownObject) obj).getErrors()).build()).build();
             }
             switch (state) {
-            case ErrorIn:
-                state = State.Open;
+            case ERROR_IN:
+                state = State.OPEN;
                 if (obj instanceof ErrorObject) {
                     final ErrorObject o = (ErrorObject) obj;
                     errorObjects.add(new ErrorsBuilder().setErrorObject(o).build());
-                    state = State.ErrorIn;
+                    state = State.ERROR_IN;
                     break;
                 }
-            case RpIn:
-                state = State.Error;
+            case RP_IN:
+                state = State.ERROR;
                 if (obj instanceof Rp) {
                     final Rp o = ((Rp) obj);
                     requestParameters.add(new RpsBuilder().setRp(o).build());
-                    state = State.RpIn;
+                    state = State.RP_IN;
                     break;
                 }
-            case SrpIn:
-                state = State.Error;
+            case SRP_IN:
+                state = State.ERROR;
                 if (obj instanceof Srp) {
                     final Srp o = ((Srp) obj);
                     srps.add(new SrpsBuilder().setSrp(o).build());
-                    state = State.SrpIn;
+                    state = State.SRP_IN;
                     break;
                 }
-            case Open:
-                state = State.OpenIn;
+            case OPEN:
+                state = State.OPEN_IN;
                 if (obj instanceof Open) {
                     b.setErrorType(new SessionCaseBuilder().setSession(new SessionBuilder().setOpen((Open) obj).build()).build());
                     break;
                 }
-            case Error:
-                state = State.OpenIn;
+            case ERROR:
+                state = State.OPEN_IN;
                 if (obj instanceof ErrorObject) {
                     final ErrorObject o = (ErrorObject) obj;
                     errorObjects.add(new ErrorsBuilder().setErrorObject(o).build());
-                    state = State.Error;
+                    state = State.ERROR;
                     break;
                 }
-            case OpenIn:
-                state = State.End;
+            case OPEN_IN:
+                state = State.END;
                 break;
-            case End:
+            case END:
                 break;
             default:
                 break;
             }
-            if (!state.equals(State.End)) {
+            if (!state.equals(State.END)) {
                 objects.remove(0);
             }
         }
@@ -190,6 +190,6 @@ public final class Stateful07ErrorMessageParser extends PCEPErrorMessageParser {
     }
 
     private enum State {
-        Init, ErrorIn, RpIn, SrpIn, Open, Error, OpenIn, End
+        INIT, ERROR_IN, RP_IN, SRP_IN, OPEN, ERROR, OPEN_IN, END
     }
 }
index a3bc2165a507f3105df8e14dd6bf903d7a0e54b0..5c4a66eea6751c9a0562003a723bf61d808e35d5 100644 (file)
@@ -137,48 +137,50 @@ public class Stateful07PCReportMessageParser extends AbstractMessageParser {
     private void parsePath(final List<Object> objects, final PathBuilder builder) {
         final List<Metrics> pathMetrics = Lists.newArrayList();
         Object obj;
-        State state = State.Init;
-        while (!objects.isEmpty() && !state.equals(State.End)) {
+        State state = State.INIT;
+        while (!objects.isEmpty() && !state.equals(State.END)) {
             obj = objects.get(0);
             switch (state) {
-            case Init:
-                state = State.LspaIn;
+            case INIT:
+                state = State.LSPA_IN;
                 if (obj instanceof Lspa) {
                     builder.setLspa((Lspa) obj);
                     break;
                 }
-            case LspaIn:
-                state = State.BandwidthIn;
+            case LSPA_IN:
+                state = State.BANDWIDTH_IN;
                 if (obj instanceof Bandwidth) {
                     builder.setBandwidth((Bandwidth) obj);
                     break;
                 }
-            case BandwidthIn:
-                state = State.MetricIn;
+            case BANDWIDTH_IN:
+                state = State.METRIC_IN;
                 if (obj instanceof Metric) {
                     pathMetrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
-                    state = State.BandwidthIn;
+                    state = State.BANDWIDTH_IN;
                     break;
                 }
-            case MetricIn:
-                state = State.IroIn;
+            case METRIC_IN:
+                state = State.IRO_IN;
                 if (obj instanceof Iro) {
                     builder.setIro((Iro) obj);
                     break;
                 }
-            case IroIn:
-                state = State.RroIn;
+            case IRO_IN:
+                state = State.RRO_IN;
                 if (obj instanceof Rro) {
                     builder.setRro((Rro) obj);
                     break;
                 }
-            case RroIn:
-                state = State.End;
+            case RRO_IN:
+                state = State.END;
                 break;
-            case End:
+            case END:
+                break;
+            default:
                 break;
             }
-            if (!state.equals(State.End)) {
+            if (!state.equals(State.END)) {
                 objects.remove(0);
             }
         }
@@ -188,6 +190,6 @@ public class Stateful07PCReportMessageParser extends AbstractMessageParser {
     }
 
     private enum State {
-        Init, LspaIn, BandwidthIn, MetricIn, IroIn, RroIn, End
+        INIT, LSPA_IN, BANDWIDTH_IN, METRIC_IN, IRO_IN, RRO_IN, END
     }
 }
index 384d39f71c1c87fb88948822f040483d10366b30..3eeb0c4f2ff2117544eca3976869c522674c87c2 100644 (file)
@@ -139,42 +139,44 @@ public class Stateful07PCUpdateRequestMessageParser extends AbstractMessageParse
     private void parsePath(final List<Object> objects, final PathBuilder pBuilder) {
         final List<Metrics> pathMetrics = Lists.newArrayList();
         Object obj;
-        State state = State.Init;
-        while (!objects.isEmpty() && !state.equals(State.End)) {
+        State state = State.INIT;
+        while (!objects.isEmpty() && !state.equals(State.END)) {
             obj = objects.get(0);
             switch (state) {
-            case Init:
-                state = State.LspaIn;
+            case INIT:
+                state = State.LSPA_IN;
                 if (obj instanceof Lspa) {
                     pBuilder.setLspa((Lspa) obj);
                     break;
                 }
-            case LspaIn:
-                state = State.BandwidthIn;
+            case LSPA_IN:
+                state = State.BANDWIDTH_IN;
                 if (obj instanceof Bandwidth) {
                     pBuilder.setBandwidth((Bandwidth) obj);
                     break;
                 }
-            case BandwidthIn:
-                state = State.MetricIn;
+            case BANDWIDTH_IN:
+                state = State.METRIC_IN;
                 if (obj instanceof Metric) {
                     pathMetrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
-                    state = State.BandwidthIn;
+                    state = State.BANDWIDTH_IN;
                     break;
                 }
-            case MetricIn:
-                state = State.IroIn;
+            case METRIC_IN:
+                state = State.IRO_IN;
                 if (obj instanceof Iro) {
                     pBuilder.setIro((Iro) obj);
                     break;
                 }
-            case IroIn:
-                state = State.End;
+            case IRO_IN:
+                state = State.END;
                 break;
-            case End:
+            case END:
+                break;
+            default:
                 break;
             }
-            if (!state.equals(State.End)) {
+            if (!state.equals(State.END)) {
                 objects.remove(0);
             }
         }
@@ -184,6 +186,6 @@ public class Stateful07PCUpdateRequestMessageParser extends AbstractMessageParse
     }
 
     private enum State {
-        Init, LspaIn, BandwidthIn, MetricIn, IroIn, End
+        INIT, LSPA_IN, BANDWIDTH_IN, METRIC_IN, IRO_IN, END
     }
 }
index 45fc048f229896191f75c4e1f2b8135b309151a9..c9629096f1de63b4126afe912122521834d59155 100644 (file)
@@ -52,26 +52,26 @@ public abstract class AbstractPCEPSessionNegotiator extends AbstractSessionNegot
          * Negotiation has not begun. It will be activated once we are asked to provide our initial proposal, at which
          * point we move into OpenWait state.
          */
-        Idle,
+        IDLE,
         /**
          * Waiting for the peer's OPEN message.
          */
-        OpenWait,
+        OPEN_WAIT,
         /**
          * Waiting for the peer's KEEPALIVE message.
          */
-        KeepWait,
+        KEEP_WAIT,
         /**
          * Negotiation has completed.
          */
-        Finished,
+        FINISHED,
     }
 
     private static final Logger LOG = LoggerFactory.getLogger(AbstractPCEPSessionNegotiator.class);
     private static final Keepalive KEEPALIVE = new KeepaliveBuilder().setKeepaliveMessage(new KeepaliveMessageBuilder().build()).build();
 
     private volatile boolean localOK, openRetry, remoteOK;
-    private volatile State state = State.Idle;
+    private volatile State state = State.IDLE;
     private Future<?> failTimer;
     private Open localPrefs;
     private Open remotePrefs;
@@ -138,18 +138,20 @@ public abstract class AbstractPCEPSessionNegotiator extends AbstractSessionNegot
             @Override
             public void run() {
                 switch (AbstractPCEPSessionNegotiator.this.state) {
-                case Finished:
-                case Idle:
+                case FINISHED:
+                case IDLE:
                     break;
-                case KeepWait:
+                case KEEP_WAIT:
                     sendErrorMessage(PCEPErrors.NO_MSG_BEFORE_EXP_KEEPWAIT);
                     negotiationFailed(new TimeoutException("KeepWait timer expired"));
-                    AbstractPCEPSessionNegotiator.this.state = State.Finished;
+                    AbstractPCEPSessionNegotiator.this.state = State.FINISHED;
                     break;
-                case OpenWait:
+                case OPEN_WAIT:
                     sendErrorMessage(PCEPErrors.NO_OPEN_BEFORE_EXP_OPENWAIT);
                     negotiationFailed(new TimeoutException("OpenWait timer expired"));
-                    AbstractPCEPSessionNegotiator.this.state = State.Finished;
+                    AbstractPCEPSessionNegotiator.this.state = State.FINISHED;
+                    break;
+                default:
                     break;
                 }
             }
@@ -158,12 +160,12 @@ public abstract class AbstractPCEPSessionNegotiator extends AbstractSessionNegot
 
     @Override
     protected final void startNegotiation() {
-        Preconditions.checkState(this.state == State.Idle);
+        Preconditions.checkState(this.state == State.IDLE);
         this.localPrefs = getInitialProposal();
         final OpenMessage m = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.OpenBuilder().setOpenMessage(
                 new OpenMessageBuilder().setOpen(this.localPrefs).build()).build();
         this.sendMessage(m);
-        this.state = State.OpenWait;
+        this.state = State.OPEN_WAIT;
         scheduleFailTimer();
 
         LOG.info("PCEP session with {} started, sent proposal {}", this.channel, this.localPrefs);
@@ -175,10 +177,10 @@ public abstract class AbstractPCEPSessionNegotiator extends AbstractSessionNegot
             if (this.remoteOK) {
                 LOG.info("PCEP peer {} completed negotiation", this.channel);
                 negotiationSuccessful(createSession(this.channel, this.localPrefs, this.remotePrefs));
-                this.state = State.Finished;
+                this.state = State.FINISHED;
             } else {
                 scheduleFailTimer();
-                this.state = State.OpenWait;
+                this.state = State.OPEN_WAIT;
                 LOG.debug("Channel {} moved to OpenWait state with localOK=1", this.channel);
             }
             return true;
@@ -188,19 +190,19 @@ public abstract class AbstractPCEPSessionNegotiator extends AbstractSessionNegot
                 final ErrorObject obj = err.getErrors().get(0).getErrorObject();
                 LOG.warn("Unexpected error received from PCC: type {} value {}", obj.getType(), obj.getValue());
                 negotiationFailed(new IllegalStateException("Unexpected error received from PCC."));
-                this.state = State.Idle;
+                this.state = State.IDLE;
                 return true;
             }
             this.localPrefs = getRevisedProposal(((SessionCase) err.getErrorType()).getSession().getOpen());
             if (this.localPrefs == null) {
                 sendErrorMessage(PCEPErrors.PCERR_NON_ACC_SESSION_CHAR);
                 negotiationFailed(new IllegalStateException("Peer suggested unacceptable retry proposal"));
-                this.state = State.Finished;
+                this.state = State.FINISHED;
                 return true;
             }
             this.sendMessage(new OpenBuilder().setOpenMessage(new OpenMessageBuilder().setOpen(this.localPrefs).build()).build());
             if (!this.remoteOK) {
-                this.state = State.OpenWait;
+                this.state = State.OPEN_WAIT;
             }
             scheduleFailTimer();
             return true;
@@ -219,10 +221,10 @@ public abstract class AbstractPCEPSessionNegotiator extends AbstractSessionNegot
                 if (this.localOK) {
                     negotiationSuccessful(createSession(this.channel, this.localPrefs, this.remotePrefs));
                     LOG.info("PCEP peer {} completed negotiation", this.channel);
-                    this.state = State.Finished;
+                    this.state = State.FINISHED;
                 } else {
                     scheduleFailTimer();
-                    this.state = State.KeepWait;
+                    this.state = State.KEEP_WAIT;
                     LOG.debug("Channel {} moved to KeepWait state with remoteOK=1", this.channel);
                 }
                 return true;
@@ -231,7 +233,7 @@ public abstract class AbstractPCEPSessionNegotiator extends AbstractSessionNegot
             if (this.openRetry) {
                 sendErrorMessage(PCEPErrors.SECOND_OPEN_MSG);
                 negotiationFailed(new IllegalStateException("OPEN renegotiation failed"));
-                this.state = State.Finished;
+                this.state = State.FINISHED;
                 return true;
             }
 
@@ -239,14 +241,14 @@ public abstract class AbstractPCEPSessionNegotiator extends AbstractSessionNegot
             if (newPrefs == null) {
                 sendErrorMessage(PCEPErrors.NON_ACC_NON_NEG_SESSION_CHAR);
                 negotiationFailed(new IllegalStateException("Peer sent unacceptable session parameters"));
-                this.state = State.Finished;
+                this.state = State.FINISHED;
                 return true;
             }
 
             this.sendMessage(Util.createErrorMessage(PCEPErrors.NON_ACC_NEG_SESSION_CHAR, newPrefs));
 
             this.openRetry = true;
-            this.state = this.localOK ? State.OpenWait : State.KeepWait;
+            this.state = this.localOK ? State.OPEN_WAIT : State.KEEP_WAIT;
             scheduleFailTimer();
             return true;
         }
@@ -260,24 +262,26 @@ public abstract class AbstractPCEPSessionNegotiator extends AbstractSessionNegot
         LOG.debug("Channel {} handling message {} in state {}", this.channel, msg, this.state);
 
         switch (this.state) {
-        case Finished:
-        case Idle:
+        case FINISHED:
+        case IDLE:
             throw new IllegalStateException("Unexpected handleMessage in state " + this.state);
-        case KeepWait:
+        case KEEP_WAIT:
             if (handleMessageKeepWait(msg)) {
                 return;
             }
             break;
-        case OpenWait:
+        case OPEN_WAIT:
             if (handleMessageOpenWait(msg)) {
                 return;
             }
             break;
+        default:
+            break;
         }
         LOG.warn("Channel {} in state {} received unexpected message {}", this.channel, this.state, msg);
         sendErrorMessage(PCEPErrors.NON_OR_INVALID_OPEN_MSG);
         negotiationFailed(new Exception("Illegal message encountered"));
-        this.state = State.Finished;
+        this.state = State.FINISHED;
     }
 
     @VisibleForTesting
index 69feacda4f96ab0b5102e13823ec74eb1e63e1ab..ebca75ef2e1e774c4c350ead4bda343b65d1d8a2 100644 (file)
@@ -149,7 +149,7 @@ public class PCEPSessionImpl extends AbstractProtocolSession<Message> implements
         if (this.channel.isActive()) {
             if (ct >= nextDead) {
                 LOG.debug("DeadTimer expired. {}", new Date());
-                this.terminate(TerminationReason.ExpDeadtimer);
+                this.terminate(TerminationReason.EXP_DEADTIMER);
             } else {
                 this.channel.eventLoop().schedule(new Runnable() {
                     @Override
@@ -300,7 +300,7 @@ public class PCEPSessionImpl extends AbstractProtocolSession<Message> implements
                 this.unknownMessagesTimes.poll();
             }
             if (this.unknownMessagesTimes.size() > this.maxUnknownMessages) {
-                this.terminate(TerminationReason.TooManyUnknownMsg);
+                this.terminate(TerminationReason.TOO_MANY_UNKNOWN_MSGS);
             }
         }
     }
index 630d6a3a1dee791accb4deecce5b074d6062813f..242d4ec0c87818f8573e11f9ce754f9db87c6508 100644 (file)
@@ -87,12 +87,12 @@ public class PCEPErrorMessageParser extends AbstractMessageParser {
         final PcerrMessageBuilder b = new PcerrMessageBuilder();
 
         Object obj = objects.get(0);
-        State state = State.Init;
+        State state = State.INIT;
 
         if (obj instanceof ErrorObject) {
             final ErrorObject o = (ErrorObject) obj;
             errorObjects.add(new ErrorsBuilder().setErrorObject(o).build());
-            state = State.ErrorIn;
+            state = State.ERROR_IN;
         } else if (obj instanceof Rp) {
             final Rp o = (Rp) obj;
             if (o.isProcessingRule()) {
@@ -100,9 +100,9 @@ public class PCEPErrorMessageParser extends AbstractMessageParser {
                 return null;
             }
             requestParameters.add(new RpsBuilder().setRp(o).build());
-            state = State.RpIn;
+            state = State.RP_IN;
         }
-        if (state.equals(State.Init)) {
+        if (state.equals(State.INIT)) {
             throw new PCEPDeserializerException("At least one PCEPErrorObject is mandatory.");
         }
         objects.remove(0);
@@ -112,45 +112,45 @@ public class PCEPErrorMessageParser extends AbstractMessageParser {
                 return new PcerrBuilder().setPcerrMessage(b.setErrors(((UnknownObject) obj).getErrors()).build()).build();
             }
             switch (state) {
-            case ErrorIn:
-                state = State.Open;
+            case ERROR_IN:
+                state = State.OPEN;
                 if (obj instanceof ErrorObject) {
                     final ErrorObject o = (ErrorObject) obj;
                     errorObjects.add(new ErrorsBuilder().setErrorObject(o).build());
-                    state = State.ErrorIn;
+                    state = State.ERROR_IN;
                     break;
                 }
-            case RpIn:
-                state = State.Error;
+            case RP_IN:
+                state = State.ERROR;
                 if (obj instanceof Rp) {
                     final Rp o = ((Rp) obj);
                     requestParameters.add(new RpsBuilder().setRp(o).build());
-                    state = State.RpIn;
+                    state = State.RP_IN;
                     break;
                 }
-            case Open:
-                state = State.OpenIn;
+            case OPEN:
+                state = State.OPEN_IN;
                 if (obj instanceof Open) {
                     b.setErrorType(new SessionCaseBuilder().setSession(new SessionBuilder().setOpen((Open) obj).build()).build());
                     break;
                 }
-            case Error:
-                state = State.OpenIn;
+            case ERROR:
+                state = State.OPEN_IN;
                 if (obj instanceof ErrorObject) {
                     final ErrorObject o = (ErrorObject) obj;
                     errorObjects.add(new ErrorsBuilder().setErrorObject(o).build());
-                    state = State.Error;
+                    state = State.ERROR;
                     break;
                 }
-            case OpenIn:
-                state = State.End;
+            case OPEN_IN:
+                state = State.END;
                 break;
-            case End:
+            case END:
                 break;
             default:
                 break;
             }
-            if (!state.equals(State.End)) {
+            if (!state.equals(State.END)) {
                 objects.remove(0);
             }
         }
@@ -167,6 +167,6 @@ public class PCEPErrorMessageParser extends AbstractMessageParser {
     }
 
     private enum State {
-        Init, ErrorIn, RpIn, Open, Error, OpenIn, End
+        INIT, ERROR_IN, RP_IN, OPEN, ERROR, OPEN_IN, END
     }
 }
index db14b676610127fe9f15cdb0bedf072f79b6d3e4..ec5a467a589c51320df8e5ed989962ec12e93cc6 100644 (file)
@@ -93,12 +93,12 @@ public class PCEPNotificationMessageParser extends AbstractMessageParser {
         final List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcntf.message.pcntf.message.notifications.Notifications> notifications = new ArrayList<>();
         Object obj;
 
-        State state = State.Init;
-        while (!objects.isEmpty() && !state.equals(State.End)) {
+        State state = State.INIT;
+        while (!objects.isEmpty() && !state.equals(State.END)) {
             obj = objects.get(0);
             switch (state) {
-            case Init:
-                state = State.RpIn;
+            case INIT:
+                state = State.RP_IN;
                 if (obj instanceof Rp) {
                     final Rp rp = (Rp) obj;
                     if (rp.isProcessingRule()) {
@@ -106,24 +106,26 @@ public class PCEPNotificationMessageParser extends AbstractMessageParser {
                         return null;
                     }
                     requestParameters.add(new RpsBuilder().setRp(rp).build());
-                    state = State.Init;
+                    state = State.INIT;
                     break;
                 }
-            case RpIn:
-                state = State.NotificationIn;
+            case RP_IN:
+                state = State.NOTIFICATION_IN;
                 if (obj instanceof CNotification) {
                     final CNotification n = (CNotification) obj;
                     notifications.add(new NotificationsBuilder().setCNotification(n).build());
-                    state = State.RpIn;
+                    state = State.RP_IN;
                     break;
                 }
-            case NotificationIn:
-                state = State.End;
+            case NOTIFICATION_IN:
+                state = State.END;
                 break;
-            case End:
+            case END:
+                break;
+            default:
                 break;
             }
-            if (!state.equals(State.End)) {
+            if (!state.equals(State.END)) {
                 objects.remove(0);
             }
         }
@@ -137,6 +139,6 @@ public class PCEPNotificationMessageParser extends AbstractMessageParser {
     }
 
     private enum State {
-        Init, RpIn, NotificationIn, End
+        INIT, RP_IN, NOTIFICATION_IN, END
     }
 }
index 5f82607c3cf2d43b7865054dd9ee26b7a413fc7d..6ef825c4e448c56c05c39f1144819a6ff64398f6 100644 (file)
@@ -183,43 +183,45 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
         final List<Metrics> pathMetrics = new ArrayList<>();
 
         Object obj;
-        State state = State.Init;
-        while (!objects.isEmpty() && !state.equals(State.End)) {
+        State state = State.INIT;
+        while (!objects.isEmpty() && !state.equals(State.END)) {
             obj = objects.get(0);
 
             switch (state) {
-            case Init:
-                state = State.LspaIn;
+            case INIT:
+                state = State.LSPA_IN;
                 if (obj instanceof Lspa) {
                     builder.setLspa((Lspa) obj);
                     break;
                 }
-            case LspaIn:
-                state = State.BandwidthIn;
+            case LSPA_IN:
+                state = State.BANDWIDTH_IN;
                 if (obj instanceof Bandwidth) {
                     builder.setBandwidth((Bandwidth) obj);
                     break;
                 }
-            case BandwidthIn:
-                state = State.MetricIn;
+            case BANDWIDTH_IN:
+                state = State.METRIC_IN;
                 if (obj instanceof Metric) {
                     pathMetrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
-                    state = State.MetricIn;
+                    state = State.METRIC_IN;
                     break;
                 }
-            case MetricIn:
-                state = State.IroIn;
+            case METRIC_IN:
+                state = State.IRO_IN;
                 if (obj instanceof Iro) {
                     builder.setIro((Iro) obj);
                     break;
                 }
-            case IroIn:
-                state = State.End;
+            case IRO_IN:
+                state = State.END;
                 break;
-            case End:
+            case END:
+                break;
+            default:
                 break;
             }
-            if (!state.equals(State.End)) {
+            if (!state.equals(State.END)) {
                 objects.remove(0);
             }
         }
@@ -232,49 +234,51 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
         final List<Metrics> pathMetrics = new ArrayList<>();
 
         Object obj;
-        State state = State.Init;
-        while (!objects.isEmpty() && !state.equals(State.End)) {
+        State state = State.INIT;
+        while (!objects.isEmpty() && !state.equals(State.END)) {
             obj = objects.get(0);
 
             switch (state) {
-            case Init:
-                state = State.LspaIn;
+            case INIT:
+                state = State.LSPA_IN;
                 if (obj instanceof Lspa) {
                     builder.setLspa((Lspa) obj);
                     break;
                 }
-            case LspaIn:
-                state = State.OfIn;
+            case LSPA_IN:
+                state = State.OF_IN;
                 if (obj instanceof Of) {
                     builder.setOf((Of) obj);
                     break;
                 }
-            case OfIn:
-                state = State.BandwidthIn;
+            case OF_IN:
+                state = State.BANDWIDTH_IN;
                 if (obj instanceof Bandwidth) {
                     builder.setBandwidth((Bandwidth) obj);
                     break;
                 }
-            case BandwidthIn:
-                state = State.MetricIn;
+            case BANDWIDTH_IN:
+                state = State.METRIC_IN;
                 if (obj instanceof Metric) {
                     pathMetrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
-                    state = State.BandwidthIn;
+                    state = State.BANDWIDTH_IN;
                     break;
                 }
-            case MetricIn:
-                state = State.IroIn;
+            case METRIC_IN:
+                state = State.IRO_IN;
                 if (obj instanceof Iro) {
                     builder.setIro((Iro) obj);
                     break;
                 }
-            case IroIn:
-                state = State.End;
+            case IRO_IN:
+                state = State.END;
+                break;
+            case END:
                 break;
-            case End:
+            default:
                 break;
             }
-            if (!state.equals(State.End)) {
+            if (!state.equals(State.END)) {
                 objects.remove(0);
             }
         }
@@ -284,6 +288,6 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
     }
 
     private enum State {
-        Init, LspaIn, OfIn, BandwidthIn, MetricIn, IroIn, End
+        INIT, LSPA_IN, OF_IN, BANDWIDTH_IN, METRIC_IN, IRO_IN, END
     }
 }
index 83b0a1a651ace61cfd4c5aacaa70240396dcc4f0..593cc33577d1dcce8ee3f701bca17a5fae8264b0 100644 (file)
@@ -209,13 +209,13 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
         final List<Metrics> metrics = new ArrayList<>();
         final List<VendorInformationObject> viObjects = new ArrayList<>();
 
-        State state = State.Init;
-        while (!objects.isEmpty() && state != State.End) {
+        State state = State.INIT;
+        while (!objects.isEmpty() && state != State.END) {
             Object obj = objects.get(0);
 
             switch (state) {
-            case Init:
-                state = State.ReportedIn;
+            case INIT:
+                state = State.REPORTED_IN;
                 if (obj instanceof Rro) {
                     final ReportedRouteBuilder rrBuilder = new ReportedRouteBuilder();
                     rrBuilder.setRro((Rro) obj);
@@ -226,64 +226,64 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
                     }
                     break;
                 }
-            case ReportedIn:
-                state = State.VendorInfoList;
+            case REPORTED_IN:
+                state = State.VENDOR_INFO_LIST;
                 if (obj instanceof VendorInformationObject) {
                     viObjects.add((VendorInformationObject) obj);
-                    state = State.ReportedIn;
+                    state = State.REPORTED_IN;
                     break;
                 }
-            case VendorInfoList:
-                state = State.LoadBIn;
+            case VENDOR_INFO_LIST:
+                state = State.LOAD_BIN;
                 if (obj instanceof LoadBalancing) {
                     builder.setLoadBalancing((LoadBalancing) obj);
                     break;
                 }
-            case LoadBIn:
-                state = State.LspaIn;
+            case LOAD_BIN:
+                state = State.LSPA_IN;
                 if (obj instanceof Lspa) {
                     builder.setLspa((Lspa) obj);
                     break;
                 }
-            case LspaIn:
-                state = State.BandwidthIn;
+            case LSPA_IN:
+                state = State.BANDWIDTH_IN;
                 if (obj instanceof Bandwidth) {
                     builder.setBandwidth((Bandwidth) obj);
                     break;
                 }
-            case BandwidthIn:
-                state = State.MetricIn;
+            case BANDWIDTH_IN:
+                state = State.METRIC_IN;
                 if (obj instanceof Metric) {
                     metrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
-                    state = State.BandwidthIn;
+                    state = State.BANDWIDTH_IN;
                     break;
                 }
-            case MetricIn:
-                state = State.IroIn;
+            case METRIC_IN:
+                state = State.IRO_IN;
                 if (obj instanceof Iro) {
                     builder.setIro((Iro) obj);
                     break;
                 }
-            case IroIn:
-                state = State.RroIn;
+            case IRO_IN:
+                state = State.RRO_IN;
                 if (obj instanceof Rro) {
                     builder.setRro((Rro) obj);
                     break;
                 }
-            case RroIn:
-                state = State.XroIn;
+            case RRO_IN:
+                state = State.XRO_IN;
                 if (obj instanceof Xro) {
                     builder.setXro((Xro) obj);
                     break;
                 }
-            case XroIn:
-                state = State.OfIn;
+            case XRO_IN:
+                state = State.OF_IN;
                 if (obj instanceof Of) {
                     builder.setOf((Of) obj);
                     break;
                 }
-            case OfIn:
-                state = State.CtIn;
+            case OF_IN:
+                state = State.CT_IN;
                 if (obj instanceof ClassType) {
                     final ClassType classType = (ClassType) obj;
                     if (!classType.isProcessingRule()) {
@@ -293,13 +293,15 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
                     }
                     break;
                 }
-            case CtIn:
-                state = State.End;
+            case CT_IN:
+                state = State.END;
                 break;
-            case End:
+            case END:
+                break;
+            default:
                 break;
             }
-            if (!state.equals(State.End)) {
+            if (!state.equals(State.END)) {
                 objects.remove(0);
             }
         }
@@ -322,7 +324,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
     }
 
     private enum State {
-        Init, ReportedIn, VendorInfoList, LoadBIn, LspaIn, BandwidthIn, MetricIn, IroIn, RroIn, XroIn, OfIn, CtIn, End
+        INIT, REPORTED_IN, VENDOR_INFO_LIST, LOAD_BIN, LSPA_IN, BANDWIDTH_IN, METRIC_IN, IRO_IN, RRO_IN, XRO_IN, OF_IN, CT_IN, END
     }
 
     private Svec getValidSvec(final SvecBuilder builder, final List<Object> objects) {
@@ -339,50 +341,52 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
         final List<VendorInformationObject> viObjects = new ArrayList<>();
 
         Object obj = null;
-        SvecState state = SvecState.Init;
-        while (!objects.isEmpty() && !state.equals(SvecState.End)) {
+        SvecState state = SvecState.INIT;
+        while (!objects.isEmpty() && !state.equals(SvecState.END)) {
             obj = objects.get(0);
 
             switch (state) {
-            case Init:
-                state = SvecState.OfIn;
+            case INIT:
+                state = SvecState.OF_IN;
                 if (obj instanceof Of) {
                     builder.setOf((Of) obj);
                     break;
                 }
-            case OfIn:
-                state = SvecState.GcIn;
+            case OF_IN:
+                state = SvecState.GC_IN;
                 if (obj instanceof Gc) {
                     builder.setGc((Gc) obj);
                     break;
                 }
-            case GcIn:
-                state = SvecState.XroIn;
+            case GC_IN:
+                state = SvecState.XRO_IN;
                 if (obj instanceof Xro) {
                     builder.setXro((Xro) obj);
                     break;
                 }
-            case XroIn:
-                state = SvecState.MetricIn;
+            case XRO_IN:
+                state = SvecState.METRIC_IN;
                 if (obj instanceof Metric) {
                     metrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
-                    state = SvecState.XroIn;
+                    state = SvecState.XRO_IN;
                     break;
                 }
-            case MetricIn:
-                state = SvecState.VendorInfo;
+            case METRIC_IN:
+                state = SvecState.VENDOR_INFO;
                 if (obj instanceof VendorInformationObject) {
                     viObjects.add((VendorInformationObject) obj);
-                    state = SvecState.MetricIn;
+                    state = SvecState.METRIC_IN;
                     break;
                 }
-            case VendorInfo:
-                state = SvecState.End;
+            case VENDOR_INFO:
+                state = SvecState.END;
+                break;
+            case END:
                 break;
-            case End:
+            default:
                 break;
             }
-            if (!state.equals(SvecState.End)) {
+            if (!state.equals(SvecState.END)) {
                 objects.remove(0);
             }
         }
@@ -393,6 +397,6 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
     }
 
     private enum SvecState {
-        Init, OfIn, GcIn, XroIn, MetricIn, VendorInfo, End
+        INIT, OF_IN, GC_IN, XRO_IN, METRIC_IN, VENDOR_INFO, END
     }
 }
index d65ee1e1d82e8580422099832608266f809cd0f3..55a37946632721c4f872020ea4cb0de283440ad5 100644 (file)
@@ -50,7 +50,7 @@ public class FiniteStateMachineTest extends AbstractPCEPSessionTest {
         assertEquals(2, this.msgsSend.size());
         assertTrue(this.msgsSend.get(1) instanceof Keepalive);
         this.serverSession.handleMessage(this.kaMsg);
-        assertEquals(this.serverSession.getState(), DefaultPCEPSessionNegotiator.State.Finished);
+        assertEquals(this.serverSession.getState(), DefaultPCEPSessionNegotiator.State.FINISHED);
     }
 
     /**
@@ -71,7 +71,7 @@ public class FiniteStateMachineTest extends AbstractPCEPSessionTest {
         assertEquals(3, this.msgsSend.size());
         assertTrue(this.msgsSend.get(2) instanceof Open);
         this.serverSession.handleMessage(this.kaMsg);
-        assertEquals(this.serverSession.getState(), DefaultPCEPSessionNegotiator.State.Finished);
+        assertEquals(this.serverSession.getState(), DefaultPCEPSessionNegotiator.State.FINISHED);
     }
 
     /**
index 46f632237dc594553d30fc50484c67164f1f709f..db3d81e59e653f42bee5692dadbd4403671821bc 100644 (file)
@@ -87,7 +87,7 @@ public class PCEPSessionImplTest extends AbstractPCEPSessionTest {
         // exceeded max. unknown messages count - terminate session
         Assert.assertTrue(this.msgsSend.get(1) instanceof CloseMessage);
         final CloseMessage closeMsg = (CloseMessage) this.msgsSend.get(1);
-        Assert.assertEquals(TerminationReason.TooManyUnknownMsg, TerminationReason.forValue(closeMsg.getCCloseMessage().getCClose().getReason()));
+        Assert.assertEquals(TerminationReason.TOO_MANY_UNKNOWN_MSGS, TerminationReason.forValue(closeMsg.getCCloseMessage().getCClose().getReason()));
         Mockito.verify(this.channel, Mockito.times(1)).close();
     }
 
@@ -100,11 +100,11 @@ public class PCEPSessionImplTest extends AbstractPCEPSessionTest {
 
     @Test
     public void testCloseSessionWithReason() {
-        this.session.close(TerminationReason.Unknown);
+        this.session.close(TerminationReason.UNKNOWN);
         Assert.assertEquals(1, this.msgsSend.size());
         Assert.assertTrue(this.msgsSend.get(0) instanceof CloseMessage);
         final CloseMessage closeMsg = (CloseMessage) this.msgsSend.get(0);
-        Assert.assertEquals(TerminationReason.Unknown, TerminationReason.forValue(closeMsg.getCCloseMessage().getCClose().getReason()));
+        Assert.assertEquals(TerminationReason.UNKNOWN, TerminationReason.forValue(closeMsg.getCCloseMessage().getCClose().getReason()));
         Mockito.verify(this.channel, Mockito.times(1)).close();
     }
 
index 1276ae4a5028c4e2eec85dccaf6f7357ea88651e..7f7a6455b30d502c0e5b5c3e624a1649edfa81b5 100644 (file)
@@ -37,6 +37,6 @@ public class ServerSessionMock extends PCEPSessionImpl {
 
     @Override
     public void close() {
-        this.client.onSessionTerminated(this, new PCEPCloseTermination(TerminationReason.Unknown));
+        this.client.onSessionTerminated(this, new PCEPCloseTermination(TerminationReason.UNKNOWN));
     }
 }
index 393d4e441c6cf17c04fd90ebe3e6f56764c88bda..1b6a5616ee1523522f391d6958269edacd6cb3e7 100644 (file)
@@ -60,7 +60,7 @@ public class SimpleSessionListener implements PCEPSessionListener {
             final Pcupd updMsg = (Pcupd) message;
             final Updates updates = updMsg.getPcupdMessage().getUpdates().get(0);
             final long srpId = updates.getSrp().getOperationId().getValue();
-            if (pcError) {
+            if (this.pcError) {
                 session.sendMessage(MsgBuilderUtil.createErrorMsg(getRandomError(), srpId));
             } else {
                 final Tlvs tlvs = createLspTlvs(updates.getLsp().getPlspId().getValue(), false,
@@ -104,17 +104,17 @@ public class SimpleSessionListener implements PCEPSessionListener {
                     .getIpPrefix().getIpPrefix().getIpv4Prefix().getValue();
             try {
                 return InetAddress.getByName(prefix.substring(0, prefix.indexOf('/')));
-            } catch (UnknownHostException e) {
-                LOG.warn("Unknown host name {}", prefix);
+            } catch (final UnknownHostException e) {
+                LOG.warn("Unknown host name {}.", prefix, e);
             }
         }
         return this.address;
     }
 
-    private Random rnd = new Random();
+    private final Random rnd = new Random();
 
     private PCEPErrors getRandomError() {
-        return PCEPErrors.values()[rnd.nextInt(PCEPErrors.values().length)];
+        return PCEPErrors.values()[this.rnd.nextInt(PCEPErrors.values().length)];
     }
 
 }
index 632a2ee0382cf1000772c59d8d4d1a64f6be27f3..eeb5b058f58de63ebc9e7a0138cefdc5ca49d0ee 100644 (file)
@@ -56,7 +56,7 @@ public class SrEroSubobjectParser implements EROSubobjectParser, EROSubobjectSer
     private static final int F_FLAG_POSITION = 4;
 
     @Override
-    public void serializeSubobject(Subobject subobject, final ByteBuf buffer) {
+    public void serializeSubobject(final Subobject subobject, final ByteBuf buffer) {
         Preconditions.checkArgument(subobject.getSubobjectType() instanceof SrEroSubobject,
                 "Unknown subobject instance. Passed %s. Needed SrEroSubobject.", subobject.getSubobjectType()
                         .getClass());
@@ -102,13 +102,15 @@ public class SrEroSubobjectParser implements EROSubobjectParser, EROSubobjectSer
                 ByteBufWriteUtil.writeUnsignedInt(unnumbered.getRemoteNodeId(), body);
                 ByteBufWriteUtil.writeUnsignedInt(unnumbered.getRemoteInterfaceId(), body);
                 break;
+            default:
+                break;
             }
         }
         EROSubobjectUtil.formatSubobject(TYPE, subobject.isLoose(), body, buffer);
     }
 
     @Override
-    public Subobject parseSubobject(ByteBuf buffer, boolean loose) throws PCEPDeserializerException {
+    public Subobject parseSubobject(final ByteBuf buffer, final boolean loose) throws PCEPDeserializerException {
         Preconditions.checkArgument(buffer != null && buffer.isReadable(),
                 "Array of bytes is mandatory. Can't be null or empty.");
         if (buffer.readableBytes() <= MINIMAL_LENGTH) {
@@ -120,7 +122,7 @@ public class SrEroSubobjectParser implements EROSubobjectParser, EROSubobjectSer
         final SidType sidType = SidType.forValue(sidTypeByte);
         srEroSubobjectBuilder.setSidType(sidType);
 
-        BitSet bitSet = ByteArray.bytesToBitSet(new byte[] { buffer.readByte() });
+        final BitSet bitSet = ByteArray.bytesToBitSet(new byte[] { buffer.readByte() });
         final boolean f = bitSet.get(F_FLAG_POSITION);
         final boolean s = bitSet.get(S_FLAG_POSITION);
         final boolean c = bitSet.get(C_FLAG_POSITION);
@@ -157,6 +159,8 @@ public class SrEroSubobjectParser implements EROSubobjectParser, EROSubobjectSer
                         .setLocalInterfaceId(buffer.readUnsignedInt()).setRemoteNodeId(buffer.readUnsignedInt())
                         .setRemoteInterfaceId(buffer.readUnsignedInt()).build());
                 break;
+            default:
+                break;
             }
         }
         final SubobjectBuilder subobjectBuilder = new SubobjectBuilder();
index b2dba188f67938b17d7fcaa7ff3f36d0633655a5..ce878e66d61b062243df736c4b06aee285b821f0 100644 (file)
@@ -37,7 +37,7 @@ public final class SimplePCEPExtensionProviderContextModule extends
     @Override
     public boolean canReuseInstance(final AbstractSimplePCEPExtensionProviderContextModule oldModule) {
         return oldModule.getInstance().getClass().equals(ReusablePCEPExtensionProviderContext.class);
-    };
+    }
 
     @Override
     public java.lang.AutoCloseable reuseInstance(final java.lang.AutoCloseable oldInstance) {
index 6d38c5273df825baf569c46dd257db7bb4d61e36..aa696fcd7ff0efcfdb8b06c7bd436749bc1c47cd 100644 (file)
@@ -15,6 +15,9 @@ public final class ServiceLoaderPCEPExtensionProviderContext extends SimplePCEPE
     private static final class Holder {
         private static final PCEPExtensionProviderContext INSTANCE;
 
+        private Holder() {
+        }
+
         static {
             try {
                 INSTANCE = create();
index 8ab6a4da2d44ff0ec8969e5a314a6795a12bcf95..301561c0743a5dc34f5f2339a1db9262279fda09 100644 (file)
@@ -165,7 +165,7 @@ public abstract class AbstractTopologySessionListener<S, L> implements PCEPSessi
             @Override
             public void onFailure(final Throwable t) {
                 LOG.error("Failed to update internal state for session {}, terminating it", session, t);
-                session.close(TerminationReason.Unknown);
+                session.close(TerminationReason.UNKNOWN);
             }
         });
 
@@ -202,6 +202,8 @@ public abstract class AbstractTopologySessionListener<S, L> implements PCEPSessi
                 LOG.debug("Request {} was not sent when session went down, cancelling the instruction", e.getKey());
                 r.done(OperationResults.UNSENT);
                 break;
+            default:
+                break;
             }
         }
         this.requests.clear();
@@ -239,7 +241,7 @@ public abstract class AbstractTopologySessionListener<S, L> implements PCEPSessi
             public void onFailure(final Throwable t) {
                 LOG.error("Failed to update internal state for session {}, closing it", session, t);
                 ctx.notifyRequests();
-                session.close(TerminationReason.Unknown);
+                session.close(TerminationReason.UNKNOWN);
             }
         });
     }
@@ -248,7 +250,7 @@ public abstract class AbstractTopologySessionListener<S, L> implements PCEPSessi
     public void close() {
         unregister();
         if (this.session != null) {
-            this.session.close(TerminationReason.Unknown);
+            this.session.close(TerminationReason.UNKNOWN);
         }
     }
 
index 2689201a7f8d0d93456980ac54fd02289b67ae6a..572da1b77e86d59446e7d9eeb0ecb20f413d588c 100644 (file)
@@ -173,6 +173,8 @@ final class Stateful07TopologySessionListener extends AbstractTopologySessionLis
                         // These are transitive states, so we don't have to do anything, as they will be followed
                         // up...
                         break;
+                    default:
+                        break;
                     }
                     // if remove flag is set in SRP object, remove the tunnel immediately
                     if (srp.getAugmentation(Srp1.class) != null) {
index 2e47d1561034d2961036530c62100345f3d922f1..53063eac747dbe8d065de4c713c8c02b789f0f69 100644 (file)
@@ -295,7 +295,7 @@ public class Stateful07TopologySessionListenerTest extends AbstractPCEPSessionTe
         assertEquals(1, getTopology().get().getNode().size());
 
         // node should be removed after termination
-        this.listener.onSessionTerminated(this.session, new PCEPCloseTermination(TerminationReason.Unknown));
+        this.listener.onSessionTerminated(this.session, new PCEPCloseTermination(TerminationReason.UNKNOWN));
         assertEquals(0, getTopology().get().getNode().size());
     }
 
index 7d9192e3d4483469ba9a1be7918216b848c8bde8..a7b55bb56668cbb2c52a644bb400c0cfc7b75e63 100644 (file)
@@ -11,7 +11,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-
 import org.opendaylight.bgpcep.programming.spi.Instruction;
 import org.opendaylight.bgpcep.programming.spi.InstructionScheduler;
 import org.opendaylight.bgpcep.programming.spi.SchedulerException;
@@ -43,7 +42,7 @@ public abstract class AbstractInstructionExecutor implements FutureCallback<Inst
 
         try {
             s = scheduler.scheduleInstruction(fwd.getInput());
-        } catch (SchedulerException e) {
+        } catch (final SchedulerException e) {
             LOG.info("Instuction {} failed to schedule", e.getMessage(), e);
             return new FailureCaseBuilder().setFailure(e.getFailure()).build();
         }
@@ -70,6 +69,8 @@ public abstract class AbstractInstructionExecutor implements FutureCallback<Inst
                         case Unsent:
                             insn.executionCompleted(InstructionStatus.Cancelled, null);
                             break;
+                        default:
+                            break;
                         }
                     } else {
                         insn.executionCompleted(InstructionStatus.Successful, null);
index 5b9ba41878d51fb2a16588e1bb2eec474cd3926c..ede798d7207f4f608597d089c4ebdf2ca1cb1df7 100644 (file)
@@ -252,7 +252,7 @@ public final class TunnelProgramming implements TopologyTunnelPcepProgrammingSer
                     final InstanceIdentifier<Link> lii = NodeChangedListener.linkIdentifier(tii, ab.getNode(), ab.getName());
                     try {
                         Preconditions.checkState(! t.read(LogicalDatastoreType.OPERATIONAL, lii).checkedGet().isPresent());
-                    } catch (ReadFailedException e) {
+                    } catch (final ReadFailedException e) {
                         throw new IllegalStateException("Failed to ensure link existence.", e);
                     }
 
@@ -267,7 +267,7 @@ public final class TunnelProgramming implements TopologyTunnelPcepProgrammingSer
                     args.setEro(buildEro(input.getExplicitHops()));
                     args.setLspa(new LspaBuilder(input).build());
 
-                    AdministrativeStatus adminStatus = input.getAugmentation(PcepCreateP2pTunnelInput1.class).getAdministrativeStatus();
+                    final AdministrativeStatus adminStatus = input.getAugmentation(PcepCreateP2pTunnelInput1.class).getAdministrativeStatus();
                     if (adminStatus != null) {
                         args.addAugmentation(Arguments2.class, new Arguments2Builder().setLsp(new LspBuilder().setAdministrative((adminStatus == AdministrativeStatus.Active) ? true : false).build()).build());
                     }
@@ -315,6 +315,7 @@ public final class TunnelProgramming implements TopologyTunnelPcepProgrammingSer
                         // The source node has to exist
                         node = sourceNode(t, tii, link).get();
                     } catch (IllegalStateException | ReadFailedException e) {
+                        LOG.debug("Link or node does not exist.", e.getMessage());
                         return Futures.<OperationResult>immediateFuture(new OperationResult() {
                             @Override
                             public Class<? extends DataContainer> getImplementedInterface() {
@@ -374,6 +375,7 @@ public final class TunnelProgramming implements TopologyTunnelPcepProgrammingSer
                         // The source node has to exist
                         node = sourceNode(t, tii, link).get();
                     } catch (IllegalStateException | ReadFailedException e) {
+                        LOG.debug("Link or node does not exist.", e.getMessage());
                         return Futures.<OperationResult>immediateFuture(new OperationResult() {
                             @Override
                             public Class<? extends DataContainer> getImplementedInterface() {
@@ -402,7 +404,7 @@ public final class TunnelProgramming implements TopologyTunnelPcepProgrammingSer
                     args.setEro(buildEro(input.getExplicitHops()));
                     args.setLspa(new LspaBuilder(input).build());
 
-                    AdministrativeStatus adminStatus = input.getAugmentation(PcepUpdateTunnelInput1.class).getAdministrativeStatus();
+                    final AdministrativeStatus adminStatus = input.getAugmentation(PcepUpdateTunnelInput1.class).getAdministrativeStatus();
                     if (adminStatus != null) {
                         args.addAugmentation(Arguments3.class, new Arguments3Builder().setLsp(new LspBuilder().setAdministrative((adminStatus == AdministrativeStatus.Active) ? true : false).build()).build());
                     }
index acf788936bba9885ede8afb346ff7fc9feff9148..2929c82e72f0b650dd865639bf447358c70dc5c4 100644 (file)
@@ -75,6 +75,8 @@ final class InstructionImpl implements Instruction {
         case Scheduled:
         case Successful:
             break;
+        default:
+            break;
         }
     }
 
@@ -119,6 +121,8 @@ final class InstructionImpl implements Instruction {
             LOG.debug("Instruction {} timed out while Scheduled, cancelling it", this.id);
             cancel(this.heldUpDetails);
             break;
+        default:
+            break;
         }
     }
 
@@ -150,9 +154,9 @@ final class InstructionImpl implements Instruction {
         case Scheduled:
             cancel(details);
             return null;
+        default:
+            throw new IllegalStateException("Unhandled instruction state " + this.status);
         }
-
-        throw new IllegalStateException("Unhandled instruction state " + this.status);
     }
 
     @Override
@@ -235,6 +239,8 @@ final class InstructionImpl implements Instruction {
             case Successful:
                 // No-op
                 break;
+            default:
+                break;
             }
         }
         if (!unmet.isEmpty()) {
index 6ebf815ba9f1cd7ef083a4a475993ce691f61bfe..bbda508a0fe29e6ae62d67ffe6ab9e5f0f52f90e 100644 (file)
@@ -188,6 +188,8 @@ public final class ProgrammingServiceImpl implements AutoCloseable, InstructionS
                 LOG.debug("Instruction {} cannot be cleaned because of it's in state {}", id, i.getStatus());
                 failed.add(id);
                 continue;
+            default:
+                break;
             }
 
             // The instruction is in a terminal state, we need to just unlink
@@ -228,6 +230,8 @@ public final class ProgrammingServiceImpl implements AutoCloseable, InstructionS
             case Scheduled:
             case Successful:
                 break;
+            default:
+                break;
             }
         }
         /*
index 602bf72f5ea07dc5110fb71308a36eaedc32e8a0..d5e7ecd87261e1fbe7449d6a982ca933dc1a953e 100644 (file)
@@ -17,12 +17,16 @@ import java.nio.charset.CharacterCodingException;
 import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.BitSet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Util class for methods working with byte array.
  */
 public final class ByteArray {
 
+    private static final Logger LOG = LoggerFactory.getLogger(ByteArray.class);
+
     private ByteArray() {
         throw new UnsupportedOperationException();
     }
@@ -284,6 +288,7 @@ public final class ByteArray {
         try {
             return Charset.forName("UTF-8").newDecoder().decode(ByteBuffer.wrap(bytes)).toString();
         } catch (final CharacterCodingException e) {
+            LOG.debug("Could not apply UTF-8 encoding.", e);
             return Arrays.toString(bytes);
         }
     }
index e7fb51da5ecc7583fd10326f1dd09b30b1936c13..06fa8121812bce61b829d9ef454946d3fd58da07 100644 (file)
@@ -13,6 +13,9 @@ package org.opendaylight.protocol.util;
 public final class NoopReferenceCache implements ReferenceCache {
     private static final class Holder {
         static final NoopReferenceCache INSTANCE = new NoopReferenceCache();
+
+        private Holder() {
+        }
     }
 
     private NoopReferenceCache() {