BUG-731: reduced complexity

[bgpcep.git] / pcep / ietf-stateful02 / src / main / java / org / opendaylight / protocol / pcep / ietf / stateful02 / Stateful02PCReplyMessageParser.java

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);
                     }
                 }
             }