BUG-731: reduced complexity

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

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/crabbe/initiated00/PcinitiateMessageParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/crabbe/initiated00/PcinitiateMessageParser.java
index 29ea5aa98cbf21fa00a33edb92c97dd7001a2363..de93e54d28dd5f8204353dfe4ad9fc527c956eb8 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/crabbe/initiated00/PcinitiateMessageParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/crabbe/initiated00/PcinitiateMessageParser.java
@@ -49,12 +49,8 @@ public class PcinitiateMessageParser extends AbstractMessageParser {
         for (final Requests req : init.getRequests()) {
             serializeObject(req.getEndpointsObj(), buffer);
             serializeObject(req.getLspa(), buffer);
-            if (req.getEro() != null) {
-                serializeObject(req.getEro(), buffer);
-            }
-            if (req.getBandwidth() != null) {
-                serializeObject(req.getBandwidth(), buffer);
-            }
+            serializeObject(req.getEro(), buffer);
+            serializeObject(req.getBandwidth(), buffer);
             if (req.getMetrics() != null && !req.getMetrics().isEmpty()) {
                 for (final Metrics m : req.getMetrics()) {
                     serializeObject(m.getMetric(), buffer);

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCReplyMessageParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCReplyMessageParser.java
index e1c327ae3ae68e53623f7502da12c9129b212d1c..316c484bf161ca75058f04bb34c3ac9c656733fb 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCReplyMessageParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCReplyMessageParser.java
@@ -55,7 +55,7 @@ public final class Stateful02PCReplyMessageParser extends PCEPReplyMessageParser
         if (repMsg.getReplies() == null || repMsg.getReplies().isEmpty()) {
             throw new IllegalArgumentException("Replies cannot be null or empty.");
         }
-        ByteBuf buffer = Unpooled.buffer();
+        final ByteBuf buffer = Unpooled.buffer();
         for (final Replies reply : repMsg.getReplies()) {
             if (reply.getRp() == null) {
                 throw new IllegalArgumentException("Reply must contain RP object.");
@@ -68,41 +68,27 @@ public final class Stateful02PCReplyMessageParser extends PCEPReplyMessageParser
                 if (reply.getResult() instanceof FailureCase) {
                     final FailureCase f = ((FailureCase) reply.getResult());
                     serializeObject(f.getNoPath(), buffer);
-                    if (f.getLspa() != null) {
-                        serializeObject(f.getLspa(), buffer);
-                    }
-                    if (f.getBandwidth() != null) {
-                        serializeObject(f.getBandwidth(), buffer);
-                    }
+                    serializeObject(f.getLspa(), buffer);
+                    serializeObject(f.getBandwidth(), buffer);
                     if (f.getMetrics() != null && !f.getMetrics().isEmpty()) {
                         for (final Metrics m : f.getMetrics()) {
                             serializeObject(m.getMetric(), buffer);
                         }
                     }
-                    if (f.getIro() != null) {
-                        serializeObject(f.getIro(), buffer);
-                    }
+                    serializeObject(f.getIro(), buffer);
                 } else {
                     final SuccessCase s = (SuccessCase) reply.getResult();
                     for (final Paths p : s.getSuccess().getPaths()) {
                         serializeObject(p.getEro(), buffer);
-                        if (p.getLspa() != null) {
-                            serializeObject(p.getLspa(), buffer);
-                        }
-                        if (p.getOf() != null) {
-                            serializeObject(p.getOf(), buffer);
-                        }
-                        if (p.getBandwidth() != null) {
-                            serializeObject(p.getBandwidth(), buffer);
-                        }
+                        serializeObject(p.getLspa(), buffer);
+                        serializeObject(p.getOf(), buffer);
+                        serializeObject(p.getBandwidth(), buffer);
                         if (p.getMetrics() != null && !p.getMetrics().isEmpty()) {
                             for (final Metrics m : p.getMetrics()) {
                                 serializeObject(m.getMetric(), buffer);
                             }
                         }
-                        if (p.getIro() != null) {
-                            serializeObject(p.getIro(), buffer);
-                        }
+                        serializeObject(p.getIro(), buffer);
                     }
                 }
             }

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCReportMessageParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCReportMessageParser.java
index 1b7b2bef08e4410ea582d9764dd3ab6d4f306c00..9627003190b5f98cd33ee7436a9641e0c0486890 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCReportMessageParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCReportMessageParser.java
@@ -53,28 +53,20 @@ public final class Stateful02PCReportMessageParser extends AbstractMessageParser
         Preconditions.checkArgument(message instanceof Pcrpt, "Wrong instance of Message. Passed instance of %s. Need Pcrpt.", message.getClass());
         final Pcrpt msg = (Pcrpt) message;
         final List<Reports> reports = msg.getPcrptMessage().getReports();
-        ByteBuf buffer = Unpooled.buffer();
+        final ByteBuf buffer = Unpooled.buffer();
         for (final Reports report : reports) {
             serializeObject(report.getLsp(), buffer);
             final Path p = report.getPath();
             if (p != null) {
-                if (p.getEro() != null) {
-                    serializeObject(p.getEro(), buffer);
-                }
-                if (p.getLspa() != null) {
-                    serializeObject(p.getLspa(), buffer);
-                }
-                if (p.getBandwidth() != null) {
-                    serializeObject(p.getBandwidth(), buffer);
-                }
+                serializeObject(p.getEro(), buffer);
+                serializeObject(p.getLspa(), buffer);
+                serializeObject(p.getBandwidth(), buffer);
                 if (p.getMetrics() != null && !p.getMetrics().isEmpty()) {
                     for (final Metrics m : p.getMetrics()) {
                         serializeObject(m.getMetric(), buffer);
                     }
                 }
-                if (p.getIro() != null) {
-                    serializeObject(p.getRro(), buffer);
-                }
+                serializeObject(p.getIro(), buffer);
             }
         }
         MessageUtil.formatMessage(TYPE, buffer, out);

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCRequestMessageParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCRequestMessageParser.java
index eaf0bb3b7e640cb0708bcbe192736de0d3f3a9ef..f9b7bead9370c86db61aa56bd305e227680a8bfe 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCRequestMessageParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCRequestMessageParser.java
@@ -50,50 +50,28 @@ public final class Stateful02PCRequestMessageParser extends PCEPRequestMessagePa
 
     @Override
     protected void serializeP2P(final ByteBuf buffer, final P2p p2p) {
-        if (p2p.getEndpointsObj() != null) {
-            serializeObject(p2p.getEndpointsObj(), buffer);
-        }
-        if (p2p.getAugmentation(P2p1.class) != null && p2p.getAugmentation(P2p1.class).getLsp() != null) {
+        serializeObject(p2p.getEndpointsObj(), buffer);
+        if (p2p.getAugmentation(P2p1.class) != null) {
             serializeObject(p2p.getAugmentation(P2p1.class).getLsp(), buffer);
         }
-        if (p2p.getReportedRoute() != null) {
-            final ReportedRoute rr = p2p.getReportedRoute();
-            if (rr.getRro() != null) {
-                serializeObject(rr.getRro(), buffer);
-            }
-            if (rr.getBandwidth() != null) {
-                serializeObject(rr.getBandwidth(), buffer);
-            }
-        }
-        if (p2p.getLoadBalancing() != null) {
-            serializeObject(p2p.getLoadBalancing(), buffer);
-        }
-        if (p2p.getLspa() != null) {
-            serializeObject(p2p.getLspa(), buffer);
-        }
-        if (p2p.getBandwidth() != null) {
-            serializeObject(p2p.getBandwidth(), buffer);
+        final ReportedRoute rr = p2p.getReportedRoute();
+        if (rr != null) {
+            serializeObject(rr.getRro(), buffer);
+            serializeObject(rr.getBandwidth(), buffer);
         }
+        serializeObject(p2p.getLoadBalancing(), buffer);
+        serializeObject(p2p.getLspa(), buffer);
+        serializeObject(p2p.getBandwidth(), buffer);
         if (p2p.getMetrics() != null) {
             for (final Metrics m : p2p.getMetrics()) {
                 serializeObject(m.getMetric(), buffer);
             }
         }
-        if (p2p.getIro() != null) {
-            serializeObject(p2p.getIro(), buffer);
-        }
-        if (p2p.getRro() != null) {
-            serializeObject(p2p.getRro(), buffer);
-        }
-        if (p2p.getXro() != null) {
-            serializeObject(p2p.getXro(), buffer);
-        }
-        if (p2p.getOf() != null) {
-            serializeObject(p2p.getOf(), buffer);
-        }
-        if (p2p.getClassType() != null) {
-            serializeObject(p2p.getClassType(), buffer);
-        }
+        serializeObject(p2p.getIro(), buffer);
+        serializeObject(p2p.getRro(), buffer);
+        serializeObject(p2p.getXro(), buffer);
+        serializeObject(p2p.getOf(), buffer);
+        serializeObject(p2p.getClassType(), buffer);
     }
 
     @Override

diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCUpdateRequestMessageParser.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCUpdateRequestMessageParser.java
index 2ac1c2e8717905abeeba2ba9c17d094f9adb3ba7..feae4746b02e448e587abda2c91b40b591dda3a7 100644 (file)
--- a/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCUpdateRequestMessageParser.java
+++ b/pcep/ietf-stateful02/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful02/Stateful02PCUpdateRequestMessageParser.java
@@ -53,26 +53,20 @@ public final class Stateful02PCUpdateRequestMessageParser extends AbstractMessag
         Preconditions.checkArgument(message instanceof Pcupd, "Wrong instance of Message. Passed instance of %s. Need Pcupd.", message.getClass());
         final Pcupd msg = (Pcupd) message;
         final List<Updates> updates = msg.getPcupdMessage().getUpdates();
-        ByteBuf buffer = Unpooled.buffer();
+        final ByteBuf buffer = Unpooled.buffer();
         for (final Updates update : updates) {
             serializeObject(update.getLsp(), buffer);
             final Path p = update.getPath();
             if (p != null) {
                 serializeObject(p.getEro(), buffer);
-                if (p.getLspa() != null) {
-                    serializeObject(p.getLspa(), buffer);
-                }
-                if (p.getBandwidth() != null) {
-                    serializeObject(p.getBandwidth(), buffer);
-                }
+                serializeObject(p.getLspa(), buffer);
+                serializeObject(p.getBandwidth(), buffer);
                 if (p.getMetrics() != null && !p.getMetrics().isEmpty()) {
                     for (final Metrics m : p.getMetrics()) {
                         serializeObject(m.getMetric(), buffer);
                     }
                 }
-                if (p.getIro() != null) {
-                    serializeObject(p.getIro(), buffer);
-                }
+                serializeObject(p.getIro(), buffer);
             }
         }
         MessageUtil.formatMessage(TYPE, buffer, out);

diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/CInitiated00PCInitiateMessageParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/CInitiated00PCInitiateMessageParser.java
index da305895ce8824dddafad3e41b0ebad4bac92758..d1e3ba32bc0f6768a0ff6faa186fd85073fd10f5 100644 (file)
--- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/CInitiated00PCInitiateMessageParser.java
+++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/initiated00/CInitiated00PCInitiateMessageParser.java
@@ -59,26 +59,16 @@ public class CInitiated00PCInitiateMessageParser extends AbstractMessageParser {
     protected void serializeRequest(final Requests req, final ByteBuf buffer) {
         serializeObject(req.getSrp(), buffer);
         serializeObject(req.getLsp(), buffer);
-        if (req.getEndpointsObj() != null) {
-            serializeObject(req.getEndpointsObj(), buffer);
-        }
-        if (req.getEro() != null) {
-            serializeObject(req.getEro(), buffer);
-        }
-        if (req.getLspa() != null) {
-            serializeObject(req.getLspa(), buffer);
-        }
-        if (req.getBandwidth() != null) {
-            serializeObject(req.getBandwidth(), buffer);
-        }
+        serializeObject(req.getEndpointsObj(), buffer);
+        serializeObject(req.getEro(), buffer);
+        serializeObject(req.getLspa(), buffer);
+        serializeObject(req.getBandwidth(), buffer);
         if (req.getMetrics() != null && !req.getMetrics().isEmpty()) {
             for (final Metrics m : req.getMetrics()) {
                 serializeObject(m.getMetric(), buffer);
             }
         }
-        if (req.getIro() != null) {
-            serializeObject(req.getIro(), buffer);
-        }
+        serializeObject(req.getIro(), buffer);
     }
 
     @Override

diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCReportMessageParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCReportMessageParser.java
index 3b75c77a29d0ce5120c9adad986526ef708a0322..a3bc2165a507f3105df8e14dd6bf903d7a0e54b0 100644 (file)
--- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCReportMessageParser.java
+++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCReportMessageParser.java
@@ -55,7 +55,7 @@ public class Stateful07PCReportMessageParser extends AbstractMessageParser {
         Preconditions.checkArgument(message instanceof Pcrpt, "Wrong instance of Message. Passed instance of %s. Need Pcrpt.", message.getClass());
         final Pcrpt msg = (Pcrpt) message;
         final List<Reports> reports = msg.getPcrptMessage().getReports();
-        ByteBuf buffer = Unpooled.buffer();
+        final ByteBuf buffer = Unpooled.buffer();
         for (final Reports report : reports) {
             serializeReport(report, buffer);
         }
@@ -70,23 +70,15 @@ public class Stateful07PCReportMessageParser extends AbstractMessageParser {
         final Path p = report.getPath();
         if (p != null) {
             serializeObject(p.getEro(), buffer);
-            if (p.getLspa() != null) {
-                serializeObject(p.getLspa(), buffer);
-            }
-            if (p.getBandwidth() != null) {
-                serializeObject(p.getBandwidth(), buffer);
-            }
+            serializeObject(p.getLspa(), buffer);
+            serializeObject(p.getBandwidth(), buffer);
             if (p.getMetrics() != null && !p.getMetrics().isEmpty()) {
                 for (final Metrics m : p.getMetrics()) {
                     serializeObject(m.getMetric(), buffer);
                 }
             }
-            if (p.getIro() != null) {
-                serializeObject(p.getIro(), buffer);
-            }
-            if (p.getRro() != null) {
-                serializeObject(p.getRro(), buffer);
-            }
+            serializeObject(p.getIro(), buffer);
+            serializeObject(p.getRro(), buffer);
         }
     }
 

diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCUpdateRequestMessageParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCUpdateRequestMessageParser.java
index 581e28781c160f781c20fc49d8489ce0ffa38fb5..384d39f71c1c87fb88948822f040483d10366b30 100644 (file)
--- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCUpdateRequestMessageParser.java
+++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCUpdateRequestMessageParser.java
@@ -54,7 +54,7 @@ public class Stateful07PCUpdateRequestMessageParser extends AbstractMessageParse
         Preconditions.checkArgument(message instanceof Pcupd, "Wrong instance of Message. Passed instance of %s. Need Pcupd.", message.getClass());
         final Pcupd msg = (Pcupd) message;
         final List<Updates> updates = msg.getPcupdMessage().getUpdates();
-        ByteBuf buffer = Unpooled.buffer();
+        final ByteBuf buffer = Unpooled.buffer();
         for (final Updates update : updates) {
             serializeUpdate(update, buffer);
         }
@@ -67,20 +67,14 @@ public class Stateful07PCUpdateRequestMessageParser extends AbstractMessageParse
         final Path p = update.getPath();
         if (p != null) {
             serializeObject(p.getEro(), buffer);
-            if (p.getLspa() != null) {
-                serializeObject(p.getLspa(), buffer);
-            }
-            if (p.getBandwidth() != null) {
-                serializeObject(p.getBandwidth(), buffer);
-            }
+            serializeObject(p.getLspa(), buffer);
+            serializeObject(p.getBandwidth(), buffer);
             if (p.getMetrics() != null && !p.getMetrics().isEmpty()) {
                 for (final Metrics m : p.getMetrics()) {
                     serializeObject(m.getMetric(), buffer);
                 }
             }
-            if (p.getIro() != null) {
-                serializeObject(p.getIro(), buffer);
-            }
+            serializeObject(p.getIro(), buffer);
         }
     }
 

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 a1a15cba59529cba961c585ecfc0f2878f49f935..256a015f314c8103a567d7afc2c83a4da8b1b29f 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
@@ -64,7 +64,7 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
         if (repMsg.getReplies() == null || repMsg.getReplies().isEmpty()) {
             throw new IllegalArgumentException("Replies cannot be null or empty.");
         }
-        ByteBuf buffer = Unpooled.buffer();
+        final ByteBuf buffer = Unpooled.buffer();
         for (final Replies reply : repMsg.getReplies()) {
             if (reply.getRp() == null) {
                 throw new IllegalArgumentException("Reply must contain RP object.");
@@ -80,40 +80,30 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
         if (reply.getResult() != null) {
             if (reply.getResult() instanceof FailureCase) {
                 final FailureCase f = ((FailureCase) reply.getResult());
-                serializeObject(f.getNoPath(), buffer);
-                if (f.getLspa() != null) {
+                if (f != null) {
+                    serializeObject(f.getNoPath(), buffer);
                     serializeObject(f.getLspa(), buffer);
-                }
-                if (f.getBandwidth() != null) {
                     serializeObject(f.getBandwidth(), buffer);
-                }
-                if (f.getMetrics() != null && !f.getMetrics().isEmpty()) {
-                    for (final Metrics m : f.getMetrics()) {
-                        serializeObject(m.getMetric(), buffer);
+                    if (f.getMetrics() != null && !f.getMetrics().isEmpty()) {
+                        for (final Metrics m : f.getMetrics()) {
+                            serializeObject(m.getMetric(), buffer);
+                        }
                     }
-                }
-                if (f.getIro() != null) {
                     serializeObject(f.getIro(), buffer);
                 }
             } else {
                 final SuccessCase s = (SuccessCase) reply.getResult();
-                for (final Paths p : s.getSuccess().getPaths()) {
-                    serializeObject(p.getEro(), buffer);
-                    if (p.getLspa() != null) {
+                if (s != null) {
+                    for (final Paths p : s.getSuccess().getPaths()) {
+                        serializeObject(p.getEro(), buffer);
                         serializeObject(p.getLspa(), buffer);
-                    }
-                    if (p.getOf() != null) {
                         serializeObject(p.getOf(), buffer);
-                    }
-                    if (p.getBandwidth() != null) {
                         serializeObject(p.getBandwidth(), buffer);
-                    }
-                    if (p.getMetrics() != null && !p.getMetrics().isEmpty()) {
-                        for (final Metrics m : p.getMetrics()) {
-                            serializeObject(m.getMetric(), buffer);
+                        if (p.getMetrics() != null && !p.getMetrics().isEmpty()) {
+                            for (final Metrics m : p.getMetrics()) {
+                                serializeObject(m.getMetric(), buffer);
+                            }
                         }
-                    }
-                    if (p.getIro() != null) {
                         serializeObject(p.getIro(), buffer);
                     }
                 }

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 35d95bc872db082d263e936919d34ab1c787366b..4c8926a07e208a8f109be22388ecde425a5d7b57 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
@@ -88,15 +88,9 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
         if (msg.getSvec() != null) {
             for (final Svec s : msg.getSvec()) {
                 serializeObject(s.getSvec(), buffer);
-                if (s.getOf() != null) {
-                    serializeObject(s.getOf(), buffer);
-                }
-                if (s.getGc() != null) {
-                    serializeObject(s.getGc(), buffer);
-                }
-                if (s.getXro() != null) {
-                    serializeObject(s.getXro(), buffer);
-                }
+                serializeObject(s.getOf(), buffer);
+                serializeObject(s.getGc(), buffer);
+                serializeObject(s.getXro(), buffer);
                 if (s.getMetric() != null) {
                     for (final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcreq.message.pcreq.message.svec.Metric m : s.getMetric()) {
                         serializeObject(m.getMetric(), buffer);
@@ -109,48 +103,28 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
     }
 
     protected void serializeP2P(final ByteBuf buffer, final P2p p2p) {
-        if (p2p.getEndpointsObj() != null) {
-            serializeObject(p2p.getEndpointsObj(), buffer);
-        }
+        serializeObject(p2p.getEndpointsObj(), buffer);
         serializeVendorInformationObjects(p2p.getVendorInformationObject(), buffer);
         if (p2p.getReportedRoute() != null) {
             final ReportedRoute rr = p2p.getReportedRoute();
-            if (rr.getRro() != null) {
+            if (rr != null) {
                 serializeObject(rr.getRro(), buffer);
-            }
-            if (rr.getBandwidth() != null) {
                 serializeObject(rr.getBandwidth(), buffer);
             }
         }
-        if (p2p.getLoadBalancing() != null) {
-            serializeObject(p2p.getLoadBalancing(), buffer);
-        }
-        if (p2p.getLspa() != null) {
-            serializeObject(p2p.getLspa(), buffer);
-        }
-        if (p2p.getBandwidth() != null) {
-            serializeObject(p2p.getBandwidth(), buffer);
-        }
+        serializeObject(p2p.getLoadBalancing(), buffer);
+        serializeObject(p2p.getLspa(), buffer);
+        serializeObject(p2p.getBandwidth(), buffer);
         if (p2p.getMetrics() != null) {
             for (final Metrics m : p2p.getMetrics()) {
                 serializeObject(m.getMetric(), buffer);
             }
         }
-        if (p2p.getIro() != null) {
-            serializeObject(p2p.getIro(), buffer);
-        }
-        if (p2p.getRro() != null) {
-            serializeObject(p2p.getRro(), buffer);
-        }
-        if (p2p.getXro() != null) {
-            serializeObject(p2p.getXro(), buffer);
-        }
-        if (p2p.getOf() != null) {
-            serializeObject(p2p.getOf(), buffer);
-        }
-        if (p2p.getClassType() != null) {
-            serializeObject(p2p.getClassType(), buffer);
-        }
+        serializeObject(p2p.getIro(), buffer);
+        serializeObject(p2p.getRro(), buffer);
+        serializeObject(p2p.getXro(), buffer);
+        serializeObject(p2p.getOf(), buffer);
+        serializeObject(p2p.getClassType(), buffer);
     }
 
     @Override

diff --git a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/SrPcInitiateMessageParser.java b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/SrPcInitiateMessageParser.java
index c2875cf870c6db7d81f7051d6b6713df6b6bc27e..3b1a38499c20cdba8d7b2afa87998f777820dc0b 100644 (file)
--- a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/SrPcInitiateMessageParser.java
+++ b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/SrPcInitiateMessageParser.java
@@ -23,17 +23,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 
 public class SrPcInitiateMessageParser extends CInitiated00PCInitiateMessageParser {
 
-    public SrPcInitiateMessageParser(ObjectRegistry registry) {
+    public SrPcInitiateMessageParser(final ObjectRegistry registry) {
         super(registry);
     }
 
     @Override
-    protected void serializeRequest(Requests req, ByteBuf buffer) {
+    protected void serializeRequest(final Requests req, final ByteBuf buffer) {
         if (SrEroUtil.isSegmentRoutingPath(req.getEro())) {
             serializeObject(SrEroUtil.addSRPathSetupTypeTlv(req.getSrp()), buffer);
-            if (req.getLsp() != null) {
-                serializeObject(req.getLsp(), buffer);
-            }
+            serializeObject(req.getLsp(), buffer);
             serializeObject(req.getEro(), buffer);
         } else {
             super.serializeRequest(req, buffer);
@@ -41,7 +39,7 @@ public class SrPcInitiateMessageParser extends CInitiated00PCInitiateMessagePars
     }
 
     @Override
-    protected Requests getValidRequest(List<Object> objects) {
+    protected Requests getValidRequest(final List<Object> objects) {
         final Srp srp = (Srp) objects.get(0);
         if (isSegmentRoutingPath(srp)) {
             final RequestsBuilder builder = new RequestsBuilder();

diff --git a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/SrPcUpdMessageParser.java b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/SrPcUpdMessageParser.java
index 643843b17c6632edf6e02e1b797cd9ccb723c1b1..e64a71e791f8a6cc631fd3d0ddc896364c94cc48 100644 (file)
--- a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/SrPcUpdMessageParser.java
+++ b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/SrPcUpdMessageParser.java
@@ -28,17 +28,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 
 public class SrPcUpdMessageParser extends Stateful07PCUpdateRequestMessageParser {
 
-    public SrPcUpdMessageParser(ObjectRegistry registry) {
+    public SrPcUpdMessageParser(final ObjectRegistry registry) {
         super(registry);
     }
 
     @Override
-    protected void serializeUpdate(Updates update, ByteBuf buffer) {
+    protected void serializeUpdate(final Updates update, final ByteBuf buffer) {
         if (update.getPath() != null && SrEroUtil.isSegmentRoutingPath(update.getPath().getEro())) {
             serializeObject(SrEroUtil.addSRPathSetupTypeTlv(update.getSrp()), buffer);
-            if (update.getLsp() != null) {
-                serializeObject(update.getLsp(), buffer);
-            }
+            serializeObject(update.getLsp(), buffer);
             serializeObject(update.getPath().getEro(), buffer);
         } else {
             super.serializeUpdate(update, buffer);
@@ -46,7 +44,7 @@ public class SrPcUpdMessageParser extends Stateful07PCUpdateRequestMessageParser
     }
 
     @Override
-    protected Updates getValidUpdates(List<Object> objects, List<Message> errors) {
+    protected Updates getValidUpdates(final List<Object> objects, final List<Message> errors) {
         if (objects.get(0) instanceof Srp && isSegmentRoutingPath((Srp) objects.get(0))) {
             boolean isValid = true;
             final Srp srp = (Srp) objects.get(0);

diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java
index 32295523449574dd0ca1430a57e0b8d771dcf67e..4022e512d1cf9b7dfe46202e0a30ce4257518693 100644 (file)
--- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java
@@ -9,7 +9,6 @@ package org.opendaylight.protocol.pcep.spi;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
 import com.google.common.primitives.UnsignedBytes;
 import io.netty.buffer.ByteBuf;
 import java.util.ArrayList;
@@ -156,7 +155,7 @@ public abstract class AbstractMessageParser implements MessageParser, MessageSer
     }
 
     protected final List<VendorInformationObject> addVendorInformationObjects(final List<Object> objects) {
-        final List<VendorInformationObject> vendorInfo = Lists.newArrayList();
+        final List<VendorInformationObject> vendorInfo = new ArrayList<>();
         while (!objects.isEmpty() && objects.get(0) instanceof VendorInformationObject) {
             final VendorInformationObject viObject = (VendorInformationObject) objects.get(0);
             vendorInfo.add(viObject);