BUG-47 : added messages to registry.

Change-Id: Id0155658da8851a69affdacffecdd7da11b88366
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/SimpleMessageHandlerRegistry.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/SimpleMessageHandlerRegistry.java
index e73f3bc20065669de87c370a2832241af049a764..f35ec11664333e31c723d2c85fcdbf976de4b188 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/SimpleMessageHandlerRegistry.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/SimpleMessageHandlerRegistry.java
@@ -8,39 +8,89 @@
 package org.opendaylight.protocol.pcep.impl;
 
 import org.opendaylight.protocol.concepts.HandlerRegistry;
+import org.opendaylight.protocol.pcep.impl.message.PCCreateMessageParser;
+import org.opendaylight.protocol.pcep.impl.message.PCEPCloseMessageParser;
+import org.opendaylight.protocol.pcep.impl.message.PCEPErrorMessageParser;
+import org.opendaylight.protocol.pcep.impl.message.PCEPKeepAliveMessageParser;
+import org.opendaylight.protocol.pcep.impl.message.PCEPNotificationMessageParser;
+import org.opendaylight.protocol.pcep.impl.message.PCEPOpenMessageParser;
+import org.opendaylight.protocol.pcep.impl.message.PCEPReplyMessageParser;
+import org.opendaylight.protocol.pcep.impl.message.PCEPReportMessageParser;
+import org.opendaylight.protocol.pcep.impl.message.PCEPRequestMessageParser;
+import org.opendaylight.protocol.pcep.impl.message.PCEPUpdateRequestMessageParser;
 import org.opendaylight.protocol.pcep.spi.MessageHandlerRegistry;
 import org.opendaylight.protocol.pcep.spi.MessageParser;
 import org.opendaylight.protocol.pcep.spi.MessageSerializer;
+import org.opendaylight.protocol.pcep.spi.ObjectHandlerRegistry;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.CloseMessage;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.KeepaliveMessage;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.OpenMessage;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.PcerrMessage;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.PcinitiateMessage;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.PcntfMessage;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.PcrepMessage;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.PcreqMessage;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.PcrptMessage;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.PcupdMessage;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
 
 import com.google.common.base.Preconditions;
 
-/**
- *
- */
 public final class SimpleMessageHandlerRegistry implements MessageHandlerRegistry {
+       public static final MessageHandlerRegistry INSTANCE;
+
+       static {
+               final MessageHandlerRegistry reg = new SimpleMessageHandlerRegistry();
+
+               final ObjectHandlerRegistry objReg = new SimpleObjectHandlerRegistry();
+
+               reg.registerMessageParser(PCEPOpenMessageParser.TYPE, new PCEPOpenMessageParser(objReg));
+               reg.registerMessageParser(PCEPNotificationMessageParser.TYPE, new PCEPNotificationMessageParser(objReg));
+               reg.registerMessageParser(PCEPKeepAliveMessageParser.TYPE, new PCEPKeepAliveMessageParser(objReg));
+               reg.registerMessageParser(PCEPReplyMessageParser.TYPE, new PCEPReplyMessageParser(objReg));
+               reg.registerMessageParser(PCEPRequestMessageParser.TYPE, new PCEPRequestMessageParser(objReg));
+               reg.registerMessageParser(PCEPErrorMessageParser.TYPE, new PCEPErrorMessageParser(objReg));
+               reg.registerMessageParser(PCEPCloseMessageParser.TYPE, new PCEPCloseMessageParser(objReg));
+               reg.registerMessageParser(PCEPUpdateRequestMessageParser.TYPE, new PCEPUpdateRequestMessageParser(objReg));
+               reg.registerMessageParser(PCEPReportMessageParser.TYPE, new PCEPReportMessageParser(objReg));
+               reg.registerMessageParser(PCCreateMessageParser.TYPE, new PCCreateMessageParser(objReg));
+
+               reg.registerMessageSerializer(OpenMessage.class, new PCEPOpenMessageParser(objReg));
+               reg.registerMessageSerializer(PcntfMessage.class, new PCEPNotificationMessageParser(objReg));
+               reg.registerMessageSerializer(KeepaliveMessage.class, new PCEPKeepAliveMessageParser(objReg));
+               reg.registerMessageSerializer(PcrepMessage.class, new PCEPReplyMessageParser(objReg));
+               reg.registerMessageSerializer(PcreqMessage.class, new PCEPRequestMessageParser(objReg));
+               reg.registerMessageSerializer(PcerrMessage.class, new PCEPErrorMessageParser(objReg));
+               reg.registerMessageSerializer(CloseMessage.class, new PCEPCloseMessageParser(objReg));
+               reg.registerMessageSerializer(PcupdMessage.class, new PCEPUpdateRequestMessageParser(objReg));
+               reg.registerMessageSerializer(PcrptMessage.class, new PCEPReportMessageParser(objReg));
+               reg.registerMessageSerializer(PcinitiateMessage.class, new PCCreateMessageParser(objReg));
+
+               INSTANCE = reg;
+       }
+
        private final HandlerRegistry<DataContainer, MessageParser, MessageSerializer> handlers = new HandlerRegistry<>();
 
        @Override
        public AutoCloseable registerMessageParser(final int messageType, final MessageParser parser) {
                Preconditions.checkArgument(messageType >= 0 && messageType <= 255);
-               return handlers.registerParser(messageType, parser);
+               return this.handlers.registerParser(messageType, parser);
        }
 
        @Override
        public AutoCloseable registerMessageSerializer(final Class<? extends Message> msgClass, final MessageSerializer serializer) {
-               return handlers.registerSerializer(msgClass, serializer);
+               return this.handlers.registerSerializer(msgClass, serializer);
        }
 
        @Override
        public MessageParser getMessageParser(final int messageType) {
                Preconditions.checkArgument(messageType >= 0 && messageType <= 255);
-               return handlers.getParser(messageType);
+               return this.handlers.getParser(messageType);
        }
 
        @Override
        public MessageSerializer getMessageSerializer(final Message message) {
-               return handlers.getSerializer(message.getImplementedInterface());
+               return this.handlers.getSerializer(message.getImplementedInterface());
        }
 }

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCCreateMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCCreateMessageParser.java
index 99e8577a5009d785ee0ac560da510688fb890b58..db158e3f73c88502bfd4e24608a18e0aeff6bed8 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCCreateMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCCreateMessageParser.java
@@ -20,7 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
  */
 public class PCCreateMessageParser extends AbstractMessageParser {
 
-       private final int TYPE = 12;
+       public static final int TYPE = 12;
 
        public PCCreateMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);
@@ -41,6 +41,6 @@ public class PCCreateMessageParser extends AbstractMessageParser {
 
        @Override
        public int getMessageType() {
-               return this.TYPE;
+               return TYPE;
        }
 }

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPCloseMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPCloseMessageParser.java
index de83f4ca3e43556108eba075e7299ea7bd1dd531..5fd81073bbede711c36651600807dc5798391358 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPCloseMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPCloseMessageParser.java
@@ -29,7 +29,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
  */
 public class PCEPCloseMessageParser extends AbstractMessageParser {
 
-       private final int TYPE = 7;
+       public static final int TYPE = 7;
 
        public PCEPCloseMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);
@@ -81,6 +81,6 @@ public class PCEPCloseMessageParser extends AbstractMessageParser {
 
        @Override
        public int getMessageType() {
-               return this.TYPE;
+               return TYPE;
        }
 }

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPErrorMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPErrorMessageParser.java
index 01f037dddab35728dd693250b934739ea1c4e71b..bc3192f3ee4ab5bc4acbad8522064dfdf579cea9 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPErrorMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPErrorMessageParser.java
@@ -43,7 +43,7 @@ import com.google.common.collect.Lists;
  */
 public class PCEPErrorMessageParser extends AbstractMessageParser {
 
-       public final int TYPE = 6;
+       public static final int TYPE = 6;
 
        public PCEPErrorMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);
@@ -190,6 +190,6 @@ public class PCEPErrorMessageParser extends AbstractMessageParser {
 
        @Override
        public int getMessageType() {
-               return this.TYPE;
+               return TYPE;
        }
 }

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPKeepAliveMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPKeepAliveMessageParser.java
index 5349348bce9327b61552644f4b5ece533406c002..baf317e8011acf14d5200d68e9482222f74ba58c 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPKeepAliveMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPKeepAliveMessageParser.java
@@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
  */
 public class PCEPKeepAliveMessageParser extends AbstractMessageParser {
 
-       private final int TYPE = 2;
+       public static final int TYPE = 2;
 
        public PCEPKeepAliveMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPNotificationMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPNotificationMessageParser.java
index 9c428783183172a49dbf9ce6f82729a9b6118263..23732fd9bc873eb1efa731f71c049864f844a81a 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPNotificationMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPNotificationMessageParser.java
@@ -39,7 +39,7 @@ import com.google.common.collect.Lists;
  */
 public class PCEPNotificationMessageParser extends AbstractMessageParser {
 
-       private final int TYPE = 5;
+       public static final int TYPE = 5;
 
        public PCEPNotificationMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);
@@ -170,6 +170,6 @@ public class PCEPNotificationMessageParser extends AbstractMessageParser {
 
        @Override
        public int getMessageType() {
-               return this.TYPE;
+               return TYPE;
        }
 }

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPOpenMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPOpenMessageParser.java
index e682b9df4d481e56ead270f008b524b1db196429..90731f71210bb67af803c890736bc35795ab0de0 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPOpenMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPOpenMessageParser.java
@@ -26,7 +26,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
  */
 public class PCEPOpenMessageParser extends AbstractMessageParser {
 
-       private final int TYPE = 1;
+       public static final int TYPE = 1;
 
        public PCEPOpenMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);
@@ -81,6 +81,6 @@ public class PCEPOpenMessageParser extends AbstractMessageParser {
 
        @Override
        public int getMessageType() {
-               return this.TYPE;
+               return TYPE;
        }
 }

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java
index 72f9012c82cc22919aefd4d49db9af7c8836f748..2e69e6885577ac60ec11040e77f37c33601e18ea 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java
@@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 // FIXME: finish
 public class PCEPReplyMessageParser extends AbstractMessageParser {
 
-       private final int TYPE = 4;
+       public static final int TYPE = 4;
 
        public PCEPReplyMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReportMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReportMessageParser.java
index 186b6fa9f0e6e81588d258d8a2df12168ac4d077..304fec1c9e66fd564cdb659897e66fdb22386b20 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReportMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReportMessageParser.java
@@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 // FIXME : finish
 public class PCEPReportMessageParser extends AbstractMessageParser {
 
-       private final int TYPE = 10;
+       public static final int TYPE = 10;
 
        public PCEPReportMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPRequestMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPRequestMessageParser.java
index 357bcfc26986571b263fd4d75c296dd9f4a5bdf8..8cf2f499b08e7aca8ed3db4f3643bb1e4860d83e 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPRequestMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPRequestMessageParser.java
@@ -18,10 +18,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 /**
  * Parser for {@link PcrepMessage}
  */
-//FIXME finish
+// FIXME finish
 public class PCEPRequestMessageParser extends AbstractMessageParser {
 
-       private final int TYPE = 3;
+       public static final int TYPE = 3;
 
        public PCEPRequestMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPUpdateRequestMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPUpdateRequestMessageParser.java
index 17b9ee4cb077a5aaed0e45943c212440b67d8079..530c4eb9d525278b9ff81f2c795ec3504e43a013 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPUpdateRequestMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPUpdateRequestMessageParser.java
@@ -20,7 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
  */
 public class PCEPUpdateRequestMessageParser extends AbstractMessageParser {
 
-       private final int TYPE = 11;
+       public static final int TYPE = 11;
 
        public PCEPUpdateRequestMessageParser(final ObjectHandlerRegistry registry) {
                super(registry);