Enforce Spotbugs in tapi module

by fixing remaining SpotBugs issues

JIRA: TRNSPRTPCE-215 TRNSPRTPCE-247 TRNSPRTPCE-265
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I9ca19f61747c77d2431783dab82cc63935917400

diff --git a/tapi/pom.xml b/tapi/pom.xml
index 3f41ba50975d5b70a8027371bfd3b96413fb6eae..3fb5d9c93b2d9b46986b37394ccbc343ae7baee4 100644 (file)
--- a/tapi/pom.xml
+++ b/tapi/pom.xml
@@ -109,10 +109,4 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
 
   </dependencies>
 
-<!-- checkstyle and spotbugds enforced by odlparent since Magnesium -->
-  <properties>
-    <!-- odlparent.checkstyle.enforce>false</odlparent.checkstyle.enforce -->
-    <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
-  </properties>
-
 </project>

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 6c591a5e70e78e3652207efeaac77de6b8a9c9de..8d010079c663995e34f0d5f1f2d802164100ef06 100644 (file)
--- 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<RpcResult<CreateConnectivityServiceOutput>> 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<RpcResult<DeleteConnectivityServiceOutput>> 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 3d90c2e25b33cba1a28fa44df84189aa1380142f..175e8788ba76c629d8bae414e5da3abc32750fac 100644 (file)
--- 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<TerminationPoint> oorClientPortList;
     private List<TerminationPoint> 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 9c4dfcf3e99d750af0098a64f101c1c6e13216c4..7dcb1f5e8d576f43d928b0896918e6f7e53f8f07 100644 (file)
--- 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<Node> 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 e1090a1021ee05121b2695f81d9a82185279d374..f97fc663121d8876bfe8918a969d711b0e0d3a52 100644 (file)
--- 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);