BUG-50 : added tests for PCEP TLVs.

[bgpcep.git] / pcep / spi / src / main / java / org / opendaylight / protocol / pcep / spi / pojo / SimpleObjectHandlerRegistry.java

diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleObjectHandlerRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleObjectHandlerRegistry.java
index 709452bbae49a9c4e2421b50aa341366e5b46d70..7452e375783dc9402778d6222c54a8afd7a9d8e1 100644 (file)
--- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleObjectHandlerRegistry.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleObjectHandlerRegistry.java
@@ -11,6 +11,7 @@ import org.opendaylight.protocol.concepts.HandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.ObjectParser;
 import org.opendaylight.protocol.pcep.spi.ObjectSerializer;
+import org.opendaylight.protocol.util.Util;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Object;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
 
@@ -22,29 +23,29 @@ import com.google.common.base.Preconditions;
 public final class SimpleObjectHandlerRegistry implements ObjectHandlerRegistry {
        private final HandlerRegistry<DataContainer, ObjectParser, ObjectSerializer> handlers = new HandlerRegistry<>();
 
-       private static final int createKey(final int objectClass, final int objectType) {
-               Preconditions.checkArgument(objectClass >= 0 && objectClass <= 255);
+       private static int createKey(final int objectClass, final int objectType) {
+               Preconditions.checkArgument(objectClass >= 0 && objectClass <= Util.UNSIGNED_BYTE_MAX_VALUE);
                Preconditions.checkArgument(objectType >= 0 && objectType <= 15);
                return (objectClass << 4) | objectType;
        }
 
        public AutoCloseable registerObjectParser(final int objectClass, final int objectType, final ObjectParser parser) {
-               Preconditions.checkArgument(objectClass >= 0 && objectClass <= 255);
+               Preconditions.checkArgument(objectClass >= 0 && objectClass <= Util.UNSIGNED_BYTE_MAX_VALUE);
                Preconditions.checkArgument(objectType >= 0 && objectType <= 15);
-               return handlers.registerParser(createKey(objectClass, objectType), parser);
+               return this.handlers.registerParser(createKey(objectClass, objectType), parser);
        }
 
        public AutoCloseable registerObjectSerializer(final Class<? extends Object> objClass, final ObjectSerializer serializer) {
-               return handlers.registerSerializer(objClass, serializer);
+               return this.handlers.registerSerializer(objClass, serializer);
        }
 
        @Override
        public ObjectParser getObjectParser(final int objectClass, final int objectType) {
-               return handlers.getParser(createKey(objectClass, objectType));
+               return this.handlers.getParser(createKey(objectClass, objectType));
        }
 
        @Override
        public ObjectSerializer getObjectSerializer(final Object object) {
-               return handlers.getSerializer(object.getImplementedInterface());
+               return this.handlers.getSerializer(object.getImplementedInterface());
        }
 }