BUG-3823 : fixed Sonar issues for PCEP/programming

Mostly reduced method complexity.

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

diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/Stateful07PCEPSessionProposalFactoryModule.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/Stateful07PCEPSessionProposalFactoryModule.java
index ee3d48b8964cbe70f2931a65f6918c650d3e3d54..59d9a2ea5f3045ec78c88a7ec5a72821fa0278b2 100644 (file)
--- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/Stateful07PCEPSessionProposalFactoryModule.java
+++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/Stateful07PCEPSessionProposalFactoryModule.java
@@ -49,13 +49,7 @@ public final class Stateful07PCEPSessionProposalFactoryModule extends
         JmxAttributeValidationException.checkNotNull(getTriggeredResync(), VALUE_IS_NOT_SET, triggeredResyncJmxAttribute);
         JmxAttributeValidationException.checkNotNull(getDeltaLspSyncCapability(), VALUE_IS_NOT_SET, deltaLspSyncCapabilityJmxAttribute);
         JmxAttributeValidationException.checkNotNull(getIncludeDbVersion(), VALUE_IS_NOT_SET, includeDbVersionJmxAttribute);
-        if (getKeepAliveTimerValue() != 0) {
-            JmxAttributeValidationException.checkCondition(getKeepAliveTimerValue() >= 1, "minimum value is 1.",
-                    keepAliveTimerValueJmxAttribute);
-            if (getDeadTimerValue() != 0 && (getDeadTimerValue() / getKeepAliveTimerValue() != DT_KA_RATIO)) {
-                LOG.warn("DeadTimerValue should be 4 times greater than KeepAliveTimerValue");
-            }
-        }
+        validateTimers();
         if ((getActive() || getTriggeredInitialSync() || getTriggeredResync() || getDeltaLspSyncCapability() || getIncludeDbVersion()) && !getStateful()) {
             setStateful(true);
         }
@@ -65,6 +59,16 @@ public final class Stateful07PCEPSessionProposalFactoryModule extends
         JmxAttributeValidationException.checkNotNull(getStateful(), VALUE_IS_NOT_SET, statefulJmxAttribute);
     }
 
+    private void validateTimers() {
+        if (getKeepAliveTimerValue() != 0) {
+            JmxAttributeValidationException.checkCondition(getKeepAliveTimerValue() >= 1, "minimum value is 1.",
+                    keepAliveTimerValueJmxAttribute);
+            if (getDeadTimerValue() != 0 && (getDeadTimerValue() / getKeepAliveTimerValue() != DT_KA_RATIO)) {
+                LOG.warn("DeadTimerValue should be 4 times greater than KeepAliveTimerValue");
+            }
+        }
+    }
+
     @Override
     public java.lang.AutoCloseable createInstance() {
         final Stateful07SessionProposalFactory inner = new Stateful07SessionProposalFactory(getDeadTimerValue(), getKeepAliveTimerValue(), getStateful(), getActive(), getInitiated(),

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPMonitoringReplyMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPMonitoringReplyMessageParser.java
index 4d7bffce0054517e9518166cf953998d050d5eed..dd65446a5102eb7db66fba21599bf50ad76f42e2 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPMonitoringReplyMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPMonitoringReplyMessageParser.java
@@ -106,6 +106,14 @@ public class PCEPMonitoringReplyMessageParser extends AbstractMessageParser {
             builder.setPccIdReq((PccIdReq) objects.get(0));
             objects.remove(0);
         }
+        validateSpecificMetrics(objects, builder);
+        if (!objects.isEmpty()) {
+            throw new PCEPDeserializerException("Unprocessed Objects: " + objects);
+        }
+        return new PcmonrepBuilder().setPcmonrepMessage(builder.build()).build();
+    }
+
+    private void validateSpecificMetrics(final List<Object> objects, final PcmonrepMessageBuilder builder) throws PCEPDeserializerException {
         final List<SpecificMetrics> specificMetrics = new ArrayList<>();
         while (!objects.isEmpty()) {
             final SpecificMetricsBuilder smb = new SpecificMetricsBuilder();
@@ -127,9 +135,5 @@ public class PCEPMonitoringReplyMessageParser extends AbstractMessageParser {
         if (!specificMetrics.isEmpty()) {
             builder.setMonitoringMetricsList(new SpecificMetricsListBuilder().setSpecificMetrics(specificMetrics).build());
         }
-        if (!objects.isEmpty()) {
-            throw new PCEPDeserializerException("Unprocessed Objects: " + objects);
-        }
-        return new PcmonrepBuilder().setPcmonrepMessage(builder.build()).build();
     }
 }

diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/Main.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/Main.java
index 827659ab4171394de2dc58e3337f483d752ea108..d5d0eb08e550906ffce039d0366ef1d6a14bb137 100644 (file)
--- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/Main.java
+++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/Main.java
@@ -61,6 +61,7 @@ public final class Main {
     private static final short DEFAULT_DEAD_TIMER = 120;
     private static final int RECONNECT_STRATEGY_TIMEOUT = 2000;
     private static final InetAddress LOCALHOST = InetAddresses.forString("127.0.0.1");
+    private static final int MILISECONDS = 1000;
 
     private Main() { }
 
@@ -101,7 +102,7 @@ public final class Main {
             } else if (args[argIdx].equals("--password")) {
                 password = args[++argIdx];
             } else if (args[argIdx].equals("--reconnect")) {
-                reconnectTime = Integer.valueOf(args[++argIdx]).intValue() * 1000;
+                reconnectTime = Integer.valueOf(args[++argIdx]).intValue() * MILISECONDS;
             } else if (args[argIdx].equals("--redelegation-timeout")) {
                 redelegationTimeout = Integer.valueOf(args[++argIdx]);
             } else if (args[argIdx].equals("--state-timeout")) {

diff --git a/pcep/segment-routing/src/main/java/org/opendaylight/controller/config/yang/pcep/sr/cfg/SrPCEPSessionProposalFactoryModule.java b/pcep/segment-routing/src/main/java/org/opendaylight/controller/config/yang/pcep/sr/cfg/SrPCEPSessionProposalFactoryModule.java
index ddca82573c22ccc94f6b0a7d0154b84c7b1080e8..e713460483fa95631190f29861ee8c6ce8e668dd 100644 (file)
--- a/pcep/segment-routing/src/main/java/org/opendaylight/controller/config/yang/pcep/sr/cfg/SrPCEPSessionProposalFactoryModule.java
+++ b/pcep/segment-routing/src/main/java/org/opendaylight/controller/config/yang/pcep/sr/cfg/SrPCEPSessionProposalFactoryModule.java
@@ -43,12 +43,7 @@ public class SrPCEPSessionProposalFactoryModule extends org.opendaylight.control
         JmxAttributeValidationException.checkNotNull(getTriggeredResync(), VALUE_IS_NOT_SET, triggeredResyncJmxAttribute);
         JmxAttributeValidationException.checkNotNull(getDeltaLspSyncCapability(), VALUE_IS_NOT_SET, deltaLspSyncCapabilityJmxAttribute);
         JmxAttributeValidationException.checkNotNull(getIncludeDbVersion(), VALUE_IS_NOT_SET, includeDbVersionJmxAttribute);
-        if (getKeepAliveTimerValue() != 0) {
-            JmxAttributeValidationException.checkCondition(getKeepAliveTimerValue() >= 1, "minimum value is 1.", keepAliveTimerValueJmxAttribute);
-            if (getDeadTimerValue() != 0 && (getDeadTimerValue() / getKeepAliveTimerValue() != DEADTIMER_KEEPALIVE_RATIO)) {
-                LOG.warn("DeadTimerValue should be 4 times greater than KeepAliveTimerValue");
-            }
-        }
+        validateTimers();
         if ((getActive() || getTriggeredInitialSync() || getTriggeredResync() || getDeltaLspSyncCapability() || getIncludeDbVersion()) && !getStateful()) {
             setStateful(true);
         }
@@ -59,6 +54,15 @@ public class SrPCEPSessionProposalFactoryModule extends org.opendaylight.control
         JmxAttributeValidationException.checkNotNull(getSrCapable(), VALUE_IS_NOT_SET, srCapableJmxAttribute);
     }
 
+    private void validateTimers() {
+        if (getKeepAliveTimerValue() != 0) {
+            JmxAttributeValidationException.checkCondition(getKeepAliveTimerValue() >= 1, "minimum value is 1.", keepAliveTimerValueJmxAttribute);
+            if (getDeadTimerValue() != 0 && (getDeadTimerValue() / getKeepAliveTimerValue() != DEADTIMER_KEEPALIVE_RATIO)) {
+                LOG.warn("DeadTimerValue should be 4 times greater than KeepAliveTimerValue");
+            }
+        }
+    }
+
     @Override
     public java.lang.AutoCloseable createInstance() {
         final SegmentRoutingSessionProposalFactory inner = new SegmentRoutingSessionProposalFactory(getDeadTimerValue(), getKeepAliveTimerValue(), getStateful(), getActive(), getInitiated(), getSrCapable(),

diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectHeaderImpl.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectHeaderImpl.java
index 64b0ca0b85386b6b3889f8fe71bda304ee9335e6..65724a6832508c2ffb0207e6d907d2056064efae 100644 (file)
--- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectHeaderImpl.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectHeaderImpl.java
@@ -60,17 +60,14 @@ public class ObjectHeaderImpl implements ObjectHeader {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }
-        if (obj == null) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        ObjectHeaderImpl other = (ObjectHeaderImpl) obj;
+        final ObjectHeaderImpl other = (ObjectHeaderImpl) obj;
         if (this.ignored == null) {
             if (other.ignored != null) {
                 return false;

diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPErrorIdentifier.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPErrorIdentifier.java
index cd573fca94d19317c82fb02af5e9b0458b13dd71..df8152eb732635bd49208ff501f90a6d3a034ae6 100644 (file)
--- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPErrorIdentifier.java
+++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPErrorIdentifier.java
@@ -44,17 +44,11 @@ final class PCEPErrorIdentifier implements Serializable {
         if (this == obj) {
             return true;
         }
-        if (obj == null) {
-            return false;
-        }
-        if (this.getClass() != obj.getClass()) {
+        if (obj == null || this.getClass() != obj.getClass()) {
             return false;
         }
         final PCEPErrorIdentifier other = (PCEPErrorIdentifier) obj;
-        if (this.type != other.type) {
-            return false;
-        }
-        if (this.value != other.value) {
+        if (this.type != other.type || this.value != other.value) {
             return false;
         }
         return true;

diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java
index 7c6dc013bbaaf029a2a19046ffeee209e8928774..68e99b9bfc73487d3c839547415ef18882eeadc7 100644 (file)
--- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java
+++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java
@@ -166,7 +166,7 @@ final class Stateful07TopologySessionListener extends AbstractTopologySessionLis
         return true;
     }
 
-    private boolean mangeNextReport(final Reports report, final MessageContext ctx) {
+    private boolean manageNextReport(final Reports report, final MessageContext ctx) {
         final Lsp lsp = report.getLsp();
         final PlspId plspid = lsp.getPlspId();
         if (!lsp.isSync() && (lsp.getPlspId() == null || plspid.getValue() == 0)) {
@@ -236,7 +236,7 @@ final class Stateful07TopologySessionListener extends AbstractTopologySessionLis
         getSessionListenerState().updateLastReceivedRptMsg();
         final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.pcrpt.message.PcrptMessage rpt = ((PcrptMessage) message).getPcrptMessage();
         for (final Reports report : rpt.getReports()) {
-            if (!mangeNextReport(report, ctx)) {
+            if (!manageNextReport(report, ctx)) {
                 return false;
             }
         }
@@ -394,40 +394,41 @@ final class Stateful07TopologySessionListener extends AbstractTopologySessionLis
                 }
             }
             final Srp srp = srpBuilder.build();
-
             final Lsp inputLsp = args.getLsp();
             final Lsp lsp = (inputLsp != null) ?
                 new LspBuilder().setPlspId(reportedLsp.getPlspId()).setDelegate((inputLsp.isDelegate() != null) ? inputLsp.isDelegate() : false).setTlvs(inputLsp.getTlvs()).setAdministrative((inputLsp.isAdministrative() != null) ? inputLsp.isAdministrative() : false).build()
                 : new LspBuilder().setPlspId(reportedLsp.getPlspId()).build();
-            Message msg = null;
-            // the D bit that was reported decides the type of PCE message sent
-            Preconditions.checkNotNull(reportedLsp.isDelegate());
-            if (reportedLsp.isDelegate()) {
-                // we already have delegation, send update
-                final UpdatesBuilder rb = new UpdatesBuilder();
-                rb.setSrp(srp);
-                rb.setLsp(lsp);
-                final PathBuilder pb = new PathBuilder();
-                pb.fieldsFrom(this.input.getArguments());
-                rb.setPath(pb.build());
-                final PcupdMessageBuilder ub = new PcupdMessageBuilder(MESSAGE_HEADER);
-                ub.setUpdates(Collections.singletonList(rb.build()));
-                msg = new PcupdBuilder().setPcupdMessage(ub.build()).build();
-            } else {
-                // we want to revoke delegation, different type of message
-                // is sent because of specification by Siva
-                // this message is also sent, when input delegate bit is set to 0
-                // generating an error in PCC
-                final List<Requests> reqs = new ArrayList<>();
-                reqs.add(new RequestsBuilder().setSrp(srp).setLsp(lsp).build());
-                final PcinitiateMessageBuilder ib = new PcinitiateMessageBuilder();
-                ib.setRequests(reqs);
-                msg = new PcinitiateBuilder().setPcinitiateMessage(ib.build()).build();
-            }
+            final Message msg = redelegate(reportedLsp.isDelegate(), srp, lsp, this.input);
             return sendMessage(msg, srp.getOperationId(), this.input.getArguments().getMetadata());
         }
     }
 
+    private Message redelegate(final Boolean isDelegate, final Srp srp, final Lsp lsp, final UpdateLspArgs input) {
+        // the D bit that was reported decides the type of PCE message sent
+        Preconditions.checkNotNull(isDelegate);
+        if (isDelegate) {
+            // we already have delegation, send update
+            final UpdatesBuilder rb = new UpdatesBuilder();
+            rb.setSrp(srp);
+            rb.setLsp(lsp);
+            final PathBuilder pb = new PathBuilder();
+            pb.fieldsFrom(input.getArguments());
+            rb.setPath(pb.build());
+            final PcupdMessageBuilder ub = new PcupdMessageBuilder(MESSAGE_HEADER);
+            ub.setUpdates(Collections.singletonList(rb.build()));
+            return new PcupdBuilder().setPcupdMessage(ub.build()).build();
+        }
+        // we want to revoke delegation, different type of message
+        // is sent because of specification by Siva
+        // this message is also sent, when input delegate bit is set to 0
+        // generating an error in PCC
+        final List<Requests> reqs = new ArrayList<>();
+        reqs.add(new RequestsBuilder().setSrp(srp).setLsp(lsp).build());
+        final PcinitiateMessageBuilder ib = new PcinitiateMessageBuilder();
+        ib.setRequests(reqs);
+        return new PcinitiateBuilder().setPcinitiateMessage(ib.build()).build();
+    }
+
     @Override
     public synchronized ListenableFuture<OperationResult> updateLsp(final UpdateLspArgs input) {
         Preconditions.checkArgument(input != null && input.getName() != null && input.getNode() != null && input.getArguments() != null, MISSING_XML_TAG);

diff --git a/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/InstructionImpl.java b/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/InstructionImpl.java
index 2b39ef590f330799c29edafb94b415674169826b..b92b8ee84e3ee46d7696df723d042ccfdee23fb0 100644 (file)
--- a/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/InstructionImpl.java
+++ b/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/InstructionImpl.java
@@ -109,13 +109,7 @@ final class InstructionImpl implements Instruction {
             break;
         case Queued:
             LOG.debug("Instruction {} timed out while Queued, cancelling it", this.id);
-            final List<InstructionId> ids = new ArrayList<>();
-            for (final InstructionImpl d : this.dependencies) {
-                if (d.getStatus() != InstructionStatus.Successful) {
-                    ids.add(d.getId());
-                }
-            }
-            cancel(new DetailsBuilder().setUnmetDependencies(ids).build());
+            cancelInstrunction();
             break;
         case Scheduled:
             LOG.debug("Instruction {} timed out while Scheduled, cancelling it", this.id);
@@ -126,6 +120,16 @@ final class InstructionImpl implements Instruction {
         }
     }
 
+    private synchronized void cancelInstrunction() {
+        final List<InstructionId> ids = new ArrayList<>();
+        for (final InstructionImpl d : this.dependencies) {
+            if (d.getStatus() != InstructionStatus.Successful) {
+                ids.add(d.getId());
+            }
+        }
+        cancel(new DetailsBuilder().setUnmetDependencies(ids).build());
+    }
+
     @GuardedBy("this")
     private void cancelDependants() {
         final Details details = new DetailsBuilder().setUnmetDependencies(ImmutableList.of(this.id)).build();