From 8d1c2412985df564f1d2797be205d3990d1ffec1 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Thu, 7 May 2020 18:01:17 +0200 Subject: [PATCH] Enforce Spotbugs in tapi module by fixing remaining SpotBugs issues JIRA: TRNSPRTPCE-215 TRNSPRTPCE-247 TRNSPRTPCE-265 Signed-off-by: guillaume.lambert Change-Id: I9ca19f61747c77d2431783dab82cc63935917400 --- tapi/pom.xml | 6 ------ .../transportpce/tapi/impl/TapiImpl.java | 14 +++++++------- .../ConvertORTopoObjectToTapiTopoObject.java | 2 +- .../tapi/topology/TapiTopologyImpl.java | 1 + .../CreateConnectivityServiceValidation.java | 2 -- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/tapi/pom.xml b/tapi/pom.xml index 3f41ba509..3fb5d9c93 100644 --- a/tapi/pom.xml +++ b/tapi/pom.xml @@ -109,10 +109,4 @@ Author: Martial Coulibaly on behalf of Orange - - - - false - - diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiImpl.java index 6c591a5e7..8d010079c 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/TapiImpl.java @@ -19,8 +19,8 @@ import org.opendaylight.transportpce.tapi.utils.MappingUtils; import org.opendaylight.transportpce.tapi.utils.TapiUtils; import org.opendaylight.transportpce.tapi.validation.CreateConnectivityServiceValidation; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateOutput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteInput; +//import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateOutput; +//import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Uuid; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.Name; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.NameBuilder; @@ -70,8 +70,7 @@ public class TapiImpl implements TapiConnectivityService { @Override public ListenableFuture> createConnectivityService( CreateConnectivityServiceInput input) { - LOG.info("RPC create-connectivity received"); - LOG.info(input.getEndPoint().toString()); + LOG.info("RPC create-connectivity received: {}", input.getEndPoint().toString()); OperationResult validationResult = CreateConnectivityServiceValidation.validateCreateConnectivityServiceRequest( input); if (validationResult.isSuccess()) { @@ -86,7 +85,7 @@ public class TapiImpl implements TapiConnectivityService { .getServiceInterfacePoint() .getServiceInterfacePointUuid()), map.get(input.getEndPoint().get(1).getServiceInterfacePoint() .getServiceInterfacePointUuid())); - ServiceCreateOutput output = this.serviceHandler.serviceCreate(sci); + this.serviceHandler.serviceCreate(sci); } else { LOG.error("Unknown UUID"); } @@ -152,8 +151,9 @@ public class TapiImpl implements TapiConnectivityService { public ListenableFuture> deleteConnectivityService( DeleteConnectivityServiceInput input) { LOG.info("RPC delete-connectivity received"); - ServiceDeleteInput inputSh = null; - this.serviceHandler.serviceDelete(inputSh); + //ServiceDeleteInput inputSh = null; + //this.serviceHandler.serviceDelete(inputSh); + this.serviceHandler.serviceDelete(null); //TODO to continue... return null; } diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTopoObject.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTopoObject.java index 3d90c2e25..175e8788b 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTopoObject.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTopoObject.java @@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory; public class ConvertORTopoObjectToTapiTopoObject { - private static final Logger LOG = LoggerFactory.getLogger(TapiTopologyImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(ConvertORTopoObjectToTapiTopoObject.class); private String ietfNodeId; private List oorClientPortList; private List oorNetworkPortList; diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java index 9c4dfcf3e..7dcb1f5e8 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java @@ -126,6 +126,7 @@ public class TapiTopologyImpl implements TapiTopologyService { openroadmTopo = openroadmTopoOpt.get().get(); } catch (InterruptedException | ExecutionException | NoSuchElementException e) { LOG.error("Impossible to retreive openroadm-topology from mdsal"); + return null; } List nodeList = openroadmTopo.getNode(); @Nullable diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/validation/CreateConnectivityServiceValidation.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/validation/CreateConnectivityServiceValidation.java index e1090a102..f97fc6631 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/validation/CreateConnectivityServiceValidation.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/validation/CreateConnectivityServiceValidation.java @@ -61,8 +61,6 @@ public final class CreateConnectivityServiceValidation { return OperationResult.failed(resilienceConstraintCheckResult.getMessage()); } - String state = input.getState(); - LOG.info("checking TopoConstraint..."); TopologyConstraint topoConstraint = input.getTopologyConstraint(); ComplianceCheckResult topoConstraintCheckResult = TopoConstraintCheck.check(topoConstraint); -- 2.36.6