fix some checkstyle warnings and errors

- WhitespaceAround
- CustomImportOrder
- EmptyLineSeparator
- MultipleVariableDeclarations
- ParenPad
- OperatorWrap
- UnusedImports

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ic1a80872f3796a37c7b4cd46ece39cde89852690

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/BaseParserExtensionActivator.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/BaseParserExtensionActivator.java
index b0ee6dfda77bbaf7807b74cbbecb1e339ca2c19e..7c257f0860984c7efc9591cf8e13ed6f899be729 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/BaseParserExtensionActivator.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/BaseParserExtensionActivator.java
@@ -239,7 +239,7 @@ public final class BaseParserExtensionActivator extends AbstractPCEPExtensionPro
         regs.add(context.registerObjectParser(unreachIpv4Parser));
         regs.add(context.registerObjectParser(unreachIpv6Parser));
 
-        final PCEPUnreachDestinationSerializer unreachSerializer= new PCEPUnreachDestinationSerializer();
+        final PCEPUnreachDestinationSerializer unreachSerializer = new PCEPUnreachDestinationSerializer();
         regs.add(context.registerObjectSerializer(UnreachDestinationObj.class, unreachSerializer));
 
         final PCEPP2MPEndPointsIpv4ObjectParser endpoints4Pp2mparser = new PCEPP2MPEndPointsIpv4ObjectParser();

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java
index cde6e9008bb33fdde2cdc6c0b3c80c2fbaa3f916..7f4898fdbd19fe18223d55fa6d32d9990b0265a6 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java
@@ -194,7 +194,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
             }
         }
         if (p2mp.getIroBncChoice() instanceof IroCase) {
-            serializeObject(((IroCase) p2mp.getIroBncChoice()).getIro(), buffer );
+            serializeObject(((IroCase) p2mp.getIroBncChoice()).getIro(), buffer);
         } else if (p2mp.getIroBncChoice() instanceof BncCase) {
             final BranchNodeType branchNodeType = ((BncCase) p2mp.getIroBncChoice()).getBranchNodeType();
             if (branchNodeType instanceof BranchNodeCase) {
@@ -555,7 +555,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
                     return P2MPState.BANDWIDTH_IN;
                 }
             case METRIC_IN:
-                if (obj instanceof Iro ) {
+                if (obj instanceof Iro) {
                     builder.setIroBncChoice(new IroCaseBuilder().setIro((Iro) obj).build());
                     return P2MPState.IRO_BNC_IN;
                 }
@@ -666,7 +666,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
             objects.remove(0);
         }
         final List<PceIdList> pceIdList = new ArrayList<>();
-        while(!objects.isEmpty() && objects.get(0) instanceof PceId) {
+        while (!objects.isEmpty() && objects.get(0) instanceof PceId) {
             pceIdList.add(new PceIdListBuilder().setPceId((PceId) objects.get(0)).build());
             objects.remove(0);
         }

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractEROWithSubobjectsParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractEROWithSubobjectsParser.java
index 0b05c96ff515dc717db6136c7e9c3e9af7b23a11..8f521d058ef478bc562cc1e1508ce28eabdd914c 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractEROWithSubobjectsParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractEROWithSubobjectsParser.java
@@ -62,7 +62,7 @@ public abstract class AbstractEROWithSubobjectsParser extends CommonObjectParser
     }
 
     protected final void serializeSubobject(final List<Subobject> subobjects, final ByteBuf buffer) {
-        if(subobjects != null) {
+        if (subobjects != null) {
             for (final Subobject subobject : subobjects) {
                 this.subobjReg.serializeSubobject(subobject, buffer);
             }

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPClassTypeObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPClassTypeObjectParser.java
index 23b6c63b0f51d4c2e8d717df2c5d82fb3ae3e107..11d7f9d6e0f96289f207ab056487f4dd17ca57ce 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPClassTypeObjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPClassTypeObjectParser.java
@@ -83,7 +83,7 @@ public final class PCEPClassTypeObjectParser extends CommonObjectParser implemen
     public void serializeObject(final Object object, final ByteBuf buffer) {
         Preconditions.checkArgument(object instanceof ClassType, "Wrong instance of PCEPObject. Passed %s. Needed ClassTypeObject.", object.getClass());
         final ByteBuf body = Unpooled.buffer(SIZE);
-        body.writeZero(SIZE -1);
+        body.writeZero(SIZE - 1);
         final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.ClassType classType = ((ClassType) object).getClassType();
         Preconditions.checkArgument(classType != null, "ClassType is mandatory.");
         writeUnsignedByte(classType.getValue(), body);

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPExistingBandwidthObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPExistingBandwidthObjectParser.java
index 6320f7cba4cfa8f5834223bca56b4be42f68f01d..2b3f0b11cad627ca8062abba3089094aee02a2c1 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPExistingBandwidthObjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPExistingBandwidthObjectParser.java
@@ -50,8 +50,8 @@ public class PCEPExistingBandwidthObjectParser extends CommonObjectParser implem
 
     @Override
     public void serializeObject(final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.Object object, final ByteBuf buffer) {
-        Preconditions.checkArgument(object instanceof ReoptimizationBandwidth, "Wrong instance of PCEPObject. Passed " +
-            "%s. Needed ReoptimizationBandwidthObject.", object.getClass());
+        Preconditions.checkArgument(object instanceof ReoptimizationBandwidth, "Wrong instance of PCEPObject. Passed "
+            + "%s. Needed ReoptimizationBandwidthObject.", object.getClass());
         final ByteBuf body = Unpooled.buffer();
         writeFloat32(((ReoptimizationBandwidth) object).getBandwidth(), body);
         ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPNoPathObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPNoPathObjectParser.java
index 4f0222d940fe23f4099806901cf98dd1fba16f34..bc7ab38d06b90b3968102778fc6391f799d8ea9d 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPNoPathObjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPNoPathObjectParser.java
@@ -103,7 +103,7 @@ public class PCEPNoPathObjectParser extends AbstractObjectWithTlvsParser<TlvsBui
 
     @Override
     protected final void addVendorInformationTlvs(final TlvsBuilder builder, final List<VendorInformationTlv> tlvs) {
-        if(!tlvs.isEmpty()) {
+        if (!tlvs.isEmpty()) {
             builder.setVendorInformationTlv(tlvs);
         }
     }

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPOpenObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPOpenObjectParser.java
index 5f817da80b7a719d8e7a72840c4481bc51ecfaf5..ad4709758fe5bc08093a4c55c701d008b8ccde4c 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPOpenObjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPOpenObjectParser.java
@@ -72,7 +72,7 @@ public class PCEPOpenObjectParser extends AbstractObjectWithTlvsParser<TlvsBuild
         final short keepalive = bytes.readUnsignedByte();
         builder.setKeepalive(keepalive);
         final short deadTimer = bytes.readUnsignedByte();
-        if(keepalive == 0) {
+        if (keepalive == 0) {
             builder.setDeadTimer((short) 0);
         } else {
             builder.setDeadTimer(deadTimer);

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPRequestParameterObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPRequestParameterObjectParser.java
index 14b59ab184fdf45b354164fee7691356dc178e6a..f7aede3b08006dd841aca9fa4c3178cb6071607b 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPRequestParameterObjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPRequestParameterObjectParser.java
@@ -156,7 +156,7 @@ public class PCEPRequestParameterObjectParser extends AbstractObjectWithTlvsPars
         final byte[] res = flags.array();
         if (rpObj.getPriority() != null) {
             final byte p = UnsignedBytes.checkedCast(rpObj.getPriority());
-            res[res.length -1] = (byte) (res[res.length -1] | p);
+            res[res.length - 1] = (byte) (res[res.length - 1] | p);
         }
         body.writeBytes(res);
         Preconditions.checkArgument(rpObj.getRequestId() != null, "RequestId is mandatory");

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/AsNumberCaseParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/AsNumberCaseParser.java
index 48944fdc555fe3c9481c7030a28c69cac69d12a5..97e129b385f07fa34822cbb02d6295cf56841d9a 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/AsNumberCaseParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/AsNumberCaseParser.java
@@ -8,6 +8,7 @@
 package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeShort;
+
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROIpv4PrefixSubobjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROIpv4PrefixSubobjectParser.java
index 919a694243177dc87aae250bab54f273d04e7fed..7ced9af109191f6a164c136ab10aad33f49039b6 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROIpv4PrefixSubobjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROIpv4PrefixSubobjectParser.java
@@ -8,6 +8,7 @@
 package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeIpv4Prefix;
+
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROIpv6PrefixSubobjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROIpv6PrefixSubobjectParser.java
index c6f117354d0b165b99566393886311e2b524feb3..c2767465816c6d46e0503fe9b9e7f36717679abf 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROIpv6PrefixSubobjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROIpv6PrefixSubobjectParser.java
@@ -8,6 +8,7 @@
 package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeIpv6Prefix;
+
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv4PrefixSubobjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv4PrefixSubobjectParser.java
index 4744ea32d478b0add662535045172b1cb565c206..2f2def5eb66e04ec3a50692de261918816a744ed 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv4PrefixSubobjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv4PrefixSubobjectParser.java
@@ -8,6 +8,7 @@
 package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeIpv4Prefix;
+
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv6PrefixSubobjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv6PrefixSubobjectParser.java
index a254e04c14981212f5aec80948e4945f0aee2d16..baa7f03895cf92dea86566f7969f7145d937def0 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv6PrefixSubobjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROIpv6PrefixSubobjectParser.java
@@ -8,6 +8,7 @@
 package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeIpv6Prefix;
+
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROIpv4PrefixSubobjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROIpv4PrefixSubobjectParser.java
index 558e4419b3dd5b92243ebe38af35f47baea8c57e..48e392fdd0b7b1773b11687c0df3bc4838f15a28 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROIpv4PrefixSubobjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROIpv4PrefixSubobjectParser.java
@@ -9,6 +9,7 @@ package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeIpv4Prefix;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
+
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROIpv6PrefixSubobjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROIpv6PrefixSubobjectParser.java
index 897496cf7fa6d3dc97bc0902e2413eddff9a7457..05fdaf49bd549f44f9576b8e80e2d84e1152c14c 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROIpv6PrefixSubobjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROIpv6PrefixSubobjectParser.java
@@ -9,6 +9,7 @@ package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeIpv6Prefix;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
+
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROSRLGSubobjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROSRLGSubobjectParser.java
index 9789c1ae398ea095bc482fb2521d9789593a3b35..551d7d99d37fb4faeb31aac59ebc0163ce66665c 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROSRLGSubobjectParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/XROSRLGSubobjectParser.java
@@ -9,6 +9,7 @@ package org.opendaylight.protocol.pcep.parser.subobject;
 
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedByte;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
+
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/util/Util.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/util/Util.java
index ad3930ccfb5fe6daffc188e5a8d3966b14c2d4bc..7cfa3c9bb51d5fd6b03fa33ae34fda399659a9d5 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/util/Util.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/util/Util.java
@@ -26,7 +26,7 @@ public final class Util {
     }
 
     private static State insertObject(final MetricPceBuilder metricPceBuilder, final State state, final Object obj) {
-        switch(state) {
+        switch (state) {
         case START :
             if (obj instanceof ProcTime) {
                 metricPceBuilder.setProcTime((ProcTime) obj);

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java
index 51f0b8ca72fe1f198f68d4dfceaf7b49ea160932..8289bab6861b10ee73956001d3de8bb01b283e60 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java
@@ -83,7 +83,9 @@ public abstract class AbstractPCEPSessionNegotiator extends AbstractSessionNegot
     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 boolean localOK;
+    private volatile boolean openRetry;
+    private volatile boolean remoteOK;
     private volatile State state = State.IDLE;
     private Future<?> failTimer;
     private Open localPrefs;

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/BasePCEPSessionProposalFactory.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/BasePCEPSessionProposalFactory.java
index a1a96ca53aef8030979e1ec1729295498d8d8eb8..c1a3a52da88d0cec20b907607241d8f9f044e4fe 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/BasePCEPSessionProposalFactory.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/BasePCEPSessionProposalFactory.java
@@ -25,13 +25,14 @@ public final class BasePCEPSessionProposalFactory implements PCEPSessionProposal
     private static final Logger LOG = LoggerFactory.getLogger(BasePCEPSessionProposalFactory.class);
     private static final int KA_TO_DEADTIMER_RATIO = 4;
 
-    private final int keepAlive, deadTimer;
+    private final int keepAlive;
+    private final int deadTimer;
     private final List<PCEPCapability> capabilities;
 
     public BasePCEPSessionProposalFactory(final int deadTimer, final int keepAlive, final List<PCEPCapability> capabilities) {
-        if(keepAlive != 0) {
+        if (keepAlive != 0) {
             Preconditions.checkArgument(keepAlive >= 1, "Minimum value for keep-alive-timer-value is 1");
-            if(deadTimer != 0 && (deadTimer / keepAlive != KA_TO_DEADTIMER_RATIO)) {
+            if (deadTimer != 0 && (deadTimer / keepAlive != KA_TO_DEADTIMER_RATIO)) {
                 LOG.warn("dead-timer-value should be {} times greater than keep-alive-timer-value", KA_TO_DEADTIMER_RATIO);
             }
         }
@@ -53,7 +54,7 @@ public final class BasePCEPSessionProposalFactory implements PCEPSessionProposal
         final OpenBuilder oBuilder = new OpenBuilder();
         oBuilder.setSessionId((short) sessionId);
         oBuilder.setKeepalive((short) BasePCEPSessionProposalFactory.this.keepAlive);
-        if(BasePCEPSessionProposalFactory.this.keepAlive == 0) {
+        if (BasePCEPSessionProposalFactory.this.keepAlive == 0) {
             oBuilder.setDeadTimer((short) 0);
         } else {
             oBuilder.setDeadTimer((short) BasePCEPSessionProposalFactory.this.deadTimer);

diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java
index 9e65c14852180cfbf7bf95f0f7fef320c542adcd..0cf55d977011d66a0b23f7ca2d3b94da82ccbc04 100644 (file)
--- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java
+++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java
@@ -149,7 +149,7 @@ public class FiniteStateMachineTest extends AbstractPCEPSessionTest {
         assertEquals(1, this.msgsSend.size());
         assertTrue(this.msgsSend.get(0) instanceof Open);
         this.serverSession.handleMessage(this.kaMsg);
-        checkEquals(()-> {
+        checkEquals(() -> {
             for (final Notification m : this.msgsSend) {
                 if (m instanceof Pcerr) {
                     final Errors obj = ((Pcerr) m).getPcerrMessage().getErrors().get(0);
@@ -211,28 +211,28 @@ public class FiniteStateMachineTest extends AbstractPCEPSessionTest {
         PCEPSessionImpl.setTicker(this.ticker);
         session.handleMalformedMessage(PCEPErrors.CAPABILITY_NOT_SUPPORTED);
         final Queue<Long> qeue = session.getUnknownMessagesTimes();
-        CheckTestUtil.checkEquals(()-> assertEquals(1, qeue.size()));
+        CheckTestUtil.checkEquals(() -> assertEquals(1, qeue.size()));
         session.handleMalformedMessage(PCEPErrors.CAPABILITY_NOT_SUPPORTED);
-        CheckTestUtil.checkEquals(()-> assertEquals(2, qeue.size()));
+        CheckTestUtil.checkEquals(() -> assertEquals(2, qeue.size()));
         session.handleMalformedMessage(PCEPErrors.CAPABILITY_NOT_SUPPORTED);
-        CheckTestUtil.checkEquals(()-> assertEquals(3, qeue.size()));
+        CheckTestUtil.checkEquals(() -> assertEquals(3, qeue.size()));
         session.handleMalformedMessage(PCEPErrors.CAPABILITY_NOT_SUPPORTED);
-        CheckTestUtil.checkEquals(()-> assertEquals(4, qeue.size()));
+        CheckTestUtil.checkEquals(() -> assertEquals(4, qeue.size()));
         session.handleMalformedMessage(PCEPErrors.CAPABILITY_NOT_SUPPORTED);
-        CheckTestUtil.checkEquals(()-> assertEquals(3, qeue.size()));
+        CheckTestUtil.checkEquals(() -> assertEquals(3, qeue.size()));
         session.handleMalformedMessage(PCEPErrors.CAPABILITY_NOT_SUPPORTED);
-        CheckTestUtil.checkEquals(()-> assertEquals(3, qeue.size()));
+        CheckTestUtil.checkEquals(() -> assertEquals(3, qeue.size()));
         session.handleMalformedMessage(PCEPErrors.CAPABILITY_NOT_SUPPORTED);
-        CheckTestUtil.checkEquals(()-> assertEquals(4, qeue.size()));
+        CheckTestUtil.checkEquals(() -> assertEquals(4, qeue.size()));
         session.handleMalformedMessage(PCEPErrors.CAPABILITY_NOT_SUPPORTED);
-        CheckTestUtil.checkEquals(()-> assertEquals(5, qeue.size()));
+        CheckTestUtil.checkEquals(() -> assertEquals(5, qeue.size()));
         session.handleMalformedMessage(PCEPErrors.CAPABILITY_NOT_SUPPORTED);
         synchronized (client) {
             while (client.up) {
                 client.wait();
             }
         }
-        CheckTestUtil.checkEquals(()-> assertTrue(!client.up));
+        CheckTestUtil.checkEquals(() -> assertTrue(!client.up));
     }
 
     private final class TestTicker extends Ticker {

diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java
index a2e5ec3cbfb4ea105a6700c235deb68a7bbbaa54..aeb29a195694bbd0b8f749d2ce57558f003fa562 100644 (file)
--- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java
+++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java
@@ -169,7 +169,8 @@ public class PCEPSessionImplTest extends AbstractPCEPSessionTest {
         try {
             this.session.sessionUp();
             Assert.fail();  // expect the exception to be populated
-        } catch (final RuntimeException ignored) {}
+        } catch (final RuntimeException ignored) {
+        }
         Assert.assertFalse(this.listener.up);
         Mockito.verify(this.session).handleException(ArgumentMatchers.any());
         Mockito.verify(this.session).sendMessage(ArgumentMatchers.any(CloseMessage.class));

diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPTlvParserTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPTlvParserTest.java
index b945af77d50f956cc4ae1a6f1db9e25fe94e29cf..2ccb52338a1b29d8bc390bda1df92b68804a07d8 100644 (file)
--- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPTlvParserTest.java
+++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPTlvParserTest.java
@@ -148,13 +148,13 @@ public class PCEPTlvParserTest {
         assertArrayEquals(PST_TLV_BYTES, ByteArray.getAllBytes(buff));
     }
 
-    @Test(expected=PCEPDeserializerException.class)
+    @Test(expected = PCEPDeserializerException.class)
     public void testUnsupportedPSTParser() throws PCEPDeserializerException {
         final PathSetupTypeTlvParser parser = new PathSetupTypeTlvParser();
         parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(PST_TLV_BYTES_UNSUPPORTED, 4)));
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testUnsupportedPSTSerializer() {
         final PathSetupTypeTlvParser parser = new PathSetupTypeTlvParser();
         final PathSetupType pstTlv = new PathSetupTypeBuilder().setPst((short) 1).build();

diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java
index 52e7cff98f24a0c2223f507f5b28a865fb5aee02..b9c96f925ce9869d9b8dda3ef50c630f75795c44 100644 (file)
--- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java
+++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java
@@ -58,10 +58,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.P2mpLeaves;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.ProtocolVersion;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.RequestId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.bandwidth.object.BandwidthBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.bnc.object.branch.node.type.BranchNodeCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.branch.node.object.BranchNodeListBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.close.message.CCloseMessageBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.bandwidth.object.BandwidthBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.close.object.CCloseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.close.object.c.close.TlvsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.endpoints.address.family.Ipv4CaseBuilder;

diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/SslContextFactoryTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/SslContextFactoryTest.java
index 10f2301d102c1926d1c8cdce856457790a6a3e5c..f2d2a858119782394a729bc82251e7a5d552b760 100644 (file)
--- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/SslContextFactoryTest.java
+++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/SslContextFactoryTest.java
@@ -9,6 +9,7 @@
 package org.opendaylight.protocol.pcep.impl;
 
 import static org.junit.Assert.assertNotNull;
+
 import javax.net.ssl.SSLContext;
 import org.junit.Test;
 import org.opendaylight.protocol.pcep.impl.tls.SslContextFactory;

diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/TestVendorInformationTlvParser.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/TestVendorInformationTlvParser.java
index 61c00d8318c21016cfca805d866aaf57079cba5f..2f037a0f3d1cbce6c174e11b46f049986705bf3d 100644 (file)
--- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/TestVendorInformationTlvParser.java
+++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/TestVendorInformationTlvParser.java
@@ -10,7 +10,6 @@ package org.opendaylight.protocol.pcep.impl;
 
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.protocol.pcep.parser.tlv.AbstractVendorInformationTlvParser;
-import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.iana.rev130816.EnterpriseNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.vendor.information.EnterpriseSpecificInformation;
 

diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/UtilTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/UtilTest.java
index 8afb6183b37fb12f7a4e3c5be379cfdeba8de352..368264c0aca3f8229d39424e2c1143a0f5b24e22 100644 (file)
--- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/UtilTest.java
+++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/UtilTest.java
@@ -49,7 +49,7 @@ public class UtilTest {
         Assert.assertEquals(PCEPErrors.BAD_LABEL_VALUE.getErrorValue(), errorObject.getValue().shortValue());
     }
 
-    @Test(expected=UnsupportedOperationException.class)
+    @Test(expected = UnsupportedOperationException.class)
     public void testPrivateConstructor() throws Throwable {
         final Constructor<Util> c = Util.class.getDeclaredConstructor();
         c.setAccessible(true);