More warnings down: 45/13245/2
authorDana Kutenicsova <dkutenic@cisco.com>
Mon, 1 Dec 2014 08:22:25 +0000 (09:22 +0100)
committerDana Kutenicsova <dkutenic@cisco.com>
Mon, 1 Dec 2014 09:04:15 +0000 (10:04 +0100)
- remove empty statement
- add private constructor where needed
- log exception
- order modifiers
- duplicate string literals

Change-Id: I9456437fd66421dbb040f08f469b2a99851cce66
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
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/BGPDispatcherImpl.java
bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/SimpleSessionListener.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/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgramming.java
util/src/main/java/org/opendaylight/protocol/util/ByteArray.java
util/src/main/java/org/opendaylight/protocol/util/NoopReferenceCache.java

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 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 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 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 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 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 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() {