Fix checkstyle FallThrough errors

Document explicit fall-through cases, where we resume state
machine processing.

JIRA: BGPCEP-715
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I0de8a738465feb44c2da79a4d4e79b5be3b4bfac
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPErrorMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPErrorMessageParser.java
index 6af70dab8ba95673a00722ce951d8e1c7dbf0c2a..ae2b972be7293388b31feaf7e8323ac51c77aaf5 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPErrorMessageParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPErrorMessageParser.java
@@ -139,24 +139,29 @@ public class PCEPErrorMessageParser extends AbstractMessageParser {
                     requestParameters.add(new RpsBuilder().setRp(o).build());
                     return State.RP_IN;
                 }
+                // fall-through
             case ERROR_IN:
                 if (obj instanceof ErrorObject) {
                     final ErrorObject o = (ErrorObject) obj;
                     errorObjects.add(new ErrorsBuilder().setErrorObject(o).build());
                     return State.ERROR_IN;
                 }
+                // fall-through
             case OPEN:
                 if (obj instanceof Open) {
                     b.setErrorType(new SessionCaseBuilder().setSession(new SessionBuilder().setOpen((Open) obj).build()).build());
                     return State.OPEN_IN;
                 }
+                // fall-through
             case ERROR:
                 if (obj instanceof ErrorObject) {
                     final ErrorObject o = (ErrorObject) obj;
                     errorObjects.add(new ErrorsBuilder().setErrorObject(o).build());
                     return State.ERROR;
                 }
+                // fall-through
             case OPEN_IN:
+                // fall-through
             case END:
                 return State.END;
             default:

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPNotificationMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPNotificationMessageParser.java
index 39402a3cc6db58d0037659dbc8f0fa6b3f0fbdca..ccf6e2cb3e2de11758f1b88d48a252821495b91c 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPNotificationMessageParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPNotificationMessageParser.java
@@ -120,13 +120,16 @@ public class PCEPNotificationMessageParser extends AbstractMessageParser {
                     requestParameters.add(new RpsBuilder().setRp(rp).build());
                     return State.INIT;
                 }
+                // fall-through
             case RP_IN:
                 if (obj instanceof CNotification) {
                     final CNotification n = (CNotification) obj;
                     notifications.add(new NotificationsBuilder().setCNotification(n).build());
                     return State.RP_IN;
                 }
+                // fall-through
             case NOTIFICATION_IN:
+                // fall-through
             case END:
                 return State.END;
             default:

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java
index 977ea44ab0aa92a6b568fd2318834f39d1c652c1..90cca4888bc4d7ecdd0686959b79ab4fce7f9735 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java
@@ -258,22 +258,27 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
                     builder.setLspa((Lspa) obj);
                     return State.LSPA_IN;
                 }
+                // fall-through
             case LSPA_IN:
                 if (obj instanceof Bandwidth) {
                     builder.setBandwidth((Bandwidth) obj);
                     return State.BANDWIDTH_IN;
                 }
+                // fall-through
             case BANDWIDTH_IN:
                 if (obj instanceof Metric) {
                     pathMetrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
                     return State.BANDWIDTH_IN;
                 }
+                // fall-through
             case METRIC_IN:
                 if (obj instanceof Iro) {
                     builder.setIro((Iro) obj);
                     return State.IRO_IN;
                 }
+                // fall-through
             case IRO_IN:
+                // fall-through
             case END:
                 return State.END;
             default:
@@ -306,27 +311,33 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
                     builder.setLspa((Lspa) obj);
                     return State.LSPA_IN;
                 }
+                // fall-through
             case LSPA_IN:
                 if (obj instanceof Of) {
                     builder.setOf((Of) obj);
                     return State.OF_IN;
                 }
+                // fall-through
             case OF_IN:
                 if (obj instanceof Bandwidth) {
                     builder.setBandwidth((Bandwidth) obj);
                     return State.BANDWIDTH_IN;
                 }
+                // fall-through
             case BANDWIDTH_IN:
                 if (obj instanceof Metric) {
                     pathMetrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
                     return State.BANDWIDTH_IN;
                 }
+                // fall-through
             case METRIC_IN:
                 if (obj instanceof Iro) {
                     builder.setIro((Iro) obj);
                     return State.IRO_IN;
                 }
+                // fall-through
             case IRO_IN:
+                // fall-through
             case END:
                 return State.END;
             default:

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java
index 57f43b3752f8923a0284c268c0c5f8be5b741547..2fdef46dd9650bcade310224b775f750c2340b46 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java
@@ -365,51 +365,61 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
                     }
                     return P2PState.REPORTED_IN;
                 }
+                // fall-through
             case REPORTED_IN:
                 if (obj instanceof VendorInformationObject) {
                     viObjects.add((VendorInformationObject) obj);
                     return P2PState.REPORTED_IN;
                 }
+                // fall-through
             case VENDOR_INFO_LIST:
                 if (obj instanceof LoadBalancing) {
                     builder.setLoadBalancing((LoadBalancing) obj);
                     return P2PState.LOAD_BIN;
                 }
+                // fall-through
             case LOAD_BIN:
                 if (obj instanceof Lspa) {
                     builder.setLspa((Lspa) obj);
                     return P2PState.LSPA_IN;
                 }
+                // fall-through
             case LSPA_IN:
                 if (obj instanceof Bandwidth) {
                     builder.setBandwidth((Bandwidth) obj);
                     return P2PState.BANDWIDTH_IN;
                 }
+                // fall-through
             case BANDWIDTH_IN:
                 if (obj instanceof Metric) {
                     metrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
                     return P2PState.BANDWIDTH_IN;
                 }
+                // fall-through
             case METRIC_IN:
                 if (obj instanceof Iro) {
                     builder.setIro((Iro) obj);
                     return P2PState.IRO_IN;
                 }
+                // fall-through
             case IRO_IN:
                 if (obj instanceof Rro) {
                     builder.setRro((Rro) obj);
                     return P2PState.RRO_IN;
                 }
+                // fall-through
             case RRO_IN:
                 if (obj instanceof Xro) {
                     builder.setXro((Xro) obj);
                     return P2PState.XRO_IN;
                 }
+                // fall-through
             case XRO_IN:
                 if (obj instanceof Of) {
                     builder.setOf((Of) obj);
                     return P2PState.OF_IN;
                 }
+                // fall-through
             case OF_IN:
                 if (obj instanceof ClassType) {
                     final ClassType classType = (ClassType) obj;
@@ -420,7 +430,9 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
                     }
                     return P2PState.CT_IN;
                 }
+                // fall-through
             case CT_IN:
+                // fall-through
             case END:
                 return P2PState.END;
             default:
@@ -501,6 +513,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
                     epRros.add(rroPairBuilder.setRros(new ArrayList<>()).build());
                     return P2MPState.ENDPOINT;
                 }
+                // fall-through
             case ENDPOINT:
                 if (obj instanceof Rro || obj instanceof Srro) {
                     if (obj.isProcessingRule()) {
@@ -521,6 +534,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
                     }
                     return P2MPState.ENDPOINT;
                 }
+                // fall-through
             case RRO_SRRO:
                 if (obj instanceof ReoptimizationBandwidth) {
                     final int lastIndex = epRros.size() - 1;
@@ -531,6 +545,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
                             .build());
                     return P2MPState.BANDWIDTH;
                 }
+                // fall-through
             case BANDWIDTH:
                 if (obj instanceof EndpointsObj) {
                     return P2MPState.RP;
@@ -539,21 +554,25 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
                     builder.setOf((Of) obj);
                     return P2MPState.OF_IN;
                 }
+                // fall-through
             case OF_IN:
                 if (obj instanceof Lspa) {
                     builder.setLspa((Lspa) obj);
                     return P2MPState.LSPA_IN;
                 }
+                // fall-through
             case LSPA_IN:
                 if (obj instanceof Bandwidth) {
                     builder.setBandwidth((Bandwidth) obj);
                     return P2MPState.BANDWIDTH_IN;
                 }
+                // fall-through
             case BANDWIDTH_IN:
                 if (obj instanceof Metric) {
                     metrics.add(new MetricBuilder().setMetric((Metric) obj).build());
                     return P2MPState.BANDWIDTH_IN;
                 }
+                // fall-through
             case METRIC_IN:
                 if (obj instanceof Iro) {
                     builder.setIroBncChoice(new IroCaseBuilder().setIro((Iro) obj).build());
@@ -569,13 +588,17 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
                             .setNonBranchNodeList((NonBranchNodeList) obj).build()).build());
                     return P2MPState.IRO_BNC_IN;
                 }
+                // fall-through
             case IRO_BNC_IN:
                 if (obj instanceof LoadBalancing) {
                     builder.setLoadBalancing((LoadBalancing) obj);
                     return P2MPState.LOAD_BIN;
                 }
+                // fall-through
             case LOAD_BIN:
+                // fall-through
             case END:
+                // fall-through
             default:
                 return P2MPState.END;
         }
@@ -621,27 +644,33 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
                     builder.setOf((Of) obj);
                     return SvecState.OF_IN;
                 }
+                // fall-through
             case OF_IN:
                 if (obj instanceof Gc) {
                     builder.setGc((Gc) obj);
                     return SvecState.GC_IN;
                 }
+                // fall-through
             case GC_IN:
                 if (obj instanceof Xro) {
                     builder.setXro((Xro) obj);
                     return SvecState.XRO_IN;
                 }
+                // fall-through
             case XRO_IN:
                 if (obj instanceof Metric) {
                     metrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
                     return SvecState.XRO_IN;
                 }
+                // fall-through
             case METRIC_IN:
                 if (obj instanceof VendorInformationObject) {
                     viObjects.add((VendorInformationObject) obj);
                     return SvecState.METRIC_IN;
                 }
+                // fall-through
             case VENDOR_INFO:
+                // fall-through
             case END:
                 return SvecState.END;
             default:

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/util/Util.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/util/Util.java
index fb19fc6b6fe50d155e88739657f130366560d363..43c6c93fd286df7fa742d1bfac3d0478afb28385 100644 (file)
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/util/Util.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/util/Util.java
@@ -32,12 +32,15 @@ public final class Util {
                     metricPceBuilder.setProcTime((ProcTime) obj);
                     return State.PROC_TIME;
                 }
+                // fall-through
             case PROC_TIME :
                 if (obj instanceof Overload) {
                     metricPceBuilder.setOverload((Overload) obj);
                     return State.OVERLOAD;
                 }
+                // fall-through
             case OVERLOAD :
+                // fall-through
             case END :
                 return State.END;
             default: