From be660d35c655920e7385c0185873801d937c286d Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Mon, 23 Aug 2021 16:44:06 +0200 Subject: [PATCH] Fix static methods warnings after Phosphorus bump Static methods should be qualified by type name, instead of by an expression. JIRA: TRNSPRTPCE-435 Signed-off-by: guillaume.lambert Change-Id: I2d298f7fd36af590e7745530a740efe32e23fd06 --- .../olm/OlmPowerServiceRpcImplTest.java | 6 +-- .../olm/power/PowerMgmtPowerMockTest.java | 6 +-- .../OlmPowerServiceImplSpanLossBaseTest.java | 6 +-- .../pce/PcePathDescriptionTests.java | 5 +- .../constraints/PceConstraintsCalcTest.java | 4 +- .../pce/constraints/PceConstraintsTest.java | 46 +++++++++---------- .../pce/impl/PceServiceRPCImplTest.java | 4 +- .../networkanalyzer/PceCalculationTest.java | 12 ++--- .../PathComputationServiceImplTest.java | 4 +- ...ceRendererServiceImplCreateOtsOmsTest.java | 2 +- .../RendererServiceOperationsImplTest.java | 2 +- 11 files changed, 49 insertions(+), 48 deletions(-) diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImplTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImplTest.java index a881f2f88..03fe640ea 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImplTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImplTest.java @@ -103,7 +103,7 @@ public class OlmPowerServiceRpcImplTest extends AbstractTest { @Before public void setUp() { - this.mountPoint = new MountPointStub(this.getDataBroker()); + this.mountPoint = new MountPointStub(getDataBroker()); this.mountPointService = new MountPointServiceStub(mountPoint); this.deviceTransactionManager = new DeviceTransactionManagerImpl(mountPointService, 3000); this.mappingUtils = Mockito.spy(new MappingUtilsImpl(getDataBroker())); @@ -130,9 +130,9 @@ public class OlmPowerServiceRpcImplTest extends AbstractTest { this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion710, this.portMappingVersion22, this.portMappingVersion121); this.portMapping = Mockito.spy(this.portMapping); - this.powerMgmt = new PowerMgmtImpl(this.getDataBroker(), this.openRoadmInterfaces, this.crossConnect, + this.powerMgmt = new PowerMgmtImpl(getDataBroker(), this.openRoadmInterfaces, this.crossConnect, this.deviceTransactionManager); - this.olmPowerService = new OlmPowerServiceImpl(this.getDataBroker(), this.powerMgmt, + this.olmPowerService = new OlmPowerServiceImpl(getDataBroker(), this.powerMgmt, this.deviceTransactionManager, this.portMapping,mappingUtils,openRoadmInterfaces); this.olmPowerServiceRpc = new OlmPowerServiceRpcImpl(this.olmPowerService); //TODO diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java index 109f336bc..61758ea4f 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/power/PowerMgmtPowerMockTest.java @@ -96,7 +96,7 @@ public class PowerMgmtPowerMockTest extends AbstractTest { @Before public void setUp() { - this.mountPoint = new MountPointStub(this.getDataBroker()); + this.mountPoint = new MountPointStub(getDataBroker()); this.mountPointService = new MountPointServiceStub(mountPoint); this.mappingUtils = new MappingUtilsImpl(getDataBroker()); this.mappingUtils = Mockito.spy(new MappingUtilsImpl(getDataBroker())); @@ -123,7 +123,7 @@ public class PowerMgmtPowerMockTest extends AbstractTest { this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion710, this.portMappingVersion22, this.portMappingVersion121); this.portMapping = Mockito.spy(this.portMapping); - this.powerMgmt = new PowerMgmtImpl(this.getDataBroker(), this.openRoadmInterfaces, this.crossConnect, + this.powerMgmt = new PowerMgmtImpl(getDataBroker(), this.openRoadmInterfaces, this.crossConnect, this.deviceTransactionManager); } @@ -247,7 +247,7 @@ public class PowerMgmtPowerMockTest extends AbstractTest { this.mappingUtils, openRoadmInterfacesImpl121Spy, this.openRoadmInterfacesImpl22, this.openRoadmInterfacesImpl710); openRoadmInterfacesSpy = PowerMockito.spy(openRoadmInterfacesSpy); - return new PowerMgmtImpl(this.getDataBroker(), openRoadmInterfacesSpy, crossConnectMock, + return new PowerMgmtImpl(getDataBroker(), openRoadmInterfacesSpy, crossConnectMock, this.deviceTransactionManager); } diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplSpanLossBaseTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplSpanLossBaseTest.java index f8ec774ed..79816bf2f 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplSpanLossBaseTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplSpanLossBaseTest.java @@ -82,9 +82,9 @@ public class OlmPowerServiceImplSpanLossBaseTest extends AbstractTest { this.powerMgmt = Mockito.mock(PowerMgmtImpl.class); this.openRoadmInterfaces = new OpenRoadmInterfacesImpl(this.deviceTransactionManager, this.mappingUtils, this.openRoadmInterfacesImpl121, this.openRoadmInterfacesImpl221, this.openRoadmInterfacesImpl710); - this.olmPowerService = new OlmPowerServiceImpl(this.getDataBroker(), this.powerMgmt, + this.olmPowerService = new OlmPowerServiceImpl(getDataBroker(), this.powerMgmt, this.deviceTransactionManager, this.portMapping, this.mappingUtils, this.openRoadmInterfaces); - this.dataBroker = this.getDataBroker(); + this.dataBroker = getDataBroker(); MockitoAnnotations.initMocks(this); Mockito.doReturn(StringConstants.OPENROADM_DEVICE_VERSION_2_2_1).when(this.mappingUtils) .getOpenRoadmVersion(Mockito.anyString()); @@ -179,4 +179,4 @@ public class OlmPowerServiceImplSpanLossBaseTest extends AbstractTest { Assert.assertEquals("ROADM-A1-to-ROADM-C1", output.getSpans().get(0).getLinkId().getValue()); Assert.assertEquals("14.6", output.getSpans().get(0).getSpanloss()); } -} \ No newline at end of file +} diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java b/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java index 92e1d38ad..ebb322038 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java @@ -89,8 +89,9 @@ public class PcePathDescriptionTests extends AbstractTest { @Test public void mapUtil() { - PceConstraints pceConstraintsCalc = new PceConstraintsCalc(PceTestData - .getPCERequest(), new NetworkTransactionImpl(new RequestProcessor(this.getDataBroker()))) + PceConstraints pceConstraintsCalc = new PceConstraintsCalc( + PceTestData.getPCERequest(), + new NetworkTransactionImpl(new RequestProcessor(getDataBroker()))) .getPceHardConstraints(); MapUtils.mapDiversityConstraints(List.of(node), List.of(link), pceConstraintsCalc); MapUtils.getSupLink(link); diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalcTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalcTest.java index e7fc75117..6ba36dfbe 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalcTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalcTest.java @@ -22,12 +22,12 @@ import org.opendaylight.transportpce.test.AbstractTest; public class PceConstraintsCalcTest extends AbstractTest { private static PceConstraintsCalc pceConstraintsCalc; private static NetworkTransactionService networkTransactionService = null; - private DataBroker dataBroker = this.getDataBroker(); + private DataBroker dataBroker = getDataBroker(); @Before public void setup() throws Exception { // networkTransactionService = Mockito.mock(NetworkTransactionService.class); - PceTestUtils.writeNetworkIntoDataStore(dataBroker, this.getDataStoreContextUtil(), + PceTestUtils.writeNetworkIntoDataStore(dataBroker, getDataStoreContextUtil(), TransactionUtils.getNetworkForSpanLoss()); networkTransactionService = new NetworkTransactionImpl(new RequestProcessor(dataBroker)); diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsTest.java index 9142415f8..d6b3bc94d 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsTest.java @@ -26,72 +26,72 @@ public class PceConstraintsTest extends AbstractTest { @Test public void setAndGetMaxLatencyTest() { - Assert.assertEquals(-1, this.pceConstraints.getMaxLatency().intValue()); + Assert.assertEquals(-1, pceConstraints.getMaxLatency().intValue()); pceConstraints.setMaxLatency(-2L); - Assert.assertEquals(-2, this.pceConstraints.getMaxLatency().intValue()); + Assert.assertEquals(-2, pceConstraints.getMaxLatency().intValue()); } @Test public void setAndGetExcludeSupNodesTest() { - Assert.assertEquals(0, this.pceConstraints.getExcludeSupNodes().size()); + Assert.assertEquals(0, pceConstraints.getExcludeSupNodes().size()); List nodes = new ArrayList<>(); nodes.add("test"); - this.pceConstraints.setExcludeSupNodes(nodes); - Assert.assertEquals(1, this.pceConstraints.getExcludeSupNodes().size()); + pceConstraints.setExcludeSupNodes(nodes); + Assert.assertEquals(1, pceConstraints.getExcludeSupNodes().size()); } @Test public void setAndGetExcludeSRLGTest() { - Assert.assertEquals(0, this.pceConstraints.getExcludeSRLG().size()); + Assert.assertEquals(0, pceConstraints.getExcludeSRLG().size()); List nodes = new ArrayList<>(); nodes.add(1L); - this.pceConstraints.setExcludeSRLG(nodes); - Assert.assertEquals(1, this.pceConstraints.getExcludeSRLG().size()); + pceConstraints.setExcludeSRLG(nodes); + Assert.assertEquals(1, pceConstraints.getExcludeSRLG().size()); } @Test public void setAndGetExcludeCLLITest() { - Assert.assertEquals(0, this.pceConstraints.getExcludeCLLI().size()); + Assert.assertEquals(0, pceConstraints.getExcludeCLLI().size()); List nodes = new ArrayList<>(); nodes.add("test"); - this.pceConstraints.setExcludeCLLI(nodes); - Assert.assertEquals(1, this.pceConstraints.getExcludeCLLI().size()); + pceConstraints.setExcludeCLLI(nodes); + Assert.assertEquals(1, pceConstraints.getExcludeCLLI().size()); } @Test public void setAndGetExcludeClliNodesTest() { - Assert.assertEquals(0, this.pceConstraints.getExcludeClliNodes().size()); + Assert.assertEquals(0, pceConstraints.getExcludeClliNodes().size()); List nodes = new ArrayList<>(); nodes.add("test"); - this.pceConstraints.setExcludeClliNodes(nodes); - Assert.assertEquals(1, this.pceConstraints.getExcludeClliNodes().size()); + pceConstraints.setExcludeClliNodes(nodes); + Assert.assertEquals(1, pceConstraints.getExcludeClliNodes().size()); } @Test public void setAndGetExcludeSrlgLinksTest() { - Assert.assertEquals(0, this.pceConstraints.getExcludeSrlgLinks().size()); + Assert.assertEquals(0, pceConstraints.getExcludeSrlgLinks().size()); List nodes = new ArrayList<>(); nodes.add("test"); - this.pceConstraints.setExcludeSrlgLinks(nodes); - Assert.assertEquals(1, this.pceConstraints.getExcludeSrlgLinks().size()); + pceConstraints.setExcludeSrlgLinks(nodes); + Assert.assertEquals(1, pceConstraints.getExcludeSrlgLinks().size()); } @Test public void setAndGetExcludeNodesTest() { - Assert.assertEquals(0, this.pceConstraints.getExcludeNodes().size()); + Assert.assertEquals(0, pceConstraints.getExcludeNodes().size()); List nodes = new ArrayList<>(); nodes.add("test"); - this.pceConstraints.setExcludeNodes(nodes); - Assert.assertEquals(1, this.pceConstraints.getExcludeNodes().size()); + pceConstraints.setExcludeNodes(nodes); + Assert.assertEquals(1, pceConstraints.getExcludeNodes().size()); } @Test public void setAndGetIncludeNodesTest() { - Assert.assertEquals(0, this.pceConstraints.getIncludeNodes().size()); + Assert.assertEquals(0, pceConstraints.getIncludeNodes().size()); List nodes = new ArrayList<>(); nodes.add("test"); - this.pceConstraints.setIncludeNodes(nodes); - Assert.assertEquals(1, this.pceConstraints.getIncludeNodes().size()); + pceConstraints.setIncludeNodes(nodes); + Assert.assertEquals(1, pceConstraints.getIncludeNodes().size()); } @Test diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImplTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImplTest.java index a99fd91d8..78cde86a7 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImplTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImplTest.java @@ -39,10 +39,10 @@ public class PceServiceRPCImplTest extends AbstractTest { @Before public void setUp() throws ExecutionException, InterruptedException { - PceTestUtils.writeNetworkIntoDataStore(this.getDataBroker(), this.getDataStoreContextUtil(), + PceTestUtils.writeNetworkIntoDataStore(getDataBroker(), getDataStoreContextUtil(), TransactionUtils.getNetworkForSpanLoss()); notificationPublishService = new NotificationPublishServiceMock(); - networkTransaction = new NetworkTransactionImpl(new RequestProcessor(this.getDataBroker())); + networkTransaction = new NetworkTransactionImpl(new RequestProcessor(getDataBroker())); pathComputationService = new PathComputationServiceImpl(networkTransaction, notificationPublishService, null, portMapping); pceServiceRPC = new PceServiceRPCImpl(pathComputationService); diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculationTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculationTest.java index 403d32a1d..5d4d64b1a 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculationTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculationTest.java @@ -52,10 +52,10 @@ public class PceCalculationTest extends AbstractTest { @Before public void setUp() throws ExecutionException, InterruptedException { pceResult.setRC("200"); - PceTestUtils.writeNetworkIntoDataStore(this.getDataBroker(), this.getDataStoreContextUtil(), + PceTestUtils.writeNetworkIntoDataStore(getDataBroker(), getDataStoreContextUtil(), TransactionUtils.getNetworkForSpanLoss()); pceConstraintsCalc = new PceConstraintsCalc(PceTestData.getPCERequest(), - new NetworkTransactionImpl(new RequestProcessor(this.getDataBroker()))); + new NetworkTransactionImpl(new RequestProcessor(getDataBroker()))); mapping = new MappingBuilder().setLogicalConnectionPoint("logicalConnectionPoint").setPortQual("xpdr-client") .build(); NodeInfo info = new NodeInfoBuilder().setNodeType(NodeTypes.Xpdr).build(); @@ -68,7 +68,7 @@ public class PceCalculationTest extends AbstractTest { public void testPceCalculationValues() { pceCalculation = new PceCalculation( PceTestData.getPCERequest(), - new NetworkTransactionImpl(new RequestProcessor(this.getDataBroker())), + new NetworkTransactionImpl(new RequestProcessor(getDataBroker())), pceConstraintsCalc.getPceHardConstraints(), pceConstraintsCalc.getPceSoftConstraints(), pceResult, @@ -85,7 +85,7 @@ public class PceCalculationTest extends AbstractTest { public void testPceCalculationValues2() { pceCalculation = new PceCalculation( PceTestData.getPathComputationRequestInputWithCoRoutingOrGeneral(), - new NetworkTransactionImpl(new RequestProcessor(this.getDataBroker())), + new NetworkTransactionImpl(new RequestProcessor(getDataBroker())), pceConstraintsCalc.getPceHardConstraints(), pceConstraintsCalc.getPceSoftConstraints(), pceResult, portMapping); @@ -101,10 +101,10 @@ public class PceCalculationTest extends AbstractTest { public void testPceCalculationValues42() { PathComputationRequestInput input = PceTestData.getPathComputationRequestInputWithCoRoutingOrGeneral2(); pceConstraintsCalc = new PceConstraintsCalc(input, - new NetworkTransactionImpl(new RequestProcessor(this.getDataBroker()))); + new NetworkTransactionImpl(new RequestProcessor(getDataBroker()))); pceCalculation = new PceCalculation( PceTestData.getPCE_test3_request_54(), - new NetworkTransactionImpl(new RequestProcessor(this.getDataBroker())), + new NetworkTransactionImpl(new RequestProcessor(getDataBroker())), pceConstraintsCalc.getPceHardConstraints(), pceConstraintsCalc.getPceSoftConstraints(), pceResult, portMapping); diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImplTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImplTest.java index 29d40e329..2bea3e823 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImplTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImplTest.java @@ -39,8 +39,8 @@ public class PathComputationServiceImplTest extends AbstractTest { private static NetworkTransactionService networkTransactionService = null; private static GnpyTopoImpl gnpyTopoImpl = null; private static GnpyResult gnpyResult = null; - private DataStoreContext dataStoreContext = this.getDataStoreContextUtil(); - private DataBroker dataBroker = this.getDataBroker(); + private DataStoreContext dataStoreContext = getDataStoreContextUtil(); + private DataBroker dataBroker = getDataBroker(); @Before public void setUp() { 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 f9d1f363c..1388ec5bc 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 @@ -117,7 +117,7 @@ public class DeviceRendererServiceImplCreateOtsOmsTest extends AbstractTest { this.crossConnect = new CrossConnectImpl(this.deviceTransactionManager, this.mappingUtils, this.crossConnectImpl121, this.crossConnectImpl221, this.crossConnectImpl710); this.crossConnect = Mockito.spy(this.crossConnect); - this.deviceRendererService = new DeviceRendererServiceImpl(this.getDataBroker(), + this.deviceRendererService = new DeviceRendererServiceImpl(getDataBroker(), this.deviceTransactionManager, this.openRoadmInterfaceFactory, this.openRoadmInterfaces, this.crossConnect, portMapping, null); } diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java index 136a4910a..8dac8877f 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java @@ -129,7 +129,7 @@ public class RendererServiceOperationsImplTest extends AbstractTest { public void setUp() throws OpenRoadmInterfaceException { setMountPoint(new MountPointStub(getDataBroker())); this.olmService = new OlmServiceStub(); - this.deviceRenderer = new DeviceRendererServiceImpl(this.getDataBroker(), this.deviceTransactionManager, + this.deviceRenderer = new DeviceRendererServiceImpl(getDataBroker(), this.deviceTransactionManager, openRoadmInterfaceFactory, openRoadmInterfaces, crossConnect, portMapping, null); this.otnDeviceRendererService = new OtnDeviceRendererServiceImpl(openRoadmInterfaceFactory, this.crossConnect, openRoadmInterfaces, this.deviceTransactionManager, null); -- 2.36.6