Fixup breakage introduced by 0.6.0 yang tools 33/1833/1
authorRobert Varga <rovarga@cisco.com>
Fri, 11 Oct 2013 14:09:03 +0000 (16:09 +0200)
committerRobert Varga <rovarga@cisco.com>
Fri, 11 Oct 2013 14:10:00 +0000 (16:10 +0200)
Also fixes classpath versioning problems

Change-Id: I9b66d7dc9aecb089be57c25c4f7f5a13884b0f41
Signed-off-by: Robert Varga <rovarga@cisco.com>
21 files changed:
bgp/concepts/pom.xml
bgp/linkstate/pom.xml
bgp/parser-api/pom.xml
bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BgpTableTypeImpl.java
bgp/rib-api/pom.xml
bgp/rib-impl/pom.xml
bgp/rib-spi/pom.xml
concepts/pom.xml
integration-tests/pom.xml
pcep/api/pom.xml
pcep/api/src/main/java/org/opendaylight/protocol/pcep/message/PCCreateMessage.java
pcep/api/src/main/java/org/opendaylight/protocol/pcep/message/PCEPCloseMessage.java
pcep/api/src/main/java/org/opendaylight/protocol/pcep/message/PCEPErrorMessage.java
pcep/api/src/main/java/org/opendaylight/protocol/pcep/message/PCEPNotificationMessage.java
pcep/api/src/main/java/org/opendaylight/protocol/pcep/message/PCEPOpenMessage.java
pcep/api/src/main/java/org/opendaylight/protocol/pcep/message/PCEPReplyMessage.java
pcep/api/src/main/java/org/opendaylight/protocol/pcep/message/PCEPReportMessage.java
pcep/api/src/main/java/org/opendaylight/protocol/pcep/message/PCEPRequestMessage.java
pcep/api/src/main/java/org/opendaylight/protocol/pcep/message/PCEPUpdateRequestMessage.java
pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/RawMessage.java
pom.xml

index 94f8467910185414e5d7f59cded08cb77e75d62c..a6bdfbe73de724e064bf313a03e1509240fff7b3 100644 (file)
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${code.generator.version}</version>
+            <version>${yang.binding.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -87,7 +87,7 @@
                    <dependency>
                        <groupId>org.opendaylight.yangtools</groupId>
                        <artifactId>maven-sal-api-gen-plugin</artifactId>
-                       <version>${code.generator.version}</version>
+                       <version>${yang.binding.version}</version>
                        <type>jar</type>
                    </dependency>
                </dependencies>
index 7c69ae7343bbc997cda924aa9873add9ccc0db5b..2bb56937dfa3488cff709512077acc8702f79b2b 100644 (file)
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>
                        <version>${guava.version}</version>
-               </dependency>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-binding</artifactId>
+            <version>${yang.binding.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
+            <version>${yangtools.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
@@ -82,7 +93,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${code.generator.version}</version>
+                        <version>${yang.binding.version}</version>
                         <type>jar</type>
                     </dependency>
                 </dependencies>
index 76a8a8af091fac2b50997606e55b9f3bc9aaf0de..4e123d15867200f21a4264d648befd0616f0777b 100644 (file)
                        <artifactId>slf4j-api</artifactId>
                        <version>${slf4j.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-binding</artifactId>
+            <version>${yang.binding.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
+            <version>${yangtools.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
@@ -87,7 +99,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${code.generator.version}</version>
+                        <version>${yang.binding.version}</version>
                         <type>jar</type>
                     </dependency>
                 </dependencies>
index a28ac20545e802b125fcd33e03eea82eb2c23641..03763d5464233832881e8a4602926f7994f768df 100644 (file)
@@ -33,6 +33,11 @@ public final class BgpTableTypeImpl implements BgpTableType {
                this.safi = Preconditions.checkNotNull(safi, "Subsequent address family may not be null");
        }
 
+       @Override
+       public Class<BgpTableType> getImplementedInterface() {
+               return BgpTableType.class;
+       }
+
        @Override
        public int hashCode() {
                int ret = 3 * this.afi.hashCode();
index 57f34cc4d1508d041ea5b5a6d38b63c6b749d6fb..0eb68bb9283709bae8c04a23d9bd88996466f140 100644 (file)
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${code.generator.version}</version>
+            <version>${yang.binding.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -77,7 +77,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${code.generator.version}</version>
+                        <version>${yang.binding.version}</version>
                         <type>jar</type>
                     </dependency>
                 </dependencies>
index 8e8fb3d393540c775335516c43daee7b931358f7..a9e4d166f4938871167b0f1bbfda4fd2af3004c8 100644 (file)
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${code.generator.version}</version>
+            <version>${yang.binding.version}</version>
         </dependency>
                <dependency>
                        <groupId>org.mockito</groupId>
index 0d6f406f629202d1d95e3337355854c159ac80cb..98347b430c425cfe738793f8d1bfda43fae5e08f 100644 (file)
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${code.generator.version}</version>
+            <version>${yang.binding.version}</version>
         </dependency>
         
                <dependency>
index b12f100726775424c2993e051950346f04f7ae61..b9e897f7a53ef5347bb6a5da243cc3ee4dd639ca 100644 (file)
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${yangtools.version}</version>
+            <version>${yang.binding.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -92,7 +92,7 @@
                    <dependency>
                        <groupId>org.opendaylight.yangtools</groupId>
                        <artifactId>maven-sal-api-gen-plugin</artifactId>
-                       <version>${code.generator.version}</version>
+                       <version>${yang.binding.version}</version>
                        <type>jar</type>
                    </dependency>
                </dependencies>
index 63d01bf08401fc99203048ddb15cf61f10f36db2..830077e1cd11e6c60b31967a568d75737e656fc7 100644 (file)
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${code.generator.version}</version>
+            <version>${yang.binding.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
index 0e41eb30cf7f483134473b45c44dbf05f1624be2..b94358f00af268e176f42a62cc33b1fe9b527b3b 100644 (file)
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${code.generator.version}</version>
+            <version>${yang.binding.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
                    <dependency>
                        <groupId>org.opendaylight.yangtools</groupId>
                        <artifactId>maven-sal-api-gen-plugin</artifactId>
-                       <version>${code.generator.version}</version>
+                       <version>${yang.binding.version}</version>
                        <type>jar</type>
                    </dependency>
                </dependencies>
index b12b6bdec0b1e1b2f7d0061a5ab544461f291a01..a942e566c73c6540b5f3a751d0150f8de018a807 100644 (file)
@@ -33,8 +33,9 @@ public class PCCreateMessage implements Message {
         * @param lsps List<CompositeInstantiationObject>. Can't be empty or null.
         */
        public PCCreateMessage(final List<CompositeInstantiationObject> lsps) {
-               if (lsps == null || lsps.isEmpty())
+               if (lsps == null || lsps.isEmpty()) {
                        throw new IllegalArgumentException("At least one CompositeStateReportObject is mandatory.");
+               }
 
                this.lsps = lsps;
                this.objects = Lists.newArrayList();
@@ -72,18 +73,23 @@ public class PCCreateMessage implements Message {
         */
        @Override
        public boolean equals(final Object obj) {
-               if (this == obj)
+               if (this == obj) {
                        return true;
-               if (!super.equals(obj))
+               }
+               if (!super.equals(obj)) {
                        return false;
-               if (!(obj instanceof PCCreateMessage))
+               }
+               if (!(obj instanceof PCCreateMessage)) {
                        return false;
+               }
                final PCCreateMessage other = (PCCreateMessage) obj;
                if (this.lsps == null) {
-                       if (other.lsps != null)
+                       if (other.lsps != null) {
                                return false;
-               } else if (!this.lsps.equals(other.lsps))
+                       }
+               } else if (!this.lsps.equals(other.lsps)) {
                        return false;
+               }
                return true;
        }
 
@@ -98,4 +104,9 @@ public class PCCreateMessage implements Message {
                builder.append("]");
                return builder.toString();
        }
+
+       @Override
+       public Class<Message> getImplementedInterface() {
+               return Message.class;
+       }
 }
index 940173e8b9a1e1a05a3bab64c120fa4fbaa3ee49..498eff03eab3454f27fdb2029af8fb919fd9da6f 100644 (file)
@@ -37,13 +37,15 @@ public class PCEPCloseMessage implements Message {
         * @param closeObj Can't be null.
         */
        public PCEPCloseMessage(final PCEPCloseObject closeObj) {
-               if (closeObj == null)
+               if (closeObj == null) {
                        throw new IllegalArgumentException("PCEPCloseObject is mandatory. Can't be null.");
+               }
 
                this.closeObj = closeObj;
                this.objects = Lists.newArrayList();
-               if (closeObj != null)
+               if (closeObj != null) {
                        this.objects.add(closeObj);
+               }
        }
 
        /**
@@ -69,18 +71,23 @@ public class PCEPCloseMessage implements Message {
 
        @Override
        public boolean equals(final Object obj) {
-               if (this == obj)
+               if (this == obj) {
                        return true;
-               if (!super.equals(obj))
+               }
+               if (!super.equals(obj)) {
                        return false;
-               if (this.getClass() != obj.getClass())
+               }
+               if (this.getClass() != obj.getClass()) {
                        return false;
+               }
                final PCEPCloseMessage other = (PCEPCloseMessage) obj;
                if (this.closeObj == null) {
-                       if (other.closeObj != null)
+                       if (other.closeObj != null) {
                                return false;
-               } else if (!this.closeObj.equals(other.closeObj))
+                       }
+               } else if (!this.closeObj.equals(other.closeObj)) {
                        return false;
+               }
                return true;
        }
 
@@ -92,4 +99,9 @@ public class PCEPCloseMessage implements Message {
                builder.append("]");
                return builder.toString();
        }
+
+       @Override
+       public Class<Message> getImplementedInterface() {
+               return Message.class;
+       }
 }
index f5a4ebe05a33ea05e301c858dff42cd487dc94a0..b32f39cc3e95c87ff0bff1f4ec1d57e1894dcfe9 100644 (file)
@@ -49,8 +49,9 @@ public class PCEPErrorMessage implements Message {
                        private static final long serialVersionUID = 72172137965955228L;
 
                        {
-                               if (compositeErrorObject != null)
+                               if (compositeErrorObject != null) {
                                        this.add(compositeErrorObject);
+                               }
                        }
                });
        }
@@ -64,7 +65,7 @@ public class PCEPErrorMessage implements Message {
         */
        public PCEPErrorMessage(final List<?> errorObjects) {
                this.objects = Lists.newArrayList();
-               if (errorObjects != null)
+               if (errorObjects != null) {
                        for (int i = 0; i < errorObjects.size(); i++) {
                                if (errorObjects.get(i) instanceof CompositeErrorObject) {
                                        this.objects.addAll(((CompositeErrorObject) errorObjects.get(i)).getCompositeAsList());
@@ -72,6 +73,7 @@ public class PCEPErrorMessage implements Message {
                                        this.objects.add((PCEPErrorObject) errorObjects.get(i));
                                }
                        }
+               }
                this.errors = new ArrayList<CompositeErrorObject>();
                this.errorObjects = new ArrayList<PCEPErrorObject>();
 
@@ -81,8 +83,9 @@ public class PCEPErrorMessage implements Message {
                                        this.errors.add((CompositeErrorObject) errorObjects.get(i));
                                } else if (errorObjects.get(i) instanceof PCEPErrorObject) {
                                        this.errorObjects.add((PCEPErrorObject) errorObjects.get(i));
-                               } else
+                               } else {
                                        throw new IllegalArgumentException("Wrong instance passed in list. Acceptable is only CompositeErrorObject or PCEPErrorObject.");
+                               }
                        }
                }
        }
@@ -98,25 +101,30 @@ public class PCEPErrorMessage implements Message {
         */
        public PCEPErrorMessage(final PCEPOpenObject openObj, final List<PCEPErrorObject> errorObjects, final List<CompositeErrorObject> errors) {
                this.objects = Lists.newArrayList();
-               if (errorObjects != null)
+               if (errorObjects != null) {
                        this.objects.addAll(errorObjects);
-               if (openObj != null)
+               }
+               if (openObj != null) {
                        this.objects.add(openObj);
-               if (errors != null)
+               }
+               if (errors != null) {
                        for (final CompositeErrorObject ceo : errors) {
                                this.objects.addAll(ceo.getCompositeAsList());
                        }
+               }
 
                this.openObj = openObj;
 
-               if (errorObjects == null)
+               if (errorObjects == null) {
                        throw new IllegalArgumentException("At least one PCEPErrorObject is mandatory.");
+               }
                this.errorObjects = errorObjects;
 
-               if (errors == null)
+               if (errors == null) {
                        this.errors = Collections.emptyList();
-               else
+               } else {
                        this.errors = errors;
+               }
        }
 
        /**
@@ -167,28 +175,37 @@ public class PCEPErrorMessage implements Message {
 
        @Override
        public boolean equals(final Object obj) {
-               if (this == obj)
+               if (this == obj) {
                        return true;
-               if (!super.equals(obj))
+               }
+               if (!super.equals(obj)) {
                        return false;
-               if (this.getClass() != obj.getClass())
+               }
+               if (this.getClass() != obj.getClass()) {
                        return false;
+               }
                final PCEPErrorMessage other = (PCEPErrorMessage) obj;
                if (this.errorObjects == null) {
-                       if (other.errorObjects != null)
+                       if (other.errorObjects != null) {
                                return false;
-               } else if (!this.errorObjects.equals(other.errorObjects))
+                       }
+               } else if (!this.errorObjects.equals(other.errorObjects)) {
                        return false;
+               }
                if (this.errors == null) {
-                       if (other.errors != null)
+                       if (other.errors != null) {
                                return false;
-               } else if (!this.errors.equals(other.errors))
+                       }
+               } else if (!this.errors.equals(other.errors)) {
                        return false;
+               }
                if (this.openObj == null) {
-                       if (other.openObj != null)
+                       if (other.openObj != null) {
                                return false;
-               } else if (!this.openObj.equals(other.openObj))
+                       }
+               } else if (!this.openObj.equals(other.openObj)) {
                        return false;
+               }
                return true;
        }
 
@@ -204,4 +221,9 @@ public class PCEPErrorMessage implements Message {
                builder.append("]");
                return builder.toString();
        }
+
+       @Override
+       public Class<Message> getImplementedInterface() {
+               return Message.class;
+       }
 }
index 9923ab44505b138579294ce9876576eeaf1997b8..10ebdb44c50e5a113da09fdff0078cdde5517464 100644 (file)
@@ -40,8 +40,9 @@ public class PCEPNotificationMessage implements Message {
                                this.objects.addAll(cno.getCompositeAsList());
                        }
                }
-               if (notifications == null || notifications.isEmpty())
+               if (notifications == null || notifications.isEmpty()) {
                        throw new IllegalArgumentException("At least one CompositeNotifyObject is mandatory.");
+               }
 
                this.notifications = notifications;
        }
@@ -69,18 +70,23 @@ public class PCEPNotificationMessage implements Message {
 
        @Override
        public boolean equals(final Object obj) {
-               if (this == obj)
+               if (this == obj) {
                        return true;
-               if (!super.equals(obj))
+               }
+               if (!super.equals(obj)) {
                        return false;
-               if (this.getClass() != obj.getClass())
+               }
+               if (this.getClass() != obj.getClass()) {
                        return false;
+               }
                final PCEPNotificationMessage other = (PCEPNotificationMessage) obj;
                if (this.notifications == null) {
-                       if (other.notifications != null)
+                       if (other.notifications != null) {
                                return false;
-               } else if (!this.notifications.equals(other.notifications))
+                       }
+               } else if (!this.notifications.equals(other.notifications)) {
                        return false;
+               }
                return true;
        }
 
@@ -92,4 +98,9 @@ public class PCEPNotificationMessage implements Message {
                builder.append("]");
                return builder.toString();
        }
+
+       @Override
+       public Class<Message> getImplementedInterface() {
+               return Message.class;
+       }
 }
index 1f4bd294c65148f75599b2439e182c58c0834544..5186e11f64eddc80c8abad5d50eb37de49e5ad08 100644 (file)
@@ -35,10 +35,11 @@ public class PCEPOpenMessage implements Message {
         */
        public PCEPOpenMessage(final PCEPOpenObject openObj) {
                this.objects = Lists.newArrayList();
-               if (openObj != null)
+               if (openObj != null) {
                        this.objects.add(openObj);
-               else
+               } else {
                        throw new IllegalArgumentException("PCEPOpenObject is mandatory.");
+               }
 
                this.openObj = openObj;
        }
@@ -66,18 +67,23 @@ public class PCEPOpenMessage implements Message {
 
        @Override
        public boolean equals(final Object obj) {
-               if (this == obj)
+               if (this == obj) {
                        return true;
-               if (!super.equals(obj))
+               }
+               if (!super.equals(obj)) {
                        return false;
-               if (this.getClass() != obj.getClass())
+               }
+               if (this.getClass() != obj.getClass()) {
                        return false;
+               }
                final PCEPOpenMessage other = (PCEPOpenMessage) obj;
                if (this.openObj == null) {
-                       if (other.openObj != null)
+                       if (other.openObj != null) {
                                return false;
-               } else if (!this.openObj.equals(other.openObj))
+                       }
+               } else if (!this.openObj.equals(other.openObj)) {
                        return false;
+               }
                return true;
        }
 
@@ -89,4 +95,9 @@ public class PCEPOpenMessage implements Message {
                builder.append("]");
                return builder.toString();
        }
+
+       @Override
+       public Class<Message> getImplementedInterface() {
+               return Message.class;
+       }
 }
index 8330b02c936100adbdafefdc5a3d48416555558d..46d86ec1d6c267432e6df346a76c5c338d96a0f9 100644 (file)
@@ -51,23 +51,27 @@ public class PCEPReplyMessage implements Message {
         */
        public PCEPReplyMessage(final List<CompositeResponseObject> responses, final List<CompositeReplySvecObject> svecList) {
                this.objects = Lists.newArrayList();
-               if (svecList != null)
+               if (svecList != null) {
                        for (final CompositeReplySvecObject cno : svecList) {
                                this.objects.addAll(cno.getCompositeAsList());
                        }
-               if (responses != null)
+               }
+               if (responses != null) {
                        for (final CompositeResponseObject cno : responses) {
                                this.objects.addAll(cno.getCompositeAsList());
                        }
+               }
 
-               if (responses == null || responses.isEmpty())
+               if (responses == null || responses.isEmpty()) {
                        throw new IllegalArgumentException("At least one CompositeResponseObject is mandatory.");
+               }
                this.responses = responses;
 
-               if (svecList != null)
+               if (svecList != null) {
                        this.svecList = svecList;
-               else
+               } else {
                        this.svecList = Collections.emptyList();
+               }
        }
 
        /**
@@ -103,23 +107,30 @@ public class PCEPReplyMessage implements Message {
 
        @Override
        public boolean equals(final Object obj) {
-               if (this == obj)
+               if (this == obj) {
                        return true;
-               if (!super.equals(obj))
+               }
+               if (!super.equals(obj)) {
                        return false;
-               if (this.getClass() != obj.getClass())
+               }
+               if (this.getClass() != obj.getClass()) {
                        return false;
+               }
                final PCEPReplyMessage other = (PCEPReplyMessage) obj;
                if (this.responses == null) {
-                       if (other.responses != null)
+                       if (other.responses != null) {
                                return false;
-               } else if (!this.responses.equals(other.responses))
+                       }
+               } else if (!this.responses.equals(other.responses)) {
                        return false;
+               }
                if (this.svecList == null) {
-                       if (other.svecList != null)
+                       if (other.svecList != null) {
                                return false;
-               } else if (!this.svecList.equals(other.svecList))
+                       }
+               } else if (!this.svecList.equals(other.svecList)) {
                        return false;
+               }
                return true;
        }
 
@@ -133,4 +144,9 @@ public class PCEPReplyMessage implements Message {
                builder.append("]");
                return builder.toString();
        }
+
+       @Override
+       public Class<Message> getImplementedInterface() {
+               return Message.class;
+       }
 }
index a76ba9ac6c11f8c92936320317cc4e28823c2efb..8b1d3eaf74d0e9b0e56f294d6fff9ef26ef3628a 100644 (file)
@@ -35,12 +35,14 @@ public class PCEPReportMessage implements Message {
         */
        public PCEPReportMessage(final List<CompositeStateReportObject> reports) {
                this.objects = Lists.newArrayList();
-               if (reports != null)
+               if (reports != null) {
                        for (final CompositeStateReportObject csro : reports) {
                                this.objects.addAll(csro.getCompositeAsList());
                        }
-               if (reports == null || reports.isEmpty())
+               }
+               if (reports == null || reports.isEmpty()) {
                        throw new IllegalArgumentException("At least one CompositeStateReportObject is mandatory.");
+               }
 
                this.reports = reports;
        }
@@ -68,18 +70,23 @@ public class PCEPReportMessage implements Message {
 
        @Override
        public boolean equals(final Object obj) {
-               if (this == obj)
+               if (this == obj) {
                        return true;
-               if (!super.equals(obj))
+               }
+               if (!super.equals(obj)) {
                        return false;
-               if (this.getClass() != obj.getClass())
+               }
+               if (this.getClass() != obj.getClass()) {
                        return false;
+               }
                final PCEPReportMessage other = (PCEPReportMessage) obj;
                if (this.reports == null) {
-                       if (other.reports != null)
+                       if (other.reports != null) {
                                return false;
-               } else if (!this.reports.equals(other.reports))
+                       }
+               } else if (!this.reports.equals(other.reports)) {
                        return false;
+               }
                return true;
        }
 
@@ -91,4 +98,9 @@ public class PCEPReportMessage implements Message {
                builder.append("]");
                return builder.toString();
        }
+
+       @Override
+       public Class<Message> getImplementedInterface() {
+               return Message.class;
+       }
 }
index a839efd09d65f2aab28140e48cfed80e3743e04d..fecd3fedcb407b63a7d4958e4f27d26bf5d27eda 100644 (file)
@@ -51,22 +51,26 @@ public class PCEPRequestMessage implements Message {
         */
        public PCEPRequestMessage(final List<CompositeRequestSvecObject> svecList, final List<CompositeRequestObject> requests) {
                this.objects = Lists.newArrayList();
-               if (svecList != null)
+               if (svecList != null) {
                        for (final CompositeRequestSvecObject cso : svecList) {
                                this.objects.addAll(cso.getCompositeAsList());
                        }
-               if (requests != null)
+               }
+               if (requests != null) {
                        for (final CompositeRequestObject cro : requests) {
                                this.objects.addAll(cro.getCompositeAsList());
                        }
+               }
 
-               if (svecList != null)
+               if (svecList != null) {
                        this.svecList = svecList;
-               else
+               } else {
                        this.svecList = Collections.emptyList();
+               }
 
-               if (requests == null || requests.isEmpty())
+               if (requests == null || requests.isEmpty()) {
                        throw new IllegalArgumentException("At least one CompositeRequestObject is mandatory.");
+               }
                this.requests = requests;
 
        }
@@ -104,23 +108,30 @@ public class PCEPRequestMessage implements Message {
 
        @Override
        public boolean equals(final Object obj) {
-               if (this == obj)
+               if (this == obj) {
                        return true;
-               if (!super.equals(obj))
+               }
+               if (!super.equals(obj)) {
                        return false;
-               if (this.getClass() != obj.getClass())
+               }
+               if (this.getClass() != obj.getClass()) {
                        return false;
+               }
                final PCEPRequestMessage other = (PCEPRequestMessage) obj;
                if (this.requests == null) {
-                       if (other.requests != null)
+                       if (other.requests != null) {
                                return false;
-               } else if (!this.requests.equals(other.requests))
+                       }
+               } else if (!this.requests.equals(other.requests)) {
                        return false;
+               }
                if (this.svecList == null) {
-                       if (other.svecList != null)
+                       if (other.svecList != null) {
                                return false;
-               } else if (!this.svecList.equals(other.svecList))
+                       }
+               } else if (!this.svecList.equals(other.svecList)) {
                        return false;
+               }
                return true;
        }
 
@@ -135,4 +146,8 @@ public class PCEPRequestMessage implements Message {
                return builder.toString();
        }
 
+       @Override
+       public Class<Message> getImplementedInterface() {
+               return Message.class;
+       }
 }
index 09eb16bddadd0d33d4840062392ab4573e42c74a..32fba964fc984392c3477247779ce51d5c14c80f 100644 (file)
@@ -35,13 +35,15 @@ public class PCEPUpdateRequestMessage implements Message {
         */
        public PCEPUpdateRequestMessage(final List<CompositeUpdateRequestObject> updateRequests) {
                this.objects = Lists.newArrayList();
-               if (updateRequests != null)
+               if (updateRequests != null) {
                        for (final CompositeUpdateRequestObject curo : updateRequests) {
                                this.objects.addAll(curo.getCompositeAsList());
                        }
+               }
 
-               if (updateRequests == null || updateRequests.isEmpty())
+               if (updateRequests == null || updateRequests.isEmpty()) {
                        throw new IllegalArgumentException("At least one CompositeUpdateRequestObject is mandatory.");
+               }
                this.updateRequests = updateRequests;
        }
 
@@ -68,18 +70,23 @@ public class PCEPUpdateRequestMessage implements Message {
 
        @Override
        public boolean equals(final Object obj) {
-               if (this == obj)
+               if (this == obj) {
                        return true;
-               if (!super.equals(obj))
+               }
+               if (!super.equals(obj)) {
                        return false;
-               if (this.getClass() != obj.getClass())
+               }
+               if (this.getClass() != obj.getClass()) {
                        return false;
+               }
                final PCEPUpdateRequestMessage other = (PCEPUpdateRequestMessage) obj;
                if (this.updateRequests == null) {
-                       if (other.updateRequests != null)
+                       if (other.updateRequests != null) {
                                return false;
-               } else if (!this.updateRequests.equals(other.updateRequests))
+                       }
+               } else if (!this.updateRequests.equals(other.updateRequests)) {
                        return false;
+               }
                return true;
        }
 
@@ -91,4 +98,9 @@ public class PCEPUpdateRequestMessage implements Message {
                builder.append("]");
                return builder.toString();
        }
+
+       @Override
+       public Class<Message> getImplementedInterface() {
+               return Message.class;
+       }
 }
index 097444c0bbbc2151be212d021b532ff0b3d64df6..6e50ba15ba974463a6cc2552976591c5b2f3b924 100644 (file)
@@ -34,4 +34,9 @@ public class RawMessage implements Message {
        public List<PCEPObject> getAllObjects() {
                return this.objects;
        }
+
+       @Override
+       public Class<Message> getImplementedInterface() {
+               return Message.class;
+       }
 }
diff --git a/pom.xml b/pom.xml
index f48f90a6e68254e7c6610052e5659c0ec144aac1..5f5bc8d266d051d02b0de0d5ccb68e3b199f0bb4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
                <surefire.version>2.15</surefire.version>
 
                <yangtools.version>0.5.9-SNAPSHOT</yangtools.version>
-               <code.generator.version>0.6.0-SNAPSHOT</code.generator.version>
+               <yang.binding.version>0.6.0-SNAPSHOT</yang.binding.version>
                <ietf.types.version>2010.09.24.1</ietf.types.version>
        </properties>
        <prerequisites>