Proxy DOMMountPointServiceImpl to MD-SAL API

Change-Id: Ic16ce1a850340482688c492045101af45ca7e521
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMService.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMService.java
index 74f46344130bf23c42b47105dd378041b3edb8c5..740cea83f9e272fb8b664e209583f66b65fe4874 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMService.java
+++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMService.java
@@ -7,10 +7,13 @@
  */
 package org.opendaylight.controller.md.sal.dom.api;
 
  */
 package org.opendaylight.controller.md.sal.dom.api;
 

+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+

 /**
  * Marker interface for services which can be obtained from a {@link DOMMountPoint} instance. No further semantics are
  * implied.
  */
 /**
  * Marker interface for services which can be obtained from a {@link DOMMountPoint} instance. No further semantics are
  * implied.
  */

-public interface DOMService {
+@SuppressFBWarnings(value = "NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification = "Migration")
+public interface DOMService extends org.opendaylight.mdsal.dom.api.DOMService {

 
 }
 
 }

diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/mount/MountProvisionListener.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/mount/MountProvisionListener.java
index c4d00626ac8a0dfd9e9c1275dec3af9612b65ddc..f368dbba37a22a80f2487f46462c0e16026e8d34 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/mount/MountProvisionListener.java
+++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/mount/MountProvisionListener.java
@@ -8,13 +8,5 @@
 
 package org.opendaylight.controller.sal.core.api.mount;
 
 
 package org.opendaylight.controller.sal.core.api.mount;
 

-import java.util.EventListener;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-
-public interface MountProvisionListener extends EventListener {
-
-    void onMountPointCreated(YangInstanceIdentifier path);
-
-    void onMountPointRemoved(YangInstanceIdentifier path);
-
+public interface MountProvisionListener extends org.opendaylight.mdsal.dom.api.DOMMountPointListener {

 }
 }

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/mount/DOMMountPointServiceImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/mount/DOMMountPointServiceImpl.java
index c80d75f0d1ae5687d42ec70fd9d2867ea3b43d6b..4966348d186d6cc82722ef1274542cdc15c997a8 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/mount/DOMMountPointServiceImpl.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/mount/DOMMountPointServiceImpl.java
@@ -8,77 +8,131 @@
 
 package org.opendaylight.controller.md.sal.dom.broker.impl.mount;
 
 
 package org.opendaylight.controller.md.sal.dom.broker.impl.mount;
 

+import com.google.common.annotations.VisibleForTesting;

 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.MutableClassToInstanceMap;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.MutableClassToInstanceMap;

-import java.util.HashMap;
-import java.util.Map;

 import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
 import org.opendaylight.controller.md.sal.dom.api.DOMService;
 import org.opendaylight.controller.md.sal.dom.broker.spi.mount.SimpleDOMMountPoint;
 import org.opendaylight.controller.sal.core.api.mount.MountProvisionListener;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
 import org.opendaylight.controller.md.sal.dom.api.DOMService;
 import org.opendaylight.controller.md.sal.dom.broker.spi.mount.SimpleDOMMountPoint;
 import org.opendaylight.controller.sal.core.api.mount.MountProvisionListener;

+import org.opendaylight.mdsal.dom.api.DOMMountPointListener;
+import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;

 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;

-import org.opendaylight.yangtools.util.ListenerRegistry;

 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 public class DOMMountPointServiceImpl implements DOMMountPointService {
 
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 public class DOMMountPointServiceImpl implements DOMMountPointService {
 

-    private final Map<YangInstanceIdentifier, DOMMountPoint> mountPoints = new HashMap<>();
+    private final org.opendaylight.mdsal.dom.api.DOMMountPointService delegate;

 
 

-    private final ListenerRegistry<MountProvisionListener> listeners = ListenerRegistry.create();
+    @VisibleForTesting
+    public DOMMountPointServiceImpl() {
+        this(new org.opendaylight.mdsal.dom.broker.DOMMountPointServiceImpl());
+    }

 
 

-    @Override
-    public Optional<DOMMountPoint> getMountPoint(final YangInstanceIdentifier path) {
-        return Optional.fromNullable(mountPoints.get(path));
+    public DOMMountPointServiceImpl(org.opendaylight.mdsal.dom.api.DOMMountPointService delegate) {
+        this.delegate = delegate;

     }
 
     @Override
     }
 
     @Override

-    public DOMMountPointBuilder createMountPoint(final YangInstanceIdentifier path) {
-        Preconditions.checkState(!mountPoints.containsKey(path), "Mount point already exists");
-        return new DOMMountPointBuilderImpl(path);
+    public Optional<DOMMountPoint> getMountPoint(final YangInstanceIdentifier path) {
+        final Optional<org.opendaylight.mdsal.dom.api.DOMMountPoint> delegateMountPoint = delegate.getMountPoint(path);
+        return delegateMountPoint.isPresent() ? Optional.of(convert(delegateMountPoint.get())) : Optional.absent();

     }
 
     }
 

-    public void notifyMountCreated(final YangInstanceIdentifier identifier) {
-        for (final ListenerRegistration<MountProvisionListener> listener : listeners
-                .getListeners()) {
-            listener.getInstance().onMountPointCreated(identifier);
-        }
+    private DOMMountPoint convert(final org.opendaylight.mdsal.dom.api.DOMMountPoint from) {
+        return new DOMMountPoint() {
+            @Override
+            public YangInstanceIdentifier getIdentifier() {
+                return from.getIdentifier();
+            }
+
+            @Override
+            public <T extends DOMService> Optional<T> getService(Class<T> cls) {
+                return from.getService(cls);
+            }
+
+            @Override
+            public SchemaContext getSchemaContext() {
+                return from.getSchemaContext();
+            }
+
+            @Override
+            public int hashCode() {
+                return from.getIdentifier().hashCode();
+            }
+
+            @Override
+            public boolean equals(Object obj) {
+                if (this == obj) {
+                    return true;
+                }
+
+                if (!(obj instanceof DOMMountPoint)) {
+                    return false;
+                }
+
+                DOMMountPoint other = (DOMMountPoint) obj;
+                return from.getIdentifier().equals(other.getIdentifier());
+            }
+        };

     }
 
     }
 

-    public void notifyMountRemoved(final YangInstanceIdentifier identifier) {
-        for (final ListenerRegistration<MountProvisionListener> listener : listeners
-                .getListeners()) {
-            listener.getInstance().onMountPointRemoved(identifier);
-        }
+    @Override
+    public DOMMountPointBuilder createMountPoint(final YangInstanceIdentifier path) {
+        return new DOMMountPointBuilderImpl(path);

     }
 
     @Override
     public ListenerRegistration<MountProvisionListener> registerProvisionListener(
             final MountProvisionListener listener) {
     }
 
     @Override
     public ListenerRegistration<MountProvisionListener> registerProvisionListener(
             final MountProvisionListener listener) {

-        return listeners.register(listener);
+        final ListenerRegistration<DOMMountPointListener> delegateReg = delegate.registerProvisionListener(listener);
+        return new AbstractListenerRegistration<MountProvisionListener>(listener) {
+            @Override
+            protected void removeRegistration() {
+                delegateReg.close();
+            }
+        };

     }
 
     }
 

+    /**
+     * Deprecated.
+
+     * @deprecated this method should never have been exposed publicly - registration should be done via the
+     *         public {@link #createMountPoint} interface. As such, this method expects the {@code mountPoint} param
+     *         to be of type {@link SimpleDOMMountPoint}.
+     */
+    @SuppressWarnings("unchecked")
+    @Deprecated

     public ObjectRegistration<DOMMountPoint> registerMountPoint(final DOMMountPoint mountPoint) {
     public ObjectRegistration<DOMMountPoint> registerMountPoint(final DOMMountPoint mountPoint) {

-        synchronized (mountPoints) {
-            Preconditions
-                    .checkState(!mountPoints.containsKey(mountPoint.getIdentifier()), "Mount point already exists");
-            mountPoints.put(mountPoint.getIdentifier(), mountPoint);
-        }
-        notifyMountCreated(mountPoint.getIdentifier());
+        Preconditions.checkArgument(mountPoint instanceof SimpleDOMMountPoint, "Expected SimpleDOMMountPoint");

 
 

-        return new MountRegistration(mountPoint);
-    }
+        final org.opendaylight.mdsal.dom.api.DOMMountPointService.DOMMountPointBuilder delegateBuilder =
+            delegate.createMountPoint(mountPoint.getIdentifier());

 
 

-    public void unregisterMountPoint(final YangInstanceIdentifier mountPointId) {
-        synchronized (mountPoints) {
-            Preconditions.checkState(mountPoints.containsKey(mountPointId), "Mount point does not exist");
-            mountPoints.remove(mountPointId);
+        if (mountPoint.getSchemaContext() != null) {
+            delegateBuilder.addInitialSchemaContext(mountPoint.getSchemaContext());

         }
         }

-        notifyMountRemoved(mountPointId);
+
+        ((SimpleDOMMountPoint)mountPoint).getAllServices().forEach(
+            entry -> delegateBuilder.addService((Class<DOMService>)entry.getKey(), entry.getValue()));
+
+        final ObjectRegistration<org.opendaylight.mdsal.dom.api.DOMMountPoint> delegateReg = delegateBuilder.register();
+        return new ObjectRegistration<DOMMountPoint>() {
+            @Override
+            public void close() {
+                delegateReg.close();
+            }
+
+            @Override
+            public DOMMountPoint getInstance() {
+                return mountPoint;
+            }
+        };

     }
 
     public class DOMMountPointBuilderImpl implements DOMMountPointBuilder {
     }
 
     public class DOMMountPointBuilderImpl implements DOMMountPointBuilder {


@@ -107,26 +161,8 @@ public class DOMMountPointServiceImpl implements DOMMountPointService {
         @Override
         public ObjectRegistration<DOMMountPoint> register() {
             Preconditions.checkState(mountPoint == null, "Mount point is already built.");
         @Override
         public ObjectRegistration<DOMMountPoint> register() {
             Preconditions.checkState(mountPoint == null, "Mount point is already built.");

-            mountPoint = SimpleDOMMountPoint.create(path, services,schemaContext);
+            mountPoint = SimpleDOMMountPoint.create(path, services, schemaContext);

             return registerMountPoint(mountPoint);
         }
     }
             return registerMountPoint(mountPoint);
         }
     }

-
-    private final class MountRegistration implements ObjectRegistration<DOMMountPoint> {
-        private final DOMMountPoint mountPoint;
-
-        MountRegistration(final DOMMountPoint mountPoint) {
-            this.mountPoint = mountPoint;
-        }
-
-        @Override
-        public DOMMountPoint getInstance() {
-            return mountPoint;
-        }
-
-        @Override
-        public void close() {
-            unregisterMountPoint(mountPoint.getIdentifier());
-        }
-    }

 }
 }

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/resources/org/opendaylight/blueprint/dom-broker.xml b/opendaylight/md-sal/sal-dom-broker/src/main/resources/org/opendaylight/blueprint/dom-broker.xml
index f77b7935e5c6981f856b551039b298a52a633d46..67ebcf5e42da1c24d13284a7818e9cadf2cbb1ae 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/resources/org/opendaylight/blueprint/dom-broker.xml
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/resources/org/opendaylight/blueprint/dom-broker.xml
@@ -61,7 +61,12 @@
 
   <!-- DOM MountPoint Service -->
 
 
   <!-- DOM MountPoint Service -->
 

-  <bean id="domMountPointService" class="org.opendaylight.controller.md.sal.dom.broker.impl.mount.DOMMountPointServiceImpl"/>
+  <reference id="delegateDomMountPointService" interface="org.opendaylight.mdsal.dom.api.DOMMountPointService"
+      odl:type="default"/>
+
+  <bean id="domMountPointService" class="org.opendaylight.controller.md.sal.dom.broker.impl.mount.DOMMountPointServiceImpl">
+    <argument ref="delegateDomMountPointService"/>
+  </bean>

 
   <service ref="domMountPointService" interface="org.opendaylight.controller.md.sal.dom.api.DOMMountPointService"
         odl:type="default"/>
 
   <service ref="domMountPointService" interface="org.opendaylight.controller.md.sal.dom.api.DOMMountPointService"
         odl:type="default"/>

diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/mount/SimpleDOMMountPoint.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/mount/SimpleDOMMountPoint.java
index 11d9cab1b84e91f7d5906c292f913a0f1da09120..bd0b6fb3c4867d8d95f6632ff2d35b1066fe2b45 100644 (file)
--- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/mount/SimpleDOMMountPoint.java
+++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/mount/SimpleDOMMountPoint.java
@@ -11,6 +11,8 @@ package org.opendaylight.controller.md.sal.dom.broker.spi.mount;
 import com.google.common.base.Optional;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableClassToInstanceMap;
 import com.google.common.base.Optional;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableClassToInstanceMap;

+import java.util.Map.Entry;
+import java.util.Set;

 import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
 import org.opendaylight.controller.md.sal.dom.api.DOMService;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
 import org.opendaylight.controller.md.sal.dom.api.DOMService;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;


@@ -48,4 +50,18 @@ public final class SimpleDOMMountPoint implements DOMMountPoint {
     public <T extends DOMService> Optional<T> getService(final Class<T> cls) {
         return Optional.fromNullable(services.getInstance(cls));
     }
     public <T extends DOMService> Optional<T> getService(final Class<T> cls) {
         return Optional.fromNullable(services.getInstance(cls));
     }

+
+    public Set<Entry<Class<? extends DOMService>, DOMService>> getAllServices() {
+        return services.entrySet();
+    }
+
+    @Override
+    public int hashCode() {
+        return identifier.hashCode();
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        return this == obj || obj instanceof DOMMountPoint && identifier.equals(((DOMMountPoint) obj).getIdentifier());
+    }

 }
 }