fix indentation checkstyle errors

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I024a086d00688dab5e78263fdc09d8cd221416b1

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 0c087e54f387957cbbf156dc4c0b0a50bf8eb935..6af70dab8ba95673a00722ce951d8e1c7dbf0c2a 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
@@ -133,34 +133,34 @@ public class PCEPErrorMessageParser extends AbstractMessageParser {
     private static State insertObject(final State state, final List<Errors> errorObjects, final Object obj,
             final List<Rps> requestParameters, final PcerrMessageBuilder b) {
         switch (state) {
-        case RP_IN:
-            if (obj instanceof Rp) {
-                final Rp o = (Rp) obj;
-                requestParameters.add(new RpsBuilder().setRp(o).build());
-                return State.RP_IN;
-            }
-        case ERROR_IN:
-            if (obj instanceof ErrorObject) {
-                final ErrorObject o = (ErrorObject) obj;
-                errorObjects.add(new ErrorsBuilder().setErrorObject(o).build());
-                return State.ERROR_IN;
-            }
-        case OPEN:
-            if (obj instanceof Open) {
-                b.setErrorType(new SessionCaseBuilder().setSession(new SessionBuilder().setOpen((Open) obj).build()).build());
-                return State.OPEN_IN;
-            }
-        case ERROR:
-            if (obj instanceof ErrorObject) {
-                final ErrorObject o = (ErrorObject) obj;
-                errorObjects.add(new ErrorsBuilder().setErrorObject(o).build());
-                return State.ERROR;
-            }
-        case OPEN_IN:
-        case END:
-            return State.END;
-        default:
-            return state;
+           case RP_IN:
+                if (obj instanceof Rp) {
+                    final Rp o = (Rp) obj;
+                    requestParameters.add(new RpsBuilder().setRp(o).build());
+                    return State.RP_IN;
+                }
+            case ERROR_IN:
+                if (obj instanceof ErrorObject) {
+                    final ErrorObject o = (ErrorObject) obj;
+                    errorObjects.add(new ErrorsBuilder().setErrorObject(o).build());
+                    return State.ERROR_IN;
+                }
+            case OPEN:
+                if (obj instanceof Open) {
+                    b.setErrorType(new SessionCaseBuilder().setSession(new SessionBuilder().setOpen((Open) obj).build()).build());
+                    return State.OPEN_IN;
+                }
+            case ERROR:
+                if (obj instanceof ErrorObject) {
+                    final ErrorObject o = (ErrorObject) obj;
+                    errorObjects.add(new ErrorsBuilder().setErrorObject(o).build());
+                    return State.ERROR;
+                }
+            case OPEN_IN:
+            case END:
+                return State.END;
+            default:
+                return state;
         }
     }
 

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 c601affcbb21211093b94cd7c8dffe899a6e891f..39402a3cc6db58d0037659dbc8f0fa6b3f0fbdca 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
@@ -110,27 +110,27 @@ public class PCEPNotificationMessageParser extends AbstractMessageParser {
 
     private static State insertObject(final State state, final Object obj, final List<Message> errors, final List<Rps> requestParameters, final List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcntf.message.pcntf.message.notifications.Notifications> notifications) {
         switch (state) {
-        case INIT:
-            if (obj instanceof Rp) {
-                final Rp rp = (Rp) obj;
-                if (rp.isProcessingRule()) {
-                    errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.empty()));
-                    return null;
+            case INIT:
+                if (obj instanceof Rp) {
+                    final Rp rp = (Rp) obj;
+                    if (rp.isProcessingRule()) {
+                        errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.empty()));
+                        return null;
+                    }
+                    requestParameters.add(new RpsBuilder().setRp(rp).build());
+                    return State.INIT;
                 }
-                requestParameters.add(new RpsBuilder().setRp(rp).build());
-                return State.INIT;
-            }
-        case RP_IN:
-            if (obj instanceof CNotification) {
-                final CNotification n = (CNotification) obj;
-                notifications.add(new NotificationsBuilder().setCNotification(n).build());
-                return State.RP_IN;
-            }
-        case NOTIFICATION_IN:
-        case END:
-            return State.END;
-        default:
-            return state;
+            case RP_IN:
+                if (obj instanceof CNotification) {
+                    final CNotification n = (CNotification) obj;
+                    notifications.add(new NotificationsBuilder().setCNotification(n).build());
+                    return State.RP_IN;
+                }
+            case NOTIFICATION_IN:
+            case END:
+                return State.END;
+            default:
+                return state;
         }
     }
 

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 72d742a53ac4662ec22aa4aefe6cf2dc0ecf3bda..977ea44ab0aa92a6b568fd2318834f39d1c652c1 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
@@ -253,31 +253,31 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
     private static State insertObject(final State state, final Object obj, final FailureCaseBuilder builder,
             final List<Metrics> pathMetrics) {
         switch (state) {
-        case INIT:
-            if (obj instanceof Lspa) {
-                builder.setLspa((Lspa) obj);
-                return State.LSPA_IN;
-            }
-        case LSPA_IN:
-            if (obj instanceof Bandwidth) {
-                builder.setBandwidth((Bandwidth) obj);
-                return State.BANDWIDTH_IN;
-            }
-        case BANDWIDTH_IN:
-            if (obj instanceof Metric) {
-                pathMetrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
-                return State.BANDWIDTH_IN;
-            }
-        case METRIC_IN:
-            if (obj instanceof Iro) {
-                builder.setIro((Iro) obj);
-                return State.IRO_IN;
-            }
-        case IRO_IN:
-        case END:
-            return State.END;
-        default:
-            return state;
+            case INIT:
+                if (obj instanceof Lspa) {
+                    builder.setLspa((Lspa) obj);
+                    return State.LSPA_IN;
+                }
+            case LSPA_IN:
+                if (obj instanceof Bandwidth) {
+                    builder.setBandwidth((Bandwidth) obj);
+                    return State.BANDWIDTH_IN;
+                }
+            case BANDWIDTH_IN:
+                if (obj instanceof Metric) {
+                    pathMetrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
+                    return State.BANDWIDTH_IN;
+                }
+            case METRIC_IN:
+                if (obj instanceof Iro) {
+                    builder.setIro((Iro) obj);
+                    return State.IRO_IN;
+                }
+            case IRO_IN:
+            case END:
+                return State.END;
+            default:
+                return state;
         }
     }
 
@@ -301,36 +301,36 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
     private static State insertObject(final State state, final Object obj, final PathsBuilder builder,
             final List<Metrics> pathMetrics) {
         switch (state) {
-        case INIT:
-            if (obj instanceof Lspa) {
-                builder.setLspa((Lspa) obj);
-                return State.LSPA_IN;
-            }
-        case LSPA_IN:
-            if (obj instanceof Of) {
-                builder.setOf((Of) obj);
-                return State.OF_IN;
-            }
-        case OF_IN:
-            if (obj instanceof Bandwidth) {
-                builder.setBandwidth((Bandwidth) obj);
-                return State.BANDWIDTH_IN;
-            }
-        case BANDWIDTH_IN:
-            if (obj instanceof Metric) {
-                pathMetrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
-                return State.BANDWIDTH_IN;
-            }
-        case METRIC_IN:
-            if (obj instanceof Iro) {
-                builder.setIro((Iro) obj);
-                return State.IRO_IN;
-            }
-        case IRO_IN:
-        case END:
-            return State.END;
-        default:
-            return state;
+            case INIT:
+                if (obj instanceof Lspa) {
+                    builder.setLspa((Lspa) obj);
+                    return State.LSPA_IN;
+                }
+            case LSPA_IN:
+                if (obj instanceof Of) {
+                    builder.setOf((Of) obj);
+                    return State.OF_IN;
+                }
+            case OF_IN:
+                if (obj instanceof Bandwidth) {
+                    builder.setBandwidth((Bandwidth) obj);
+                    return State.BANDWIDTH_IN;
+                }
+            case BANDWIDTH_IN:
+                if (obj instanceof Metric) {
+                    pathMetrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
+                    return State.BANDWIDTH_IN;
+                }
+            case METRIC_IN:
+                if (obj instanceof Iro) {
+                    builder.setIro((Iro) obj);
+                    return State.IRO_IN;
+                }
+            case IRO_IN:
+            case END:
+                return State.END;
+            default:
+                return state;
         }
     }
 

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 7f4898fdbd19fe18223d55fa6d32d9990b0265a6..57f43b3752f8923a0284c268c0c5f8be5b741547 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
@@ -352,79 +352,79 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
                                             final Rp rp) {
         final Object obj = objects.get(0);
         switch (p2PState) {
-        case INIT:
-            if (obj instanceof Rro) {
-                builder.setRro((Rro) obj);
-                objects.remove(0);
-                final Object nextObj = objects.get(0);
-                if (nextObj instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types
-                        .rev181109.reoptimization.bandwidth.object.ReoptimizationBandwidth) {
-                    builder.setReoptimizationBandwidth((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns
-                            .yang.pcep.types.rev181109.reoptimization.bandwidth.object
-                            .ReoptimizationBandwidth) nextObj);
-                }
-                return P2PState.REPORTED_IN;
-            }
-        case REPORTED_IN:
-            if (obj instanceof VendorInformationObject) {
-                viObjects.add((VendorInformationObject) obj);
-                return P2PState.REPORTED_IN;
-            }
-        case VENDOR_INFO_LIST:
-            if (obj instanceof LoadBalancing) {
-                builder.setLoadBalancing((LoadBalancing) obj);
-                return P2PState.LOAD_BIN;
-            }
-        case LOAD_BIN:
-            if (obj instanceof Lspa) {
-                builder.setLspa((Lspa) obj);
-                return P2PState.LSPA_IN;
-            }
-        case LSPA_IN:
-            if (obj instanceof Bandwidth) {
-                builder.setBandwidth((Bandwidth) obj);
-                return P2PState.BANDWIDTH_IN;
-            }
-        case BANDWIDTH_IN:
-            if (obj instanceof Metric) {
-                metrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
-                return P2PState.BANDWIDTH_IN;
-            }
-        case METRIC_IN:
-            if (obj instanceof Iro) {
-                builder.setIro((Iro) obj);
-                return P2PState.IRO_IN;
-            }
-        case IRO_IN:
-            if (obj instanceof Rro) {
-                builder.setRro((Rro) obj);
-                return P2PState.RRO_IN;
-            }
-        case RRO_IN:
-            if (obj instanceof Xro) {
-                builder.setXro((Xro) obj);
-                return P2PState.XRO_IN;
-            }
-        case XRO_IN:
-            if (obj instanceof Of) {
-                builder.setOf((Of) obj);
-                return P2PState.OF_IN;
-            }
-        case OF_IN:
-            if (obj instanceof ClassType) {
-                final ClassType classType = (ClassType) obj;
-                if (!classType.isProcessingRule()) {
-                    errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.of(rp)));
-                } else {
-                    builder.setClassType(classType);
+            case INIT:
+                if (obj instanceof Rro) {
+                    builder.setRro((Rro) obj);
+                    objects.remove(0);
+                    final Object nextObj = objects.get(0);
+                    if (nextObj instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types
+                            .rev181109.reoptimization.bandwidth.object.ReoptimizationBandwidth) {
+                        builder.setReoptimizationBandwidth((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns
+                                .yang.pcep.types.rev181109.reoptimization.bandwidth.object
+                                .ReoptimizationBandwidth) nextObj);
+                    }
+                    return P2PState.REPORTED_IN;
                 }
-                return P2PState.CT_IN;
-            }
-        case CT_IN:
-        case END:
-            return P2PState.END;
-        default:
-            return p2PState;
+            case REPORTED_IN:
+                if (obj instanceof VendorInformationObject) {
+                    viObjects.add((VendorInformationObject) obj);
+                    return P2PState.REPORTED_IN;
+                }
+            case VENDOR_INFO_LIST:
+                if (obj instanceof LoadBalancing) {
+                    builder.setLoadBalancing((LoadBalancing) obj);
+                    return P2PState.LOAD_BIN;
+                }
+            case LOAD_BIN:
+                if (obj instanceof Lspa) {
+                    builder.setLspa((Lspa) obj);
+                    return P2PState.LSPA_IN;
+                }
+            case LSPA_IN:
+                if (obj instanceof Bandwidth) {
+                    builder.setBandwidth((Bandwidth) obj);
+                    return P2PState.BANDWIDTH_IN;
+                }
+            case BANDWIDTH_IN:
+                if (obj instanceof Metric) {
+                    metrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
+                    return P2PState.BANDWIDTH_IN;
+                }
+            case METRIC_IN:
+                if (obj instanceof Iro) {
+                    builder.setIro((Iro) obj);
+                    return P2PState.IRO_IN;
+                }
+            case IRO_IN:
+                if (obj instanceof Rro) {
+                    builder.setRro((Rro) obj);
+                    return P2PState.RRO_IN;
+                }
+            case RRO_IN:
+                if (obj instanceof Xro) {
+                    builder.setXro((Xro) obj);
+                    return P2PState.XRO_IN;
+                }
+            case XRO_IN:
+                if (obj instanceof Of) {
+                    builder.setOf((Of) obj);
+                    return P2PState.OF_IN;
+                }
+            case OF_IN:
+                if (obj instanceof ClassType) {
+                    final ClassType classType = (ClassType) obj;
+                    if (!classType.isProcessingRule()) {
+                        errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.of(rp)));
+                    } else {
+                        builder.setClassType(classType);
+                    }
+                    return P2PState.CT_IN;
+                }
+            case CT_IN:
+            case END:
+                return P2PState.END;
+            default:
+                return p2PState;
         }
     }
 
@@ -616,36 +616,36 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
     private static SvecState insertP2PObject(final SvecState state, final Object obj, final SvecBuilder builder,
                                              final List<Metrics> metrics, final List<VendorInformationObject> viObjects) {
         switch (state) {
-        case INIT:
-            if (obj instanceof Of) {
-                builder.setOf((Of) obj);
-                return SvecState.OF_IN;
-            }
-        case OF_IN:
-            if (obj instanceof Gc) {
-                builder.setGc((Gc) obj);
-                return SvecState.GC_IN;
-            }
-        case GC_IN:
-            if (obj instanceof Xro) {
-                builder.setXro((Xro) obj);
-                return SvecState.XRO_IN;
-            }
-        case XRO_IN:
-            if (obj instanceof Metric) {
-                metrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
-                return SvecState.XRO_IN;
-            }
-        case METRIC_IN:
-            if (obj instanceof VendorInformationObject) {
-                viObjects.add((VendorInformationObject) obj);
-                return SvecState.METRIC_IN;
-            }
-        case VENDOR_INFO:
-        case END:
-            return SvecState.END;
-        default:
-            return state;
+            case INIT:
+                if (obj instanceof Of) {
+                    builder.setOf((Of) obj);
+                    return SvecState.OF_IN;
+                }
+            case OF_IN:
+                if (obj instanceof Gc) {
+                    builder.setGc((Gc) obj);
+                    return SvecState.GC_IN;
+                }
+            case GC_IN:
+                if (obj instanceof Xro) {
+                    builder.setXro((Xro) obj);
+                    return SvecState.XRO_IN;
+                }
+            case XRO_IN:
+                if (obj instanceof Metric) {
+                    metrics.add(new MetricsBuilder().setMetric((Metric) obj).build());
+                    return SvecState.XRO_IN;
+                }
+            case METRIC_IN:
+                if (obj instanceof VendorInformationObject) {
+                    viObjects.add((VendorInformationObject) obj);
+                    return SvecState.METRIC_IN;
+                }
+            case VENDOR_INFO:
+            case END:
+                return SvecState.END;
+            default:
+                return state;
         }
     }
 

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 7cfa3c9bb51d5fd6b03fa33ae34fda399659a9d5..fb19fc6b6fe50d155e88739657f130366560d363 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
@@ -27,21 +27,21 @@ public final class Util {
 
     private static State insertObject(final MetricPceBuilder metricPceBuilder, final State state, final Object obj) {
         switch (state) {
-        case START :
-            if (obj instanceof ProcTime) {
-                metricPceBuilder.setProcTime((ProcTime) obj);
-                return State.PROC_TIME;
-            }
-        case PROC_TIME :
-            if (obj instanceof Overload) {
-                metricPceBuilder.setOverload((Overload) obj);
-                return State.OVERLOAD;
-            }
-        case OVERLOAD :
-        case END :
-            return State.END;
-        default:
-            return state;
+            case START :
+                if (obj instanceof ProcTime) {
+                    metricPceBuilder.setProcTime((ProcTime) obj);
+                    return State.PROC_TIME;
+                }
+            case PROC_TIME :
+                if (obj instanceof Overload) {
+                    metricPceBuilder.setOverload((Overload) obj);
+                    return State.OVERLOAD;
+                }
+            case OVERLOAD :
+            case END :
+                return State.END;
+            default:
+                return state;
         }
     }
 

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java
index 8289bab6861b10ee73956001d3de8bb01b283e60..edeb9ed6c6576688b0e81221935e01cfe87fa70c 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java
@@ -151,26 +151,26 @@ public abstract class AbstractPCEPSessionNegotiator extends AbstractSessionNegot
     private void scheduleFailTimer() {
         this.failTimer = this.channel.eventLoop().schedule(() -> {
             switch (AbstractPCEPSessionNegotiator.this.state) {
-            case FINISHED:
-            case IDLE:
-                break;
-            case START_TLS_WAIT:
-                sendErrorMessage(PCEPErrors.STARTTLS_TIMER_EXP);
-                negotiationFailed(new TimeoutException("StartTLSWait timer expired"));
-                AbstractPCEPSessionNegotiator.this.state = State.FINISHED;
-                break;
-            case KEEP_WAIT:
-                sendErrorMessage(PCEPErrors.NO_MSG_BEFORE_EXP_KEEPWAIT);
-                negotiationFailed(new TimeoutException("KeepWait timer expired"));
-                AbstractPCEPSessionNegotiator.this.state = State.FINISHED;
-                break;
-            case OPEN_WAIT:
-                sendErrorMessage(PCEPErrors.NO_OPEN_BEFORE_EXP_OPENWAIT);
-                negotiationFailed(new TimeoutException("OpenWait timer expired"));
-                AbstractPCEPSessionNegotiator.this.state = State.FINISHED;
-                break;
-            default:
-                break;
+                case FINISHED:
+                case IDLE:
+                    break;
+                case START_TLS_WAIT:
+                    sendErrorMessage(PCEPErrors.STARTTLS_TIMER_EXP);
+                    negotiationFailed(new TimeoutException("StartTLSWait timer expired"));
+                    AbstractPCEPSessionNegotiator.this.state = State.FINISHED;
+                    break;
+                case KEEP_WAIT:
+                    sendErrorMessage(PCEPErrors.NO_MSG_BEFORE_EXP_KEEPWAIT);
+                    negotiationFailed(new TimeoutException("KeepWait timer expired"));
+                    AbstractPCEPSessionNegotiator.this.state = State.FINISHED;
+                    break;
+                case OPEN_WAIT:
+                    sendErrorMessage(PCEPErrors.NO_OPEN_BEFORE_EXP_OPENWAIT);
+                    negotiationFailed(new TimeoutException("OpenWait timer expired"));
+                    AbstractPCEPSessionNegotiator.this.state = State.FINISHED;
+                    break;
+                default:
+                    break;
             }
         }, FAIL_TIMER_VALUE, TimeUnit.SECONDS);
     }
@@ -325,26 +325,26 @@ public abstract class AbstractPCEPSessionNegotiator extends AbstractSessionNegot
         LOG.debug("Channel {} handling message {} in state {}", this.channel, msg, this.state);
 
         switch (this.state) {
-        case FINISHED:
-        case IDLE:
-            throw new IllegalStateException("Unexpected handleMessage in state " + this.state);
-        case START_TLS_WAIT:
-            if (handleMessageStartTlsWait(msg)) {
-                return;
-            }
-            break;
-        case KEEP_WAIT:
-            if (handleMessageKeepWait(msg)) {
-                return;
-            }
-            break;
-        case OPEN_WAIT:
-            if (handleMessageOpenWait(msg)) {
-                return;
-            }
-            break;
-        default:
-            break;
+            case FINISHED:
+            case IDLE:
+                throw new IllegalStateException("Unexpected handleMessage in state " + this.state);
+            case START_TLS_WAIT:
+                if (handleMessageStartTlsWait(msg)) {
+                    return;
+                }
+                break;
+            case KEEP_WAIT:
+                if (handleMessageKeepWait(msg)) {
+                    return;
+                }
+                break;
+            case OPEN_WAIT:
+                if (handleMessageOpenWait(msg)) {
+                    return;
+                }
+                break;
+            default:
+                break;
         }
         LOG.warn("Channel {} in state {} received unexpected message {}", this.channel, this.state, msg);
         sendErrorMessage(PCEPErrors.NON_OR_INVALID_OPEN_MSG);

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tls/SslKeyStore.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tls/SslKeyStore.java
index 5c49c083d6d1fbbda919f3cc63cffcb1036a2164..6b68dd199394534ddb80b1a6a9409171913d2515 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tls/SslKeyStore.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tls/SslKeyStore.java
@@ -37,21 +37,21 @@ public final class SslKeyStore {
     public static InputStream asInputStream(final String filename, final PathType pathType) {
         InputStream in;
         switch (pathType) {
-        case CLASSPATH:
-            in = SslKeyStore.class.getResourceAsStream(filename);
-            Preconditions.checkArgument(in != null, "KeyStore file not found: %s", filename);
-            break;
-        case PATH:
-            LOG.debug("Current dir using System: {}", System.getProperty("user.dir"));
-            final File keystorefile = new File(filename);
-            try {
-                in = new FileInputStream(keystorefile);
-            } catch (final FileNotFoundException e) {
-                throw new IllegalStateException("KeyStore file not found: " + filename,e);
-            }
-            break;
-        default:
-            throw new IllegalArgumentException("Unknown path type: " + pathType);
+            case CLASSPATH:
+                in = SslKeyStore.class.getResourceAsStream(filename);
+                Preconditions.checkArgument(in != null, "KeyStore file not found: %s", filename);
+                break;
+            case PATH:
+                LOG.debug("Current dir using System: {}", System.getProperty("user.dir"));
+                final File keystorefile = new File(filename);
+                try {
+                    in = new FileInputStream(keystorefile);
+                } catch (final FileNotFoundException e) {
+                    throw new IllegalStateException("KeyStore file not found: " + filename,e);
+                }
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown path type: " + pathType);
         }
         return in;
     }

diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java
index d9a245583b77a29a2e60a380851deaf1c57e9f58..348ba9346e4aef2bb10efd4f7dd82d006969e89b 100755 (executable)
--- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java
+++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java
@@ -222,9 +222,7 @@ public class PCEPDispatcherImplTest {
             return createClient(address, retryTimer, connectTimeout, (ch, promise) -> {
                 ch.pipeline().addLast(this.factory.getDecoders());
                 ch.pipeline().addLast("negotiator", this.negotiatorFactory.getSessionNegotiator(
-                        () -> listenerFactory,
-                        ch,
-                        promise));
+                    () -> listenerFactory, ch, promise));
                 ch.pipeline().addLast(this.factory.getEncoders());
             });
         }
@@ -261,4 +259,4 @@ public class PCEPDispatcherImplTest {
         }
     }
 
-}
\ No newline at end of file
+}