Integrate TopologyStatsProviderImpl

[bgpcep.git] / pcep / topology / topology-provider / src / main / java / org / opendaylight / bgpcep / pcep / topology / provider / AbstractTopologySessionListener.java

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java
index 5bfb71a6e9af9e33a36bae4270ab9b644d6ce0eb..cf90355f2a47269b3952f4cd589470db339a6a1d 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java
@@ -100,8 +100,8 @@ public abstract class AbstractTopologySessionListener implements TopologySession
     private final Map<SrpIdNumber, PCEPRequest> requests = new HashMap<>();
     @GuardedBy("this")
     private final Map<String, ReportedLsp> lspData = new ConcurrentHashMap<>();
-    private final TopologySessionStatsRegistry statsProvider;
     private final ServerSessionManager serverSessionManager;
+    private final SessionStateRegistry stateRegistry;
 
     private InstanceIdentifier<PathComputationClient> pccIdentifier;
     @GuardedBy("this")
@@ -114,9 +114,9 @@ public abstract class AbstractTopologySessionListener implements TopologySession
     @GuardedBy("this")
     private boolean triggeredResyncInProcess;
 
-    AbstractTopologySessionListener(final TopologySessionStatsRegistry statsProvider,
+    AbstractTopologySessionListener(final SessionStateRegistry stateRegistry,
             final ServerSessionManager serverSessionManager) {
-        this.statsProvider = requireNonNull(statsProvider);
+        this.stateRegistry = requireNonNull(stateRegistry);
         this.serverSessionManager = requireNonNull(serverSessionManager);
     }
 
@@ -131,8 +131,8 @@ public abstract class AbstractTopologySessionListener implements TopologySession
                  */
                 final InetAddress peerAddress = psession.getRemoteAddress();
 
-                syncOptimization = new SyncOptimization(psession.getLocalTlvs(), psession.getRemoteTlvs());
-                final boolean haveLspDbVersion = syncOptimization.isDbVersionPresent();
+                syncOptimization = SyncOptimization.of(psession.getLocalTlvs(), psession.getRemoteTlvs());
+                final boolean haveLspDbVersion = syncOptimization.dbVersionPresent();
 
                 final TopologyNodeState state =
                         serverSessionManager.takeNodeState(peerAddress, this, haveLspDbVersion);
@@ -181,7 +181,7 @@ public abstract class AbstractTopologySessionListener implements TopologySession
                 state.storeNode(topologyAugment,
                         new Node1Builder().setPathComputationClient(pccBuilder.build()).build(), psession);
 
-                listenerState = statsProvider.bind(nodeId, new SessionStateImpl(this, psession));
+                listenerState = stateRegistry.bind(nodeId, new SessionStateImpl(this, psession));
                 LOG.info("Session with {} attached to topology node {}", peerAddress, nodeId);
             }
         }
@@ -627,7 +627,7 @@ public abstract class AbstractTopologySessionListener implements TopologySession
             boolean incrementalSynchro);
 
     final boolean isLspDbPersisted() {
-        return syncOptimization != null && syncOptimization.isSyncAvoidanceEnabled();
+        return syncOptimization != null && syncOptimization.syncAvoidanceEnabled();
     }
 
     /**
@@ -635,20 +635,20 @@ public abstract class AbstractTopologySessionListener implements TopologySession
      * LSP-DB-VERSION TLV values doesnt match, and  LSP-SYNC-CAPABILITY is enabled.
      */
     final synchronized boolean isIncrementalSynchro() {
-        return syncOptimization != null && syncOptimization.isSyncAvoidanceEnabled()
-                && syncOptimization.isDeltaSyncEnabled();
+        return syncOptimization != null && syncOptimization.syncAvoidanceEnabled()
+                && syncOptimization.deltaSyncEnabled();
     }
 
     final synchronized boolean isTriggeredInitialSynchro() {
-        return syncOptimization != null && syncOptimization.isTriggeredInitSyncEnabled();
+        return syncOptimization != null && syncOptimization.triggeredInitialSyncEnabled();
     }
 
     final synchronized boolean isTriggeredReSyncEnabled() {
-        return syncOptimization != null && syncOptimization.isTriggeredReSyncEnabled();
+        return syncOptimization != null && syncOptimization.triggeredReSyncEnabled();
     }
 
     protected final synchronized boolean isSynchronized() {
-        return syncOptimization != null && syncOptimization.doesLspDbMatch();
+        return syncOptimization != null && syncOptimization.dbVersionMatch();
     }
 
     @Override