BUG 5031:

[bgpcep.git] / bgp / linkstate / src / main / java / org / opendaylight / protocol / bgp / linkstate / impl / attribute / sr / RangeTlvParser.java

diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/attribute/sr/RangeTlvParser.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/RangeTlvParser.java
similarity index 86%
rename from bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/attribute/sr/RangeTlvParser.java
rename to bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/RangeTlvParser.java
index c5d9e16e72bca097cc9281d596ed937cb73fe891..3b6c7728de292245346b81e54daf92511701bb25 100644 (file)
--- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/attribute/sr/RangeTlvParser.java
+++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/RangeTlvParser.java
@@ -5,14 +5,18 @@
  * 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.bgp.linkstate.attribute.sr;
+package org.opendaylight.protocol.bgp.linkstate.impl.attribute.sr;
+
+import static org.opendaylight.protocol.bgp.linkstate.impl.attribute.PrefixAttributesParser.BINDING_SID;
+import static org.opendaylight.protocol.bgp.linkstate.impl.attribute.sr.binding.sid.sub.tlvs.Ipv4PrefixSidParser.PREFIX_SID;
+import static org.opendaylight.protocol.bgp.linkstate.impl.attribute.sr.binding.sid.sub.tlvs.Ipv6PrefixSidParser.IPV6_PREFIX_SID;
+import static org.opendaylight.protocol.bgp.linkstate.impl.attribute.sr.binding.sid.sub.tlvs.SIDParser.SID_TYPE;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.ArrayList;
 import java.util.List;
-import org.opendaylight.protocol.bgp.linkstate.attribute.PrefixAttributesParser;
-import org.opendaylight.protocol.bgp.linkstate.attribute.sr.SidLabelIndexParser.Size;
+import org.opendaylight.protocol.bgp.linkstate.impl.attribute.sr.SidLabelIndexParser.Size;
 import org.opendaylight.protocol.bgp.linkstate.spi.TlvUtil;
 import org.opendaylight.protocol.util.BitArray;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev150210.ProtocolId;
@@ -33,19 +37,16 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public final class RangeTlvParser {
-
     private static final Logger LOG = LoggerFactory.getLogger(RangeTlvParser.class);
-
-    private RangeTlvParser() {
-        throw new UnsupportedOperationException();
-    }
-
     /* Flags */
     private static final int FLAGS_SIZE = 8;
     private static final int INNER_AREA = 0;
-
     private static final int RESERVED = 1;
 
+    private RangeTlvParser() {
+        throw new UnsupportedOperationException();
+    }
+
     public static SrRange parseSrRange(final ByteBuf buffer, final ProtocolId protocolId) {
         final BitArray flags = BitArray.valueOf(buffer, FLAGS_SIZE);
         final SrRangeBuilder range = new SrRangeBuilder();
@@ -64,20 +65,20 @@ public final class RangeTlvParser {
         final List<SubTlvs> subTlvs = new ArrayList<>();
         while (buffer.isReadable()) {
             final SubTlvsBuilder subTlv = new SubTlvsBuilder();
-            RangeSubTlv subTlvCase = null;
+            final RangeSubTlv subTlvCase;
             final int type = buffer.readUnsignedShort();
             final int length = buffer.readUnsignedShort();
             switch (type) {
-            case PrefixAttributesParser.PREFIX_SID:
+            case PREFIX_SID:
                 subTlvCase = new PrefixSidTlvCaseBuilder(SrPrefixAttributesParser.parseSrPrefix(buffer.readSlice(length), protocolId)).build();
                 break;
-            case PrefixAttributesParser.IPV6_PREFIX_SID:
+            case IPV6_PREFIX_SID:
                 subTlvCase = new Ipv6PrefixSidTlvCaseBuilder(Ipv6SrPrefixAttributesParser.parseSrIpv6Prefix(buffer.readSlice(length))).build();
                 break;
-            case PrefixAttributesParser.BINDING_SID:
+            case BINDING_SID:
                 subTlvCase = new BindingSidTlvCaseBuilder(BindingSidLabelParser.parseBindingSidLabel(buffer.readSlice(length), protocolId)).build();
                 break;
-            case SidLabelIndexParser.SID_TYPE:
+            case SID_TYPE:
                 subTlvCase = new SidLabelTlvCaseBuilder().setSidLabelIndex(SidLabelIndexParser.parseSidLabelIndex(Size.forValue(length), buffer.readSlice(length))).build();
                 break;
             default:
@@ -110,11 +111,11 @@ public final class RangeTlvParser {
                     prefixSidTlv.getAlgorithm(),
                     prefixSidTlv.getSidLabelIndex(),
                     buffer);
-                TlvUtil.writeTLV(PrefixAttributesParser.PREFIX_SID, buffer, aggregator);
+                TlvUtil.writeTLV(PREFIX_SID, buffer, aggregator);
             } else if (rangeSubTlv instanceof Ipv6PrefixSidTlvCase) {
                 final Ipv6PrefixSidTlvCase prefixSidTlv = (Ipv6PrefixSidTlvCase) rangeSubTlv;
                 Ipv6SrPrefixAttributesParser.serializePrefixAttributes(prefixSidTlv.getAlgorithm(), buffer);
-                TlvUtil.writeTLV(PrefixAttributesParser.IPV6_PREFIX_SID, buffer, aggregator);
+                TlvUtil.writeTLV(IPV6_PREFIX_SID, buffer, aggregator);
             } else if (rangeSubTlv instanceof BindingSidTlvCase) {
                 final BindingSidTlvCase rangeTlv = (BindingSidTlvCase) rangeSubTlv;
                 BindingSidLabelParser.serializeBindingSidAttributes(
@@ -122,10 +123,10 @@ public final class RangeTlvParser {
                     rangeTlv.getFlags(),
                     rangeTlv.getBindingSubTlvs(),
                     buffer);
-                TlvUtil.writeTLV(PrefixAttributesParser.BINDING_SID, buffer, aggregator);
+                TlvUtil.writeTLV(BINDING_SID, buffer, aggregator);
             } else if (rangeSubTlv instanceof SidLabelTlvCase) {
                 buffer = SidLabelIndexParser.serializeSidValue(((SidLabelTlvCase) rangeSubTlv).getSidLabelIndex());
-                TlvUtil.writeTLV(SidLabelIndexParser.SID_TYPE, buffer, aggregator);
+                TlvUtil.writeTLV(SID_TYPE, buffer, aggregator);
             }
         }
     }