From 922e31d0c09ed2f189362381cd19e6c5dc69a949 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Mon, 3 Sep 2018 16:59:53 +0200 Subject: [PATCH] clean some compilation warnings - remove HiddenField warnings - remove HideUtilityClassConstructor warnings - remove Servicehandler private constructors call from Junit tests - remove unused imports - remove WhitespaceAround warnings Change-Id: Ie71482b476b2b92e91f96df36463315bf935037b Signed-off-by: guillaume.lambert Co-authored-by: Martial COULIBALY --- .../common/mapping/PortMappingImpl.java | 4 +- .../OpenRoadmInterfacesImpl.java | 15 +++-- .../networkmodel/NetConfTopologyListener.java | 4 -- .../transportpce/networkmodel/OrdLink.java | 3 + .../transportpce/pce/PceComplianceCheck.java | 5 +- .../transportpce/pce/PceGraph.java | 8 +-- .../transportpce/pce/PceResult.java | 8 +-- .../transportpce/pce/PceSendingPceRPCs.java | 11 ++-- .../validation/ServiceCreateValidation.java | 2 +- .../checks/CheckCoherencyHardSoft.java | 2 +- .../checks/ServicehandlerCompliancyCheck.java | 2 +- .../checks/ServicehandlerTxRxCheck.java | 2 +- .../impl/ServiceHandlerImplTest.java | 4 +- .../ServiceCreateValidationTest.java | 20 ------- .../ServicehandlerCompliancyCheckTest.java | 6 -- .../transportpce/stubpce/SendingPceRPCs.java | 56 +++++++++---------- .../stubpce/impl/StubpceImpl.java | 8 +-- .../stubpce/topology/InterNodePath.java | 28 +++++----- .../stubpce/topology/NodePath.java | 5 +- .../stubpce/topology/Resource.java | 5 +- .../stubpce/topology/SuperNodePath.java | 14 +++-- 21 files changed, 91 insertions(+), 121 deletions(-) diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java index c14d4f4f5..c4edf0a3d 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java @@ -378,14 +378,14 @@ public class PortMappingImpl implements PortMapping { for (Ports port : cp.getPorts()) { if (Port.PortQual.XpdrNetwork.equals(port.getPortQual())) { portMapList.add(createMappingObject(nodeId, port, circuitPackName, - "XPDR1-"+OpenRoadmInterfacesImpl.NETWORK_TOKEN + line)); + "XPDR1-" + OpenRoadmInterfacesImpl.NETWORK_TOKEN + line)); //String lcp = port.getLogicalConnectionPoint(); //String regex = "XPDR[0-9]+-NETWORK[0-9]+"; //checkLogicalConnectionPoint(regex, lcp, nodeId, portMapList, circuitPackName, port, "NETWORK", line); line++; } else if (Port.PortQual.XpdrClient.equals(port.getPortQual())) { portMapList.add(createMappingObject(nodeId, port, circuitPackName, - "XPDR1-"+OpenRoadmInterfacesImpl.CLIENT_TOKEN + client)); + "XPDR1-" + OpenRoadmInterfacesImpl.CLIENT_TOKEN + client)); //String lcp = port.getLogicalConnectionPoint(); //String regex = "XPDR[0-9]+-CLIENT[0-9]+"; //checkLogicalConnectionPoint(regex, lcp, nodeId, portMapList, circuitPackName, port, "CLIENT", client); diff --git a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl.java index af8c10e79..5492eb5c1 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/openroadminterfaces/OpenRoadmInterfacesImpl.java @@ -120,7 +120,7 @@ public class OpenRoadmInterfacesImpl implements OpenRoadmInterfaces { otuBuilder = new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.Interface1Builder( intf2Delete.augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.Interface1.class)); + org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.Interface1.class)); OtuBuilder otu = new OtuBuilder(otuBuilder.getOtu()); if (otu.getMaintLoopback() != null) { MaintLoopbackBuilder maintLoopBackBuilder = new MaintLoopbackBuilder(); @@ -200,15 +200,14 @@ public class OpenRoadmInterfacesImpl implements OpenRoadmInterfaces { CircuitPacksBuilder cpBldr = new CircuitPacksBuilder(cp); boolean change = false; if (activate) { - if (cpBldr.getEquipmentState()!=null && !cpBldr.getEquipmentState().equals(States.NotReservedInuse)) { + if (cpBldr.getEquipmentState() != null && !cpBldr.getEquipmentState().equals(States.NotReservedInuse)) { cpBldr.setEquipmentState(States.NotReservedInuse); change = true; } - } else { - if ((cpBldr.getEquipmentState()!=null && !cpBldr.getEquipmentState().equals(States.NotReservedAvailable))) { - cpBldr.setEquipmentState(States.NotReservedAvailable); - change = true; - } + } else if ( + (cpBldr.getEquipmentState() != null && !cpBldr.getEquipmentState().equals(States.NotReservedAvailable))) { + cpBldr.setEquipmentState(States.NotReservedAvailable); + change = true; } if (change) { Future> deviceTxFuture = this.deviceTransactionManager.getDeviceTransaction( @@ -239,4 +238,4 @@ public class OpenRoadmInterfacesImpl implements OpenRoadmInterfaces { } } -} \ No newline at end of file +} diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java index d58b88f36..9772212e0 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListener.java @@ -20,7 +20,6 @@ import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; import org.opendaylight.controller.md.sal.binding.api.MountPoint; import org.opendaylight.controller.md.sal.binding.api.NotificationService; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; @@ -36,9 +35,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.de.operations.rev161014.O import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.OrgOpenroadmDeviceListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.OrgOpenroadmLldpListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.tca.rev161014.OrgOpenroadmTcaListener; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.CreateSubscriptionInputBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.NotificationsService; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.StreamNameType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.Netconf; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.Streams; import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java index e0e05eea3..408d13adc 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java @@ -86,4 +86,7 @@ final class OrdLink { return false; } } + + private OrdLink(){ + } } diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PceComplianceCheck.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PceComplianceCheck.java index d4dc57b84..86b34f2ec 100755 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/PceComplianceCheck.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PceComplianceCheck.java @@ -14,7 +14,7 @@ import org.slf4j.LoggerFactory; /* * Class to check RPCs Compliancy. */ -public class PceComplianceCheck { +public final class PceComplianceCheck { private static final Logger LOG = LoggerFactory.getLogger(PceComplianceCheck.class); @@ -51,5 +51,8 @@ public class PceComplianceCheck { return new PceComplianceCheckResult(result, message); } + private PceComplianceCheck() { + } + } diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PceGraph.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PceGraph.java index 79e0b9c5d..3deec9d7a 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/PceGraph.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PceGraph.java @@ -10,13 +10,11 @@ package org.opendaylight.transportpce.pce; import edu.uci.ics.jung.algorithms.shortestpath.DijkstraShortestPath; import edu.uci.ics.jung.graph.DirectedSparseMultigraph; - import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; - import org.apache.commons.collections15.Transformer; import org.opendaylight.transportpce.common.ResponseCodes; import org.opendaylight.transportpce.pce.PceResult.LocalCause; @@ -448,9 +446,9 @@ public class PceGraph { } - public void setConstrains(PceConstraints pceHardConstraints, PceConstraints pceSoftConstraints) { - this.pceHardConstraints = pceHardConstraints; - this.pceSoftConstraints = pceSoftConstraints; + public void setConstrains(PceConstraints pceHardCons, PceConstraints pceSoftCons) { + this.pceHardConstraints = pceHardCons; + this.pceSoftConstraints = pceSoftCons; } } diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PceResult.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PceResult.java index 8c912dad2..4ee19df5a 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/PceResult.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PceResult.java @@ -86,12 +86,12 @@ public class PceResult { return this.ztoadirection; } - public void setAtoZDirection(AToZDirection atozdirection) { - this.atozdirection = atozdirection; + public void setAtoZDirection(AToZDirection atozdir) { + this.atozdirection = atozdir; } - public void setZtoADirection(ZToADirection ztoadirection) { - this.ztoadirection = ztoadirection; + public void setZtoADirection(ZToADirection ztoadir) { + this.ztoadirection = ztoadir; } public long getRate() { diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java index 843aebfab..a897b86f9 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PceSendingPceRPCs.java @@ -103,7 +103,7 @@ public class PceSendingPceRPCs { // TODO fix. This is quick workaround for algorithm problem if ((rc.getLocalCause() == LocalCause.TOO_HIGH_LATENCY) && (pceHardConstraints.getPceMetrics() == PceMetric.HopCount) - && (pceHardConstraints.getMaxLatency() != (long) -1)) { + && (pceHardConstraints.getMaxLatency() != -1)) { pceHardConstraints.setPceMetrics(PceMetric.PropagationDelay); graph = patchRerunGraph(graph, pceHardConstraints, pceSoftConstraints); @@ -129,12 +129,12 @@ public class PceSendingPceRPCs { LOG.info("setPathDescription ..."); AToZDirection atoz = rc.getAtoZDirection(); ZToADirection ztoa = rc.getZtoADirection(); - if (atoz == null || atoz.getAToZ() == null) { + if ((atoz == null) || (atoz.getAToZ() == null)) { rc.setRC("400"); LOG.error("In pathComputation empty atoz path after description: result = {}", rc.toString()); return; } - if (ztoa == null || ztoa.getZToA() == null) { + if ((ztoa == null) || (ztoa.getZToA() == null)) { rc.setRC("400"); LOG.error("In pathComputation empty ztoa path after description: result = {}", rc.toString()); return; @@ -145,11 +145,10 @@ public class PceSendingPceRPCs { LOG.info("In pathComputation Graph is Found"); } - private PceGraph patchRerunGraph(PceGraph graph, PceConstraints pceHardConstraints, - PceConstraints pceSoftConstraints) { + private PceGraph patchRerunGraph(PceGraph graph, PceConstraints pceHardCons, PceConstraints pceSoftCons) { LOG.info("In pathComputation patchRerunGraph : rerun Graph with metric = PROPAGATION-DELAY "); - graph.setConstrains(pceHardConstraints, pceSoftConstraints); + graph.setConstrains(pceHardCons, pceSoftCons); graph.calcPath(); return graph; diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/ServiceCreateValidation.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/ServiceCreateValidation.java index 68f1f2b65..6d962aea0 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/ServiceCreateValidation.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/ServiceCreateValidation.java @@ -90,7 +90,7 @@ public final class ServiceCreateValidation { return OperationResult.ok("Validation successful."); } - public ServiceCreateValidation() { + private ServiceCreateValidation() { } } diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/CheckCoherencyHardSoft.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/CheckCoherencyHardSoft.java index f3c015a04..828bc3c08 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/CheckCoherencyHardSoft.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/CheckCoherencyHardSoft.java @@ -44,7 +44,7 @@ public final class CheckCoherencyHardSoft { return result; } - public CheckCoherencyHardSoft() { + private CheckCoherencyHardSoft() { } } diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerCompliancyCheck.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerCompliancyCheck.java index 0ee2ba8f7..24432ae57 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerCompliancyCheck.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerCompliancyCheck.java @@ -90,7 +90,7 @@ public final class ServicehandlerCompliancyCheck { return new ComplianceCheckResult(result, message); } - public ServicehandlerCompliancyCheck() { + private ServicehandlerCompliancyCheck() { } } diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerTxRxCheck.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerTxRxCheck.java index e55cf5cdc..b7a23d938 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerTxRxCheck.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerTxRxCheck.java @@ -170,7 +170,7 @@ public final class ServicehandlerTxRxCheck { return new ComplianceCheckResult(result, message); } - public ServicehandlerTxRxCheck() { + private ServicehandlerTxRxCheck() { } } diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServiceHandlerImplTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServiceHandlerImplTest.java index 104d1713c..2f81fc1f0 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServiceHandlerImplTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServiceHandlerImplTest.java @@ -451,7 +451,7 @@ public class ServiceHandlerImplTest extends AbstractTest { txDirectionBuilder.setLgx(lgx); serviceAEndBuilder.setTxDirection(txDirectionBuilder.build()); ServiceCreateInputBuilder buildInput = new ServiceCreateInputBuilder(serviceCreateInput); - ServicehandlerImpl serviceHandler = new ServicehandlerImpl(getDataBroker(), this.pathComputationService, null); + this.serviceHandler = new ServicehandlerImpl(getDataBroker(), this.pathComputationService, null); return serviceHandler.serviceCreate(buildInput.setServiceAEnd(serviceAEndBuilder.build()).build()).get() .getResult(); } @@ -734,7 +734,7 @@ public class ServiceHandlerImplTest extends AbstractTest { rxDirectionBuilder.setLgx(lgx); serviceAEndBuilder.setRxDirection(rxDirectionBuilder.build()); ServiceCreateInputBuilder buildInput = new ServiceCreateInputBuilder(serviceCreateInput); - ServicehandlerImpl serviceHandler = new ServicehandlerImpl(getDataBroker(), this.pathComputationService, null); + this.serviceHandler = new ServicehandlerImpl(getDataBroker(), this.pathComputationService, null); return serviceHandler.serviceCreate(buildInput.setServiceAEnd(serviceAEndBuilder.build()).build()).get() .getResult(); } diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/ServiceCreateValidationTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/ServiceCreateValidationTest.java index 5ec1362dc..06958d204 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/ServiceCreateValidationTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/ServiceCreateValidationTest.java @@ -12,8 +12,6 @@ import org.junit.Assert; import org.junit.Test; import org.opendaylight.transportpce.common.OperationResult; import org.opendaylight.transportpce.servicehandler.utils.ServiceDataUtils; -import org.opendaylight.transportpce.servicehandler.validation.checks.CheckCoherencyHardSoft; -import org.opendaylight.transportpce.servicehandler.validation.checks.ServicehandlerTxRxCheck; import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev161014.constraints.co.routing.or.general.CoRoutingBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev161014.routing.constraints.HardConstraintsBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev161014.routing.constraints.SoftConstraintsBuilder; @@ -94,22 +92,4 @@ public class ServiceCreateValidationTest { OperationResult result = ServiceCreateValidation.validateServiceCreateRequest(input); Assert.assertEquals(true, result.isSuccess()); } - - @Test - public void constructServicehandlerTxRxCheck() { - ServicehandlerTxRxCheck servicehandlerTxRxCheck = new ServicehandlerTxRxCheck(); - Assert.assertEquals(ServicehandlerTxRxCheck.class, servicehandlerTxRxCheck.getClass()); - } - - @Test - public void constructCheckCoherencyHardSoft() { - CheckCoherencyHardSoft checkCoherencyHardSoft = new CheckCoherencyHardSoft(); - Assert.assertEquals(CheckCoherencyHardSoft.class, checkCoherencyHardSoft.getClass()); - } - - @Test - public void constructServiceCreateValidation() { - ServiceCreateValidation serviceCreateValidation = new ServiceCreateValidation(); - Assert.assertEquals(ServiceCreateValidation.class, serviceCreateValidation.getClass()); - } } diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerCompliancyCheckTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerCompliancyCheckTest.java index 1ea15d624..3c9c0aac3 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerCompliancyCheckTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerCompliancyCheckTest.java @@ -28,10 +28,4 @@ public class ServicehandlerCompliancyCheckTest { Assert.assertEquals("", result.getMessage()); Assert.assertEquals(true, result.hasPassed()); } - - @Test - public void constructServicehandlerCompliancyCheck() { - ServicehandlerCompliancyCheck servicehandlerCompliancyCheck = new ServicehandlerCompliancyCheck(); - Assert.assertEquals(ServicehandlerCompliancyCheck.class, servicehandlerCompliancyCheck.getClass()); - } } diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/SendingPceRPCs.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/SendingPceRPCs.java index 2f2137d96..4d5b153d1 100644 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/SendingPceRPCs.java +++ b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/SendingPceRPCs.java @@ -13,7 +13,6 @@ import com.google.common.base.Optional; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -24,7 +23,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; - import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; @@ -120,8 +118,8 @@ public class SendingPceRPCs { */ private Boolean comp(Resource pathAend, Resource pathZend, String inputAend, String inputZend) { Boolean result = false; - if (pathAend != null && pathZend != null && inputAend != null && inputZend != null) { - if (pathAend instanceof Node && pathZend instanceof Node) { + if ((pathAend != null) && (pathZend != null) && (inputAend != null) && (inputZend != null)) { + if ((pathAend instanceof Node) && (pathZend instanceof Node)) { Node aend = (Node) pathAend; Node zend = (Node) pathZend; if (aend.getNodeIdentifier().getNodeId().compareToIgnoreCase(inputAend) == 0) { @@ -146,7 +144,7 @@ public class SendingPceRPCs { Boolean result = false; LOG.info("{} - {}", res1.getClass().getName(), res2.getClass().getName()); if (res1.getClass().getName().compareToIgnoreCase(res2.getClass().getName()) == 0) { - if (res1 instanceof Node && res2 instanceof Node) { + if ((res1 instanceof Node) && (res2 instanceof Node)) { Node node1 = (Node)res1; Node node2 = (Node)res2; if (node1.getNodeIdentifier().getNodeId() @@ -154,7 +152,7 @@ public class SendingPceRPCs { result = true; } } - if (res1 instanceof TerminationPoint && res2 instanceof TerminationPoint) { + if ((res1 instanceof TerminationPoint) && (res2 instanceof TerminationPoint)) { TerminationPoint tp1 = (TerminationPoint)res1; TerminationPoint tp2 = (TerminationPoint)res2; if (tp1.getTerminationPointIdentifier().getNodeId() @@ -165,7 +163,7 @@ public class SendingPceRPCs { } } } - if (res1 instanceof Link && res2 instanceof Link) { + if ((res1 instanceof Link) && (res2 instanceof Link)) { Link link1 = (Link)res1; Link link2 = (Link)res2; if (link1.getLinkIdentifier().getLinkId().compareTo(link2.getLinkIdentifier().getLinkId()) == 0) { @@ -203,7 +201,7 @@ public class SendingPceRPCs { Boolean trouve = false; for (int loop = 0;loop < size;loop++) { id2 = atoz2.getAToZ().get(loop).getId(); - if (id2 != null && id2.compareTo(id1) == 0) { + if ((id2 != null) && (id2.compareTo(id1) == 0)) { res2 = atoz2.getAToZ().get(loop).getResource().getResource(); LOG.info("res2 : {}", res2.toString()); trouve = true; @@ -255,7 +253,7 @@ public class SendingPceRPCs { Boolean trouve = false; for (int loop = 0;loop < size;loop++) { id2 = ztoa2.getZToA().get(loop).getId(); - if (id2 != null && id2.compareTo(id1) == 0) { + if ((id2 != null) && (id2.compareTo(id1) == 0)) { res2 = ztoa2.getZToA().get(loop).getResource().getResource(); LOG.info("res2 : {}", res2.toString()); trouve = true; @@ -291,14 +289,14 @@ public class SendingPceRPCs { private Boolean excludeNode(PathDescriptions path, List nodes) { LOG.info("Testing exclude Nodes ..."); Boolean result = false; - if (path != null && !nodes.isEmpty()) { + if ((path != null) && !nodes.isEmpty()) { List list = path.getAToZDirection().getAToZ(); if (!list.isEmpty()) { int index = 0; boolean found = false; - while (index < list.size() && !found) { + while ((index < list.size()) && !found) { Resource res = list.get(index).getResource().getResource(); - if (res != null && res instanceof Node) { + if ((res != null) && (res instanceof Node)) { Node node = (Node) res; for (String exclude : nodes) { if (exclude.compareToIgnoreCase(node.getNodeIdentifier().getNodeId()) == 0) { @@ -333,14 +331,14 @@ public class SendingPceRPCs { private Boolean diversityService(List existingService, PathDescriptions path, int choice) { LOG.info("Testing diversity ..."); Boolean result = false; - if (path != null && choice >= 0 && !existingService.isEmpty()) { + if ((path != null) && (choice >= 0) && !existingService.isEmpty()) { int index = 0; while (index < existingService.size()) { String tmp = existingService.get(index); if (tmp != null) { org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service .types.rev170426.service.path.PathDescription pathDesc = null; - if (servicePathList != null && !servicePathList.isEmpty()) { + if ((servicePathList != null) && !servicePathList.isEmpty()) { for (ServicePaths service : servicePathList) { if (service.getServicePathName().compareTo(tmp) == 0) { LOG.info("Existing Service '{}' found in ServicePathList ...", tmp); @@ -403,9 +401,9 @@ public class SendingPceRPCs { org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service .types.rev170426.service.path.PathDescription tmp = service.getPathDescription(); if (tmp != null) { - if (path.getAToZDirection() != null && tmp.getAToZDirection() != null + if ((path.getAToZDirection() != null) && (tmp.getAToZDirection() != null) && egalAtoZDirection(path.getAToZDirection(), tmp.getAToZDirection())) { - if (path.getZToADirection() != null && tmp.getZToADirection() != null + if ((path.getZToADirection() != null) && (tmp.getZToADirection() != null) && egalZtoADirection(path.getZToADirection(), tmp.getZToADirection())) { result = true; LOG.info("Path already present in servicePath List"); @@ -446,7 +444,7 @@ public class SendingPceRPCs { private List retrievePath(String aendNodeId, String zendNodeId) { List result = new ArrayList(); List paths = readPathDescriptionList(); - if (!paths.isEmpty() && aendNodeId != null && zendNodeId != null) { + if (!paths.isEmpty() && (aendNodeId != null) && (zendNodeId != null)) { LOG.info("retrieving paths from pathDescription List for {} / {}", aendNodeId, zendNodeId); for (PathDescriptions tmp : paths) { Resource pathAend = null; @@ -479,7 +477,7 @@ public class SendingPceRPCs { } index++; } - if (pathAend != null && pathZend != null) { + if ((pathAend != null) && (pathZend != null)) { LOG.info("pathAend : {} - pathZend: {}",pathAend, pathZend); LOG.info("aendNodeId : {} - zendNodeId : {}", aendNodeId, zendNodeId); if (comp(pathAend, pathZend, aendNodeId, zendNodeId)) { @@ -510,7 +508,7 @@ public class SendingPceRPCs { PathDescriptions path = it.next(); String name = path.getPathName(); LOG.info("path : {}", name); - if (name != null && name.contains(contain)) { + if ((name != null) && name.contains(contain)) { LOG.info(" path gets : {}", name); String [] split = name.split("_"); if (split.length == 3) { @@ -577,7 +575,7 @@ public class SendingPceRPCs { if (cancelInput != null) { Boolean found = false; String name = cancelInput.getServiceName(); - if (name != null && !servicePathList.isEmpty()) { + if ((name != null) && !servicePathList.isEmpty()) { for (ServicePaths service : servicePathList) { if (name.compareTo(service.getServicePathName()) == 0) { LOG.info("ServicePaths found in ServicePathList !!!"); @@ -620,7 +618,7 @@ public class SendingPceRPCs { if (input != null) { HardConstraints inputHard = input.getHardConstraints(); SoftConstraints inputSoft = input.getSoftConstraints(); - if (inputHard != null || inputSoft != null) { + if ((inputHard != null) || (inputSoft != null)) { constraints = true; } path = null; @@ -649,17 +647,17 @@ public class SendingPceRPCs { if (existingService.size() > 0) { LOG.info("Getting existing service applicability ..."); int choice = -1; - if (choice < 0 + if ((choice < 0) && diversity.getExistingServiceApplicability().isNode()) { LOG.info("existing-service-applicability : Node"); choice = 0; } - if (choice < 0 + if ((choice < 0) && diversity.getExistingServiceApplicability().isClli()) { LOG.info("existing-service-applicability : Clli"); choice = 1; } - if (choice < 0 + if ((choice < 0) && diversity.getExistingServiceApplicability().isSrlg()) { LOG.info("existing-service-applicability : Srlg"); choice = 2; @@ -776,7 +774,7 @@ public class SendingPceRPCs { */ private Boolean writeOrDeleteServicePathList(String serviceName, int choice) { Boolean result = null; - if (serviceName != null && serviceName.compareTo(" ") != 0 && choice >= 0 && choice < 2) { + if ((serviceName != null) && (serviceName.compareTo(" ") != 0) && (choice >= 0) && (choice < 2)) { LOG.info("WriteOrDeleting '{}' ServicePaths", serviceName); WriteTransaction writeTx = db.newWriteOnlyTransaction(); result = true; @@ -875,16 +873,16 @@ public class SendingPceRPCs { return input; } - public void setInput(PathComputationRequestInput input) { - this.input = input; + public void setInput(PathComputationRequestInput pathComputationRequestInput) { + this.input = pathComputationRequestInput; } public CancelResourceReserveInput getCancelInput() { return cancelInput; } - public void setCancelInput(CancelResourceReserveInput input) { - this.cancelInput = input; + public void setCancelInput(CancelResourceReserveInput cancelResourceReserveInput) { + this.cancelInput = cancelResourceReserveInput; } public DataBroker getDb() { diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/impl/StubpceImpl.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/impl/StubpceImpl.java index a02ca4d5a..6240693e2 100644 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/impl/StubpceImpl.java +++ b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/impl/StubpceImpl.java @@ -365,10 +365,10 @@ public class StubpceImpl implements StubpceService { * @param DataBroker * Access DataStore */ - private boolean initializePathDescriptionList(DataBroker db) { + private boolean initializePathDescriptionList(DataBroker dataBroker) { Boolean result = true; LOG.info("Preparing to initialize the PathDescription List"); - WriteTransaction transaction = db.newWriteOnlyTransaction(); + WriteTransaction transaction = dataBroker.newWriteOnlyTransaction(); InstanceIdentifier iid = InstanceIdentifier.create(PathDescriptionList.class); PathDescriptionList pathDescriptionList = new PathDescriptionListBuilder().build(); transaction.put(LogicalDatastoreType.OPERATIONAL, iid, pathDescriptionList); @@ -389,10 +389,10 @@ public class StubpceImpl implements StubpceService { * Access DataStore * @return true if ok, false else */ - private boolean initializeServicePathList(DataBroker db) { + private boolean initializeServicePathList(DataBroker dataBroker) { Boolean result = true; LOG.info("Preparing to initialize the ServicePathList registry"); - WriteTransaction transaction = db.newWriteOnlyTransaction(); + WriteTransaction transaction = dataBroker.newWriteOnlyTransaction(); InstanceIdentifier iid = InstanceIdentifier.create(ServicePathList.class); ServicePathList servicePathList = new ServicePathListBuilder().build(); transaction.put(LogicalDatastoreType.OPERATIONAL, iid, servicePathList); diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/InterNodePath.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/InterNodePath.java index 0df5603c5..861bc84c1 100644 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/InterNodePath.java +++ b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/InterNodePath.java @@ -74,8 +74,8 @@ public class InterNodePath { for (Path path : paths) { tpNodeTp = path.getTpNodeTp(); tpNodeTp.createAToZListHop(order); - for (AToZ atoz : tpNodeTp.getAToZ()) { - atozList.add(atoz); + for (AToZ tmp : tpNodeTp.getAToZ()) { + atozList.add(tmp); order++; } Link link = path.getLink(); @@ -102,8 +102,8 @@ public class InterNodePath { for (Path path : paths) { tpNodeTp = path.getTpNodeTp(); tpNodeTp.createZToAListHop(order); - for (ZToA ztoa : tpNodeTp.getZToA()) { - ztoaList.add(ztoa); + for (ZToA tmp : tpNodeTp.getZToA()) { + ztoaList.add(tmp); order++; } Link link = path.getLink(); @@ -350,9 +350,9 @@ public class InterNodePath { String id = Integer.toString(size - index); org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription .rev170426.pce.resource.resource.Resource res = null; - for (AToZ atoz : atozList) { - if (atoz.getId().compareTo(id) == 0) { - res = atoz.getResource().getResource(); + for (AToZ tmpAtoz : atozList) { + if (tmpAtoz.getId().compareTo(id) == 0) { + res = tmpAtoz.getResource().getResource(); if (res != null) { switch (index) { @@ -420,17 +420,17 @@ public class InterNodePath { if (size > 0) { String id = Integer.toString(size - 1); for (ListIterator it = atozList.listIterator(); it.hasNext();) { - AToZ atoz = it.next(); - if (atoz.getId().compareTo(id) == 0) { + AToZ tmpAtoz = it.next(); + if (tmpAtoz.getId().compareTo(id) == 0) { org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription - .rev170426.pce.resource.resource.Resource res = atoz.getResource().getResource(); + .rev170426.pce.resource.resource.Resource res = tmpAtoz.getResource().getResource(); if ((res != null) && (res instanceof Link)) { Link link = new LinkBuilder() .setLinkIdentifier(new LinkIdentifierBuilder() .setLinkId(atozLink) .build()) .build(); - AToZKey atozKey = new AToZKey(atoz.key()); + AToZKey atozKey = new AToZKey(tmpAtoz.key()); org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface .pathdescription.rev170426.pce.resource.Resource resource = new ResourceBuilder() .setResource(link).build(); @@ -468,10 +468,10 @@ public class InterNodePath { int size = atozList.size(); if (size > 0) { String id = Integer.toString(0); - for (AToZ atoz : atozList) { - if (atoz.getId().compareTo(id) == 0) { + for (AToZ tmpAtoz : atozList) { + if (tmpAtoz.getId().compareTo(id) == 0) { org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription - .rev170426.pce.resource.resource.Resource res = atoz.getResource().getResource(); + .rev170426.pce.resource.resource.Resource res = tmpAtoz.getResource().getResource(); if ((res != null) && (res instanceof TerminationPoint)) { TerminationPoint tp = (TerminationPoint) res; if ((tp != null) && tp.getTerminationPointIdentifier().getTpId().contains(beginBy)) { diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/NodePath.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/NodePath.java index e8da8c2cf..61ea66886 100644 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/NodePath.java +++ b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/NodePath.java @@ -10,7 +10,6 @@ package org.opendaylight.transportpce.stubpce.topology; import java.util.ArrayList; import java.util.List; - import org.apache.commons.lang3.StringUtils; import org.opendaylight.transportpce.stubpce.TpNodeTp; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.Link; @@ -371,7 +370,7 @@ public class NodePath { return isXpdrSrgAbsent; } - public void setXpdrSrgAbsent(boolean isXpdrSrgAbsent) { - this.isXpdrSrgAbsent = isXpdrSrgAbsent; + public void setXpdrSrgAbsent(boolean xpdrSrgAbsent) { + this.isXpdrSrgAbsent = xpdrSrgAbsent; } } diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Resource.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Resource.java index 141cae4c8..47d2dff9d 100644 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Resource.java +++ b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Resource.java @@ -11,7 +11,6 @@ package org.opendaylight.transportpce.stubpce.topology; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; - import java.util.List; @@ -72,8 +71,8 @@ public class Resource { return lcps; } - public void setLpcs(List lcps) { - this.lcps = lcps; + public void setLpcs(List logicalConPoints) { + this.lcps = logicalConPoints; } @Override diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/SuperNodePath.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/SuperNodePath.java index 5c8e66ab3..55bfa81af 100644 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/SuperNodePath.java +++ b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/SuperNodePath.java @@ -567,13 +567,14 @@ public class SuperNodePath { * @param paths NodeLinkNode list paths * @return PathDescriptionsOrdered List of direct paths */ - public SortedSet getDirectPathDesc(String aend, String zend,List paths) { + public SortedSet getDirectPathDesc(String aend, String zend, + List nodeLinkNodes) { List atozdirectionPaths = new ArrayList(); SortedSet result = new TreeSet(); SuperNode aendSp = getSuperNode(aend); SuperNode zendSp = getSuperNode(zend); - if (!paths.isEmpty()) { - for (NodeLinkNode tmp : paths) { + if (!nodeLinkNodes.isEmpty()) { + for (NodeLinkNode tmp : nodeLinkNodes) { if (tmp.getDirect()) { LOG.info("Direct NodeLinkNode : {}", tmp.toString()); String atozLink = null; @@ -630,13 +631,14 @@ public class SuperNodePath { * @param paths NodeLinkNode list paths * @return PathDescriptionsOrdered List of indirect paths */ - public SortedSet getIndirectPathDesc(String aend, String zend,List paths) { + public SortedSet getIndirectPathDesc(String aend, String zend, + List nodeLinkNodes) { List atozdirectionPaths = new ArrayList(); SortedSet result = new TreeSet(); SuperNode aendSp = getSuperNode(aend); SuperNode zendSp = getSuperNode(zend); - if (!paths.isEmpty()) { - for (NodeLinkNode tmp : paths) { + if (!nodeLinkNodes.isEmpty()) { + for (NodeLinkNode tmp : nodeLinkNodes) { if (!tmp.getDirect()) { LOG.info("Indirect NodeLinkNode : {}", tmp.toString()); int size = tmp.getAtozLink().size(); -- 2.36.6