X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fbroker%2Fimpl%2Fmount%2FDOMMountPointServiceImpl.java;h=6cfdb5abce34cf65bd77f53740480ab9a0ba4723;hp=cdb78fc5921bc7e23132de35455d8960da93a8b9;hb=e1ede0942d3bff1f1b150816e6bfa96ed9366c20;hpb=cf5be659d906cc80d52647cb516bbab435156742 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 cdb78fc592..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 @@ -3,79 +3,158 @@ * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html. + * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.controller.md.sal.dom.broker.impl.mount; -import java.util.HashMap; -import java.util.Map; +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.api.mount.MountProvisionListener; +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.concepts.util.ListenerRegistry; -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.google.common.collect.ClassToInstanceMap; -import com.google.common.collect.MutableClassToInstanceMap; - public class DOMMountPointServiceImpl implements DOMMountPointService { + private abstract static class CompatFactory { + private final Class controllerClass; + private final Class mdsalClass; + + CompatFactory(final Class controllerClass, final Class mdsalClass) { + this.controllerClass = requireNonNull(controllerClass); + this.mdsalClass = requireNonNull(mdsalClass); + } - private final Map mountPoints = new HashMap<>(); + final void addService(final org.opendaylight.mdsal.dom.api.DOMMountPointService.DOMMountPointBuilder builder, + final ClassToInstanceMap 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); + } + } + } + } - private final ListenerRegistry listeners = ListenerRegistry.create(); + abstract M createService(C delegate); + } - @Override - public Optional getMountPoint(final InstanceIdentifier path) { - return Optional.fromNullable(mountPoints.get(path)); + private static final Map, CompatFactory> KNOWN_SERVICES = ImmutableMap.of( + DOMActionService.class, new CompatFactory( + 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( + 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(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( + 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 + public DOMMountPointServiceImpl() { + this(new org.opendaylight.mdsal.dom.broker.DOMMountPointServiceImpl()); + } + + public DOMMountPointServiceImpl(final org.opendaylight.mdsal.dom.api.DOMMountPointService delegate) { + this.delegate = delegate; } @Override - public DOMMountPointBuilder createMountPoint(final InstanceIdentifier path) { - Preconditions.checkState(!mountPoints.containsKey(path), "Mount point already exists"); - return new DOMMountPointBuilderImpl(path); + public Optional getMountPoint(final YangInstanceIdentifier path) { + return Optional.fromJavaUtil(delegate.getMountPoint(path).map(DOMMountPointAdapter::new)); } - public void notifyMountCreated(final InstanceIdentifier identifier) { - for (final ListenerRegistration listener : listeners - .getListeners()) { - listener.getInstance().onMountPointCreated(identifier); - } + @Override + public DOMMountPointBuilder createMountPoint(final YangInstanceIdentifier path) { + return new DOMMountPointBuilderImpl(path); } @Override - public ListenerRegistration registerProvisionListener( - final MountProvisionListener listener) { - return listeners.register(listener); + public ListenerRegistration registerProvisionListener(final DOMMountPointListener listener) { + return delegate.registerProvisionListener(listener); } - public ObjectRegistration registerMountPoint(final SimpleDOMMountPoint mountPoint) { - synchronized (mountPoints) { - Preconditions.checkState(!mountPoints.containsKey(mountPoint.getIdentifier()), "Mount point already exists"); - mountPoints.put(mountPoint.getIdentifier(), mountPoint); + @SuppressWarnings("unchecked") + ObjectRegistration registerMountPoint(final SimpleDOMMountPoint mountPoint) { + final org.opendaylight.mdsal.dom.api.DOMMountPointService.DOMMountPointBuilder delegateBuilder = + delegate.createMountPoint(mountPoint.getIdentifier()); + + if (mountPoint.getSchemaContext() != null) { + delegateBuilder.addInitialSchemaContext(mountPoint.getSchemaContext()); + } + + final ClassToInstanceMap myServices = mountPoint.getServices(); + for (Entry, DOMService> entry : myServices.entrySet()) { + delegateBuilder.addService((Class)entry.getKey(), entry.getValue()); + + final CompatFactory compat = KNOWN_SERVICES.get(entry.getKey()); + if (compat != null) { + compat.addService(delegateBuilder, myServices); + } } - notifyMountCreated(mountPoint.getIdentifier()); - // FIXME this shouldnt be null - return null; + final ObjectRegistration delegateReg = delegateBuilder.register(); + return new AbstractObjectRegistration(mountPoint) { + @Override + protected void removeRegistration() { + delegateReg.close(); + } + }; } public class DOMMountPointBuilderImpl implements DOMMountPointBuilder { - - ClassToInstanceMap services = MutableClassToInstanceMap.create(); + private final ClassToInstanceMap services = MutableClassToInstanceMap.create(); + private final YangInstanceIdentifier path; private SimpleDOMMountPoint mountPoint; - private final InstanceIdentifier path; private SchemaContext schemaContext; - public DOMMountPointBuilderImpl(final InstanceIdentifier path) { + public DOMMountPointBuilderImpl(final YangInstanceIdentifier path) { this.path = path; } @@ -94,7 +173,7 @@ public class DOMMountPointServiceImpl implements DOMMountPointService { @Override public ObjectRegistration 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); } }