Fix checkstyle in ietf-stateful07 47/80847/2
authorRobert Varga <robert.varga@pantheon.tech>
Thu, 14 Mar 2019 10:04:36 +0000 (11:04 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Thu, 14 Mar 2019 11:01:09 +0000 (12:01 +0100)
This fixes all offenders and the flips the switch on.

JIRA: BGPCEP-715
Change-Id: I8a7ab1fa50626413cc1294c69bb471a05d97be6f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
26 files changed:
pcep/ietf-stateful07/pom.xml
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/CInitiated00LspObjectParser.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/initiated00/CInitiated00SrpObjectParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/CInitiated00StatefulCapabilityTlvParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PCEPStatefulCapability.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PathBindingTlvParser.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/Stateful07LSPIdentifierIpv4TlvParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LSPIdentifierIpv6TlvParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LspObjectParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LspSymbolicNameTlvParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LspUpdateErrorTlvParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LspaObjectParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07OpenObjectParser.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/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07RSVPErrorSpecTlvParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07SrpObjectParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07StatefulCapabilityTlvParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/sync/optimizations/LspDbVersionTlvParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/sync/optimizations/SyncOptimizationsCapabilityTlvParser.java
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPStatefulCapabilityTest.java
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPTlvParserTest.java
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPValidatorTest.java

index 3bd84a8b43a6722fd98487f0c1821c6a0e3515f4..e9231aa5a81b77e1567550c7c9118a150db87639 100644 (file)
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <configuration>
-                    <violationSeverity>warn</violationSeverity>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/bgpcep.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/bgpcep.git</developerConnection>
index 2b015ef100d52862e6cc740d69b9aa9cfbe367ff..c6f080d2518fc860bd0450b65038eeb9abcfd509 100644 (file)
@@ -19,7 +19,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.iet
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.LspBuilder;
 
 /**
- * Parser for {@link Lsp}
+ * Parser for {@link Lsp}.
  */
 public class CInitiated00LspObjectParser extends Stateful07LspObjectParser {
 
@@ -37,11 +37,11 @@ public class CInitiated00LspObjectParser extends Stateful07LspObjectParser {
         builder.setRemove(flags.get(REMOVE));
         builder.setAdministrative(flags.get(ADMINISTRATIVE));
         builder.addAugmentation(Lsp1.class, new Lsp1Builder().setCreate(flags.get(CREATE_FLAG_OFFSET)).build());
-        short s = 0;
-        s |= flags.get(OPERATIONAL + 2) ? 1 : 0;
-        s |= (flags.get(OPERATIONAL + 1) ? 1 : 0) << 1;
-        s |= (flags.get(OPERATIONAL) ? 1 : 0) << 2;
-        builder.setOperational(OperationalStatus.forValue(s));
+        short oper = 0;
+        oper |= flags.get(OPERATIONAL + 2) ? 1 : 0;
+        oper |= (flags.get(OPERATIONAL + 1) ? 1 : 0) << 1;
+        oper |= (flags.get(OPERATIONAL) ? 1 : 0) << 2;
+        builder.setOperational(OperationalStatus.forValue(oper));
     }
 
     @Override
index 9848d0f45ad107a1013bb2a6f0201896eed4ea13..c646f0693dee97458bdcfb3a7ccc49f18f0d64f4 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.protocol.pcep.ietf.initiated00;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.google.common.collect.Lists;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -15,7 +16,6 @@ import java.util.List;
 import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.MessageUtil;
 import org.opendaylight.protocol.pcep.spi.ObjectRegistry;
-import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.Pcinitiate;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.PcinitiateBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.PcinitiateMessageBuilder;
@@ -35,7 +35,7 @@ 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.metric.object.Metric;
 
 /**
- * Parser for {@link Pcinitiate}
+ * Parser for {@link Pcinitiate}.
  */
 public class CInitiated00PCInitiateMessageParser extends AbstractMessageParser {
 
@@ -47,8 +47,10 @@ public class CInitiated00PCInitiateMessageParser extends AbstractMessageParser {
 
     @Override
     public void serializeMessage(final Message message, final ByteBuf out) {
-        Preconditions.checkArgument(message instanceof Pcinitiate, "Wrong instance of Message. Passed instance of %s. Need PcinitiateMessage.", message.getClass());
-        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109.pcinitiate.message.PcinitiateMessage init = ((Pcinitiate) message).getPcinitiateMessage();
+        checkArgument(message instanceof Pcinitiate,
+            "Wrong instance of Message. Passed instance of %s. Need PcinitiateMessage.", message.getClass());
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev181109
+            .pcinitiate.message.PcinitiateMessage init = ((Pcinitiate) message).getPcinitiateMessage();
         final ByteBuf buffer = Unpooled.buffer();
         for (final Requests req : init.getRequests()) {
             serializeRequest(req, buffer);
@@ -72,8 +74,8 @@ public class CInitiated00PCInitiateMessageParser extends AbstractMessageParser {
     }
 
     @Override
-    protected Message validate(final List<Object> objects, final List<Message> errors) throws PCEPDeserializerException {
-        Preconditions.checkArgument(objects != null, "Passed list can't be null.");
+    protected Message validate(final List<Object> objects, final List<Message> errors) {
+        checkArgument(objects != null, "Passed list can't be null.");
         final PcinitiateMessageBuilder builder = new PcinitiateMessageBuilder();
         final List<Requests> reqs = Lists.newArrayList();
         while (!objects.isEmpty()) {
@@ -109,41 +111,47 @@ public class CInitiated00PCInitiateMessageParser extends AbstractMessageParser {
     private static State insertObject(final State state, final Object obj, final RequestsBuilder builder,
             final List<Metrics> metrics) {
         switch (state) {
-        case INIT:
-            if (obj instanceof EndpointsObj) {
-                builder.setEndpointsObj((EndpointsObj) obj);
-                return State.ENDPOINTS_IN;
-            }
-        case ENDPOINTS_IN:
-            if (obj instanceof Ero) {
-                builder.setEro((Ero) obj);
-                return State.ERO_IN;
-            }
-        case ERO_IN:
-            if (obj instanceof Lspa) {
-                builder.setLspa((Lspa) obj);
-                return State.LSPA_IN;
-            }
-        case LSPA_IN:
-            if (obj instanceof Bandwidth) {
-                builder.setBandwidth((Bandwidth) obj);
-                return State.BANDWIDTH_IN;
-            }
-        case BANDWIDTH_IN:
-            if (obj instanceof Metric) {
-                metrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
-                return State.BANDWIDTH_IN;
-            }
-        case METRIC_IN:
-            if (obj instanceof Iro) {
-                builder.setIro((Iro) obj);
-                return State.IRO_IN;
-            }
-        case IRO_IN:
-        case END:
-            return State.END;
-        default:
-            return state;
+            case INIT:
+                if (obj instanceof EndpointsObj) {
+                    builder.setEndpointsObj((EndpointsObj) obj);
+                    return State.ENDPOINTS_IN;
+                }
+                // fall through
+            case ENDPOINTS_IN:
+                if (obj instanceof Ero) {
+                    builder.setEro((Ero) obj);
+                    return State.ERO_IN;
+                }
+                // fall through
+            case ERO_IN:
+                if (obj instanceof Lspa) {
+                    builder.setLspa((Lspa) obj);
+                    return State.LSPA_IN;
+                }
+                // fall through
+            case LSPA_IN:
+                if (obj instanceof Bandwidth) {
+                    builder.setBandwidth((Bandwidth) obj);
+                    return State.BANDWIDTH_IN;
+                }
+                // fall through
+            case BANDWIDTH_IN:
+                if (obj instanceof Metric) {
+                    metrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
+                    return State.BANDWIDTH_IN;
+                }
+                // fall through
+            case METRIC_IN:
+                if (obj instanceof Iro) {
+                    builder.setIro((Iro) obj);
+                    return State.IRO_IN;
+                }
+                // fall through
+            case IRO_IN:
+            case END:
+                return State.END;
+            default:
+                return state;
         }
     }
 
index ee7721c050b06d3f699d2b2a9e0a9d9f91cdcd44..d33fad6006c279ed987d3673b6b8b6e56a3d94b7 100644 (file)
@@ -18,7 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.iet
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.srp.object.SrpBuilder;
 
 /**
- * Parser for {@link Srp}
+ * Parser for {@link Srp}.
  */
 public class CInitiated00SrpObjectParser extends Stateful07SrpObjectParser {
 
index 184bc8eacea76d1751c06d321e18d6d100356cf8..69d6f94b92be74b9deeece8ecb1d25a29906335a 100644 (file)
@@ -16,7 +16,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.iet
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.stateful.capability.tlv.StatefulBuilder;
 
 /**
- * Parser for {@link Stateful}
+ * Parser for {@link Stateful}.
  */
 public class CInitiated00StatefulCapabilityTlvParser extends Stateful07StatefulCapabilityTlvParser {
 
index e54cb62071417e02aad5b6fe53565f7bb50e24f2..dc1e962f3a566bfbc3d4cbb25212d557cc04880c 100644 (file)
@@ -19,10 +19,17 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 
 public class PCEPStatefulCapability implements PCEPCapability {
 
-    private final boolean stateful, active, instant, triggeredSync, triggeredResync, deltaLspSync, includeDbVersion;
+    private final boolean stateful;
+    private final boolean active;
+    private final boolean instant;
+    private final boolean triggeredSync;
+    private final boolean triggeredResync;
+    private final boolean deltaLspSync;
+    private final boolean includeDbVersion;
 
     public PCEPStatefulCapability(final boolean stateful, final boolean active, final boolean instant,
-        final boolean triggeredSync, final boolean triggeredResync, final boolean deltaLspSync, final boolean includeDbVersion){
+            final boolean triggeredSync, final boolean triggeredResync, final boolean deltaLspSync,
+            final boolean includeDbVersion) {
         this.stateful = stateful || active || triggeredSync || triggeredResync || deltaLspSync || includeDbVersion;
         this.active = active;
         this.instant = instant;
@@ -40,16 +47,18 @@ public class PCEPStatefulCapability implements PCEPCapability {
     @Override
     public void setCapabilityProposal(final InetSocketAddress address, final TlvsBuilder builder) {
         if (this.stateful) {
-            builder.addAugmentation(
-                Tlvs1.class, new Tlvs1Builder()
-                    .setStateful( new StatefulBuilder().setLspUpdateCapability(this.active)
+            builder.addAugmentation(Tlvs1.class, new Tlvs1Builder()
+                    .setStateful(new StatefulBuilder().setLspUpdateCapability(this.active)
                         .addAugmentation(Stateful1.class, new Stateful1Builder().setInitiation(this.instant).build())
-                        .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1Builder()
-                            .setTriggeredInitialSync(this.triggeredSync)
-                            .setTriggeredResync(this.triggeredResync)
-                            .setDeltaLspSyncCapability(this.deltaLspSync)
-                            .setIncludeDbVersion(this.includeDbVersion)
-                            .build())
+                        .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller
+                                .pcep.sync.optimizations.rev181109.Stateful1.class, new org.opendaylight.yang.gen.v1.urn
+                                    .opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109
+                                    .Stateful1Builder()
+                                    .setTriggeredInitialSync(this.triggeredSync)
+                                    .setTriggeredResync(this.triggeredResync)
+                                    .setDeltaLspSyncCapability(this.deltaLspSync)
+                                    .setIncludeDbVersion(this.includeDbVersion)
+                                    .build())
                         .build())
                     .build());
         }
index ecbc01551e213b7586a6a38e5bf60cbdaf1f5656..1778735380f4277e2ce4999e835a1d88042d6041 100644 (file)
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.protocol.pcep.ietf.stateful07;
 
 import com.google.common.base.Preconditions;
@@ -30,7 +29,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 import org.opendaylight.yangtools.concepts.Codec;
 
 /**
- * Parser for {@link PathBinding}
+ * Parser for {@link PathBinding}.
  */
 public final class PathBindingTlvParser implements TlvParser, TlvSerializer {
 
@@ -162,14 +161,14 @@ public final class PathBindingTlvParser implements TlvParser, TlvSerializer {
         int getBindingType();
     }
 
-    private static org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.MplsLabel getMplsLabel(
-            final long mplsStackEntry) {
-        return new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.MplsLabel(
-                mplsStackEntry >> LABEL_SHIFT & LABEL_MASK);
+    private static org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.MplsLabel
+        getMplsLabel(final long mplsStackEntry) {
+        return new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125
+                .MplsLabel(mplsStackEntry >> LABEL_SHIFT & LABEL_MASK);
     }
 
-    private static long getMplsStackEntry(
-            final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.MplsLabel mplsLabel) {
+    private static long getMplsStackEntry(final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network
+            .concepts.rev131125.MplsLabel mplsLabel) {
         return mplsLabel.getValue() << LABEL_SHIFT;
     }
 
index e7919561e963a96c990a2d281a4295a63085f242..187b7a7b0f77debbcdd4c8c5ad6c71930d30dede 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.protocol.pcep.ietf.stateful07;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+
 import io.netty.buffer.ByteBuf;
 import java.util.ArrayList;
 import java.util.List;
@@ -42,7 +43,7 @@ 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.rp.object.Rp;
 
 /**
- * Parser for {@link PcerrMessage}
+ * Parser for {@link PcerrMessage}.
  */
 public final class Stateful07ErrorMessageParser extends PCEPErrorMessageParser {
 
@@ -51,7 +52,8 @@ public final class Stateful07ErrorMessageParser extends PCEPErrorMessageParser {
     }
 
     @Override
-    protected void serializeCases(final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcerr.message.PcerrMessage err, final ByteBuf buffer) {
+    protected void serializeCases(final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types
+            .rev181109.pcerr.message.PcerrMessage err, final ByteBuf buffer) {
         if (err.getErrorType() instanceof RequestCase) {
             final List<Rps> rps = ((RequestCase) err.getErrorType()).getRequest().getRps();
             for (final Rps r : rps) {
@@ -67,8 +69,9 @@ public final class Stateful07ErrorMessageParser extends PCEPErrorMessageParser {
     }
 
     @Override
-    protected PcerrMessage validate(final List<Object> objects, final List<Message> errors) throws PCEPDeserializerException {
-        Preconditions.checkArgument(objects != null, "Passed list can't be null.");
+    protected PcerrMessage validate(final List<Object> objects, final List<Message> errors)
+            throws PCEPDeserializerException {
+        checkArgument(objects != null, "Passed list can't be null.");
         if (objects.isEmpty()) {
             throw new PCEPDeserializerException("Error message is empty.");
         }
@@ -101,7 +104,8 @@ public final class Stateful07ErrorMessageParser extends PCEPErrorMessageParser {
         while (!objects.isEmpty() && !state.equals(State.END)) {
             obj = objects.get(0);
             if (obj instanceof UnknownObject) {
-                return new PcerrBuilder().setPcerrMessage(b.setErrors(((UnknownObject) obj).getErrors()).build()).build();
+                return new PcerrBuilder().setPcerrMessage(b.setErrors(((UnknownObject) obj).getErrors()).build())
+                        .build();
             }
             state = insertObject(state, obj, errorObjects, requestParameters, srps, b);
             if (!state.equals(State.END)) {
@@ -115,7 +119,8 @@ public final class Stateful07ErrorMessageParser extends PCEPErrorMessageParser {
             throw new PCEPDeserializerException("Unprocessed Objects: " + objects);
         }
         if (!requestParameters.isEmpty()) {
-            b.setErrorType(new RequestCaseBuilder().setRequest(new RequestBuilder().setRps(requestParameters).build()).build());
+            b.setErrorType(new RequestCaseBuilder().setRequest(new RequestBuilder().setRps(requestParameters).build())
+                .build());
         }
         if (!srps.isEmpty()) {
             b.setErrorType(new StatefulCaseBuilder().setStateful(new StatefulBuilder().setSrps(srps).build()).build());
@@ -124,42 +129,48 @@ public final class Stateful07ErrorMessageParser extends PCEPErrorMessageParser {
     }
 
     private static State insertObject(final State state, final Object obj, final List<Errors> errorObjects,
-            final List<Rps> requestParameters, final List<Srps> srps, final PcerrMessageBuilder b){
+            final List<Rps> requestParameters, final List<Srps> srps, final PcerrMessageBuilder builder) {
         switch (state) {
-        case ERROR_IN:
-            if (obj instanceof ErrorObject) {
-                final ErrorObject o = (ErrorObject) obj;
-                errorObjects.add(new ErrorsBuilder().setErrorObject(o).build());
-                return State.ERROR_IN;
-            }
-        case RP_IN:
-            if (obj instanceof Rp) {
-                final Rp o = (Rp) obj;
-                requestParameters.add(new RpsBuilder().setRp(o).build());
-                return State.RP_IN;
-            }
-        case SRP_IN:
-            if (obj instanceof Srp) {
-                final Srp o = (Srp) obj;
-                srps.add(new SrpsBuilder().setSrp(o).build());
-                return State.SRP_IN;
-            }
-        case OPEN:
-            if (obj instanceof Open) {
-                b.setErrorType(new SessionCaseBuilder().setSession(new SessionBuilder().setOpen((Open) obj).build()).build());
-                return State.OPEN_IN;
-            }
-        case ERROR:
-            if (obj instanceof ErrorObject) {
-                final ErrorObject o = (ErrorObject) obj;
-                errorObjects.add(new ErrorsBuilder().setErrorObject(o).build());
-                return State.ERROR;
-            }
-        case OPEN_IN:
-        case END:
-            return State.END;
-        default:
-            return state;
+            case ERROR_IN:
+                if (obj instanceof ErrorObject) {
+                    final ErrorObject o = (ErrorObject) obj;
+                    errorObjects.add(new ErrorsBuilder().setErrorObject(o).build());
+                    return State.ERROR_IN;
+                }
+                // fall through
+            case RP_IN:
+                if (obj instanceof Rp) {
+                    final Rp o = (Rp) obj;
+                    requestParameters.add(new RpsBuilder().setRp(o).build());
+                    return State.RP_IN;
+                }
+                // fall through
+            case SRP_IN:
+                if (obj instanceof Srp) {
+                    final Srp o = (Srp) obj;
+                    srps.add(new SrpsBuilder().setSrp(o).build());
+                    return State.SRP_IN;
+                }
+                // fall through
+            case OPEN:
+                if (obj instanceof Open) {
+                    builder.setErrorType(
+                        new SessionCaseBuilder().setSession(new SessionBuilder().setOpen((Open) obj).build()).build());
+                    return State.OPEN_IN;
+                }
+                // fall through
+            case ERROR:
+                if (obj instanceof ErrorObject) {
+                    final ErrorObject o = (ErrorObject) obj;
+                    errorObjects.add(new ErrorsBuilder().setErrorObject(o).build());
+                    return State.ERROR;
+                }
+                // fall through
+            case OPEN_IN:
+            case END:
+                return State.END;
+            default:
+                return state;
         }
     }
 
index 6dc12d015182b98e24fb6e5ca1054a6013ff748b..702491c9a93e8b1ae2a31a17d3b4984aec94fcb2 100644 (file)
@@ -7,11 +7,11 @@
  */
 package org.opendaylight.protocol.pcep.ietf.stateful07;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeIpv4Address;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeShort;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedShort;
 
-import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
@@ -33,7 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.TunnelId;
 
 /**
- * Parser for {@link LspIdentifiers}
+ * Parser for {@link LspIdentifiers}.
  */
 public final class Stateful07LSPIdentifierIpv4TlvParser implements TlvParser, TlvSerializer {
 
@@ -46,7 +46,8 @@ public final class Stateful07LSPIdentifierIpv4TlvParser implements TlvParser, Tl
         if (buffer == null) {
             return null;
         }
-        Preconditions.checkArgument(buffer.readableBytes() == V4_LENGTH, "Length %s does not match LSP Identifiers Ipv4 tlv length.", buffer.readableBytes());
+        checkArgument(buffer.readableBytes() == V4_LENGTH, "Length %s does not match LSP Identifiers Ipv4 tlv length.",
+                buffer.readableBytes());
         final Ipv4Builder builder = new Ipv4Builder();
         builder.setIpv4TunnelSenderAddress(Ipv4Util.noZoneAddressForByteBuf(buffer));
         final LspId lspId = new LspId((long) buffer.readUnsignedShort());
@@ -59,7 +60,7 @@ public final class Stateful07LSPIdentifierIpv4TlvParser implements TlvParser, Tl
 
     @Override
     public void serializeTlv(final Tlv tlv, final ByteBuf buffer) {
-        Preconditions.checkArgument(tlv instanceof LspIdentifiers, "LspIdentifiersTlv is mandatory.");
+        checkArgument(tlv instanceof LspIdentifiers, "LspIdentifiersTlv is mandatory.");
         final LspIdentifiers lsp = (LspIdentifiers) tlv;
         final AddressFamily afi = lsp.getAddressFamily();
         final ByteBuf body = Unpooled.buffer();
@@ -67,15 +68,15 @@ public final class Stateful07LSPIdentifierIpv4TlvParser implements TlvParser, Tl
             new Stateful07LSPIdentifierIpv6TlvParser().serializeTlv(tlv, buffer);
         }
         final Ipv4 ipv4 = ((Ipv4Case) afi).getIpv4();
-        Preconditions.checkArgument(ipv4.getIpv4TunnelSenderAddress() != null, "Ipv4TunnelSenderAddress is mandatory.");
+        checkArgument(ipv4.getIpv4TunnelSenderAddress() != null, "Ipv4TunnelSenderAddress is mandatory.");
         writeIpv4Address(ipv4.getIpv4TunnelSenderAddress(), body);
-        Preconditions.checkArgument(lsp.getLspId() != null, "LspId is mandatory.");
+        checkArgument(lsp.getLspId() != null, "LspId is mandatory.");
         writeShort(lsp.getLspId().getValue().shortValue(), body);
-        Preconditions.checkArgument(lsp.getTunnelId() != null, "TunnelId is mandatory.");
+        checkArgument(lsp.getTunnelId() != null, "TunnelId is mandatory.");
         writeUnsignedShort(lsp.getTunnelId().getValue(), body);
-        Preconditions.checkArgument(ipv4.getIpv4ExtendedTunnelId() != null, "Ipv4ExtendedTunnelId is mandatory.");
+        checkArgument(ipv4.getIpv4ExtendedTunnelId() != null, "Ipv4ExtendedTunnelId is mandatory.");
         writeIpv4Address(ipv4.getIpv4ExtendedTunnelId(), body);
-        Preconditions.checkArgument(ipv4.getIpv4TunnelEndpointAddress() != null, "Ipv4TunnelEndpointAddress is mandatory.");
+        checkArgument(ipv4.getIpv4TunnelEndpointAddress() != null, "Ipv4TunnelEndpointAddress is mandatory.");
         writeIpv4Address(ipv4.getIpv4TunnelEndpointAddress(), body);
         TlvUtil.formatTlv(TYPE, body, buffer);
     }
index 4ceb6086a6c5e5390896f05ec0e6dfd985c6e6b9..64346aef77578431ff54fa29d3d9d3514f3f5f02 100644 (file)
@@ -7,11 +7,11 @@
  */
 package org.opendaylight.protocol.pcep.ietf.stateful07;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeIpv6Address;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeShort;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedShort;
 
-import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
@@ -32,7 +32,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.TunnelId;
 
 /**
- * Parser for {@link LspIdentifiers}
+ * Parser for {@link LspIdentifiers}.
  */
 public final class Stateful07LSPIdentifierIpv6TlvParser implements TlvParser, TlvSerializer {
 
@@ -45,7 +45,8 @@ public final class Stateful07LSPIdentifierIpv6TlvParser implements TlvParser, Tl
         if (buffer == null) {
             return null;
         }
-        Preconditions.checkArgument(buffer.readableBytes() == V6_LENGTH, "Length %s does not match LSP Identifiers Ipv6 tlv length.", buffer.readableBytes());
+        checkArgument(buffer.readableBytes() == V6_LENGTH, "Length %s does not match LSP Identifiers Ipv6 tlv length.",
+                buffer.readableBytes());
         final Ipv6Builder builder = new Ipv6Builder();
         builder.setIpv6TunnelSenderAddress(Ipv6Util.noZoneAddressForByteBuf(buffer));
         final LspId lspId = new LspId((long) buffer.readUnsignedShort());
@@ -58,19 +59,19 @@ public final class Stateful07LSPIdentifierIpv6TlvParser implements TlvParser, Tl
 
     @Override
     public void serializeTlv(final Tlv tlv, final ByteBuf buffer) {
-        Preconditions.checkArgument(tlv instanceof LspIdentifiers, "LspIdentifiersTlv is mandatory.");
+        checkArgument(tlv instanceof LspIdentifiers, "LspIdentifiersTlv is mandatory.");
         final LspIdentifiers lsp = (LspIdentifiers) tlv;
         final ByteBuf body = Unpooled.buffer();
         final Ipv6 ipv6 = ((Ipv6Case) lsp.getAddressFamily()).getIpv6();
-        Preconditions.checkArgument(ipv6.getIpv6TunnelSenderAddress() != null, "Ipv6TunnelSenderAddress is mandatory.");
+        checkArgument(ipv6.getIpv6TunnelSenderAddress() != null, "Ipv6TunnelSenderAddress is mandatory.");
         writeIpv6Address(ipv6.getIpv6TunnelSenderAddress(), body);
-        Preconditions.checkArgument(lsp.getLspId() != null, "LspId is mandatory.");
+        checkArgument(lsp.getLspId() != null, "LspId is mandatory.");
         writeShort(lsp.getLspId().getValue().shortValue(), body);
-        Preconditions.checkArgument(lsp.getTunnelId() != null, "TunnelId is mandatory.");
+        checkArgument(lsp.getTunnelId() != null, "TunnelId is mandatory.");
         writeUnsignedShort(lsp.getTunnelId().getValue(), body);
-        Preconditions.checkArgument(ipv6.getIpv6ExtendedTunnelId() != null, "Ipv6ExtendedTunnelId is mandatory.");
+        checkArgument(ipv6.getIpv6ExtendedTunnelId() != null, "Ipv6ExtendedTunnelId is mandatory.");
         writeIpv6Address(ipv6.getIpv6ExtendedTunnelId(), body);
-        Preconditions.checkArgument(ipv6.getIpv6TunnelEndpointAddress() != null, "Ipv6TunnelEndpointAddress is mandatory.");
+        checkArgument(ipv6.getIpv6TunnelEndpointAddress() != null, "Ipv6TunnelEndpointAddress is mandatory.");
         writeIpv6Address(ipv6.getIpv6TunnelEndpointAddress(), body);
         TlvUtil.formatTlv(TYPE, body, buffer);
     }
index 4d97cb79d509af6f1f8fe2673aaedc1e83f51ff9..45d333906c3822b07b4823b82a2f6d6ed4ea3a0c 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.protocol.pcep.ietf.stateful07;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeMedium;
-import com.google.common.base.Preconditions;
+
 import com.google.common.primitives.UnsignedBytes;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -37,7 +38,7 @@ 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.vs.tlv.VsTlv;
 
 /**
- * Parser for {@link Lsp}
+ * Parser for {@link Lsp}.
  */
 public class Stateful07LspObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilder> {
 
@@ -63,15 +64,14 @@ public class Stateful07LspObjectParser extends AbstractObjectWithTlvsParser<Tlvs
 
     @Override
     public Lsp parseObject(final ObjectHeader header, final ByteBuf bytes) throws PCEPDeserializerException {
-        Preconditions.checkArgument(bytes != null && bytes.isReadable(),
-            "Array of bytes is mandatory. Can't be null or empty.");
+        checkArgument(bytes != null && bytes.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");
         final LspBuilder builder = new LspBuilder();
         builder.setIgnore(header.isIgnore());
         builder.setProcessingRule(header.isProcessingRule());
         final int[] plspIdRaw
             = new int[] { bytes.readUnsignedByte(), bytes.readUnsignedByte(), bytes.getUnsignedByte(2), };
-        builder.setPlspId(new PlspId((long) ((plspIdRaw[0] << FLAGS_SIZE) | (plspIdRaw[1] << FOUR_BITS_SHIFT)
-            | (plspIdRaw[2] >> FOUR_BITS_SHIFT))));
+        builder.setPlspId(new PlspId((long) (plspIdRaw[0] << FLAGS_SIZE | plspIdRaw[1] << FOUR_BITS_SHIFT
+            | plspIdRaw[2] >> FOUR_BITS_SHIFT)));
         parseFlags(builder, bytes);
         final TlvsBuilder b = new TlvsBuilder();
         parseTlvs(b, bytes.slice());
@@ -85,11 +85,11 @@ public class Stateful07LspObjectParser extends AbstractObjectWithTlvsParser<Tlvs
         builder.setSync(flags.get(SYNC));
         builder.setRemove(flags.get(REMOVE));
         builder.setAdministrative(flags.get(ADMINISTRATIVE));
-        short s = 0;
-        s |= flags.get(OPERATIONAL + 2) ? 1 : 0;
-        s |= (flags.get(OPERATIONAL + 1) ? 1 : 0) << 1;
-        s |= (flags.get(OPERATIONAL) ? 1 : 0) << 2;
-        builder.setOperational(OperationalStatus.forValue(s));
+        short oper = 0;
+        oper |= flags.get(OPERATIONAL + 2) ? 1 : 0;
+        oper |= (flags.get(OPERATIONAL + 1) ? 1 : 0) << 1;
+        oper |= (flags.get(OPERATIONAL) ? 1 : 0) << 2;
+        builder.setOperational(OperationalStatus.forValue(oper));
     }
 
     @Override
@@ -111,10 +111,11 @@ public class Stateful07LspObjectParser extends AbstractObjectWithTlvsParser<Tlvs
 
     @Override
     public void serializeObject(final Object object, final ByteBuf buffer) {
-        Preconditions.checkArgument(object instanceof Lsp, "Wrong instance of PCEPObject. Passed %s . Needed LspObject.", object.getClass());
+        checkArgument(object instanceof Lsp, "Wrong instance of PCEPObject. Passed %s . Needed LspObject.",
+            object.getClass());
         final Lsp specObj = (Lsp) object;
         final ByteBuf body = Unpooled.buffer();
-        Preconditions.checkArgument(specObj.getPlspId() != null, "PLSP-ID not present");
+        checkArgument(specObj.getPlspId() != null, "PLSP-ID not present");
         writeMedium(specObj.getPlspId().getValue().intValue() << FOUR_BITS_SHIFT, body);
         final BitArray flags = serializeFlags(specObj);
         byte op = 0;
@@ -123,8 +124,8 @@ public class Stateful07LspObjectParser extends AbstractObjectWithTlvsParser<Tlvs
             op = (byte) (op << FOUR_BITS_SHIFT);
         }
         final byte[] res = flags.array();
-        res[res.length -1] = (byte) (res[res.length -1] | op);
-        body.writeByte(res[res.length -1]);
+        res[res.length - 1] = (byte) (res[res.length - 1] | op);
+        body.writeByte(res[res.length - 1]);
         serializeTlvs(specObj.getTlvs(), body);
         ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
     }
index acafbdba9ef2e26749dfd873a21c5f697c5f0e56..951d82a1d89e42d5a4a776c68c3d8d6a07848140 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.protocol.pcep.ietf.stateful07;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
@@ -20,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.iet
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.Tlv;
 
 /**
- * Parser for {@link SymbolicPathName}
+ * Parser for {@link SymbolicPathName}.
  */
 public final class Stateful07LspSymbolicNameTlvParser implements TlvParser, TlvSerializer {
 
@@ -31,15 +32,16 @@ public final class Stateful07LspSymbolicNameTlvParser implements TlvParser, TlvS
         if (buffer == null) {
             return null;
         }
-        return new SymbolicPathNameBuilder().setPathName(
-                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.SymbolicPathName(ByteArray.getAllBytes(buffer))).build();
+        return new SymbolicPathNameBuilder().setPathName(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns
+            .yang.pcep.ietf.stateful.rev181109.SymbolicPathName(ByteArray.getAllBytes(buffer))).build();
     }
 
     @Override
     public void serializeTlv(final Tlv tlv, final ByteBuf buffer) {
-        Preconditions.checkArgument(tlv instanceof SymbolicPathName, "SymbolicPathNameTlv is mandatory.");
-        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.SymbolicPathName spn = ((SymbolicPathName) tlv).getPathName();
-        Preconditions.checkArgument(spn != null, "SymbolicPathName is mandatory");
+        checkArgument(tlv instanceof SymbolicPathName, "SymbolicPathNameTlv is mandatory.");
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109
+            .SymbolicPathName spn = ((SymbolicPathName) tlv).getPathName();
+        checkArgument(spn != null, "SymbolicPathName is mandatory");
         TlvUtil.formatTlv(TYPE, Unpooled.copiedBuffer(spn.getValue()), buffer);
     }
 }
index 0b7654659f131f17899ec9b8d0f7914c1136420b..ee7ee20f00b3b53b3077ab6b420c5be67a55675f 100644 (file)
@@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.iet
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.Tlv;
 
 /**
- * Parser for {@link LspErrorCode}
+ * Parser for {@link LspErrorCode}.
  */
 public final class Stateful07LspUpdateErrorTlvParser implements TlvParser, TlvSerializer {
 
index 75e57e1d7580d098044df297cd659aadb1ae285d..6dd19aad7d85340ea755be7101be196f2ae09f27 100644 (file)
@@ -19,7 +19,7 @@ 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.lspa.object.lspa.TlvsBuilder;
 
 /**
- * Parser for Lspa object
+ * Parser for Lspa object.
  */
 public class Stateful07LspaObjectParser extends PCEPLspaObjectParser {
 
index 78ea13ce5b473d85e157c490a53db9a8c2c39067..c62d6db4bd265f5314dcd3753a6b5f1dad222b2b 100644 (file)
@@ -19,7 +19,7 @@ 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.open.object.open.TlvsBuilder;
 
 /**
- * Parser for Open object
+ * Parser for Open object.
  */
 public class Stateful07OpenObjectParser extends PCEPOpenObjectParser {
 
index 697d8480bb98c03847bf1c5259acd57867133447..1063cf2c2854a9908c6dc3f4324c2bd553650aca 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.protocol.pcep.ietf.stateful07;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.google.common.collect.Lists;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -41,7 +42,7 @@ 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.reported.route.object.Rro;
 
 /**
- * Parser for {@link Pcrpt}
+ * Parser for {@link Pcrpt}.
  */
 public class Stateful07PCReportMessageParser extends AbstractMessageParser {
 
@@ -53,7 +54,8 @@ public class Stateful07PCReportMessageParser extends AbstractMessageParser {
 
     @Override
     public void serializeMessage(final Message message, final ByteBuf out) {
-        Preconditions.checkArgument(message instanceof Pcrpt, "Wrong instance of Message. Passed instance of %s. Need Pcrpt.", message.getClass());
+        checkArgument(message instanceof Pcrpt, "Wrong instance of Message. Passed instance of %s. Need Pcrpt.",
+            message.getClass());
         final Pcrpt msg = (Pcrpt) message;
         final List<Reports> reports = msg.getPcrptMessage().getReports();
         final ByteBuf buffer = Unpooled.buffer();
@@ -86,7 +88,7 @@ public class Stateful07PCReportMessageParser extends AbstractMessageParser {
 
     @Override
     public Message validate(final List<Object> objects, final List<Message> errors) throws PCEPDeserializerException {
-        Preconditions.checkArgument(objects != null, "Passed list can't be null.");
+        checkArgument(objects != null, "Passed list can't be null.");
         if (objects.isEmpty()) {
             throw new PCEPDeserializerException("Pcrpt message cannot be empty.");
         }
@@ -137,7 +139,8 @@ public class Stateful07PCReportMessageParser extends AbstractMessageParser {
             final ReportsBuilder builder) {
         if (object instanceof Lsp) {
             final Lsp lsp = (Lsp) object;
-            final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.lsp.Tlvs tlvs = lsp.getTlvs();
+            final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp
+                .object.lsp.Tlvs tlvs = lsp.getTlvs();
             if (!lspViaSR && lsp.getPlspId().getValue() != 0 && (tlvs == null || tlvs.getLspIdentifiers() == null)) {
                 final Message errorMsg = createErrorMsg(PCEPErrors.LSP_IDENTIFIERS_TLV_MISSING, Optional.empty());
                 errors.add(errorMsg);
@@ -186,40 +189,47 @@ public class Stateful07PCReportMessageParser extends AbstractMessageParser {
     private static State insertObject(final State state, final Object obj, final PathBuilder builder,
             final List<Metrics> pathMetrics) {
         switch (state) {
-        case INIT:
-            if (obj instanceof Lspa) {
-                builder.setLspa((Lspa) obj);
-                return State.LSPA_IN;
-            }
-        case LSPA_IN:
-            if (obj instanceof Bandwidth) {
-                builder.setBandwidth((Bandwidth) obj);
-                return State.LSPA_IN;
-            }
-            if (obj instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.reoptimization.bandwidth.object.ReoptimizationBandwidth) {
-                builder.setReoptimizationBandwidth((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.reoptimization.bandwidth.object.ReoptimizationBandwidth) obj);
-                return State.LSPA_IN;
-            }
-        case BANDWIDTH_IN:
-            if (obj instanceof Metric) {
-                pathMetrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
-                return State.BANDWIDTH_IN;
-            }
-        case METRIC_IN:
-            if (obj instanceof Iro) {
-                builder.setIro((Iro) obj);
-                return State.IRO_IN;
-            }
-        case IRO_IN:
-            if (obj instanceof Rro) {
-                builder.setRro((Rro) obj);
-                return State.RRO_IN;
-            }
-        case RRO_IN:
-        case END:
-            return State.END;
-        default:
-            return state;
+            case INIT:
+                if (obj instanceof Lspa) {
+                    builder.setLspa((Lspa) obj);
+                    return State.LSPA_IN;
+                }
+                // fall through
+            case LSPA_IN:
+                if (obj instanceof Bandwidth) {
+                    builder.setBandwidth((Bandwidth) obj);
+                    return State.LSPA_IN;
+                }
+                if (obj instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109
+                        .reoptimization.bandwidth.object.ReoptimizationBandwidth) {
+                    builder.setReoptimizationBandwidth((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang
+                            .pcep.types.rev181109.reoptimization.bandwidth.object.ReoptimizationBandwidth) obj);
+                    return State.LSPA_IN;
+                }
+                // fall through
+            case BANDWIDTH_IN:
+                if (obj instanceof Metric) {
+                    pathMetrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
+                    return State.BANDWIDTH_IN;
+                }
+                // fall through
+            case METRIC_IN:
+                if (obj instanceof Iro) {
+                    builder.setIro((Iro) obj);
+                    return State.IRO_IN;
+                }
+                // fall through
+            case IRO_IN:
+                if (obj instanceof Rro) {
+                    builder.setRro((Rro) obj);
+                    return State.RRO_IN;
+                }
+                // fall through
+            case RRO_IN:
+            case END:
+                return State.END;
+            default:
+                return state;
         }
     }
 
index b2690c38577e0dab38763dc95845b46b6c00bb39..827d0c9f9214df273469a902d78a8ac3eaedbbfe 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.protocol.pcep.ietf.stateful07;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.google.common.collect.Lists;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -38,7 +39,7 @@ 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.metric.object.Metric;
 
 /**
- * Parser for {@link Pcupd}
+ * Parser for {@link Pcupd}.
  */
 public class Stateful07PCUpdateRequestMessageParser extends AbstractMessageParser {
 
@@ -50,7 +51,8 @@ public class Stateful07PCUpdateRequestMessageParser extends AbstractMessageParse
 
     @Override
     public void serializeMessage(final Message message, final ByteBuf out) {
-        Preconditions.checkArgument(message instanceof Pcupd, "Wrong instance of Message. Passed instance of %s. Need Pcupd.", message.getClass());
+        checkArgument(message instanceof Pcupd, "Wrong instance of Message. Passed instance of %s. Need Pcupd.",
+            message.getClass());
         final Pcupd msg = (Pcupd) message;
         final List<Updates> updates = msg.getPcupdMessage().getUpdates();
         final ByteBuf buffer = Unpooled.buffer();
@@ -79,8 +81,9 @@ public class Stateful07PCUpdateRequestMessageParser extends AbstractMessageParse
     }
 
     @Override
-    protected Message validate(final List<Object> objects, final List<Message> errors) throws PCEPDeserializerException {
-        Preconditions.checkArgument(objects != null, "Passed list can't be null.");
+    protected Message validate(final List<Object> objects, final List<Message> errors)
+            throws PCEPDeserializerException {
+        checkArgument(objects != null, "Passed list can't be null.");
         if (objects.isEmpty()) {
             throw new PCEPDeserializerException("Pcup message cannot be empty.");
         }
@@ -151,54 +154,60 @@ public class Stateful07PCUpdateRequestMessageParser extends AbstractMessageParse
         return true;
     }
 
-    private static void parsePath(final List<Object> objects, final PathBuilder pBuilder) {
+    private static void parsePath(final List<Object> objects, final PathBuilder pathBuilder) {
         final List<Metrics> pathMetrics = Lists.newArrayList();
         Object obj;
         State state = State.INIT;
         while (!objects.isEmpty() && !state.equals(State.END)) {
             obj = objects.get(0);
-            state = insertObject(state,obj, pBuilder, pathMetrics);
+            state = insertObject(state,obj, pathBuilder, pathMetrics);
             if (!state.equals(State.END)) {
                 objects.remove(0);
             }
         }
         if (!pathMetrics.isEmpty()) {
-            pBuilder.setMetrics(pathMetrics);
+            pathBuilder.setMetrics(pathMetrics);
         }
     }
 
-    private static State insertObject(final State state, final Object obj, final PathBuilder pBuilder,
+    private static State insertObject(final State state, final Object obj, final PathBuilder pathBuilder,
             final List<Metrics> pathMetrics) {
         switch (state) {
-        case INIT:
-            if (obj instanceof Lspa) {
-                pBuilder.setLspa((Lspa) obj);
-                return State.LSPA_IN;
-            }
-        case LSPA_IN:
-            if (obj instanceof Bandwidth) {
-                pBuilder.setBandwidth((Bandwidth) obj);
-                return State.LSPA_IN;
-            }
-            if (obj instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.reoptimization.bandwidth.object.ReoptimizationBandwidth) {
-                pBuilder.setReoptimizationBandwidth((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.reoptimization.bandwidth.object.ReoptimizationBandwidth) obj);
-                return State.LSPA_IN;
-            }
-        case BANDWIDTH_IN:
-            if (obj instanceof Metric) {
-                pathMetrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
-                return State.BANDWIDTH_IN;
-            }
-        case METRIC_IN:
-            if (obj instanceof Iro) {
-                pBuilder.setIro((Iro) obj);
-                return State.IRO_IN;
-            }
-        case IRO_IN:
-        case END:
-            return State.END;
-        default:
-            return state;
+            case INIT:
+                if (obj instanceof Lspa) {
+                    pathBuilder.setLspa((Lspa) obj);
+                    return State.LSPA_IN;
+                }
+                // fall through
+            case LSPA_IN:
+                if (obj instanceof Bandwidth) {
+                    pathBuilder.setBandwidth((Bandwidth) obj);
+                    return State.LSPA_IN;
+                }
+                if (obj instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109
+                        .reoptimization.bandwidth.object.ReoptimizationBandwidth) {
+                    pathBuilder.setReoptimizationBandwidth((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns
+                            .yang.pcep.types.rev181109.reoptimization.bandwidth.object.ReoptimizationBandwidth) obj);
+                    return State.LSPA_IN;
+                }
+                // fall through
+            case BANDWIDTH_IN:
+                if (obj instanceof Metric) {
+                    pathMetrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
+                    return State.BANDWIDTH_IN;
+                }
+                // fall through
+            case METRIC_IN:
+                if (obj instanceof Iro) {
+                    pathBuilder.setIro((Iro) obj);
+                    return State.IRO_IN;
+                }
+                // fall through
+            case IRO_IN:
+            case END:
+                return State.END;
+            default:
+                return state;
         }
     }
 
index 4e9d40398a462b79417f37041159cf35fe8a547f..e4ab1187b473526ecf883ee8f673e4bce835ccf5 100644 (file)
@@ -42,7 +42,7 @@ 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.rsvp.rev150820.ErrorSpec.Flags;
 
 /**
- * Parser for {@link RsvpErrorSpec}
+ * Parser for {@link RsvpErrorSpec}.
  */
 public final class Stateful07RSVPErrorSpecTlvParser implements TlvParser, TlvSerializer {
 
@@ -107,7 +107,8 @@ public final class Stateful07RSVPErrorSpecTlvParser implements TlvParser, TlvSer
     }
 
     private static void serializerUserError(final UserError ue, final ByteBuf body) {
-        final byte[] desc = ue.getDescription() == null ? new byte[0] : ue.getDescription().getBytes(StandardCharsets.UTF_8);
+        final byte[] desc = ue.getDescription() == null ? new byte[0]
+                : ue.getDescription().getBytes(StandardCharsets.UTF_8);
         final ByteBuf userErrorBuf = Unpooled.buffer();
         Preconditions.checkArgument(ue.getEnterprise() != null, "EnterpriseNumber is mandatory");
         writeUnsignedInt(ue.getEnterprise().getValue(), userErrorBuf);
index 87ff2822bdf4519b86c098334321f2603351e02a..051588dc89ff4d0bd8fb0bbb7deb49e0b49f2e4c 100644 (file)
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.protocol.pcep.ietf.stateful07;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
 
-import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.List;
@@ -31,7 +31,7 @@ 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.vendor.information.tlvs.VendorInformationTlv;
 
 /**
- * Parser for {@link Srp}
+ * Parser for {@link Srp}.
  */
 public class Stateful07SrpObjectParser extends AbstractObjectWithTlvsParser<TlvsBuilder> {
 
@@ -50,10 +50,10 @@ public class Stateful07SrpObjectParser extends AbstractObjectWithTlvsParser<Tlvs
 
     @Override
     public Srp parseObject(final ObjectHeader header, final ByteBuf bytes) throws PCEPDeserializerException {
-        Preconditions.checkArgument(bytes != null && bytes.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");
+        checkArgument(bytes != null && bytes.isReadable(), "Array of bytes is mandatory. Can't be null or empty.");
         if (bytes.readableBytes() < MIN_SIZE) {
-            throw new PCEPDeserializerException("Wrong length of array of bytes. Passed: " + bytes.readableBytes() + "; Expected: >="
-                    + MIN_SIZE + ".");
+            throw new PCEPDeserializerException("Wrong length of array of bytes. Passed: " + bytes.readableBytes()
+                + "; Expected: >=" + MIN_SIZE + ".");
         }
         final SrpBuilder builder = new SrpBuilder();
         builder.setIgnore(header.isIgnore());
@@ -82,12 +82,13 @@ public class Stateful07SrpObjectParser extends AbstractObjectWithTlvsParser<Tlvs
 
     @Override
     public void serializeObject(final Object object, final ByteBuf buffer) {
-        Preconditions.checkArgument(object instanceof Srp, "Wrong instance of PCEPObject. Passed %s . Needed SrpObject.", object.getClass());
+        checkArgument(object instanceof Srp, "Wrong instance of PCEPObject. Passed %s . Needed SrpObject.",
+            object.getClass());
         final Srp srp = (Srp) object;
         final ByteBuf body = Unpooled.buffer();
         serializeFlags(srp, body);
         final SrpIdNumber srpId = srp.getOperationId();
-        Preconditions.checkArgument(srpId != null, "SrpId is mandatory.");
+        checkArgument(srpId != null, "SrpId is mandatory.");
         writeUnsignedInt(srpId.getValue(), body);
         serializeTlvs(srp.getTlvs(), body);
         ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), body, buffer);
index a42c4fdba58120887978aea3d4d655aa6c767db2..c22bf70ad364e4d27256301be6540de8f985a464 100644 (file)
@@ -20,7 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.iet
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.Tlv;
 
 /**
- * Parser for {@link Stateful}
+ * Parser for {@link Stateful}.
  */
 public class Stateful07StatefulCapabilityTlvParser implements TlvParser, TlvSerializer {
 
@@ -36,8 +36,8 @@ public class Stateful07StatefulCapabilityTlvParser implements TlvParser, TlvSeri
             return null;
         }
         if (buffer.readableBytes() < FLAGS_F_LENGTH / Byte.SIZE) {
-            throw new PCEPDeserializerException("Wrong length of array of bytes. Passed: " + buffer.readableBytes() + "; Expected: >= "
-                    + FLAGS_F_LENGTH / Byte.SIZE + ".");
+            throw new PCEPDeserializerException("Wrong length of array of bytes. Passed: " + buffer.readableBytes()
+                + "; Expected: >= " + FLAGS_F_LENGTH / Byte.SIZE + ".");
         }
         final StatefulBuilder sb = new StatefulBuilder();
         parseFlags(sb, buffer);
index 187d9bac9eb32b9ac95152847c6f51e742f48b61..d92f3ab4f4f1ed41a1c2b92f8c2995245a06e0e6 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.protocol.pcep.sync.optimizations;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedLong;
-import com.google.common.base.Preconditions;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.math.BigInteger;
@@ -27,7 +28,7 @@ public class LspDbVersionTlvParser implements TlvParser, TlvSerializer {
 
     @Override
     public void serializeTlv(final Tlv tlv, final ByteBuf buffer) {
-        Preconditions.checkArgument(tlv instanceof LspDbVersion, "Tlv object is not instance of LspDbVersion.");
+        checkArgument(tlv instanceof LspDbVersion, "Tlv object is not instance of LspDbVersion.");
         final ByteBuf body = Unpooled.buffer();
         writeUnsignedLong(((LspDbVersion) tlv).getLspDbVersionValue(), body);
         TlvUtil.formatTlv(TYPE, body, buffer);
index 4f21a5bf7d0b9731be6d03ed7ba84fce430bef9e..26cc0ae9eebbed36716aec6c5e48f8b3051e23dd 100644 (file)
@@ -29,7 +29,9 @@ public class SyncOptimizationsCapabilityTlvParser extends CInitiated00StatefulCa
         if (flags.get(I_FLAG_OFFSET)) {
             sb.addAugmentation(Stateful1.class, new Stateful1Builder().setInitiation(Boolean.TRUE).build());
         }
-        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1Builder syncOptBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1Builder();
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations
+            .rev181109.Stateful1Builder syncOptBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns
+                .yang.controller.pcep.sync.optimizations.rev181109.Stateful1Builder();
         if (flags.get(S_FLAG_OFFSET)) {
             syncOptBuilder.setIncludeDbVersion(Boolean.TRUE);
         }
@@ -42,14 +44,17 @@ public class SyncOptimizationsCapabilityTlvParser extends CInitiated00StatefulCa
         if (flags.get(F_FLAG_OFFSET)) {
             syncOptBuilder.setTriggeredInitialSync(Boolean.TRUE);
         }
-        sb.addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1.class, syncOptBuilder.build());
+        sb.addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync
+            .optimizations.rev181109.Stateful1.class, syncOptBuilder.build());
     }
 
     @Override
     protected BitArray serializeFlags(final Stateful sct) {
         final BitArray flags = new BitArray(FLAGS_F_LENGTH);
         final Stateful1 sfi = sct.augmentation(Stateful1.class);
-        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1 sf2 = sct.augmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1.class);
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations
+            .rev181109.Stateful1 sf2 = sct.augmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang
+                .controller.pcep.sync.optimizations.rev181109.Stateful1.class);
         if (sf2 != null) {
             flags.set(F_FLAG_OFFSET, sf2.isTriggeredInitialSync());
             flags.set(D_FLAG_OFFSET, sf2.isDeltaLspSyncCapability());
index 13b67567fd94a4229e8491d5aa3d5ac36f44881a..937d6dbc523ad577f600eabfec5246250fb630dc 100644 (file)
@@ -94,7 +94,8 @@ public class PCEPObjectParserTest {
         this.act = new BaseParserExtensionActivator();
         this.act.start(this.ctx);
         this.tlvRegistry = ServiceLoaderPCEPExtensionProviderContext.create().getTlvHandlerRegistry();
-        this.viTlvRegistry = ServiceLoaderPCEPExtensionProviderContext.getSingletonInstance().getVendorInformationTlvRegistry();
+        this.viTlvRegistry = ServiceLoaderPCEPExtensionProviderContext.getSingletonInstance()
+                .getVendorInformationTlvRegistry();
     }
 
     @Test
@@ -102,10 +103,14 @@ public class PCEPObjectParserTest {
         try (SyncOptimizationsActivator a = new SyncOptimizationsActivator()) {
             a.start(this.ctx);
 
-            final SyncOptimizationsOpenObjectParser parser = new SyncOptimizationsOpenObjectParser(this.ctx.getTlvHandlerRegistry(), this.ctx.getVendorInformationTlvRegistry());
-            final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPOpenObject1.bin"));
+            final SyncOptimizationsOpenObjectParser parser = new SyncOptimizationsOpenObjectParser(
+                this.ctx.getTlvHandlerRegistry(), this.ctx.getVendorInformationTlvRegistry());
+            final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes(
+                "src/test/resources/PCEPOpenObject1.bin"));
 
-            final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.OpenBuilder builder = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.OpenBuilder();
+            final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object
+                .OpenBuilder builder = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types
+                    .rev181109.open.object.OpenBuilder();
             builder.setProcessingRule(false);
             builder.setIgnore(false);
             builder.setVersion(new ProtocolVersion((short) 1));
@@ -113,21 +118,25 @@ public class PCEPObjectParserTest {
             builder.setDeadTimer((short) 120);
             builder.setSessionId((short) 1);
 
-            final Stateful tlv1 = new StatefulBuilder().setLspUpdateCapability(Boolean.TRUE).addAugmentation(Stateful1.class, new Stateful1Builder().build()).build();
+            final Stateful tlv1 = new StatefulBuilder().setLspUpdateCapability(Boolean.TRUE)
+                    .addAugmentation(Stateful1.class, new Stateful1Builder().build()).build();
 
             final Tlvs1Builder statBuilder = new Tlvs1Builder();
             statBuilder.setStateful(tlv1);
 
             final Tlvs3Builder syncOptBuilder = new Tlvs3Builder();
-            syncOptBuilder.setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(new BigInteger(DB_VERSION)).build());
+            syncOptBuilder.setLspDbVersion(new LspDbVersionBuilder()
+                .setLspDbVersionValue(new BigInteger(DB_VERSION)).build());
             syncOptBuilder.setSpeakerEntityId(new SpeakerEntityIdBuilder().setSpeakerEntityIdValue(SPEAKER_ID).build());
 
-            builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.open.TlvsBuilder()
+            builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109
+                .open.object.open.TlvsBuilder()
                 .addAugmentation(Tlvs1.class, statBuilder.build())
                 .addAugmentation(Tlvs3.class, syncOptBuilder.build())
                 .build());
 
-            assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(false, false), result.slice(4, result.readableBytes() - 4)));
+            assertEquals(builder.build(), parser.parseObject(
+                new ObjectHeaderImpl(false, false), result.slice(4, result.readableBytes() - 4)));
             final ByteBuf buf = Unpooled.buffer();
             parser.serializeObject(builder.build(), buf);
             assertArrayEquals(result.array(), ByteArray.getAllBytes(buf));
@@ -141,8 +150,10 @@ public class PCEPObjectParserTest {
             a.start(this.ctx);
             a2.start(this.ctx);
 
-            final SyncOptimizationsLspObjectParser parser = new SyncOptimizationsLspObjectParser(this.ctx.getTlvHandlerRegistry(), this.ctx.getVendorInformationTlvRegistry());
-            final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPLspObject1WithTLV.bin"));
+            final SyncOptimizationsLspObjectParser parser = new SyncOptimizationsLspObjectParser(
+                this.ctx.getTlvHandlerRegistry(), this.ctx.getVendorInformationTlvRegistry());
+            final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes(
+                "src/test/resources/PCEPLspObject1WithTLV.bin"));
 
             final LspBuilder builder = new LspBuilder();
             builder.setProcessingRule(true);
@@ -157,14 +168,20 @@ public class PCEPObjectParserTest {
 
             final LspErrorCode tlv1 = new LspErrorCodeBuilder().setErrorCode(627610883L).build();
             final SymbolicPathName tlv2 = new SymbolicPathNameBuilder().setPathName(
-                    new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.SymbolicPathName("Med".getBytes())).build();
-            final LspDbVersion lspDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(new BigInteger(DB_VERSION)).build();
-            builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.lsp.TlvsBuilder().setLspErrorCode(
-                    tlv1).setSymbolicPathName(tlv2)
-                    .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs1Builder().setLspDbVersion(lspDbVersion).build())
+                    new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109
+                        .SymbolicPathName("Med".getBytes())).build();
+            final LspDbVersion lspDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(new BigInteger(DB_VERSION))
+                    .build();
+            builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful
+                .rev181109.lsp.object.lsp.TlvsBuilder().setLspErrorCode(tlv1).setSymbolicPathName(tlv2)
+                    .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep
+                        .sync.optimizations.rev181109.Tlvs1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight
+                            .params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Tlvs1Builder()
+                            .setLspDbVersion(lspDbVersion).build())
                     .build());
 
-            assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, true), result.slice(4, result.readableBytes() - 4)));
+            assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, true),
+                result.slice(4, result.readableBytes() - 4)));
             final ByteBuf buf = Unpooled.buffer();
             parser.serializeObject(builder.build(), buf);
             assertArrayEquals(result.array(),ByteArray.getAllBytes(buf));
@@ -174,7 +191,8 @@ public class PCEPObjectParserTest {
     @Test
     public void testStateful07LspObjectWithTlv() throws IOException, PCEPDeserializerException {
         final Stateful07LspObjectParser parser = new Stateful07LspObjectParser(this.tlvRegistry, this.viTlvRegistry);
-        final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPLspObject2WithTLV.bin"));
+        final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes(
+            "src/test/resources/PCEPLspObject2WithTLV.bin"));
 
         final LspBuilder builder = new LspBuilder();
         builder.setProcessingRule(true);
@@ -188,23 +206,32 @@ public class PCEPObjectParserTest {
 
         final LspErrorCode tlv1 = new LspErrorCodeBuilder().setErrorCode(627610883L).build();
         final SymbolicPathName tlv2 = new SymbolicPathNameBuilder().setPathName(
-                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.SymbolicPathName("Med".getBytes())).build();
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109
+                    .SymbolicPathName("Med".getBytes())).build();
         final Ipv4Builder afi = new Ipv4Builder();
-        afi.setIpv4TunnelSenderAddress(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })));
-        afi.setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56,
-            (byte) 0x78 }))));
-        afi.setIpv4TunnelEndpointAddress(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })));
-        final LspIdentifiers tlv3 = new LspIdentifiersBuilder().setAddressFamily(new Ipv4CaseBuilder().setIpv4(afi.build()).build()).setLspId(
-            new LspId(65535L)).setTunnelId(new TunnelId(4660)).build();
+        afi.setIpv4TunnelSenderAddress(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+            new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })));
+        afi.setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+            new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))));
+        afi.setIpv4TunnelEndpointAddress(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+            new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })));
+        final LspIdentifiers tlv3 = new LspIdentifiersBuilder()
+                .setAddressFamily(new Ipv4CaseBuilder().setIpv4(afi.build()).build())
+                .setLspId(new LspId(65535L)).setTunnelId(new TunnelId(4660)).build();
         final RsvpErrorBuilder rsvpBuilder = new RsvpErrorBuilder();
-        rsvpBuilder.setNode(new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))));
-        rsvpBuilder.setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.ErrorSpec.Flags(false, true));
+        rsvpBuilder.setNode(new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+            new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))));
+        rsvpBuilder.setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820
+            .ErrorSpec.Flags(false, true));
         rsvpBuilder.setCode((short) 146);
         rsvpBuilder.setValue(5634);
-        final RsvpErrorSpec tlv4 = new RsvpErrorSpecBuilder().setErrorType(new RsvpCaseBuilder().setRsvpError(rsvpBuilder.build()).build()).build();
-        builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.lsp.TlvsBuilder().setLspErrorCode(
-                tlv1).setSymbolicPathName(tlv2).setLspIdentifiers(tlv3).setRsvpErrorSpec(tlv4).build());
-        assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, true), result.slice(4, result.readableBytes() - 4)));
+        final RsvpErrorSpec tlv4 = new RsvpErrorSpecBuilder()
+                .setErrorType(new RsvpCaseBuilder().setRsvpError(rsvpBuilder.build()).build()).build();
+        builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful
+            .rev181109.lsp.object.lsp.TlvsBuilder().setLspErrorCode(tlv1).setSymbolicPathName(tlv2)
+            .setLspIdentifiers(tlv3).setRsvpErrorSpec(tlv4).build());
+        assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, true),
+            result.slice(4, result.readableBytes() - 4)));
         final ByteBuf buf = Unpooled.buffer();
         parser.serializeObject(builder.build(), buf);
         assertArrayEquals(result.array(),ByteArray.getAllBytes(buf));
@@ -214,13 +241,16 @@ public class PCEPObjectParserTest {
     public void testLspaObject() throws IOException, PCEPDeserializerException {
         final Stateful07LspaObjectParser parser = new Stateful07LspaObjectParser(this.tlvRegistry, this.viTlvRegistry);
         final LspaBuilder builder = new LspaBuilder();
-        final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPLspaObject3RandVals.bin"));
+        final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes(
+            "src/test/resources/PCEPLspaObject3RandVals.bin"));
 
         final SymbolicPathName tlv = new SymbolicPathNameBuilder().setPathName(
-                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.SymbolicPathName(new byte[] {
-                    (byte) 0x4d, (byte) 0x65, (byte) 0x64, (byte) 0x20, (byte) 0x74, (byte) 0x65, (byte) 0x73, (byte) 0x74, (byte) 0x20,
-                    (byte) 0x6f, (byte) 0x66, (byte) 0x20, (byte) 0x73, (byte) 0x79, (byte) 0x6d, (byte) 0x62, (byte) 0x6f, (byte) 0x6c,
-                    (byte) 0x69, (byte) 0x63, (byte) 0x20, (byte) 0x6e, (byte) 0x61, (byte) 0x6d, (byte) 0x65 })).build();
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109
+                    .SymbolicPathName(new byte[] {
+                        (byte) 0x4d, (byte) 0x65, (byte) 0x64, (byte) 0x20, (byte) 0x74, (byte) 0x65, (byte) 0x73,
+                        (byte) 0x74, (byte) 0x20, (byte) 0x6f, (byte) 0x66, (byte) 0x20, (byte) 0x73, (byte) 0x79,
+                        (byte) 0x6d, (byte) 0x62, (byte) 0x6f, (byte) 0x6c, (byte) 0x69, (byte) 0x63, (byte) 0x20,
+                        (byte) 0x6e, (byte) 0x61, (byte) 0x6d, (byte) 0x65 })).build();
 
         builder.setIgnore(false);
         builder.setProcessingRule(false);
@@ -230,11 +260,13 @@ public class PCEPObjectParserTest {
         builder.setHoldPriority((short) 0x02);
         builder.setSetupPriority((short) 0x03);
         builder.setLocalProtectionDesired(true);
-        builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.lspa.object.lspa.TlvsBuilder().addAugmentation(
-                Tlvs2.class, new Tlvs2Builder().setSymbolicPathName(tlv).build()).build());
+        builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.lspa
+            .object.lspa.TlvsBuilder().addAugmentation(Tlvs2.class,
+                new Tlvs2Builder().setSymbolicPathName(tlv).build()).build());
 
         // Tlvs container does not contain toString
-        final Object o = parser.parseObject(new ObjectHeaderImpl(true, true), result.slice(4, result.readableBytes() - 4));
+        final Object o = parser.parseObject(new ObjectHeaderImpl(true, true),
+            result.slice(4, result.readableBytes() - 4));
         assertEquals(tlv, ((Lspa) o).getTlvs().augmentation(Tlvs2.class).getSymbolicPathName());
         // assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, true), ByteArray.cutBytes(result,
         // 4)));
@@ -245,9 +277,11 @@ public class PCEPObjectParserTest {
 
     @Test
     public void testSrpObject() throws PCEPDeserializerException {
-        final CInitiated00SrpObjectParser parser = new CInitiated00SrpObjectParser(this.tlvRegistry, this.viTlvRegistry);
-        final ByteBuf result = Unpooled.wrappedBuffer(new byte[] { (byte) 0x21, (byte) 0x10, (byte) 0x00, (byte) 0x0c, 0, 0, 0,
-            (byte) 0x01, 0, 0, 0, (byte) 0x01 });
+        final CInitiated00SrpObjectParser parser = new CInitiated00SrpObjectParser(this.tlvRegistry,
+            this.viTlvRegistry);
+        final ByteBuf result = Unpooled.wrappedBuffer(new byte[] {
+            (byte) 0x21, (byte) 0x10, (byte) 0x00, (byte) 0x0c, 0, 0, 0, (byte) 0x01, 0, 0, 0, (byte) 0x01
+        });
 
         final SrpBuilder builder = new SrpBuilder();
         builder.setProcessingRule(false);
@@ -256,7 +290,8 @@ public class PCEPObjectParserTest {
         builder.addAugmentation(Srp1.class, new Srp1Builder().setRemove(true).build());
         builder.setTlvs(new TlvsBuilder().build());
 
-        assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(false, false), result.slice(4, result.readableBytes() - 4)));
+        assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(false, false),
+            result.slice(4, result.readableBytes() - 4)));
         final ByteBuf buf = Unpooled.buffer();
         parser.serializeObject(builder.build(), buf);
         assertArrayEquals(result.array(),ByteArray.getAllBytes(buf));
@@ -268,13 +303,16 @@ public class PCEPObjectParserTest {
             0x0, 0x01,
             /* pst-tlv */
             0x0, 0x1C, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 };
-        final CInitiated00SrpObjectParser parser = new CInitiated00SrpObjectParser(this.tlvRegistry, this.viTlvRegistry);
+        final CInitiated00SrpObjectParser parser = new CInitiated00SrpObjectParser(this.tlvRegistry,
+            this.viTlvRegistry);
         final SrpBuilder builder = new SrpBuilder();
         builder.setProcessingRule(false);
         builder.setIgnore(false);
         builder.setOperationId(new SrpIdNumber(1L));
         builder.addAugmentation(Srp1.class, new Srp1Builder().setRemove(true).build());
-        builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.srp.object.srp.TlvsBuilder().setPathSetupType(new PathSetupTypeBuilder().setPst((short) 0).build()).build());
+        builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful
+            .rev181109.srp.object.srp.TlvsBuilder()
+                .setPathSetupType(new PathSetupTypeBuilder().setPst((short) 0).build()).build());
 
         final ByteBuf result = Unpooled.wrappedBuffer(srpObjectWithPstTlvBytes);
         assertEquals(builder.build(),
index 88d008be10fe60edbc39ae738bb2ebe40f90b2a9..a9894e78869fc6b1bfde6db56be9b5ab289a9c45 100644 (file)
@@ -23,17 +23,19 @@ public class PCEPStatefulCapabilityTest {
     private static final Tlvs EXPECTED_TLVS =
         new TlvsBuilder().addAugmentation(
             Tlvs1.class, new Tlvs1Builder()
-                .setStateful( new StatefulBuilder().setLspUpdateCapability(true)
+                .setStateful(new StatefulBuilder().setLspUpdateCapability(true)
                     .addAugmentation(Stateful1.class, new Stateful1Builder().setInitiation(true).build())
-                    .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1Builder()
-                        .setTriggeredInitialSync(true)
-                        .setTriggeredResync(false)
-                        .setDeltaLspSyncCapability(true)
-                        .setIncludeDbVersion(true)
-                        .build())
+                    .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep
+                        .sync.optimizations.rev181109.Stateful1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight
+                            .params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1Builder()
+                            .setTriggeredInitialSync(true)
+                            .setTriggeredResync(false)
+                            .setDeltaLspSyncCapability(true)
+                            .setIncludeDbVersion(true)
+                            .build())
                     .build())
                 .build())
-            .build();
+        .build();
 
     @Test
     public void testPCEPStatefulCapability() {
index 25f18fbf99153cf7981753c19a64115160019efa..e9b6069c9e16196bac4d00bf216d8872e5ee2d87 100644 (file)
@@ -58,45 +58,58 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev
 
 public class PCEPTlvParserTest {
 
-    private static final byte[] statefulBytes = { 0x00, 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01 };
+    private static final byte[] STATEFUL_BYTES = { 0x00, 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01 };
     private static final byte[] STATEFUL_SYNC_OPT_BYTES = new byte[]{ 0x00, 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x33 };
-    private static final byte[] symbolicNameBytes = { 0x00, 0x11, 0x00, 0x1C, 0x4d, 0x65, 0x64, 0x20, 0x74, 0x65, 0x73, 0x74, 0x20, 0x6f,
-        0x66, 0x20, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x65, 0x65, 0x65 };
-    private static final byte[] lspUpdateErrorBytes = { 0x00, 0x14, 0x00, 0x04, 0x25, 0x68, (byte) 0x95, 0x03 };
-    private static final byte[] lspIdentifiers4Bytes = { 0x00, 0x12, 0x00, 0x10, 0x12, 0x34, 0x56, 0x78, (byte) 0xFF, (byte) 0xFF, 0x12,
-        0x34, 0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78 };
-    private static final byte[] lspIdentifiers6Bytes = { 0x00, 0x13, 0x00, 0x34, 0x12, 0x34, 0x56, 0x78, (byte) 0x9A, (byte) 0xBC,
-        (byte) 0xDE, (byte) 0xF0, 0x12, 0x34, 0x56, 0x78, (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0, 0x12, 0x34, (byte) 0xFF,
-        (byte) 0xFF, 0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78, 0x01, 0x23, 0x45, 0x67, 0x01, 0x23, 0x45, 0x67, 0x12, 0x34, 0x56,
-        0x78, (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0, 0x12, 0x34, 0x56, 0x78, (byte) 0x9A, (byte) 0xBC, (byte) 0xDE,
-        (byte) 0xF0 };
-    private static final byte[] rsvpErrorBytes = { 0x00, 0x15, 0x00, 0x0c, 0, 0x0c, 0x06, 0x01, 0x12, 0x34, 0x56, 0x78, 0x02, (byte) 0x92, 0x16,
-        0x02 };
-    private static final byte[] rsvpError6Bytes = { 0x00, 0x15, 0x00, 0x18, 0, 0x18, 0x06, 0x02, 0x12, 0x34, 0x56, 0x78, (byte) 0x9a, (byte) 0xbc,
-        (byte) 0xde, (byte) 0xf0, 0x12, 0x34, 0x56, 0x78, (byte) 0x9a, (byte) 0xbc, (byte) 0xde, (byte) 0xf0, 0x02, (byte) 0xd5,
-        (byte) 0xc5, (byte) 0xd9};
-    private static final byte[] userErrorBytes = { 0x00, 0x15, 0x00, 0x18, 0, 0x18, (byte) 0xc2, 0x01, 0x00, 0x00, 0x30, 0x39, 0x05, 0x09, 0x00,
-        0x26, 0x75, 0x73, 0x65, 0x72, 0x20, 0x64, 0x65, 0x73, 0x63, 0, 0, 0 };
+    private static final byte[] SYMBOLIC_NAME_BYTES = {
+        0x00, 0x11, 0x00, 0x1C, 0x4d, 0x65, 0x64, 0x20, 0x74, 0x65, 0x73, 0x74, 0x20, 0x6f,
+        0x66, 0x20, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x65, 0x65, 0x65
+    };
+    private static final byte[] LSP_UPDATE_ERROR_BYTES = { 0x00, 0x14, 0x00, 0x04, 0x25, 0x68, (byte) 0x95, 0x03 };
+    private static final byte[] LSP_IDENTIFIERS4_BYTES = {
+        0x00, 0x12, 0x00, 0x10, 0x12, 0x34, 0x56, 0x78, (byte) 0xFF, (byte) 0xFF, 0x12,
+        0x34, 0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78
+    };
+    private static final byte[] LSP_IDENTIFIERS6_BYTES = {
+        0x00, 0x13, 0x00, 0x34, 0x12, 0x34, 0x56, 0x78, (byte) 0x9A, (byte) 0xBC,
+        (byte) 0xDE, (byte) 0xF0, 0x12, 0x34, 0x56, 0x78, (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0, 0x12,
+        0x34, (byte) 0xFF, (byte) 0xFF, 0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78, 0x01, 0x23, 0x45, 0x67, 0x01,
+        0x23, 0x45, 0x67, 0x12, 0x34, 0x56, 0x78, (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0, 0x12, 0x34, 0x56,
+        0x78, (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0
+    };
+    private static final byte[] RSVP_ERROR_BYTES = {
+        0x00, 0x15, 0x00, 0x0c, 0, 0x0c, 0x06, 0x01, 0x12, 0x34, 0x56, 0x78, 0x02, (byte) 0x92, 0x16, 0x02
+    };
+    private static final byte[] RSVP_ERROR6_BYTES = {
+        0x00, 0x15, 0x00, 0x18, 0, 0x18, 0x06, 0x02, 0x12, 0x34, 0x56, 0x78, (byte) 0x9a, (byte) 0xbc, (byte) 0xde,
+        (byte) 0xf0, 0x12, 0x34, 0x56, 0x78, (byte) 0x9a, (byte) 0xbc, (byte) 0xde, (byte) 0xf0, 0x02, (byte) 0xd5,
+        (byte) 0xc5, (byte) 0xd9
+    };
+    private static final byte[] USER_ERROR_BYTES = {
+        0x00, 0x15, 0x00, 0x18, 0, 0x18, (byte) 0xc2, 0x01, 0x00, 0x00, 0x30, 0x39, 0x05, 0x09, 0x00,
+        0x26, 0x75, 0x73, 0x65, 0x72, 0x20, 0x64, 0x65, 0x73, 0x63, 0, 0, 0
+    };
 
     @Test
     public void testStatefulTlv() throws PCEPDeserializerException {
         final Stateful07StatefulCapabilityTlvParser parser = new Stateful07StatefulCapabilityTlvParser();
         final Stateful tlv = new StatefulBuilder().setLspUpdateCapability(Boolean.TRUE).build();
-        assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(statefulBytes, 4))));
+        assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(STATEFUL_BYTES, 4))));
         final ByteBuf buff = Unpooled.buffer();
         parser.serializeTlv(tlv, buff);
-        assertArrayEquals(statefulBytes, ByteArray.getAllBytes(buff));
+        assertArrayEquals(STATEFUL_BYTES, ByteArray.getAllBytes(buff));
     }
 
     @Test
     public void testStatefulTlvSyncOptimizationExtension() throws PCEPDeserializerException {
         final SyncOptimizationsCapabilityTlvParser parser = new SyncOptimizationsCapabilityTlvParser();
         final Stateful tlv = new StatefulBuilder().setLspUpdateCapability(Boolean.TRUE)
-            .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1Builder()
-                .setTriggeredInitialSync(Boolean.TRUE)
-                .setDeltaLspSyncCapability(Boolean.TRUE)
-                .setIncludeDbVersion(Boolean.TRUE)
-                .build())
+            .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync
+                .optimizations.rev181109.Stateful1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml
+                    .ns.yang.controller.pcep.sync.optimizations.rev181109.Stateful1Builder()
+                    .setTriggeredInitialSync(Boolean.TRUE)
+                    .setDeltaLspSyncCapability(Boolean.TRUE)
+                    .setIncludeDbVersion(Boolean.TRUE)
+                    .build())
             .build();
         assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(STATEFUL_SYNC_OPT_BYTES, 4))));
         final ByteBuf buff = Unpooled.buffer();
@@ -108,91 +121,112 @@ public class PCEPTlvParserTest {
     public void testSymbolicNameTlv() throws PCEPDeserializerException {
         final Stateful07LspSymbolicNameTlvParser parser = new Stateful07LspSymbolicNameTlvParser();
         final SymbolicPathName tlv = new SymbolicPathNameBuilder().setPathName(
-            new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.
-                SymbolicPathName("Med test of symbolic nameeee".getBytes())).build();
-        assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(symbolicNameBytes, 4))));
+            new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109
+                .SymbolicPathName("Med test of symbolic nameeee".getBytes())).build();
+        assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(SYMBOLIC_NAME_BYTES, 4))));
         final ByteBuf buff = Unpooled.buffer();
         parser.serializeTlv(tlv, buff);
-        assertArrayEquals(symbolicNameBytes, ByteArray.getAllBytes(buff));
+        assertArrayEquals(SYMBOLIC_NAME_BYTES, ByteArray.getAllBytes(buff));
     }
 
     @Test
     public void testLspErrorCodeTlv() throws PCEPDeserializerException {
         final Stateful07LspUpdateErrorTlvParser parser = new Stateful07LspUpdateErrorTlvParser();
         final LspErrorCode tlv = new LspErrorCodeBuilder().setErrorCode(627610883L).build();
-        assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(lspUpdateErrorBytes, 4))));
+        assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(LSP_UPDATE_ERROR_BYTES, 4))));
         final ByteBuf buff = Unpooled.buffer();
         parser.serializeTlv(tlv, buff);
-        assertArrayEquals(lspUpdateErrorBytes, ByteArray.getAllBytes(buff));
+        assertArrayEquals(LSP_UPDATE_ERROR_BYTES, ByteArray.getAllBytes(buff));
     }
 
     @Test
     public void testLspIdentifiers4Tlv() throws PCEPDeserializerException {
         final Stateful07LSPIdentifierIpv4TlvParser parser = new Stateful07LSPIdentifierIpv4TlvParser();
         final Ipv4Builder afi = new Ipv4Builder();
-        afi.setIpv4TunnelSenderAddress(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })));
-        afi.setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56,
-            (byte) 0x78 }))));
-        afi.setIpv4TunnelEndpointAddress(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })));
-        final LspIdentifiers tlv = new LspIdentifiersBuilder().setAddressFamily(new Ipv4CaseBuilder().setIpv4(afi.build()).build()).setLspId(
-            new LspId(65535L)).setTunnelId(new TunnelId(4660)).build();
-        assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(lspIdentifiers4Bytes, 4))));
+        afi.setIpv4TunnelSenderAddress(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+            new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })));
+        afi.setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(Ipv4Util.noZoneAddressForByteBuf(
+            Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))));
+        afi.setIpv4TunnelEndpointAddress(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+            new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })));
+        final LspIdentifiers tlv = new LspIdentifiersBuilder().setAddressFamily(
+            new Ipv4CaseBuilder().setIpv4(afi.build()).build()).setLspId(new LspId(65535L))
+                .setTunnelId(new TunnelId(4660)).build();
+        assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(LSP_IDENTIFIERS4_BYTES, 4))));
         final ByteBuf buff = Unpooled.buffer();
         parser.serializeTlv(tlv, buff);
-        assertArrayEquals(lspIdentifiers4Bytes, ByteArray.getAllBytes(buff));
+        assertArrayEquals(LSP_IDENTIFIERS4_BYTES, ByteArray.getAllBytes(buff));
     }
 
     @Test
     public void testLspIdentifiers6Tlv() throws PCEPDeserializerException {
         final Stateful07LSPIdentifierIpv6TlvParser parser = new Stateful07LSPIdentifierIpv6TlvParser();
         final Ipv6Builder afi = new Ipv6Builder();
-        afi.setIpv6TunnelSenderAddress(Ipv6Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
-            (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x9A,
-            (byte) 0xBC, (byte) 0xDE, (byte) 0xF0 })));
-        afi.setIpv6ExtendedTunnelId(new Ipv6ExtendedTunnelId(Ipv6Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56,
-            (byte) 0x78, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x01, (byte) 0x23, (byte) 0x45, (byte) 0x67,
-            (byte) 0x01, (byte) 0x23, (byte) 0x45, (byte) 0x67 }))));
-        afi.setIpv6TunnelEndpointAddress(Ipv6Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
-            (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x9A,
-            (byte) 0xBC, (byte) 0xDE, (byte) 0xF0 })));
-        final LspIdentifiers tlv = new LspIdentifiersBuilder().setAddressFamily(new Ipv6CaseBuilder().setIpv6(afi.build()).build()).setLspId(
-            new LspId(4660L)).setTunnelId(new TunnelId(65535)).build();
-        assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(lspIdentifiers6Bytes, 4))));
+        afi.setIpv6TunnelSenderAddress(Ipv6Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+            new byte[] {
+                (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
+                (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
+                (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0
+            })));
+        afi.setIpv6ExtendedTunnelId(new Ipv6ExtendedTunnelId(Ipv6Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+            new byte[] {
+                (byte) 0x12, (byte) 0x34, (byte) 0x56,
+                (byte) 0x78, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x01, (byte) 0x23, (byte) 0x45,
+                (byte) 0x67, (byte) 0x01, (byte) 0x23, (byte) 0x45, (byte) 0x67
+            }))));
+        afi.setIpv6TunnelEndpointAddress(Ipv6Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+            new byte[] {
+                (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
+                (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
+                (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0xF0
+            })));
+        final LspIdentifiers tlv = new LspIdentifiersBuilder()
+                .setAddressFamily(new Ipv6CaseBuilder().setIpv6(afi.build()).build())
+                .setLspId(new LspId(4660L)).setTunnelId(new TunnelId(65535)).build();
+        assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(LSP_IDENTIFIERS6_BYTES, 4))));
         final ByteBuf buff = Unpooled.buffer();
         parser.serializeTlv(tlv, buff);
-        assertArrayEquals(lspIdentifiers6Bytes, ByteArray.getAllBytes(buff));
+        assertArrayEquals(LSP_IDENTIFIERS6_BYTES, ByteArray.getAllBytes(buff));
     }
 
     @Test
     public void testRSVPError4SpecTlv() throws PCEPDeserializerException {
         final Stateful07RSVPErrorSpecTlvParser parser = new Stateful07RSVPErrorSpecTlvParser();
         final RsvpErrorBuilder builder = new RsvpErrorBuilder();
-        builder.setNode(new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))));
-        builder.setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.ErrorSpec.Flags(false, true));
+        builder.setNode(new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+            new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))));
+        builder.setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.ErrorSpec
+            .Flags(false, true));
         builder.setCode((short) 146);
         builder.setValue(5634);
-        final RsvpErrorSpec tlv = new RsvpErrorSpecBuilder().setErrorType(new RsvpCaseBuilder().setRsvpError(builder.build()).build()).build();
-        assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(rsvpErrorBytes, 4))));
+        final RsvpErrorSpec tlv = new RsvpErrorSpecBuilder()
+                .setErrorType(new RsvpCaseBuilder().setRsvpError(builder.build()).build()).build();
+        assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(RSVP_ERROR_BYTES, 4))));
         final ByteBuf buff = Unpooled.buffer();
         parser.serializeTlv(tlv, buff);
-        assertArrayEquals(rsvpErrorBytes, ByteArray.getAllBytes(buff));
+        assertArrayEquals(RSVP_ERROR_BYTES, ByteArray.getAllBytes(buff));
     }
 
     @Test
     public void testRSVPError6SpecTlv() throws PCEPDeserializerException {
         final Stateful07RSVPErrorSpecTlvParser parser = new Stateful07RSVPErrorSpecTlvParser();
         final RsvpErrorBuilder builder = new RsvpErrorBuilder();
-        builder.setNode(new IpAddressNoZone(Ipv6Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
-            (byte) 0x9a, (byte) 0xbc, (byte) 0xde, (byte) 0xf0, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x9a,
-            (byte) 0xbc, (byte) 0xde, (byte) 0xf0 }))));
-        builder.setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.ErrorSpec.Flags(false, true));
+        builder.setNode(new IpAddressNoZone(Ipv6Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(
+            new byte[] {
+                (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
+                (byte) 0x9a, (byte) 0xbc, (byte) 0xde, (byte) 0xf0, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78,
+                (byte) 0x9a, (byte) 0xbc, (byte) 0xde, (byte) 0xf0
+            }))));
+        builder.setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.ErrorSpec
+            .Flags(false, true));
         builder.setCode((short) 213);
         builder.setValue(50649);
-        final RsvpErrorSpec tlv = new RsvpErrorSpecBuilder().setErrorType(new RsvpCaseBuilder().setRsvpError(builder.build()).build()).build();
-        assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(rsvpError6Bytes, 4))));
+        final RsvpErrorSpec tlv = new RsvpErrorSpecBuilder()
+                .setErrorType(new RsvpCaseBuilder().setRsvpError(builder.build()).build()).build();
+        assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(RSVP_ERROR6_BYTES, 4))));
         final ByteBuf buff = Unpooled.buffer();
         parser.serializeTlv(tlv, buff);
-        assertArrayEquals(rsvpError6Bytes, ByteArray.getAllBytes(buff));
+        assertArrayEquals(RSVP_ERROR6_BYTES, ByteArray.getAllBytes(buff));
     }
 
     @Test
@@ -203,16 +237,19 @@ public class PCEPTlvParserTest {
         builder.setSubOrg((short) 5);
         builder.setValue(38);
         builder.setDescription("user desc");
-        final RsvpErrorSpec tlv = new RsvpErrorSpecBuilder().setErrorType(new UserCaseBuilder().setUserError(builder.build()).build()).build();
-        assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(userErrorBytes, 4))));
+        final RsvpErrorSpec tlv = new RsvpErrorSpecBuilder()
+                .setErrorType(new UserCaseBuilder().setUserError(builder.build()).build()).build();
+        assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(USER_ERROR_BYTES, 4))));
         final ByteBuf buff = Unpooled.buffer();
         parser.serializeTlv(tlv, buff);
-        assertArrayEquals(userErrorBytes, ByteArray.getAllBytes(buff));
+        assertArrayEquals(USER_ERROR_BYTES, ByteArray.getAllBytes(buff));
     }
 
     @Test
     public void testPathBindingTlvMplsLabel() {
-        final byte[] pathBindingBytes = {0x00, 0x1f, 0x00, 0x06, 0x00, 0x00, (byte) 0xA8, 0x0F, (byte) 0x60, 0x00, 0x00, 0x00};
+        final byte[] pathBindingBytes = {
+            0x00, 0x1f, 0x00, 0x06, 0x00, 0x00, (byte) 0xA8, 0x0F, (byte) 0x60, 0x00, 0x00, 0x00
+        };
         final PathBindingTlvParser parser = new PathBindingTlvParser();
         final PathBindingBuilder builder = new PathBindingBuilder();
         builder.setBindingTypeValue(new MplsLabelBuilder().setMplsLabel(new MplsLabel(688_374L)).build());
@@ -224,14 +261,16 @@ public class PCEPTlvParserTest {
             final byte[] wrong = {0, 0x1f, 0, 4, 1, 1, 2, 3};
             parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(wrong, 4)));
             fail();
-        } catch(final PCEPDeserializerException e) {
+        } catch (final PCEPDeserializerException e) {
             assertEquals("Unsupported Path Binding Type: 257", e.getMessage());
         }
     }
 
     @Test
     public void testPathBindingTlvMplsLabelEntry() {
-        final byte[] pathBindingBytes = {0x00, 0x1f, 0x00, 0x06, 0x00, 0x01, (byte) 0xA8, (byte) 0x0F, (byte) 0x6D, (byte)0xAD, 0x00, 0x00};
+        final byte[] pathBindingBytes = {
+            0x00, 0x1f, 0x00, 0x06, 0x00, 0x01, (byte) 0xA8, (byte) 0x0F, (byte) 0x6D, (byte)0xAD, 0x00, 0x00
+        };
         final PathBindingTlvParser parser = new PathBindingTlvParser();
         final PathBindingBuilder builder = new PathBindingBuilder();
         builder.setBindingTypeValue(
index 68c3e6a0cf14090aad20aa38da880253bca740ad..d34600c2451935ead1fa87c835b798800359782e 100644 (file)
@@ -69,7 +69,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.iet
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcupd.message.pcupd.message.updates.PathBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.srp.object.Srp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.srp.object.SrpBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.stateful.capability.tlv.Stateful;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.stateful.capability.tlv.StatefulBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev181109.OpenBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev181109.PcerrBuilder;
@@ -122,8 +121,10 @@ public class PCEPValidatorTest {
     private Srp srp;
     private Lsp lsp;
     private Lsp lspSrp;
-    private org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.bandwidth.object.Bandwidth bandwidth;
-    private org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.reoptimization.bandwidth.object.ReoptimizationBandwidth reoptimizationBandwidth;
+    private org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.bandwidth.object
+        .Bandwidth bandwidth;
+    private org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.reoptimization
+        .bandwidth.object.ReoptimizationBandwidth reoptimizationBandwidth;
 
     private AsNumberCase eroASSubobject;
     private UnnumberedCase rroUnnumberedSub;
@@ -203,7 +204,8 @@ public class PCEPValidatorTest {
         lspaBuilder.setExcludeAny(new AttributeFilter(0L));
         lspaBuilder.setIncludeAll(new AttributeFilter(0L));
         lspaBuilder.setIncludeAny(new AttributeFilter(0L));
-        lspaBuilder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.lspa.object.lspa.TlvsBuilder().build());
+        lspaBuilder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109
+            .lspa.object.lspa.TlvsBuilder().build());
         this.lspa = lspaBuilder.build();
 
         final MetricBuilder mBuilder = new MetricBuilder();
@@ -215,9 +217,9 @@ public class PCEPValidatorTest {
         mBuilder.setValue(new Float32(new byte[4]));
         this.metrics = new MetricsBuilder().setMetric(mBuilder.build()).build();
 
-        this.eroASSubobject = new AsNumberCaseBuilder().setAsNumber(
-            new AsNumberBuilder().setAsNumber(
-                new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber(0xFFFFL)).build()).build();
+        this.eroASSubobject = new AsNumberCaseBuilder().setAsNumber(new AsNumberBuilder().setAsNumber(
+            new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber(0xFFFFL))
+            .build()).build();
 
         this.rroUnnumberedSub = new UnnumberedCaseBuilder().setUnnumbered(
             new UnnumberedBuilder().setRouterId(0x00112233L).setInterfaceId(0x00ff00ffL).build()).build();
@@ -233,18 +235,21 @@ public class PCEPValidatorTest {
         final EroBuilder eroBuilder = new EroBuilder();
         eroBuilder.setIgnore(false);
         eroBuilder.setProcessingRule(false);
-        final List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.explicit.route.object.ero.Subobject> eroSubs = Lists.newArrayList();
-        eroSubs.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.explicit.route.object.ero.SubobjectBuilder().setSubobjectType(
-            this.eroASSubobject).setLoose(false).build());
+        final List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.explicit.route
+            .object.ero.Subobject> eroSubs = Lists.newArrayList();
+        eroSubs.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.explicit
+            .route.object.ero.SubobjectBuilder().setSubobjectType(this.eroASSubobject).setLoose(false).build());
         eroBuilder.setSubobject(eroSubs);
         this.ero = eroBuilder.build();
 
         final RroBuilder rroBuilder = new RroBuilder();
         rroBuilder.setIgnore(false);
         rroBuilder.setProcessingRule(false);
-        final List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.reported.route.object.rro.Subobject> rroSubs = Lists.newArrayList();
-        rroSubs.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.reported.route.object.rro.SubobjectBuilder().setSubobjectType(
-            this.rroUnnumberedSub).setProtectionAvailable(false).setProtectionInUse(false).build());
+        final List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.reported.route
+            .object.rro.Subobject> rroSubs = Lists.newArrayList();
+        rroSubs.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.reported
+            .route.object.rro.SubobjectBuilder().setSubobjectType(this.rroUnnumberedSub).setProtectionAvailable(false)
+            .setProtectionInUse(false).build());
         rroBuilder.setSubobject(rroSubs);
         this.rro = rroBuilder.build();
 
@@ -253,7 +258,8 @@ public class PCEPValidatorTest {
         srpBuilder.setProcessingRule(false);
         srpBuilder.setOperationId(new SrpIdNumber(1L));
         srpBuilder.addAugmentation(Srp1.class, new Srp1Builder().setRemove(false).build());
-        srpBuilder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.srp.object.srp.TlvsBuilder().build());
+        srpBuilder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful
+            .rev181109.srp.object.srp.TlvsBuilder().build());
         this.srp = srpBuilder.build();
 
         final LspBuilder lspBuilder = new LspBuilder();
@@ -268,14 +274,18 @@ public class PCEPValidatorTest {
         lspBuilder.setTlvs(new TlvsBuilder().build());
         lspBuilder.addAugmentation(Lsp1.class, new Lsp1Builder().setCreate(false).build());
 
-        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.identifiers.tlv.lsp.identifiers.address.family.ipv4._case.Ipv4Builder builder = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.identifiers.tlv.lsp.identifiers.address.family.ipv4._case.Ipv4Builder();
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp
+            .identifiers.tlv.lsp.identifiers.address.family.ipv4._case.Ipv4Builder builder =
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp
+                    .identifiers.tlv.lsp.identifiers.address.family.ipv4._case.Ipv4Builder();
         builder.setIpv4TunnelSenderAddress(new Ipv4AddressNoZone("127.0.1.1"));
         final LspId lspId = new LspId(1L);
         final TunnelId tunnelId = new TunnelId(1);
         builder.setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(new Ipv4AddressNoZone("127.0.1.2")));
         builder.setIpv4TunnelEndpointAddress(new Ipv4AddressNoZone("127.0.1.3"));
         final AddressFamily afiLsp = new Ipv4CaseBuilder().setIpv4(builder.build()).build();
-        final LspIdentifiers identifier = new LspIdentifiersBuilder().setAddressFamily(afiLsp).setLspId(lspId).setTunnelId(tunnelId).build();
+        final LspIdentifiers identifier = new LspIdentifiersBuilder().setAddressFamily(afiLsp).setLspId(lspId)
+                .setTunnelId(tunnelId).build();
         this.lspSrp = lspBuilder.build();
         this.lsp = lspBuilder.setTlvs(new TlvsBuilder().setLspIdentifiers(identifier).build()).build();
 
@@ -283,16 +293,22 @@ public class PCEPValidatorTest {
         afi.setSourceIpv4Address(new Ipv4AddressNoZone("255.255.255.255"));
         afi.setDestinationIpv4Address(new Ipv4AddressNoZone("255.255.255.255"));
 
-        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.bandwidth.object.BandwidthBuilder bandwidthBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.bandwidth.object.BandwidthBuilder();
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.bandwidth.object
+            .BandwidthBuilder bandwidthBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang
+                .pcep.types.rev181109.bandwidth.object.BandwidthBuilder();
         bandwidthBuilder.setIgnore(false);
         bandwidthBuilder.setProcessingRule(false);
         bandwidthBuilder.setBandwidth(new Bandwidth(new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 }));
         this.bandwidth = bandwidthBuilder.build();
 
-        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.reoptimization.bandwidth.object.ReoptimizationBandwidthBuilder reoptimizationBandwidthBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.reoptimization.bandwidth.object.ReoptimizationBandwidthBuilder();
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.reoptimization
+            .bandwidth.object.ReoptimizationBandwidthBuilder reoptimizationBandwidthBuilder = new org.opendaylight.yang
+                .gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.reoptimization.bandwidth.object
+                .ReoptimizationBandwidthBuilder();
         reoptimizationBandwidthBuilder.setIgnore(false);
         reoptimizationBandwidthBuilder.setProcessingRule(false);
-        reoptimizationBandwidthBuilder.setBandwidth(new Bandwidth(new byte[] { (byte) 0x47, (byte) 0x74, (byte) 0x24, (byte) 0x00 }));
+        reoptimizationBandwidthBuilder.setBandwidth(
+            new Bandwidth(new byte[] { (byte) 0x47, (byte) 0x74, (byte) 0x24, (byte) 0x00 }));
         this.reoptimizationBandwidth = reoptimizationBandwidthBuilder.build();
     }
 
@@ -300,20 +316,24 @@ public class PCEPValidatorTest {
     public void testOpenMsg() throws IOException, PCEPDeserializerException {
         try (StatefulActivator a = new StatefulActivator()) {
             a.start(this.ctx);
-            final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPOpenMessage1.bin"));
+            final ByteBuf result = Unpooled.wrappedBuffer(
+                ByteArray.fileToBytes("src/test/resources/PCEPOpenMessage1.bin"));
             final PCEPOpenMessageParser parser = new PCEPOpenMessageParser(this.ctx.getObjectHandlerRegistry());
             final OpenMessageBuilder builder = new OpenMessageBuilder();
 
-            final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.OpenBuilder b = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.OpenBuilder();
-            b.setProcessingRule(false);
-            b.setIgnore(false);
-            b.setVersion(new ProtocolVersion((short) 1));
-            b.setKeepalive((short) 30);
-            b.setDeadTimer((short) 120);
-            b.setSessionId((short) 1);
-            final Stateful tlv1 = new StatefulBuilder().setLspUpdateCapability(Boolean.TRUE).build();
-            b.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.open.TlvsBuilder().addAugmentation(
-                Tlvs1.class, new Tlvs1Builder().setStateful(tlv1).build()).build());
+            final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object
+                .OpenBuilder b = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types
+                    .rev181109.open.object.OpenBuilder()
+                    .setProcessingRule(false)
+                    .setIgnore(false)
+                    .setVersion(new ProtocolVersion((short) 1))
+                    .setKeepalive((short) 30)
+                    .setDeadTimer((short) 120)
+                    .setSessionId((short) 1)
+                    .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109
+                        .open.object.open.TlvsBuilder().addAugmentation(Tlvs1.class,
+                            new Tlvs1Builder().setStateful(new StatefulBuilder().setLspUpdateCapability(Boolean.TRUE)
+                                .build()).build()).build());
             builder.setOpen(b.build());
 
             assertEquals(new OpenBuilder().setOpenMessage(builder.build()).build(), parser.parseMessage(result.slice(4,
@@ -336,9 +356,8 @@ public class PCEPValidatorTest {
     public void testUpdMsg() throws IOException, PCEPDeserializerException {
         try (CrabbeInitiatedActivator a = new CrabbeInitiatedActivator()) {
             a.start(this.ctx);
-            ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCUpd.2.bin"));
-
-            final Stateful07PCUpdateRequestMessageParser parser = new Stateful07PCUpdateRequestMessageParser(this.ctx.getObjectHandlerRegistry());
+            final Stateful07PCUpdateRequestMessageParser parser = new Stateful07PCUpdateRequestMessageParser(
+                this.ctx.getObjectHandlerRegistry());
 
             final PcupdMessageBuilder builder = new PcupdMessageBuilder();
 
@@ -349,14 +368,13 @@ public class PCEPValidatorTest {
             updates.add(new UpdatesBuilder().setSrp(this.srp).setLsp(this.lspSrp).setPath(pBuilder.build()).build());
             builder.setUpdates(updates);
 
-            assertEquals(new PcupdBuilder().setPcupdMessage(builder.build()).build(), parser.parseMessage(result.slice(4,
-                result.readableBytes() - 4), Collections.emptyList()));
+            ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCUpd.2.bin"));
+            assertEquals(new PcupdBuilder().setPcupdMessage(builder.build()).build(),
+                parser.parseMessage(result.slice(4, result.readableBytes() - 4), Collections.emptyList()));
             ByteBuf buf = Unpooled.buffer(result.readableBytes());
             parser.serializeMessage(new PcupdBuilder().setPcupdMessage(builder.build()).build(), buf);
             assertArrayEquals(result.array(), buf.array());
 
-            result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCUpd.5.bin"));
-
             final List<Updates> updates1 = Lists.newArrayList();
             final PathBuilder pBuilder1 = new PathBuilder();
             pBuilder1.setEro(this.ero);
@@ -365,8 +383,9 @@ public class PCEPValidatorTest {
             updates1.add(new UpdatesBuilder().setSrp(this.srp).setLsp(this.lspSrp).setPath(pBuilder1.build()).build());
             builder.setUpdates(updates1);
 
-            assertEquals(new PcupdBuilder().setPcupdMessage(builder.build()).build(), parser.parseMessage(result.slice(4,
-                result.readableBytes() - 4), Collections.emptyList()));
+            result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCUpd.5.bin"));
+            assertEquals(new PcupdBuilder().setPcupdMessage(builder.build()).build(),
+                parser.parseMessage(result.slice(4, result.readableBytes() - 4), Collections.emptyList()));
             buf = Unpooled.buffer(result.readableBytes());
             parser.serializeMessage(new PcupdBuilder().setPcupdMessage(builder.build()).build(), buf);
             assertArrayEquals(result.array(), buf.array());
@@ -375,19 +394,22 @@ public class PCEPValidatorTest {
 
     @Test
     public void testRptMsg() throws IOException, PCEPDeserializerException {
-        try (CrabbeInitiatedActivator a = new CrabbeInitiatedActivator(); StatefulActivator b = new StatefulActivator()) {
+        try (CrabbeInitiatedActivator a = new CrabbeInitiatedActivator();
+                StatefulActivator b = new StatefulActivator()) {
             a.start(this.ctx);
             b.start(this.ctx);
             ByteBuf result = Unpooled.wrappedBuffer(PCRT1);
 
-            final Stateful07PCReportMessageParser parser = new Stateful07PCReportMessageParser(this.ctx.getObjectHandlerRegistry());
+            final Stateful07PCReportMessageParser parser = new Stateful07PCReportMessageParser(
+                this.ctx.getObjectHandlerRegistry());
 
             final PcrptMessageBuilder builder = new PcrptMessageBuilder();
 
             final List<Reports> reports = Lists.newArrayList();
             reports.add(new ReportsBuilder().setLsp(this.lsp).build());
             builder.setReports(reports);
-            final Message parseResult = parser.parseMessage(result.slice(4, result.readableBytes() - 4), Collections.emptyList());
+            final Message parseResult = parser.parseMessage(result.slice(4, result.readableBytes() - 4),
+                Collections.emptyList());
             assertEquals(new PcrptBuilder().setPcrptMessage(builder.build()).build(), parseResult);
             ByteBuf buf = Unpooled.buffer(result.readableBytes());
             parser.serializeMessage(new PcrptBuilder().setPcrptMessage(builder.build()).build(), buf);
@@ -396,13 +418,14 @@ public class PCEPValidatorTest {
             result = Unpooled.wrappedBuffer(PCRT2);
 
             final List<Reports> reports1 = Lists.newArrayList();
-            reports1.add(new ReportsBuilder().setLsp(this.lsp).setPath(
-                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcrpt.message.pcrpt.message.reports.PathBuilder().setEro(
-                    this.ero).setLspa(this.lspa).build()).build());
+            reports1.add(new ReportsBuilder().setLsp(this.lsp).setPath(new org.opendaylight.yang.gen.v1.urn.opendaylight
+                    .params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcrpt.message.pcrpt.message.reports.PathBuilder()
+                        .setEro(this.ero).setLspa(this.lspa).build()).build());
             builder.setReports(reports1);
 
             final ByteBuf input = result.slice(4, result.readableBytes() - 4);
-            assertEquals(new PcrptBuilder().setPcrptMessage(builder.build()).build(), parser.parseMessage(input, Collections.emptyList()));
+            assertEquals(new PcrptBuilder().setPcrptMessage(builder.build()).build(),
+                parser.parseMessage(input, Collections.emptyList()));
             buf = Unpooled.buffer(result.readableBytes());
             parser.serializeMessage(new PcrptBuilder().setPcrptMessage(builder.build()).build(), buf);
             assertArrayEquals(result.array(), buf.array());
@@ -410,7 +433,9 @@ public class PCEPValidatorTest {
             result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCRpt.3.bin"));
 
             final List<Reports> reports2 = Lists.newArrayList();
-            final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcrpt.message.pcrpt.message.reports.PathBuilder pBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcrpt.message.pcrpt.message.reports.PathBuilder();
+            final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcrpt
+                .message.pcrpt.message.reports.PathBuilder pBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight
+                    .params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcrpt.message.pcrpt.message.reports.PathBuilder();
             pBuilder.setEro(this.ero);
             pBuilder.setLspa(this.lspa);
             pBuilder.setMetrics(Lists.newArrayList(this.metrics, this.metrics));
@@ -418,8 +443,8 @@ public class PCEPValidatorTest {
             reports2.add(new ReportsBuilder().setSrp(this.srp).setLsp(this.lspSrp).setPath(pBuilder.build()).build());
             builder.setReports(reports2);
 
-            assertEquals(new PcrptBuilder().setPcrptMessage(builder.build()).build(), parser.parseMessage(result.slice(4,
-                result.readableBytes() - 4), Collections.emptyList()));
+            assertEquals(new PcrptBuilder().setPcrptMessage(builder.build()).build(),
+                parser.parseMessage(result.slice(4, result.readableBytes() - 4), Collections.emptyList()));
             buf = Unpooled.buffer(result.readableBytes());
             parser.serializeMessage(new PcrptBuilder().setPcrptMessage(builder.build()).build(), buf);
             assertArrayEquals(result.array(), buf.array());
@@ -427,7 +452,9 @@ public class PCEPValidatorTest {
             result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCRpt.5.bin"));
 
             final List<Reports> reports3 = Lists.newArrayList();
-            final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcrpt.message.pcrpt.message.reports.PathBuilder pBuilder1 = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcrpt.message.pcrpt.message.reports.PathBuilder();
+            final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcrpt
+                .message.pcrpt.message.reports.PathBuilder pBuilder1 = new org.opendaylight.yang.gen.v1.urn.opendaylight
+                .params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcrpt.message.pcrpt.message.reports.PathBuilder();
             pBuilder1.setEro(this.ero);
             pBuilder1.setLspa(this.lspa);
             pBuilder1.setMetrics(Lists.newArrayList(this.metrics, this.metrics));
@@ -436,8 +463,8 @@ public class PCEPValidatorTest {
             reports3.add(new ReportsBuilder().setSrp(this.srp).setLsp(this.lspSrp).setPath(pBuilder1.build()).build());
             builder.setReports(reports3);
 
-            assertEquals(new PcrptBuilder().setPcrptMessage(builder.build()).build(), parser.parseMessage(result.slice(4,
-                result.readableBytes() - 4), Collections.emptyList()));
+            assertEquals(new PcrptBuilder().setPcrptMessage(builder.build()).build(),
+                parser.parseMessage(result.slice(4, result.readableBytes() - 4), Collections.emptyList()));
             buf = Unpooled.buffer(result.readableBytes());
             parser.serializeMessage(new PcrptBuilder().setPcrptMessage(builder.build()).build(), buf);
             assertArrayEquals(result.array(), buf.array());
@@ -445,13 +472,15 @@ public class PCEPValidatorTest {
             result = Unpooled.wrappedBuffer(PCRT3);
 
             final List<Reports> reports4 = Lists.newArrayList();
-            reports4.add(new ReportsBuilder().setLsp(this.lsp).setPath(
-                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcrpt.message.pcrpt.message.reports.PathBuilder().setEro(
-                    this.ero).setLspa(this.lspa).setBandwidth(this.bandwidth).setReoptimizationBandwidth(this.reoptimizationBandwidth).build()).build());
+            reports4.add(new ReportsBuilder().setLsp(this.lsp).setPath(new org.opendaylight.yang.gen.v1.urn.opendaylight
+                .params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcrpt.message.pcrpt.message.reports.PathBuilder()
+                    .setEro(this.ero).setLspa(this.lspa).setBandwidth(this.bandwidth)
+                    .setReoptimizationBandwidth(this.reoptimizationBandwidth).build()).build());
             builder.setReports(reports4);
 
             final ByteBuf input2 = result.slice(4, result.readableBytes() - 4);
-            assertEquals(new PcrptBuilder().setPcrptMessage(builder.build()).build(), parser.parseMessage(input2, Collections.emptyList()));
+            assertEquals(new PcrptBuilder().setPcrptMessage(builder.build()).build(),
+                parser.parseMessage(input2, Collections.emptyList()));
             buf = Unpooled.buffer(result.readableBytes());
             parser.serializeMessage(new PcrptBuilder().setPcrptMessage(builder.build()).build(), buf);
             assertArrayEquals(result.array(), buf.array());
@@ -464,7 +493,8 @@ public class PCEPValidatorTest {
             a.start(this.ctx);
             final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/Pcinit.bin"));
 
-            final CInitiated00PCInitiateMessageParser parser = new CInitiated00PCInitiateMessageParser(this.ctx.getObjectHandlerRegistry());
+            final CInitiated00PCInitiateMessageParser parser = new CInitiated00PCInitiateMessageParser(
+                this.ctx.getObjectHandlerRegistry());
 
             final PcinitiateMessageBuilder builder = new PcinitiateMessageBuilder();
             final RequestsBuilder rBuilder = new RequestsBuilder();
@@ -479,8 +509,8 @@ public class PCEPValidatorTest {
             reqs.add(rBuilder.build());
             builder.setRequests(reqs);
 
-            assertEquals(new PcinitiateBuilder().setPcinitiateMessage(builder.build()).build(), parser.parseMessage(result.slice(4,
-                result.readableBytes() - 4), Collections.emptyList()));
+            assertEquals(new PcinitiateBuilder().setPcinitiateMessage(builder.build()).build(),
+                parser.parseMessage(result.slice(4,result.readableBytes() - 4), Collections.emptyList()));
             final ByteBuf buf = Unpooled.buffer(result.readableBytes());
             parser.serializeMessage(new PcinitiateBuilder().setPcinitiateMessage(builder.build()).build(), buf);
             assertArrayEquals(result.array(), buf.array());
@@ -491,11 +521,11 @@ public class PCEPValidatorTest {
     public void testErrorMsg() throws IOException, PCEPDeserializerException {
         try (StatefulActivator a = new StatefulActivator()) {
             a.start(this.ctx);
-            final Stateful07ErrorMessageParser parser = new Stateful07ErrorMessageParser(this.ctx.getObjectHandlerRegistry());
+            final Stateful07ErrorMessageParser parser = new Stateful07ErrorMessageParser(
+                this.ctx.getObjectHandlerRegistry());
 
-            ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCErr.1.bin"));
-            ErrorObject error1 = new ErrorObjectBuilder().setIgnore(false).setProcessingRule(false).setType((short) 19).setValue(
-                (short) 1).build();
+            ErrorObject error1 = new ErrorObjectBuilder().setIgnore(false).setProcessingRule(false).setType((short) 19)
+                    .setValue((short) 1).build();
 
             List<Errors> innerErr = new ArrayList<>();
             innerErr.add(new ErrorsBuilder().setErrorObject(error1).build());
@@ -503,17 +533,22 @@ public class PCEPValidatorTest {
             PcerrMessageBuilder builder = new PcerrMessageBuilder();
             builder.setErrors(innerErr);
             final List<Srps> srps = new ArrayList<>();
-            srps.add(new SrpsBuilder().setSrp(new SrpBuilder().setOperationId(new SrpIdNumber(3L)).setIgnore(false).setProcessingRule(false).setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.srp.object.srp.TlvsBuilder().build()).build()).build());
-            builder.setErrorType(new StatefulCaseBuilder().setStateful(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcerr.pcerr.message.error.type.stateful._case.StatefulBuilder().setSrps(srps).build()).build());
+            srps.add(new SrpsBuilder().setSrp(new SrpBuilder().setOperationId(new SrpIdNumber(3L)).setIgnore(false)
+                .setProcessingRule(false).setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang
+                    .pcep.ietf.stateful.rev181109.srp.object.srp.TlvsBuilder().build()).build()).build());
+            builder.setErrorType(new StatefulCaseBuilder().setStateful(new org.opendaylight.yang.gen.v1.urn.opendaylight
+                .params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcerr.pcerr.message.error.type.stateful._case
+                .StatefulBuilder().setSrps(srps).build()).build());
 
-            assertEquals(new PcerrBuilder().setPcerrMessage(builder.build()).build(), parser.parseMessage(result.slice(4,
-                result.readableBytes() - 4), Collections.emptyList()));
+            ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCErr.1.bin"));
+            assertEquals(new PcerrBuilder().setPcerrMessage(builder.build()).build(),
+                parser.parseMessage(result.slice(4, result.readableBytes() - 4), Collections.emptyList()));
             ByteBuf buf = Unpooled.buffer(result.readableBytes());
             parser.serializeMessage(new PcerrBuilder().setPcerrMessage(builder.build()).build(), buf);
             assertArrayEquals(result.array(), buf.array());
 
-            result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCErr.5.bin"));
-            error1 = new ErrorObjectBuilder().setIgnore(false).setProcessingRule(false).setType((short) 3).setValue((short) 1).build();
+            error1 = new ErrorObjectBuilder().setIgnore(false).setProcessingRule(false).setType((short) 3)
+                    .setValue((short) 1).build();
 
             innerErr = new ArrayList<>();
             builder = new PcerrMessageBuilder();
@@ -533,45 +568,51 @@ public class PCEPValidatorTest {
             rpBuilder.setEroCompression(false);
             rpBuilder.setPriority((short) 1);
             rpBuilder.setRequestId(new RequestId(10L));
-            rpBuilder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.rp.object.rp.TlvsBuilder().build());
+            rpBuilder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109
+                .rp.object.rp.TlvsBuilder().build());
             rpBuilder.setProcessingRule(false);
-            final List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcerr.message.pcerr.message.error.type.request._case.request.Rps> rps = Lists.newArrayList();
-            rps.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcerr.message.pcerr.message.error.type.request._case.request.RpsBuilder().setRp(
-                rpBuilder.build()).build());
+            final List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcerr
+                .message.pcerr.message.error.type.request._case.request.Rps> rps = Lists.newArrayList();
+            rps.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcerr
+                .message.pcerr.message.error.type.request._case.request.RpsBuilder().setRp(rpBuilder.build()).build());
 
             innerErr.add(new ErrorsBuilder().setErrorObject(error1).build());
 
             builder.setErrors(innerErr);
             builder.setErrorType(new RequestCaseBuilder().setRequest(new RequestBuilder().setRps(rps).build()).build());
 
-            assertEquals(new PcerrBuilder().setPcerrMessage(builder.build()).build(), parser.parseMessage(result.slice(4,
-                result.readableBytes() - 4), Collections.emptyList()));
+            result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCErr.5.bin"));
+            assertEquals(new PcerrBuilder().setPcerrMessage(builder.build()).build(),
+                parser.parseMessage(result.slice(4, result.readableBytes() - 4), Collections.emptyList()));
             buf = Unpooled.buffer(result.readableBytes());
             parser.serializeMessage(new PcerrBuilder().setPcerrMessage(builder.build()).build(), buf);
             assertArrayEquals(result.array(), buf.array());
 
-            result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCErr.3.bin"));
 
             builder = new PcerrMessageBuilder();
-            error1 = new ErrorObjectBuilder().setIgnore(false).setProcessingRule(false).setType((short) 3).setValue((short) 1).build();
+            error1 = new ErrorObjectBuilder().setIgnore(false).setProcessingRule(false).setType((short) 3)
+                    .setValue((short) 1).build();
 
             innerErr = new ArrayList<>();
             innerErr.add(new ErrorsBuilder().setErrorObject(error1).build());
 
             builder.setErrors(innerErr);
-            builder.setErrorType(new SessionCaseBuilder().setSession(new SessionBuilder().setOpen(
-                    new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.OpenBuilder()
+            builder.setErrorType(new SessionCaseBuilder().setSession(new SessionBuilder()
+                .setOpen(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open
+                    .object.OpenBuilder()
                         .setDeadTimer((short) 1)
                         .setKeepalive((short) 1)
                         .setVersion(new ProtocolVersion((short) 1))
                         .setSessionId((short) 0)
                         .setIgnore(false)
                         .setProcessingRule(false)
-                        .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.open.TlvsBuilder().build())
+                        .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types
+                            .rev181109.open.object.open.TlvsBuilder().build())
                         .build()).build()).build());
 
-            assertEquals(new PcerrBuilder().setPcerrMessage(builder.build()).build(), parser.parseMessage(result.slice(4,
-                result.readableBytes() - 4), Collections.emptyList()));
+            result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCErr.3.bin"));
+            assertEquals(new PcerrBuilder().setPcerrMessage(builder.build()).build(),
+                parser.parseMessage(result.slice(4,result.readableBytes() - 4), Collections.emptyList()));
             buf = Unpooled.buffer(result.readableBytes());
             parser.serializeMessage(new PcerrBuilder().setPcerrMessage(builder.build()).build(), buf);
             assertArrayEquals(result.array(), buf.array());
@@ -580,7 +621,7 @@ public class PCEPValidatorTest {
 
     @Test
     public void testMissingLspObjectErrorInPcRptMsg() throws PCEPDeserializerException {
-        final byte[] statefulMsg= {
+        final byte[] statefulMsg = {
             (byte) 0x20, (byte) 0x0B, (byte) 0x00, (byte) 0x1C,
             /* srp-object */
             (byte) 0x21, (byte) 0x10, (byte) 0x00, (byte) 0x0C,