Bug 4651: Implement handling of ClusteredDOMDataTreeChangeListener in CDS

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / DelayedDataTreeListenerRegistration.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DelayedDataTreeListenerRegistration.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DelayedDataTreeListenerRegistration.java
index 958ccc4438be135a8355bcd65f8841c2159510a9..35f73086892fa5d596705e21b7bdf75a8f65c6e3 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DelayedDataTreeListenerRegistration.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DelayedDataTreeListenerRegistration.java
@@ -7,54 +7,19 @@
  */
 package org.opendaylight.controller.cluster.datastore;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import java.util.Map.Entry;
-import javax.annotation.concurrent.GuardedBy;
 import org.opendaylight.controller.cluster.datastore.messages.RegisterDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
 
 /**
  * Intermediate proxy registration returned to the user when we cannot
  * instantiate the registration immediately. It provides a bridge to
  * a real registration which may materialize at some point in the future.
  */
-final class DelayedDataTreeListenerRegistration implements ListenerRegistration<DOMDataTreeChangeListener> {
-    private final RegisterDataTreeChangeListener registerTreeChangeListener;
-    private volatile ListenerRegistration<DOMDataTreeChangeListener> delegate;
-    @GuardedBy("this")
-    private boolean closed;
+final class DelayedDataTreeListenerRegistration
+        extends DelayedListenerRegistration<DOMDataTreeChangeListener, RegisterDataTreeChangeListener> {
 
     DelayedDataTreeListenerRegistration(final RegisterDataTreeChangeListener registerTreeChangeListener) {
-        this.registerTreeChangeListener = Preconditions.checkNotNull(registerTreeChangeListener);
-    }
-
-    synchronized void createDelegate(final LeaderLocalDelegateFactory<RegisterDataTreeChangeListener, ListenerRegistration<DOMDataTreeChangeListener>, Optional<DataTreeCandidate>> factory) {
-        if (!closed) {
-            final Entry<ListenerRegistration<DOMDataTreeChangeListener>, Optional<DataTreeCandidate>> res =
-                    factory.createDelegate(registerTreeChangeListener);
-            this.delegate = res.getKey();
-            factory.getShard().getDataStore().notifyOfInitialData(registerTreeChangeListener.getPath(),
-                    this.delegate.getInstance(), res.getValue());
-        }
-    }
-
-    @Override
-    public DOMDataTreeChangeListener getInstance() {
-        final ListenerRegistration<DOMDataTreeChangeListener> d = delegate;
-        return d == null ? null : d.getInstance();
-    }
-
-    @Override
-    public synchronized void close() {
-        if (!closed) {
-            closed = true;
-            if (delegate != null) {
-                delegate.close();
-            }
-        }
+        super(registerTreeChangeListener);
     }
 }