From ee1ddcf873e73d9952aa5002e242b003c53795bf Mon Sep 17 00:00:00 2001 From: manuedelf Date: Fri, 9 Oct 2020 20:42:54 +0200 Subject: [PATCH] Technical debt - fix SH deprecated warnings JIRA: TRNSPRTPCE-334 Signed-off-by: manuedelf Change-Id: Ia7ed580e7c15050cbffd75be433aef5806097e2c --- .../service/PCEServiceWrapperTest.java | 9 ++-- .../service/RendererServiceWrapperTest.java | 7 ++- .../ServiceDataStoreOperationsImplTest.java | 19 +++++--- .../utils/ConstraintsUtils.java | 3 +- .../servicehandler/utils/InjectField.java | 2 +- .../utils/ServiceDataUtils.java | 45 ++++++++----------- .../checks/ServicehandlerTxRxCheckTest.java | 9 ++-- 7 files changed, 45 insertions(+), 49 deletions(-) diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/PCEServiceWrapperTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/PCEServiceWrapperTest.java index d92f9e9df..30898a1bd 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/PCEServiceWrapperTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/PCEServiceWrapperTest.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.servicehandler.service; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; import com.google.common.util.concurrent.ListenableFuture; import org.junit.Assert; @@ -61,7 +60,7 @@ public class PCEServiceWrapperTest extends AbstractTest { pceResponse.getConfigurationResponseCommon().getAckFinalIndicator()); Assert.assertEquals(ResponseCodes.RESPONSE_FAILED, pceResponse.getConfigurationResponseCommon().getResponseCode()); - verifyZeroInteractions(this.pathComputationServiceMock); + Mockito.verifyNoInteractions(this.pathComputationServiceMock); } @Test @@ -73,7 +72,7 @@ public class PCEServiceWrapperTest extends AbstractTest { pceResponse.getConfigurationResponseCommon().getAckFinalIndicator()); Assert.assertEquals(ResponseCodes.RESPONSE_FAILED, pceResponse.getConfigurationResponseCommon().getResponseCode()); - verifyZeroInteractions(this.pathComputationServiceMock); + Mockito.verifyNoInteractions(this.pathComputationServiceMock); } @Test @@ -85,7 +84,7 @@ public class PCEServiceWrapperTest extends AbstractTest { pceResponse.getConfigurationResponseCommon().getAckFinalIndicator()); Assert.assertEquals(ResponseCodes.RESPONSE_FAILED, pceResponse.getConfigurationResponseCommon().getResponseCode()); - verifyZeroInteractions(this.pathComputationServiceMock); + Mockito.verifyNoInteractions(this.pathComputationServiceMock); } @@ -97,7 +96,7 @@ public class PCEServiceWrapperTest extends AbstractTest { pceResponse.getConfigurationResponseCommon().getAckFinalIndicator()); Assert.assertEquals(ResponseCodes.RESPONSE_FAILED, pceResponse.getConfigurationResponseCommon().getResponseCode()); - verifyZeroInteractions(this.pathComputationServiceMock); + Mockito.verifyNoInteractions(this.pathComputationServiceMock); } @Test diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapperTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapperTest.java index 11e61cbd7..162ef16ba 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapperTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/RendererServiceWrapperTest.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.servicehandler.service; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; import com.google.common.util.concurrent.ListenableFuture; import org.junit.Assert; @@ -68,7 +67,7 @@ public class RendererServiceWrapperTest extends AbstractTest { response.getConfigurationResponseCommon().getAckFinalIndicator()); Assert.assertEquals(ResponseCodes.RESPONSE_FAILED, response.getConfigurationResponseCommon().getResponseCode()); - verifyZeroInteractions(this.rendererServiceOperationsMock); + Mockito.verifyNoInteractions(this.rendererServiceOperationsMock); } @Test @@ -84,7 +83,7 @@ public class RendererServiceWrapperTest extends AbstractTest { response.getConfigurationResponseCommon().getAckFinalIndicator()); Assert.assertEquals(ResponseCodes.RESPONSE_FAILED, response.getConfigurationResponseCommon().getResponseCode()); - verifyZeroInteractions(this.rendererServiceOperationsMock); + Mockito.verifyNoInteractions(this.rendererServiceOperationsMock); } @Test @@ -97,7 +96,7 @@ public class RendererServiceWrapperTest extends AbstractTest { response.getConfigurationResponseCommon().getAckFinalIndicator()); Assert.assertEquals(ResponseCodes.RESPONSE_FAILED, response.getConfigurationResponseCommon().getResponseCode()); - verifyZeroInteractions(this.rendererServiceOperationsMock); + Mockito.verifyNoInteractions(this.rendererServiceOperationsMock); } diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java index 8e8ff33b2..f7446c48d 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java @@ -33,6 +33,7 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdes import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.response.parameters.sp.ResponseParameters; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.response.parameters.sp.ResponseParametersBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.response.parameters.sp.response.parameters.PathDescriptionBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; //writeOrModifyOrDeleteServiceList deprecated method should not raise warnings in tests @SuppressWarnings("deprecation") @@ -92,7 +93,7 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build(); PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder() .setConfigurationResponseCommon(configurationResponseCommon).build(); - OperationResult createOutput = this.serviceDataStoreOperations.createService(createInput); + this.serviceDataStoreOperations.createService(createInput); String result = serviceDataStoreOperations.writeOrModifyOrDeleteServiceList("service 1", createInput, pathComputationRequestOutput, 0); Assert.assertNull(result); @@ -107,7 +108,7 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build(); PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder() .setConfigurationResponseCommon(configurationResponseCommon).build(); - OperationResult createOutput = this.serviceDataStoreOperations.createService(createInput); + this.serviceDataStoreOperations.createService(createInput); String result = serviceDataStoreOperations.writeOrModifyOrDeleteServiceList("service 1", createInput, pathComputationRequestOutput, 1); Assert.assertNull(result); @@ -121,7 +122,7 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build(); PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder() .setConfigurationResponseCommon(configurationResponseCommon).build(); - OperationResult createOutput = this.serviceDataStoreOperations.createService(createInput); + this.serviceDataStoreOperations.createService(createInput); String result = serviceDataStoreOperations.writeOrModifyOrDeleteServiceList("service 1", createInput, pathComputationRequestOutput, 2); Assert.assertNull(result); @@ -226,8 +227,10 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build(); ResponseParameters responseParameters = new ResponseParametersBuilder() .setPathDescription(new PathDescriptionBuilder() - .setAToZDirection(new AToZDirectionBuilder().setAToZWavelengthNumber(1L).setRate(1L).build()) - .setZToADirection(new ZToADirectionBuilder().setZToAWavelengthNumber(1L).setRate(1L).build()).build()) + .setAToZDirection(new AToZDirectionBuilder() + .setAToZWavelengthNumber(Uint32.valueOf(1)).setRate(Uint32.valueOf(1)).build()) + .setZToADirection(new ZToADirectionBuilder() + .setZToAWavelengthNumber(Uint32.valueOf(1)).setRate(Uint32.valueOf(1)).build()).build()) .build(); PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder() .setConfigurationResponseCommon(configurationResponseCommon).setResponseParameters(responseParameters) @@ -264,8 +267,10 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build(); ResponseParameters responseParameters = new ResponseParametersBuilder() .setPathDescription(new PathDescriptionBuilder() - .setAToZDirection(new AToZDirectionBuilder().setAToZWavelengthNumber(1L).setRate(1L).build()) - .setZToADirection(new ZToADirectionBuilder().setZToAWavelengthNumber(1L).setRate(1L).build()).build()) + .setAToZDirection(new AToZDirectionBuilder() + .setAToZWavelengthNumber(Uint32.valueOf(1)).setRate(Uint32.valueOf(1)).build()) + .setZToADirection(new ZToADirectionBuilder() + .setZToAWavelengthNumber(Uint32.valueOf(1)).setRate(Uint32.valueOf(1)).build()).build()) .build(); PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder() .setConfigurationResponseCommon(configurationResponseCommon).setResponseParameters(responseParameters) diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ConstraintsUtils.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ConstraintsUtils.java index 791d2f84e..62078948f 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ConstraintsUtils.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ConstraintsUtils.java @@ -21,6 +21,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190 import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.routing.constraints.HardConstraintsBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.routing.constraints.SoftConstraints; import org.opendaylight.yang.gen.v1.http.org.openroadm.routing.constrains.rev190329.routing.constraints.SoftConstraintsBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; /** * Utility Class to Build Hard Constraints and Soft Constraints. @@ -89,7 +90,7 @@ public final class ConstraintsUtils { .setSrlg(Boolean.TRUE) .build()) .build()) - .setLatency(new LatencyBuilder().setMaxLatency(1L).build()) + .setLatency(new LatencyBuilder().setMaxLatency(Uint32.valueOf(1)).build()) .build()) .setCustomerCode(new ArrayList<>(Collections.singletonList("customer-code 1"))) .build(); diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/InjectField.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/InjectField.java index 8baad8f61..11c906a07 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/InjectField.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/InjectField.java @@ -22,7 +22,7 @@ public final class InjectField { public static void inject(final Object injectable, final String fieldname, final Object value) { try { final java.lang.reflect.Field field = injectable.getClass().getDeclaredField(fieldname); - final boolean origionalValue = field.isAccessible(); + final boolean origionalValue = field.canAccess(injectable); field.setAccessible(true); field.set(injectable, value); field.setAccessible(origionalValue); diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ServiceDataUtils.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ServiceDataUtils.java index 5f0844a8b..a56f6d020 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ServiceDataUtils.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/utils/ServiceDataUtils.java @@ -72,6 +72,7 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.ServicePathNotificationTypes; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.handler.header.ServiceHandlerHeaderBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime; +import org.opendaylight.yangtools.yang.common.Uint32; public final class ServiceDataUtils { @@ -83,7 +84,7 @@ public final class ServiceDataUtils { org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service .create.input.ServiceZEndBuilder() - .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1) + .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1)) .setNodeId(new NodeIdType("XPONDER-3-2")) .setTxDirection(getTxDirection()) .setRxDirection(getRxDirection()) @@ -110,7 +111,7 @@ public final class ServiceDataUtils { org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service .create.input.ServiceZEndBuilder() - .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1) + .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1)) .setNodeId(new NodeIdType("XPONDER-3-2")) .setTxDirection(getTxDirection()) .setRxDirection(getRxDirection()) @@ -138,7 +139,7 @@ public final class ServiceDataUtils { org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service .create.input.ServiceZEndBuilder() - .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1) + .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1)) .setNodeId(new NodeIdType("XPONDER-3-2")) .setTxDirection(getTxDirection()) .setRxDirection(getRxDirection()) @@ -184,7 +185,7 @@ public final class ServiceDataUtils { org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.temp.service.create.input .ServiceAEnd serviceAEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531 .temp.service.create.input.ServiceAEndBuilder() - .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1) + .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1)) .setNodeId(new NodeIdType("XPONDER-1-2")) .setTxDirection(getTxDirection()) .setRxDirection(getRxDirection()) @@ -192,7 +193,7 @@ public final class ServiceDataUtils { org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.temp.service.create.input .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.temp .service.create.input.ServiceZEndBuilder() - .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1) + .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1)) .setNodeId(new NodeIdType("XPONDER-3-2")) .setTxDirection(getTxDirection()) .setRxDirection(getRxDirection()) @@ -213,14 +214,13 @@ public final class ServiceDataUtils { public static ServiceFeasibilityCheckInput buildServiceFeasibilityCheckInput() { ServiceAEnd serviceAEnd = new ServiceAEndBuilder() - .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1) + .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1)) .setNodeId(new NodeIdType("XPONDER-1-2")) .setTxDirection(getTxDirection()).setRxDirection(getRxDirection()).build(); ServiceZEnd serviceZEnd = new ServiceZEndBuilder() - .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1) + .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1)) .setNodeId(new NodeIdType("XPONDER-3-2")) .setTxDirection(getTxDirection()).setRxDirection(getRxDirection()).build(); - ServiceAEnd serviceAEndvalue = new ServiceAEndBuilder().build(); ServiceFeasibilityCheckInputBuilder builtInput = new ServiceFeasibilityCheckInputBuilder() .setCommonId("commonId") @@ -237,7 +237,7 @@ public final class ServiceDataUtils { .ServiceAEndBuilder getServiceAEndBuild() { return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input .ServiceAEndBuilder() - .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1) + .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1)) .setNodeId(new NodeIdType("XPONDER-1-2")) .setTxDirection(getTxDirection()) .setRxDirection(getRxDirection()); @@ -247,7 +247,7 @@ public final class ServiceDataUtils { .ServiceZEndBuilder getServiceZEndBuild() { return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.create.input .ServiceZEndBuilder() - .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1) + .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1)) .setNodeId(new NodeIdType("XPONDER-1-2")) .setTxDirection(getTxDirection()) .setRxDirection(getRxDirection()); @@ -322,14 +322,14 @@ public final class ServiceDataUtils { org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.reconfigure.input .ServiceAEnd serviceAEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service .reconfigure.input.ServiceAEndBuilder() - .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1) + .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1)) .setNodeId(new NodeIdType("XPONDER-1-2")).setTxDirection(getTxDirection()) .setRxDirection(getRxDirection()) .build(); org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.reconfigure.input .ServiceZEnd serviceZEnd = new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service .reconfigure.input.ServiceZEndBuilder() - .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1) + .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1)) .setNodeId(new NodeIdType("XPONDER-3-2")).setTxDirection(getTxDirection()) .setRxDirection(getRxDirection()) .build(); @@ -359,9 +359,6 @@ public final class ServiceDataUtils { public static ServicePathRpcResult buildServicePathRpcResult( ServicePathNotificationTypes servicePathNotificationTypes, String serviceName, RpcStatusEx rpcStatusEx, String message, Boolean pathDescription) { - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx"); - OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC); - DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime)); ServicePathRpcResultBuilder builder = new ServicePathRpcResultBuilder(); builder.setNotificationType(servicePathNotificationTypes) .setServiceName(serviceName) @@ -407,9 +404,6 @@ public final class ServiceDataUtils { public static ServiceRpcResultSp buildServiceRpcResultSp(ServicePathNotificationTypes servicePathNotificationTypes, String serviceName, RpcStatusEx rpcStatusEx, String message) { - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx"); - OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC); - DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime)); ServiceRpcResultSpBuilder builder = new ServiceRpcResultSpBuilder(); builder.setNotificationType(servicePathNotificationTypes).setServiceName(serviceName) .setStatus(rpcStatusEx).setStatusMessage(message); @@ -422,9 +416,6 @@ public final class ServiceDataUtils { org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.RpcStatusEx rpcStatusEx, String message) { - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssxxx"); - OffsetDateTime offsetDateTime = OffsetDateTime.now(ZoneOffset.UTC); - DateAndTime datetime = new DateAndTime(dtf.format(offsetDateTime)); ServiceRpcResultShBuilder builder = new ServiceRpcResultShBuilder(); builder.setNotificationType(serviceNotificationTypes).setServiceName(serviceName) .setStatus(rpcStatusEx).setStatusMessage(message); @@ -444,12 +435,12 @@ public final class ServiceDataUtils { public static PathDescription createPathDescription(long azRate, long azWaveLength, long zaRate, long zaWaveLength) { AToZDirection atozDirection = new AToZDirectionBuilder() - .setRate(azRate) - .setAToZWavelengthNumber(azWaveLength) + .setRate(Uint32.valueOf(azRate)) + .setAToZWavelengthNumber(Uint32.valueOf(azWaveLength)) .build(); ZToADirection ztoaDirection = new ZToADirectionBuilder() - .setRate(zaRate) - .setZToAWavelengthNumber(zaWaveLength) + .setRate(Uint32.valueOf(zaRate)) + .setZToAWavelengthNumber(Uint32.valueOf(zaWaveLength)) .build(); PathDescription pathDescription = new PathDescriptionBuilder() .setAToZDirection(atozDirection) @@ -462,7 +453,7 @@ public final class ServiceDataUtils { .ServiceAEndBuilder getServiceAEndBuildReconfigure() { return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.reconfigure.input .ServiceAEndBuilder() - .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1) + .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1)) .setNodeId(new NodeIdType("XPONDER-1-2")) .setTxDirection(getTxDirection()) .setRxDirection(getRxDirection()); @@ -472,7 +463,7 @@ public final class ServiceDataUtils { .ServiceZEndBuilder getServiceZEndBuildReconfigure() { return new org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.reconfigure.input .ServiceZEndBuilder() - .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate((long) 1) + .setClli("clli").setServiceFormat(ServiceFormat.OC).setServiceRate(Uint32.valueOf(1)) .setNodeId(new NodeIdType("XPONDER-1-2")) .setTxDirection(getTxDirection()) .setRxDirection(getRxDirection()); diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerTxRxCheckTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerTxRxCheckTest.java index 53f6ca8aa..0c660c3b7 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerTxRxCheckTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/validation/checks/ServicehandlerTxRxCheckTest.java @@ -20,6 +20,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev1 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.service.lgx.LgxBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.service.port.PortBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev190531.ServiceFormat; +import org.opendaylight.yangtools.yang.common.Uint32; public class ServicehandlerTxRxCheckTest { @@ -155,7 +156,7 @@ public class ServicehandlerTxRxCheckTest { @Test public void checkForServiceRateEquals0() { ComplianceCheckResult result = ServicehandlerTxRxCheck.check( - new ServiceAEndBuilder().setServiceRate(0L).build(), ServiceEndpointType.SERVICEAEND); + new ServiceAEndBuilder().setServiceRate(Uint32.valueOf(0)).build(), ServiceEndpointType.SERVICEAEND); Assert.assertFalse(result.hasPassed()); Assert.assertEquals(LogMessages.rateNotSet(ServiceEndpointType.SERVICEAEND), result.getMessage()); @@ -164,7 +165,7 @@ public class ServicehandlerTxRxCheckTest { @Test public void checkForServiceFormatNull() { ComplianceCheckResult result = ServicehandlerTxRxCheck.check( - new ServiceAEndBuilder().setServiceRate(3L).build(), ServiceEndpointType.SERVICEAEND); + new ServiceAEndBuilder().setServiceRate(Uint32.valueOf(3)).build(), ServiceEndpointType.SERVICEAEND); Assert.assertFalse(result.hasPassed()); Assert.assertEquals(LogMessages.formatNotSet(ServiceEndpointType.SERVICEAEND), result.getMessage()); @@ -173,7 +174,7 @@ public class ServicehandlerTxRxCheckTest { @Test public void checkForClliEmpty() { ComplianceCheckResult result = ServicehandlerTxRxCheck.check(new ServiceAEndBuilder() - .setServiceRate(3L).setClli("").setServiceFormat(ServiceFormat.Ethernet).build(), + .setServiceRate(Uint32.valueOf(3)).setClli("").setServiceFormat(ServiceFormat.Ethernet).build(), ServiceEndpointType.SERVICEAEND); Assert.assertFalse(result.hasPassed()); @@ -183,7 +184,7 @@ public class ServicehandlerTxRxCheckTest { @Test public void checkForFailTxOrRx() { ComplianceCheckResult result = ServicehandlerTxRxCheck.check(new ServiceAEndBuilder() - .setServiceRate(3L).setClli("cc").setServiceFormat(ServiceFormat.Ethernet).build(), + .setServiceRate(Uint32.valueOf(3)).setClli("cc").setServiceFormat(ServiceFormat.Ethernet).build(), ServiceEndpointType.SERVICEAEND); Assert.assertFalse(result.hasPassed()); -- 2.36.6