BUG-47: more subobject models

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

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPMessageFactory.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPMessageFactory.java
index d542190e8bfbb13bb048a905366761b739036398..1bc18098700dd544dcfed15f98e7f9deb9e4cdaf 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPMessageFactory.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPMessageFactory.java
@@ -10,15 +10,12 @@ package org.opendaylight.protocol.pcep.impl;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.opendaylight.protocol.framework.DeserializerException;
 import org.opendaylight.protocol.framework.DocumentedException;
 import org.opendaylight.protocol.framework.ProtocolMessageFactory;
 import org.opendaylight.protocol.pcep.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.PCEPDocumentedException;
-import org.opendaylight.protocol.pcep.spi.HandlerRegistry;
+import org.opendaylight.protocol.pcep.spi.MessageHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.MessageSerializer;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message;
@@ -48,8 +45,6 @@ public final class PCEPMessageFactory implements ProtocolMessageFactory<Message>
 
        private static final int VERSION_SF_LENGTH = 3;
 
-       private final HandlerRegistry registry;
-
        private static final int VER_FLAGS_MF_LENGTH = 1;
        private static final int TYPE_F_LENGTH = 1;
        private static final int LENGTH_F_LENGTH = 2;
@@ -58,12 +53,14 @@ public final class PCEPMessageFactory implements ProtocolMessageFactory<Message>
        private static final int TYPE_F_OFFSET = VER_FLAGS_MF_LENGTH + VER_FLAGS_MF_OFFSET;
        private static final int LENGTH_F_OFFSET = TYPE_F_LENGTH + TYPE_F_OFFSET;
 
-       public PCEPMessageFactory() {
-               this.registry = HandlerRegistryImpl.INSTANCE;
+       private final MessageHandlerRegistry registry;
+
+       public PCEPMessageFactory(final MessageHandlerRegistry registry) {
+               this.registry = Preconditions.checkNotNull(registry);
        }
 
        @Override
-       public List<Message> parse(final byte[] bytes) throws DeserializerException, DocumentedException {
+       public Message parse(final byte[] bytes) throws DeserializerException, DocumentedException {
                Preconditions.checkArgument(bytes != null, "Bytes may not be null");
                Preconditions.checkArgument(bytes.length != 0, "Bytes may not be empty");
 
@@ -92,7 +89,7 @@ public final class PCEPMessageFactory implements ProtocolMessageFactory<Message>
                        throw new DocumentedException(e.getMessage(), e);
                }
                logger.debug("Message was parsed. {}", msg);
-               return Arrays.asList(msg);
+               return msg;
        }
 
        @Override