Remove createStatefulPeerProposal()

This is a useless indirection in front of a constructor, remove it.

Change-Id: Idebba9b0b00b92a96283d6a5857fd8cf76f27489
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposal.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposal.java
index d92c3ef426332ecff8a679f379a8f82dc4071e9f..e849f8623f4d9015d93555c708189b3f279e999c 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposal.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposal.java
@@ -33,22 +33,16 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 final class PCEPStatefulPeerProposal {
-
     private static final Logger LOG = LoggerFactory.getLogger(PCEPStatefulPeerProposal.class);
 
     private final DataBroker dataBroker;
     private final InstanceIdentifier<Topology> topologyId;
 
-    private PCEPStatefulPeerProposal(final DataBroker dataBroker, final InstanceIdentifier<Topology> topologyId) {
+    PCEPStatefulPeerProposal(final DataBroker dataBroker, final InstanceIdentifier<Topology> topologyId) {
         this.dataBroker = requireNonNull(dataBroker);
         this.topologyId = requireNonNull(topologyId);
     }
 
-    public static PCEPStatefulPeerProposal createStatefulPeerProposal(final DataBroker dataBroker,
-            final InstanceIdentifier<Topology> topologyId) {
-        return new PCEPStatefulPeerProposal(dataBroker, topologyId);
-    }
-
     void setPeerProposal(final NodeId nodeId, final TlvsBuilder openTlvsBuilder, final byte[] speakerId) {
         if (isSynOptimizationEnabled(openTlvsBuilder)) {
             Optional<LspDbVersion> result = Optional.empty();

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
index 858d9358098983ee65bae6f5e91fafb74f2d5f1b..977488735bff96d7d0e4b16b79ed23c325d924d5 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
@@ -82,8 +82,7 @@ class ServerSessionManager implements PCEPSessionListenerFactory, TopologySessio
             final PCEPTopologyConfiguration configDependencies) {
         this.dependenciesProvider = requireNonNull(dependenciesProvider);
         topology = requireNonNull(configDependencies.getTopology());
-        peerProposal = PCEPStatefulPeerProposal
-                .createStatefulPeerProposal(dependenciesProvider.getDataBroker(), topology);
+        peerProposal = new PCEPStatefulPeerProposal(dependenciesProvider.getDataBroker(), topology);
         rpcTimeout = configDependencies.getRpcTimeout();
         pcepDispatcherDependencies = new PCEPDispatcherDependenciesImpl(this, configDependencies);
     }

diff --git a/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java
index bb0829f4d43fd21780599787f1abf18a40ac84f7..6919475b648c744c44facec482fdc926b3276089 100644 (file)
--- a/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java
+++ b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java
@@ -63,57 +63,52 @@ public class PCEPStatefulPeerProposalTest {
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        this.tlvsBuilder = new TlvsBuilder().addAugmentation(new Tlvs1Builder()
+        tlvsBuilder = new TlvsBuilder().addAugmentation(new Tlvs1Builder()
             .setStateful(new StatefulBuilder().addAugmentation(new Stateful1Builder().build()).build())
             .build());
-        doReturn(this.rt).when(this.dataBroker).newReadOnlyTransaction();
-        doNothing().when(this.rt).close();
-        doReturn(this.listenableFutureMock).when(this.rt)
+        doReturn(rt).when(dataBroker).newReadOnlyTransaction();
+        doNothing().when(rt).close();
+        doReturn(listenableFutureMock).when(rt)
                 .read(any(LogicalDatastoreType.class), any(InstanceIdentifier.class));
-        doReturn(true).when(this.listenableFutureMock).isDone();
+        doReturn(true).when(listenableFutureMock).isDone();
         doAnswer(invocation -> {
             final Runnable runnable = (Runnable) invocation.getArguments()[0];
             runnable.run();
             return null;
-        }).when(this.listenableFutureMock).addListener(any(Runnable.class), any(Executor.class));
+        }).when(listenableFutureMock).addListener(any(Runnable.class), any(Executor.class));
     }
 
     @Test
     public void testSetPeerProposalSuccess() throws InterruptedException, ExecutionException {
-        doReturn(Optional.of(LSP_DB_VERSION)).when(this.listenableFutureMock).get();
-        final PCEPStatefulPeerProposal peerProposal = PCEPStatefulPeerProposal
-                .createStatefulPeerProposal(this.dataBroker, TOPOLOGY_IID);
-        peerProposal.setPeerProposal(NODE_ID, this.tlvsBuilder, null);
-        assertEquals(LSP_DB_VERSION, this.tlvsBuilder.augmentation(Tlvs3.class).getLspDbVersion());
+        doReturn(Optional.of(LSP_DB_VERSION)).when(listenableFutureMock).get();
+        final PCEPStatefulPeerProposal peerProposal = new PCEPStatefulPeerProposal(dataBroker, TOPOLOGY_IID);
+        peerProposal.setPeerProposal(NODE_ID, tlvsBuilder, null);
+        assertEquals(LSP_DB_VERSION, tlvsBuilder.augmentation(Tlvs3.class).getLspDbVersion());
     }
 
     @Test
     public void testSetPeerProposalWithEntityIdSuccess() throws InterruptedException, ExecutionException {
-        doReturn(Optional.of(LSP_DB_VERSION)).when(this.listenableFutureMock).get();
-        final PCEPStatefulPeerProposal peerProposal = PCEPStatefulPeerProposal
-                .createStatefulPeerProposal(this.dataBroker, TOPOLOGY_IID);
-        peerProposal.setPeerProposal(NODE_ID, this.tlvsBuilder, SPEAKER_ID);
-        final Tlvs3 aug = this.tlvsBuilder.augmentation(Tlvs3.class);
+        doReturn(Optional.of(LSP_DB_VERSION)).when(listenableFutureMock).get();
+        final PCEPStatefulPeerProposal peerProposal = new PCEPStatefulPeerProposal(dataBroker, TOPOLOGY_IID);
+        peerProposal.setPeerProposal(NODE_ID, tlvsBuilder, SPEAKER_ID);
+        final Tlvs3 aug = tlvsBuilder.augmentation(Tlvs3.class);
         assertEquals(LSP_DB_VERSION, aug.getLspDbVersion());
         assertArrayEquals(SPEAKER_ID, aug.getSpeakerEntityId().getSpeakerEntityIdValue());
     }
 
     @Test
     public void testSetPeerProposalAbsent() throws InterruptedException, ExecutionException {
-        doReturn(Optional.empty()).when(this.listenableFutureMock).get();
-        final PCEPStatefulPeerProposal peerProposal = PCEPStatefulPeerProposal
-                .createStatefulPeerProposal(this.dataBroker, TOPOLOGY_IID);
-        peerProposal.setPeerProposal(NODE_ID, this.tlvsBuilder, null);
-        assertNull(this.tlvsBuilder.augmentation(Tlvs3.class));
+        doReturn(Optional.empty()).when(listenableFutureMock).get();
+        final PCEPStatefulPeerProposal peerProposal = new PCEPStatefulPeerProposal(dataBroker, TOPOLOGY_IID);
+        peerProposal.setPeerProposal(NODE_ID, tlvsBuilder, null);
+        assertNull(tlvsBuilder.augmentation(Tlvs3.class));
     }
 
     @Test
     public void testSetPeerProposalFailure() throws InterruptedException, ExecutionException {
-        doThrow(new InterruptedException()).when(this.listenableFutureMock).get();
-        final PCEPStatefulPeerProposal peerProposal = PCEPStatefulPeerProposal
-                .createStatefulPeerProposal(this.dataBroker, TOPOLOGY_IID);
-        peerProposal.setPeerProposal(NODE_ID, this.tlvsBuilder, null);
-        assertNull(this.tlvsBuilder.augmentation(Tlvs3.class));
+        doThrow(new InterruptedException()).when(listenableFutureMock).get();
+        final PCEPStatefulPeerProposal peerProposal = new PCEPStatefulPeerProposal(dataBroker, TOPOLOGY_IID);
+        peerProposal.setPeerProposal(NODE_ID, tlvsBuilder, null);
+        assertNull(tlvsBuilder.augmentation(Tlvs3.class));
     }
-
 }