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

[bgpcep.git] / pcep / impl / src / main / java / org / opendaylight / protocol / pcep / impl / object / PCEPBandwidthObjectParser.java

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPBandwidthObjectParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPBandwidthObjectParser.java
index 9926d6cadb964c2f037c40eff414a16105c840ef..0910199d789e94db2401805871980134bddaf745 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPBandwidthObjectParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/object/PCEPBandwidthObjectParser.java
@@ -7,60 +7,35 @@
  */
 package org.opendaylight.protocol.pcep.impl.object;
 
-import org.opendaylight.protocol.pcep.PCEPDeserializerException;
-import org.opendaylight.protocol.pcep.spi.TlvHandlerRegistry;
+import java.util.Arrays;
+
+import org.opendaylight.protocol.pcep.spi.ObjectUtil;
+import org.opendaylight.protocol.pcep.spi.TlvRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Object;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.ObjectHeader;
-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.bandwidth.object.Bandwidth;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.bandwidth.object.BandwidthBuilder;
 
 /**
  * Parser for {@link Bandwidth}
  */
-public class PCEPBandwidthObjectParser extends AbstractObjectWithTlvsParser<BandwidthBuilder> {
-
-       public static final int E_CLASS = 5;
-
-       public static final int E_TYPE = 1;
+public class PCEPBandwidthObjectParser extends AbstractBandwidthParser {
 
        public static final int CLASS = 5;
 
-       public static final int TYPE = 2;
+       public static final int TYPE = 1;
 
-       private static final int BANDWIDTH_F_LENGTH = 4;
+       private static final int BANDWIDTH_LENGTH = 4;
 
-       public PCEPBandwidthObjectParser(final TlvHandlerRegistry tlvReg) {
+       public PCEPBandwidthObjectParser(final TlvRegistry tlvReg) {
                super(tlvReg);
        }
 
-       @Override
-       public Bandwidth parseObject(final ObjectHeader header, final byte[] bytes) throws PCEPDeserializerException {
-               if (bytes == null || bytes.length == 0) {
-                       throw new IllegalArgumentException("Array of bytes is mandatory. Can't be null or empty.");
-               }
-               if (bytes.length != BANDWIDTH_F_LENGTH) {
-                       throw new PCEPDeserializerException("Wrong length of array of bytes. Passed: " + bytes.length + "; Expected: "
-                                       + BANDWIDTH_F_LENGTH + ".");
-               }
-               final BandwidthBuilder builder = new BandwidthBuilder();
-               builder.setIgnore(header.isIgnore());
-               builder.setProcessingRule(header.isProcessingRule());
-               builder.setBandwidth(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nps.concepts.rev130930.Bandwidth(bytes));
-               return builder.build();
-       }
-
-       @Override
-       public void addTlv(final BandwidthBuilder builder, final Tlv tlv) {
-               // No tlvs defined
-       }
-
        @Override
        public byte[] serializeObject(final Object object) {
                if (!(object instanceof Bandwidth)) {
                        throw new IllegalArgumentException("Wrong instance of PCEPObject. Passed " + object.getClass() + ". Needed BandwidthObject.");
                }
-               return ((Bandwidth) object).getBandwidth().getValue();
+               final byte[] retBytes = Arrays.copyOf(((Bandwidth) object).getBandwidth().getValue(), BANDWIDTH_LENGTH);
+               return ObjectUtil.formatSubobject(TYPE, CLASS, object.isProcessingRule(), object.isIgnore(), retBytes);
        }
 
        @Override
@@ -72,12 +47,4 @@ public class PCEPBandwidthObjectParser extends AbstractObjectWithTlvsParser<Band
        public int getObjectClass() {
                return CLASS;
        }
-
-       public int getEObjectType() {
-               return E_TYPE;
-       }
-
-       public int getEObjectClass() {
-               return E_CLASS;
-       }
 }