Update internal structure to pass registrations

[mdsal.git] / singleton-service / mdsal-singleton-dom-impl / src / main / java / org / opendaylight / mdsal / singleton / dom / impl / PlaceholderGroup.java

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/PlaceholderGroup.java b/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/PlaceholderGroup.java
index ea50afe01be4fea7b7eaa5afc8a671fca55a5022..a94b51b8169f59c08fd6b396948cd3009eb0990e 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/PlaceholderGroup.java
+++ b/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/PlaceholderGroup.java
@@ -18,7 +18,7 @@ import java.util.List;
 import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
 import org.opendaylight.mdsal.eos.common.api.GenericEntity;
 import org.opendaylight.mdsal.eos.common.api.GenericEntityOwnershipChange;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
+import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration;
 import org.opendaylight.yangtools.concepts.Path;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,7 +31,7 @@ final class PlaceholderGroup<P extends Path<P>, E extends GenericEntity<P>,
         C extends GenericEntityOwnershipChange<P, E>> extends ClusterSingletonServiceGroup<P, E, C> {
     private static final Logger LOG = LoggerFactory.getLogger(PlaceholderGroup.class);
 
-    private final List<ClusterSingletonService> services = new ArrayList<>(0);
+    private final List<ClusterSingletonServiceRegistration> services = new ArrayList<>(0);
     private final ClusterSingletonServiceGroup<P, E, C> previous;
     private final ListenableFuture<?> closeFuture;
 
@@ -53,17 +53,17 @@ final class PlaceholderGroup<P extends Path<P>, E extends GenericEntity<P>,
     }
 
     @Override
-    void registerService(final ClusterSingletonService service) {
+    void registerService(final ClusterSingletonServiceRegistration reg) {
         verifyNoSuccessor();
-        services.add(service);
-        LOG.debug("{}: added service {}", this, service);
+        services.add(reg);
+        LOG.debug("{}: added service {}", this, reg.getInstance());
     }
 
     @Override
-    boolean unregisterService(final ClusterSingletonService service) {
+    boolean unregisterService(final ClusterSingletonServiceRegistration reg) {
         verifyNoSuccessor();
-        services.remove(service);
-        LOG.debug("{}: removed service {}", this, service);
+        services.remove(reg);
+        LOG.debug("{}: removed service {}", this, reg.getInstance());
         return false;
     }
 
@@ -81,7 +81,7 @@ final class PlaceholderGroup<P extends Path<P>, E extends GenericEntity<P>,
     }
 
     // Note: this is a leaked structure, the caller can reuse it at will, but has to regard
-    List<ClusterSingletonService> getServices() {
+    List<ClusterSingletonServiceRegistration> getServices() {
         verifyNoSuccessor();
         LOG.trace("{}: returning services {}", this, services);
         return services;