BUG-64 : reformat TlvRegistry, to skip using getType method.

[bgpcep.git] / pcep / impl / src / main / java / org / opendaylight / protocol / pcep / impl / tlv / NoPathVectorTlvParser.java

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/NoPathVectorTlvParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/NoPathVectorTlvParser.java
index 510d678043c70593d7d2253af57b69aec91d5b3a..755f4fb95035994f92e261bbbd7e8b1773225b15 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/NoPathVectorTlvParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/NoPathVectorTlvParser.java
@@ -9,73 +9,64 @@ package org.opendaylight.protocol.pcep.impl.tlv;
 
 import java.util.BitSet;
 
-import org.opendaylight.protocol.pcep.PCEPDeserializerException;
+import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvParser;
 import org.opendaylight.protocol.pcep.spi.TlvSerializer;
 import org.opendaylight.protocol.util.ByteArray;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.NoPathVectorTlv;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.NoPathVectorTlv.Flags;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Tlv;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcrep.message.pcrep.message.replies.result.failure.no.path.tlvs.NoPathVectorBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcrep.message.pcrep.message.replies.result.failure._case.no.path.tlvs.NoPathVector;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcrep.message.pcrep.message.replies.result.failure._case.no.path.tlvs.NoPathVectorBuilder;
 
 /**
- * Parser for {@link NoPathVectorTlv}
+ * Parser for {@link NoPathVector}
  */
 public class NoPathVectorTlvParser implements TlvParser, TlvSerializer {
 
        public static final int TYPE = 1;
 
-       public static final int FLAGS_F_LENGTH = 4;
+       private static final int FLAGS_F_LENGTH = 4;
 
-       /*
-        * flags offsets inside flags field in bits
-        */
-       public static final int PCE_UNAVAILABLE = 31;
-       public static final int UNKNOWN_DEST = 30;
-       public static final int UNKNOWN_SRC = 29;
-
-       /*
-        * flags offsets of flags added by GCO extension
-        */
-       public static final int NO_GCO_SOLUTION = 25;
-       public static final int NO_GCO_MIGRATION_PATH = 26;
-
-       /*
-        * flags offsets of flags added by RFC 6006
-        */
-       public static final int REACHABLITY_PROBLEM = 24;
+       private static final int REACHABLITY_PROBLEM = 24;
+       private static final int NO_GCO_SOLUTION = 25;
+       private static final int NO_GCO_MIGRATION_PATH = 26;
+       private static final int PATH_KEY = 27;
+       private static final int CHAIN_UNAVAILABLE = 28;
+       private static final int UNKNOWN_SRC = 29;
+       private static final int UNKNOWN_DEST = 30;
+       private static final int PCE_UNAVAILABLE = 31;
 
        @Override
-       public NoPathVectorTlv parseTlv(final byte[] valueBytes) throws PCEPDeserializerException {
-               if (valueBytes == null || valueBytes.length == 0)
+       public NoPathVector parseTlv(final byte[] valueBytes) throws PCEPDeserializerException {
+               if (valueBytes == null || valueBytes.length == 0) {
                        throw new IllegalArgumentException("Array of bytes is mandatory. Can't be null or empty.");
-
-               if (valueBytes.length != FLAGS_F_LENGTH)
+               }
+               if (valueBytes.length != FLAGS_F_LENGTH) {
                        throw new PCEPDeserializerException("Wrong length of array of bytes. Passed: " + valueBytes.length + "; Expected: >="
                                        + FLAGS_F_LENGTH + ".");
-
+               }
                final BitSet flags = ByteArray.bytesToBitSet(valueBytes);
-
                return new NoPathVectorBuilder().setFlags(
-                               new Flags(false, flags.get(NO_GCO_MIGRATION_PATH), flags.get(NO_GCO_SOLUTION), flags.get(REACHABLITY_PROBLEM), false, flags.get(PCE_UNAVAILABLE), flags.get(UNKNOWN_DEST), flags.get(UNKNOWN_SRC))).build();
+                               new Flags(flags.get(CHAIN_UNAVAILABLE), flags.get(NO_GCO_MIGRATION_PATH), flags.get(NO_GCO_SOLUTION), flags.get(REACHABLITY_PROBLEM), flags.get(PATH_KEY), flags.get(PCE_UNAVAILABLE), flags.get(UNKNOWN_DEST), flags.get(UNKNOWN_SRC))).build();
        }
 
        @Override
        public byte[] serializeTlv(final Tlv tlvs) {
-               if (tlvs == null)
+               if (tlvs == null) {
                        throw new IllegalArgumentException("NoPathVectorTlv is mandatory.");
-               final NoPathVectorTlv tlv = (NoPathVectorTlv) tlvs;
+               }
+               final NoPathVector tlv = (NoPathVector) tlvs;
 
                final BitSet flags = new BitSet(FLAGS_F_LENGTH * Byte.SIZE);
-
-               flags.set(PCE_UNAVAILABLE, tlv.getFlags().isPceUnavailable());
-               flags.set(UNKNOWN_DEST, tlv.getFlags().isUnknownDestination());
-               flags.set(UNKNOWN_SRC, tlv.getFlags().isUnknownSource());
+               flags.set(REACHABLITY_PROBLEM, tlv.getFlags().isP2mpUnreachable());
                flags.set(NO_GCO_SOLUTION, tlv.getFlags().isNoGcoSolution());
                flags.set(NO_GCO_MIGRATION_PATH, tlv.getFlags().isNoGcoMigration());
-               flags.set(REACHABLITY_PROBLEM, tlv.getFlags().isP2mpUnreachable());
-
-               return ByteArray.bitSetToBytes(flags, FLAGS_F_LENGTH);
+               flags.set(PATH_KEY, tlv.getFlags().isPathKey());
+               flags.set(CHAIN_UNAVAILABLE, tlv.getFlags().isChainUnavailable());
+               flags.set(UNKNOWN_SRC, tlv.getFlags().isUnknownSource());
+               flags.set(UNKNOWN_DEST, tlv.getFlags().isUnknownDestination());
+               flags.set(PCE_UNAVAILABLE, tlv.getFlags().isPceUnavailable());
+               return TlvUtil.formatTlv(TYPE, ByteArray.bitSetToBytes(flags, FLAGS_F_LENGTH));
        }
 
        @Override