From: guillaume.lambert Date: Wed, 19 May 2021 21:00:57 +0000 (+0200) Subject: Fix deprecated warnings caused by YangTools update X-Git-Tag: 4.0.0~89 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=refs%2Fchanges%2F76%2F96276%2F3 Fix deprecated warnings caused by YangTools update Auto-generated sources from YANG models now deprecates methods with the pattern is[A-Z].* This commit replaces them with their strict equivalent with the pattern get[A-Z].* Signed-off-by: guillaume.lambert Change-Id: I17b9d02beacefda647f85d76be771aa08c48d67c --- diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java index 85280542d..78e6b9a2e 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java @@ -773,7 +773,7 @@ public class INode121 { .getOdu()); oduRate = String.valueOf(oduIfBuilder.getRate()); oduMonitoringMode = oduIfBuilder.getMonitoringMode().getName(); - oduProactiveDelayMeasurementEnabled = oduIfBuilder.isProactiveDelayMeasurementEnabled().toString(); + oduProactiveDelayMeasurementEnabled = oduIfBuilder.getProactiveDelayMeasurementEnabled().toString(); persistDevInterfaceTcm(nodeId, name, oduIfBuilder, connection); persistDevInterfaceOtnOduTxMsi(nodeId, name, oduIfBuilder, connection); @@ -787,7 +787,7 @@ public class INode121 { /*persistDevInterfaceOtnOduTxMsi(nodeId,name,oduIfBuilder,connection); persistDevInterfaceOtnOduRxMsi(nodeId,name,oduIfBuilder,connection); persistDevInterfaceOtnOduExpMsi(nodeId,name,oduIfBuilder,connection); */ - maintTestsignalEnabled = oduIfBuilder.getMaintTestsignal().isEnabled().toString(); + maintTestsignalEnabled = oduIfBuilder.getMaintTestsignal().getEnabled().toString(); maintTestsignalTestpatternEnu = oduIfBuilder.getMaintTestsignal().getTestPattern().getName(); maintTestsignalTypeEnu = oduIfBuilder.getMaintTestsignal().getType().getName(); maintTestsignalBiterrors = Integer.toString( @@ -804,7 +804,7 @@ public class INode121 { .getOtu()); otuRate = otuIfBuilder.getRate().getName(); otuFecEnu = otuIfBuilder.getFec().getName(); - otuMaintLoopbackEnabled = otuIfBuilder.getMaintLoopback().isEnabled().toString(); + otuMaintLoopbackEnabled = otuIfBuilder.getMaintLoopback().getEnabled().toString(); otuMaintTypeEnu = otuIfBuilder.getMaintLoopback().getType().getName(); break; @@ -917,8 +917,8 @@ public class INode121 { String layer = tcm.getLayer().toString(); String monitoringModeEnu = tcm.getMonitoringMode().getName(); - String ltcActEnabled = tcm.isLtcActEnabled().toString(); - String proactiveDelayMeasurementEnabled = tcm.isProactiveDelayMeasurementEnabled().toString(); + String ltcActEnabled = tcm.getLtcActEnabled().toString(); + String proactiveDelayMeasurementEnabled = tcm.getProactiveDelayMeasurementEnabled().toString(); //String tcmDirectionEnu = ""; //String timDetectModeEnu = ""; //String txSapi = ""; diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java index f8b2f6c54..24c6d45a9 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java @@ -649,7 +649,7 @@ public class INode221 { .getOdu()); oduRate = String.valueOf(oduIfBuilder.getRate()); oduMonitoringMode = oduIfBuilder.getMonitoringMode().getName(); - oduProactiveDelayMeasurementEnabled = oduIfBuilder.isProactiveDelayMeasurementEnabled().toString(); + oduProactiveDelayMeasurementEnabled = oduIfBuilder.getProactiveDelayMeasurementEnabled().toString(); persistDevInterfaceTcm(nodeId, name, oduIfBuilder, connection); persistDevInterfaceOtnOduTxMsi(nodeId, name, oduIfBuilder, connection); @@ -663,7 +663,7 @@ public class INode221 { /*persistDevInterfaceOtnOduTxMsi(nodeId,name,oduIfBuilder,connection); persistDevInterfaceOtnOduRxMsi(nodeId,name,oduIfBuilder,connection); persistDevInterfaceOtnOduExpMsi(nodeId,name,oduIfBuilder,connection); */ - maintTestsignalEnabled = oduIfBuilder.getMaintTestsignal().isEnabled().toString(); + maintTestsignalEnabled = oduIfBuilder.getMaintTestsignal().getEnabled().toString(); maintTestsignalTestpatternEnu = oduIfBuilder.getMaintTestsignal().getTestPattern().getIntValue(); maintTestsignalTypeEnu = oduIfBuilder.getMaintTestsignal().getType().getIntValue(); maintTestsignalBiterrors = oduIfBuilder.getMaintTestsignal().getBitErrors().toString(); @@ -678,7 +678,7 @@ public class INode221 { .getOtu()); otuRate = otuIfBuilder.getRate().getName(); otuFecEnu = otuIfBuilder.getFec().getIntValue(); - otuMaintLoopbackEnabled = otuIfBuilder.getMaintLoopback().isEnabled().toString(); + otuMaintLoopbackEnabled = otuIfBuilder.getMaintLoopback().getEnabled().toString(); otuMaintTypeEnu = otuIfBuilder.getMaintLoopback().getType().getIntValue(); break; @@ -792,8 +792,8 @@ public class INode221 { String layer = tcm.getLayer().toString(); int monitoringModeEnu = tcm.getMonitoringMode().getIntValue(); - String ltcActEnabled = tcm.isLtcActEnabled().toString(); - String proactiveDelayMeasurementEnabled = tcm.isProactiveDelayMeasurementEnabled().toString(); + String ltcActEnabled = tcm.getLtcActEnabled().toString(); + String proactiveDelayMeasurementEnabled = tcm.getProactiveDelayMeasurementEnabled().toString(); //int tcmDirectionEnu = -1; //int timDetectModeEnu = -1; //String txSapi = ""; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java b/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java index 7ee6e4379..3fdc00a61 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java @@ -172,13 +172,13 @@ public class PceConstraintsCalc { if (temp == null) { return; } - if (Boolean.TRUE.equals(temp.isNode())) { + if (Boolean.TRUE.equals(temp.getNode())) { rt = PceConstraints.ResourceType.NODE; } - if (Boolean.TRUE.equals(temp.isSrlg())) { + if (Boolean.TRUE.equals(temp.getSrlg())) { rt = PceConstraints.ResourceType.SRLG; } - if (Boolean.TRUE.equals(temp.isClli())) { + if (Boolean.TRUE.equals(temp.getClli())) { rt = PceConstraints.ResourceType.CLLI; } LOG.info("in readGeneralContrains {} list is :{}", rt, diversity); diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java index c4941e75a..baa04add6 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java @@ -650,7 +650,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations sendNotifications(ServicePathNotificationTypes.ServiceDelete, serviceName, RpcStatusEx.Pending, "Deleting otn-service path via renderer"); OtnServicePathOutput result = otnDeviceRenderer.deleteOtnServicePath(ospi); - if (result.isSuccess()) { + if (result.getSuccess()) { sendNotificationsWithPathDescription(ServicePathNotificationTypes.ServiceDelete, serviceName, RpcStatusEx.Successful, OPERATION_SUCCESSFUL, pathDescription); return true; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingRollbackTask.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingRollbackTask.java index b1d3b223a..46fa44e58 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingRollbackTask.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingRollbackTask.java @@ -55,7 +55,7 @@ public class DeviceRenderingRollbackTask extends RollbackTask { .setNodeInterface(this.renderedInterfaces) .build(); RendererRollbackOutput rollbackOutput = this.rendererService.rendererRollback(rollbackInput); - if (! rollbackOutput.isSuccess()) { + if (! rollbackOutput.getSuccess()) { LOG.warn("Device rendering rollback of {} was not successful! Failed rollback on {}.", this.getId(), createErrorMessage(rollbackOutput.nonnullFailedToRollback().values())); } else { diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java index 128cfb40d..7b1592327 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java @@ -38,7 +38,7 @@ public class DeviceRenderingTask implements Callable { public DeviceRenderingResult call() throws Exception { ServicePathOutput output = this.deviceRenderer.setupServicePath(this.servicePathInputData.getServicePathInput(), this.direction); - if (!output.isSuccess()) { + if (!output.getSuccess()) { LOG.warn("Device rendering not successfully finished."); return DeviceRenderingResult.failed("Operation Failed"); } diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OtnDeviceRenderingTask.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OtnDeviceRenderingTask.java index 05c6f9c0b..2721f99a8 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OtnDeviceRenderingTask.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OtnDeviceRenderingTask.java @@ -33,7 +33,7 @@ public class OtnDeviceRenderingTask implements Callable(output.nonnullNodeInterface().values())); diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java index ff2d0e25a..ec41e1423 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java @@ -121,7 +121,7 @@ public class DeviceRendererServiceImplCreateOtsOmsTest extends AbstractTest { setMountPoint(null); CreateOtsOmsInput input = CreateOtsOmsDataUtils.buildCreateOtsOms(); CreateOtsOmsOutput result = this.deviceRendererService.createOtsOms(input); - Assert.assertFalse(result.isSuccess()); + Assert.assertFalse(result.getSuccess()); Assert.assertEquals("node 1 is not mounted on the controller", result.getResult()); } @@ -131,7 +131,7 @@ public class DeviceRendererServiceImplCreateOtsOmsTest extends AbstractTest { setMountPoint(MountPointUtils.getMountPoint(new ArrayList<>(), getDataBroker())); CreateOtsOmsInput input = CreateOtsOmsDataUtils.buildCreateOtsOms(); CreateOtsOmsOutput result = this.deviceRendererService.createOtsOms(input); - Assert.assertFalse(result.isSuccess()); + Assert.assertFalse(result.getSuccess()); } @Test @@ -151,7 +151,7 @@ public class DeviceRendererServiceImplCreateOtsOmsTest extends AbstractTest { CreateOtsOmsInput input = CreateOtsOmsDataUtils.buildCreateOtsOms(); writePortMapping(input); CreateOtsOmsOutput result = this.deviceRendererService.createOtsOms(input); - Assert.assertTrue(result.isSuccess()); + Assert.assertTrue(result.getSuccess()); } private void writePortMapping(CreateOtsOmsInput input) { diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/MappingConstraints.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/MappingConstraints.java index 4dc53d7ec..8631555ec 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/MappingConstraints.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/MappingConstraints.java @@ -173,9 +173,9 @@ public class MappingConstraints { .setExistingService(tmpDiversity.getExistingService()) .setExistingServiceApplicability( new ExistingServiceApplicabilityBuilder() - .setClli(tmpDiversity.getExistingServiceApplicability().isSite()) - .setNode(tmpDiversity.getExistingServiceApplicability().isNode()) - .setSrlg(tmpDiversity.getExistingServiceApplicability().isSrlg()) + .setClli(tmpDiversity.getExistingServiceApplicability().getSite()) + .setNode(tmpDiversity.getExistingServiceApplicability().getNode()) + .setSrlg(tmpDiversity.getExistingServiceApplicability().getSrlg()) .build()) .build()); } diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImpl.java index b971605f7..05f53e4dd 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImpl.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImpl.java @@ -362,7 +362,7 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation .setFiberSpanSrlgs(readServicePath.get().getFiberSpanSrlgs()) .setHardConstraints(readServicePath.get().getHardConstraints()) .setLatency(readServicePath.get().getLatency()) - .setLocallyProtectedLinks(readServicePath.get().isLocallyProtectedLinks()) + .setLocallyProtectedLinks(readServicePath.get().getLocallyProtectedLinks()) .setPathDescription(pathDescription) .setPceMetric(readServicePath.get().getPceMetric()) .setSoftConstraints(readServicePath.get().getSoftConstraints())