by fixing remaining SpotBugs issues
JIRA: TRNSPRTPCE-215 TRNSPRTPCE-247 TRNSPRTPCE-265
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I9ca19f61747c77d2431783dab82cc63935917400
-<!-- checkstyle and spotbugds enforced by odlparent since Magnesium -->
- <properties>
- <!-- odlparent.checkstyle.enforce>false</odlparent.checkstyle.enforce -->
- <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
- </properties>
-
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.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;
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;
@Override
public ListenableFuture<RpcResult<CreateConnectivityServiceOutput>> createConnectivityService(
CreateConnectivityServiceInput input) {
@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()) {
OperationResult validationResult = CreateConnectivityServiceValidation.validateCreateConnectivityServiceRequest(
input);
if (validationResult.isSuccess()) {
.getServiceInterfacePoint()
.getServiceInterfacePointUuid()), map.get(input.getEndPoint().get(1).getServiceInterfacePoint()
.getServiceInterfacePointUuid()));
.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");
}
} else {
LOG.error("Unknown UUID");
}
public ListenableFuture<RpcResult<DeleteConnectivityServiceOutput>> deleteConnectivityService(
DeleteConnectivityServiceInput input) {
LOG.info("RPC delete-connectivity received");
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;
}
//TODO to continue...
return null;
}
public class ConvertORTopoObjectToTapiTopoObject {
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;
private String ietfNodeId;
private List<TerminationPoint> oorClientPortList;
private List<TerminationPoint> oorNetworkPortList;
openroadmTopo = openroadmTopoOpt.get().get();
} catch (InterruptedException | ExecutionException | NoSuchElementException e) {
LOG.error("Impossible to retreive openroadm-topology from mdsal");
openroadmTopo = openroadmTopoOpt.get().get();
} catch (InterruptedException | ExecutionException | NoSuchElementException e) {
LOG.error("Impossible to retreive openroadm-topology from mdsal");
}
List<Node> nodeList = openroadmTopo.getNode();
@Nullable
}
List<Node> nodeList = openroadmTopo.getNode();
@Nullable
return OperationResult.failed(resilienceConstraintCheckResult.getMessage());
}
return OperationResult.failed(resilienceConstraintCheckResult.getMessage());
}
- String state = input.getState();
-
LOG.info("checking TopoConstraint...");
TopologyConstraint topoConstraint = input.getTopologyConstraint();
ComplianceCheckResult topoConstraintCheckResult = TopoConstraintCheck.check(topoConstraint);
LOG.info("checking TopoConstraint...");
TopologyConstraint topoConstraint = input.getTopologyConstraint();
ComplianceCheckResult topoConstraintCheckResult = TopoConstraintCheck.check(topoConstraint);