From: guillaume.lambert Date: Wed, 1 Aug 2018 13:04:04 +0000 (+0200) Subject: clean some compilation warnings X-Git-Tag: v0.2.0~23 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=bef367e6b840b0dae22ccc15135f67ed0bb708fb;p=transportpce.git clean some compilation warnings mostly remove LineLength warnings introduced in Fluorine bump changes Change-Id: I1ab4cd671ad7a453abd2c5a158a7590bda7ca1ce Signed-off-by: guillaume.lambert --- diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/job/PeriodicDeviceBackupJob.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/job/PeriodicDeviceBackupJob.java index a99b4def0..a97d140c6 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/job/PeriodicDeviceBackupJob.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/job/PeriodicDeviceBackupJob.java @@ -228,7 +228,7 @@ public class PeriodicDeviceBackupJob implements Runnable { return ""; } long count = netconfNode.getAvailableCapabilities().getAvailableCapability().stream() - .filter(cp -> (cp.getCapability() != null) && cp.getCapability().contains(ORG_OPENROADM_DEVICE)).count(); + .filter(cp -> (cp.getCapability() != null) && cp.getCapability().contains(ORG_OPENROADM_DEVICE)).count(); if (count < 1) { LOG.trace("The node {} has not capabilities of OpenROADMDevice", node); return ""; diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/query/Queries.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/query/Queries.java index 8438fda5f..eae4147e5 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/query/Queries.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/query/Queries.java @@ -81,7 +81,7 @@ public final class Queries { return new Query(); } - public final static class Query { + public static final class Query { private String sql; private String schema; diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImpl.java index c0dfb2054..d793f6d70 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImpl.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImpl.java @@ -104,7 +104,8 @@ public class OlmPowerServiceRpcImpl implements OlmService { * @return Result of the request */ @Override - public ListenableFuture> servicePowerTurndown(ServicePowerTurndownInput input) { + public ListenableFuture> + servicePowerTurndown(ServicePowerTurndownInput input) { return RpcResultBuilder.success(this.olmPowerService.servicePowerTurndown(input)).buildFuture(); } @@ -131,7 +132,8 @@ public class OlmPowerServiceRpcImpl implements OlmService { * @return Result of the request */ @Override - public ListenableFuture> calculateSpanlossBase(CalculateSpanlossBaseInput input) { + public ListenableFuture> + calculateSpanlossBase(CalculateSpanlossBaseInput input) { return RpcResultBuilder.success(this.olmPowerService.calculateSpanlossBase(input)).buildFuture(); } @@ -145,4 +147,4 @@ public class OlmPowerServiceRpcImpl implements OlmService { public ListenableFuture> servicePowerReset(ServicePowerResetInput input) { return RpcResultBuilder.success(this.olmPowerService.servicePowerReset(input)).buildFuture(); } -} \ No newline at end of file +} diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmt.java b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmt.java index 45172d4a5..dc4dbbc77 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmt.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmt.java @@ -171,7 +171,8 @@ public class PowerMgmt { Mapping portMapping = mappingObjectOptional.get(); Optional interfaceOpt; try { - interfaceOpt = this.openRoadmInterfaces.getInterface(nodeId, portMapping.getSupportingOts()); + interfaceOpt = + this.openRoadmInterfaces.getInterface(nodeId, portMapping.getSupportingOts()); } catch (OpenRoadmInterfaceException ex) { LOG.error("Failed to get interface {} from node {}!", portMapping.getSupportingOts(), nodeId, ex); @@ -310,7 +311,8 @@ public class PowerMgmt { if (nodeInterfaceOpt.isPresent()) { InterfaceBuilder intfBuilder = new InterfaceBuilder(nodeInterfaceOpt.get()); intfBuilder.setAdministrativeState(AdminStates.OutOfService); - Future> deviceTxFuture = this.deviceTransactionManager.getDeviceTransaction(nodeId); + Future> deviceTxFuture = + this.deviceTransactionManager.getDeviceTransaction(nodeId); DeviceTransaction deviceTx; try { Optional deviceTxOpt = deviceTxFuture.get(); @@ -460,7 +462,8 @@ public class PowerMgmt { org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014 .Interface1.class, new Interface1Builder().setOch(ochBuilder.build()).build()); - Future> deviceTxFuture = this.deviceTransactionManager.getDeviceTransaction(nodeId); + Future> deviceTxFuture = + this.deviceTransactionManager.getDeviceTransaction(nodeId); DeviceTransaction deviceTx; try { Optional deviceTxOpt = deviceTxFuture.get(); diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java index 824550d32..27b91ce39 100755 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java @@ -38,14 +38,16 @@ public class PceServiceRPCImpl implements PceService { } @Override - public ListenableFuture> cancelResourceReserve(CancelResourceReserveInput input) { + public ListenableFuture> + cancelResourceReserve(CancelResourceReserveInput input) { LOG.info("RPC cancelResourceReserve request received"); return RpcResultBuilder.success(this.pathComputationService.cancelResourceReserve(input)).buildFuture(); } @Override - public ListenableFuture> pathComputationRequest(PathComputationRequestInput input) { + public ListenableFuture> + pathComputationRequest(PathComputationRequestInput input) { LOG.info("RPC path computation request received"); return RpcResultBuilder.success(this.pathComputationService.pathComputationRequest(input)).buildFuture(); } diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java index be29295f0..c15a93638 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java @@ -34,7 +34,8 @@ public class TransportPCEServicePathRPCImpl implements TransportpceServicepathSe } @Override - public ListenableFuture> cancelResourceReserve(CancelResourceReserveInput input) { + public ListenableFuture> + cancelResourceReserve(CancelResourceReserveInput input) { // TODO Auto-generated method stub return null; } @@ -54,7 +55,8 @@ public class TransportPCEServicePathRPCImpl implements TransportpceServicepathSe } @Override - public ListenableFuture> pathComputationRequest(PathComputationRequestInput input) { + public ListenableFuture> + pathComputationRequest(PathComputationRequestInput input) { // TODO Auto-generated method stub return null; } diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/OlmServiceStub.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/OlmServiceStub.java index 473088079..8822b9b76 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/OlmServiceStub.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/OlmServiceStub.java @@ -51,11 +51,13 @@ public class OlmServiceStub implements OlmService { return null; } - @Override public ListenableFuture> servicePowerReset(ServicePowerResetInput input) { + @Override public ListenableFuture> + servicePowerReset(ServicePowerResetInput input) { return null; } - @Override public ListenableFuture> servicePowerSetup(ServicePowerSetupInput input) { + @Override public ListenableFuture> + servicePowerSetup(ServicePowerSetupInput input) { return RpcResultBuilder.success(new ServicePowerSetupOutputBuilder().build()).buildFuture(); } } diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java index f4bbc718d..b81e9b4d5 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImpl.java @@ -258,13 +258,15 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { } @Override - public ListenableFuture> equipmentNotification(EquipmentNotificationInput input) { + public ListenableFuture> + equipmentNotification(EquipmentNotificationInput input) { // TODO Auto-generated method stub return null; } @Override - public ListenableFuture> serviceRerouteConfirm(ServiceRerouteConfirmInput input) { + public ListenableFuture> + serviceRerouteConfirm(ServiceRerouteConfirmInput input) { // TODO Auto-generated method stub return null; } @@ -342,7 +344,8 @@ public class ServicehandlerImpl implements OrgOpenroadmServiceService { } @Override - public ListenableFuture> networkReOptimization(NetworkReOptimizationInput input) { + public ListenableFuture> + networkReOptimization(NetworkReOptimizationInput input) { // TODO Auto-generated method stub return null; } diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/common/DataStoreContextImpl.java b/test-common/src/main/java/org/opendaylight/transportpce/test/common/DataStoreContextImpl.java index b9093fe63..f0dc8f7ef 100644 --- a/test-common/src/main/java/org/opendaylight/transportpce/test/common/DataStoreContextImpl.java +++ b/test-common/src/main/java/org/opendaylight/transportpce/test/common/DataStoreContextImpl.java @@ -231,7 +231,8 @@ public class DataStoreContextImpl implements DataStoreContext { * @return BindingNormalizedNodeCodecRegistry the resulting binding registry */ private BindingNormalizedNodeCodecRegistry createBindingRegistry() { - BindingRuntimeContext bindingContext = BindingRuntimeContext.create(this.moduleInfoBackedCntxt, this.schemaContext); + BindingRuntimeContext bindingContext = + BindingRuntimeContext.create(this.moduleInfoBackedCntxt, this.schemaContext); BindingNormalizedNodeCodecRegistry bindingNormalizedNodeCodecRegistry = new BindingNormalizedNodeCodecRegistry( StreamWriterGenerator.create(JavassistUtils.forClassPool(ClassPool.getDefault()))); 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 a32b6d2fe..a02ca4d5a 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 @@ -103,7 +103,8 @@ public class StubpceImpl implements StubpceService { } @Override - public ListenableFuture> cancelResourceReserve(CancelResourceReserveInput input) { + public ListenableFuture> + cancelResourceReserve(CancelResourceReserveInput input) { LOG.info("RPC cancelResourceReserve request received"); String message = ""; String responseCode = ""; @@ -194,7 +195,8 @@ public class StubpceImpl implements StubpceService { } @Override - public ListenableFuture> pathComputationRequest(PathComputationRequestInput input) { + public ListenableFuture> + pathComputationRequest(PathComputationRequestInput input) { LOG.info("RPC pathcomputation request received"); String message = ""; String responseCode = ""; @@ -277,14 +279,17 @@ public class StubpceImpl implements StubpceService { .setNotificationType(ServicePathNotificationTypes.PathComputationRequest) .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Successful) .setStatusMessage(this.message); - StubpceImpl.this.pathDescriptionBuilder = StubpceImpl.this.sendingPCE.getPathDescription(); + StubpceImpl.this.pathDescriptionBuilder = + StubpceImpl.this.sendingPCE.getPathDescription(); if (StubpceImpl.this.pathDescriptionBuilder != null) { PathDescription pathDescription = new org.opendaylight.yang.gen.v1.http.org - .transportpce.b.c._interface.servicepath.rev170426.service.path - .rpc.result.PathDescriptionBuilder() - .setAToZDirection(StubpceImpl.this.pathDescriptionBuilder.getAToZDirection()) - .setZToADirection(StubpceImpl.this.pathDescriptionBuilder.getZToADirection()) - .build(); + .transportpce.b.c._interface.servicepath.rev170426.service.path + .rpc.result.PathDescriptionBuilder() + .setAToZDirection( + StubpceImpl.this.pathDescriptionBuilder.getAToZDirection()) + .setZToADirection( + StubpceImpl.this.pathDescriptionBuilder.getZToADirection()) + .build(); tmp.setPathDescription(new PathDescriptionBuilder() .setAToZDirection(pathDescription.getAToZDirection()) .setZToADirection(pathDescription.getZToADirection())