X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fbroker%2Fimpl%2Fmount%2FDOMMountPointServiceImpl.java;fp=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fbroker%2Fimpl%2Fmount%2FDOMMountPointServiceImpl.java;h=6cfdb5abce34cf65bd77f53740480ab9a0ba4723;hb=e1ede0942d3bff1f1b150816e6bfa96ed9366c20;hp=27a4a78b73899361e7d6086069a0848251491e5d;hpb=4dab19f89e79f43d3b270072f7260128788804ff;p=controller.git

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 27a4a78b73..6cfdb5abce 100644
--- 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
@@ -7,23 +7,93 @@
  */
 package org.opendaylight.controller.md.sal.dom.broker.impl.mount;
 
+import static java.util.Objects.requireNonNull;
+
 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.ImmutableMap;
 import com.google.common.collect.MutableClassToInstanceMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import org.opendaylight.controller.md.sal.dom.api.DOMActionService;
+import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 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.DOMNotificationService;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
 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.compat.DOMDataBrokerAdapter;
 import org.opendaylight.controller.sal.core.compat.DOMMountPointAdapter;
+import org.opendaylight.controller.sal.core.compat.DOMNotificationServiceAdapter;
+import org.opendaylight.controller.sal.core.compat.DOMRpcServiceAdapter;
 import org.opendaylight.mdsal.dom.api.DOMMountPointListener;
+import org.opendaylight.yangtools.concepts.AbstractObjectRegistration;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 public class DOMMountPointServiceImpl implements DOMMountPointService {
+    private abstract static class CompatFactory<M extends org.opendaylight.mdsal.dom.api.DOMService,
+            C extends DOMService> {
+        private final Class<C> controllerClass;
+        private final Class<M> mdsalClass;
+
+        CompatFactory(final Class<C> controllerClass, final Class<M> mdsalClass) {
+            this.controllerClass = requireNonNull(controllerClass);
+            this.mdsalClass = requireNonNull(mdsalClass);
+        }
+
+        final void addService(final org.opendaylight.mdsal.dom.api.DOMMountPointService.DOMMountPointBuilder builder,
+                final ClassToInstanceMap<DOMService> services) {
+            if (!services.containsKey(mdsalClass)) {
+                final C controllerService = services.getInstance(controllerClass);
+                if (controllerService != null) {
+                    final M mdsalService = createService(controllerService);
+                    if (mdsalService != null) {
+                        builder.addService(mdsalClass, mdsalService);
+                    }
+                }
+            }
+        }
+
+        abstract M createService(C delegate);
+    }
+
+    private static final Map<Class<? extends DOMService>, CompatFactory<?, ?>> KNOWN_SERVICES = ImmutableMap.of(
+        DOMActionService.class, new CompatFactory<org.opendaylight.mdsal.dom.api.DOMActionService, DOMActionService>(
+                DOMActionService.class, org.opendaylight.mdsal.dom.api.DOMActionService.class) {
+            @Override
+            org.opendaylight.mdsal.dom.api.DOMActionService createService(final DOMActionService delegate) {
+                return delegate;
+            }
+        },
+        DOMDataBroker.class, new CompatFactory<org.opendaylight.mdsal.dom.api.DOMDataBroker, DOMDataBroker>(
+                DOMDataBroker.class, org.opendaylight.mdsal.dom.api.DOMDataBroker.class) {
+            @Override
+            org.opendaylight.mdsal.dom.api.DOMDataBroker createService(final DOMDataBroker delegate) {
+                return new DOMDataBrokerAdapter(delegate);
+            }
+        },
+        DOMNotificationService.class, new CompatFactory<org.opendaylight.mdsal.dom.api.DOMNotificationService,
+                DOMNotificationService>(DOMNotificationService.class,
+                        org.opendaylight.mdsal.dom.api.DOMNotificationService.class) {
+            @Override
+            org.opendaylight.mdsal.dom.api.DOMNotificationService createService(final DOMNotificationService delegate) {
+                return new DOMNotificationServiceAdapter(delegate);
+            }
+        },
+        DOMRpcService.class, new CompatFactory<org.opendaylight.mdsal.dom.api.DOMRpcService, DOMRpcService>(
+                DOMRpcService.class, org.opendaylight.mdsal.dom.api.DOMRpcService.class) {
+            @Override
+            org.opendaylight.mdsal.dom.api.DOMRpcService createService(final DOMRpcService delegate) {
+                return new DOMRpcServiceAdapter(delegate);
+            }
+        });
+
     private final org.opendaylight.mdsal.dom.api.DOMMountPointService delegate;
 
     @VisibleForTesting
@@ -59,28 +129,29 @@ public class DOMMountPointServiceImpl implements DOMMountPointService {
             delegateBuilder.addInitialSchemaContext(mountPoint.getSchemaContext());
         }
 
-        mountPoint.getAllServices().forEach(
-            entry -> delegateBuilder.addService((Class<DOMService>)entry.getKey(), entry.getValue()));
+        final ClassToInstanceMap<DOMService> myServices = mountPoint.getServices();
+        for (Entry<Class<? extends DOMService>, DOMService> entry : myServices.entrySet()) {
+            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();
+            final CompatFactory<?, ?> compat = KNOWN_SERVICES.get(entry.getKey());
+            if (compat != null) {
+                compat.addService(delegateBuilder, myServices);
             }
+        }
 
+        final ObjectRegistration<org.opendaylight.mdsal.dom.api.DOMMountPoint> delegateReg = delegateBuilder.register();
+        return new AbstractObjectRegistration<DOMMountPoint>(mountPoint) {
             @Override
-            public DOMMountPoint getInstance() {
-                return mountPoint;
+            protected void removeRegistration() {
+                delegateReg.close();
             }
         };
     }
 
     public class DOMMountPointBuilderImpl implements DOMMountPointBuilder {
-
-        ClassToInstanceMap<DOMService> services = MutableClassToInstanceMap.create();
-        private SimpleDOMMountPoint mountPoint;
+        private final ClassToInstanceMap<DOMService> services = MutableClassToInstanceMap.create();
         private final YangInstanceIdentifier path;
+        private SimpleDOMMountPoint mountPoint;
         private SchemaContext schemaContext;
 
         public DOMMountPointBuilderImpl(final YangInstanceIdentifier path) {