From 5d8642f75fcaaf0dfa86277813989837c539e2c8 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 6 May 2014 17:49:29 +0200 Subject: [PATCH 1/1] BUG-731: hide serverSessionManager It should not be visible, so expose the only functionality required by subclasses. Change-Id: Ic90c71080ed14cfcb1afbc67f18f85ab9888ffa5 Signed-off-by: Robert Varga --- .../provider/AbstractTopologySessionListener.java | 9 ++++++--- .../provider/Stateful02TopologySessionListener.java | 8 ++++---- .../provider/Stateful07TopologySessionListener.java | 8 ++++---- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java index acc7e2d508..c3cdc667a2 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java @@ -42,6 +42,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey; import org.opendaylight.yangtools.yang.binding.DataContainer; +import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -71,13 +72,11 @@ public abstract class AbstractTopologySessionListener implements }; private static final Logger LOG = LoggerFactory.getLogger(AbstractTopologySessionListener.class); - // FIXME: make this private - protected final ServerSessionManager serverSessionManager; - private final Map waitingRequests = new HashMap<>(); private final Map sendingRequests = new HashMap<>(); private final Map lspData = new HashMap<>(); private final Map lsps = new HashMap<>(); + private final ServerSessionManager serverSessionManager; private InstanceIdentifier topologyNode; private InstanceIdentifier topologyAugment; private PathComputationClientBuilder pccBuilder; @@ -376,4 +375,8 @@ public abstract class AbstractTopologySessionListener implements Preconditions.checkNotNull(id, "ID parameter null."); return this.lsps.get(id); } + + protected final T readOperationalData(final InstanceIdentifier id) { + return serverSessionManager.readOperationalData(id); + } } diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful02TopologySessionListener.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful02TopologySessionListener.java index 4caf11d67d..018b63b659 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful02TopologySessionListener.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful02TopologySessionListener.java @@ -160,7 +160,7 @@ public class Stateful02TopologySessionListener extends AbstractTopologySessionLi public synchronized ListenableFuture addLsp(final AddLspArgs input) { // Make sure there is no such LSP final InstanceIdentifier lsp = lspIdentifier(input.getName()).build(); - if (this.serverSessionManager.readOperationalData(lsp) != null) { + if (readOperationalData(lsp) != null) { LOG.debug("Node {} already contains lsp {} at {}", input.getNode(), input.getName(), lsp); return OperationResults.UNSENT.future(); } @@ -188,7 +188,7 @@ public class Stateful02TopologySessionListener extends AbstractTopologySessionLi public synchronized ListenableFuture removeLsp(final RemoveLspArgs input) { // Make sure the LSP exists, we need it for PLSP-ID final InstanceIdentifier lsp = lspIdentifier(input.getName()).build(); - final ReportedLsp rep = this.serverSessionManager.readOperationalData(lsp); + final ReportedLsp rep = readOperationalData(lsp); if (rep == null) { LOG.debug("Node {} does not contain LSP {}", input.getNode(), input.getName()); return OperationResults.UNSENT.future(); @@ -210,7 +210,7 @@ public class Stateful02TopologySessionListener extends AbstractTopologySessionLi public synchronized ListenableFuture updateLsp(final UpdateLspArgs input) { // Make sure the LSP exists final InstanceIdentifier lsp = lspIdentifier(input.getName()).build(); - final ReportedLsp rep = this.serverSessionManager.readOperationalData(lsp); + final ReportedLsp rep = readOperationalData(lsp); if (rep == null) { LOG.warn("Node {} does not contain LSP {}", input.getNode(), input.getName()); return OperationResults.UNSENT.future(); @@ -244,7 +244,7 @@ public class Stateful02TopologySessionListener extends AbstractTopologySessionLi // Make sure the LSP exists final InstanceIdentifier lsp = lspIdentifier(input.getName()).build(); LOG.debug("Checking if LSP {} has operational state {}", lsp, op); - final ReportedLsp rep = this.serverSessionManager.readOperationalData(lsp); + final ReportedLsp rep = readOperationalData(lsp); if (rep == null) { LOG.debug("Node {} does not contain LSP {}", input.getNode(), input.getName()); return OperationResults.UNSENT.future(); diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java index eea99a8e90..03dcea609a 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java @@ -201,7 +201,7 @@ final class Stateful07TopologySessionListener extends AbstractTopologySessionLis public synchronized ListenableFuture addLsp(final AddLspArgs input) { // Make sure there is no such LSP final InstanceIdentifier lsp = lspIdentifier(input.getName()).build(); - if (this.serverSessionManager.readOperationalData(lsp) != null) { + if (readOperationalData(lsp) != null) { LOG.debug("Node {} already contains lsp {} at {}", input.getNode(), input.getName(), lsp); return OperationResults.UNSENT.future(); } @@ -227,7 +227,7 @@ final class Stateful07TopologySessionListener extends AbstractTopologySessionLis public synchronized ListenableFuture removeLsp(final RemoveLspArgs input) { // Make sure the LSP exists, we need it for PLSP-ID final InstanceIdentifier lsp = lspIdentifier(input.getName()).build(); - final ReportedLsp rep = this.serverSessionManager.readOperationalData(lsp); + final ReportedLsp rep = readOperationalData(lsp); if (rep == null) { LOG.debug("Node {} does not contain LSP {}", input.getNode(), input.getName()); return OperationResults.UNSENT.future(); @@ -250,7 +250,7 @@ final class Stateful07TopologySessionListener extends AbstractTopologySessionLis public synchronized ListenableFuture updateLsp(final UpdateLspArgs input) { // Make sure the LSP exists final InstanceIdentifier lsp = lspIdentifier(input.getName()).build(); - final ReportedLsp rep = this.serverSessionManager.readOperationalData(lsp); + final ReportedLsp rep = readOperationalData(lsp); if (rep == null) { LOG.debug("Node {} does not contain LSP {}", input.getNode(), input.getName()); return OperationResults.UNSENT.future(); @@ -284,7 +284,7 @@ final class Stateful07TopologySessionListener extends AbstractTopologySessionLis // Make sure the LSP exists final InstanceIdentifier lsp = lspIdentifier(input.getName()).build(); LOG.debug("Checking if LSP {} has operational state {}", lsp, op); - final ReportedLsp rep = this.serverSessionManager.readOperationalData(lsp); + final ReportedLsp rep = readOperationalData(lsp); if (rep == null) { LOG.debug("Node {} does not contain LSP {}", input.getNode(), input.getName()); return OperationResults.UNSENT.future(); -- 2.36.6