*
* 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 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 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.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 final Map<InstanceIdentifier, SimpleDOMMountPoint> 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 InstanceIdentifier path) {
- return Optional.<DOMMountPoint>fromNullable(mountPoints.get(path));
+ public DOMMountPointServiceImpl(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<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 InstanceIdentifier 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());
+ }
+ };
+ }
+
+ @Override
+ public DOMMountPointBuilder createMountPoint(final YangInstanceIdentifier path) {
+ return new DOMMountPointBuilderImpl(path);
}
@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();
+ }
+ };
}
- public ObjectRegistration<DOMMountPoint> registerMountPoint(final SimpleDOMMountPoint mountPoint) {
- synchronized (mountPoints) {
- Preconditions.checkState(!mountPoints.containsKey(mountPoint.getIdentifier()), "Mount point already exists");
- mountPoints.put(mountPoint.getIdentifier(), mountPoint);
+ /**
+ * 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) {
+ Preconditions.checkArgument(mountPoint instanceof SimpleDOMMountPoint, "Expected SimpleDOMMountPoint");
+
+ final org.opendaylight.mdsal.dom.api.DOMMountPointService.DOMMountPointBuilder delegateBuilder =
+ delegate.createMountPoint(mountPoint.getIdentifier());
+
+ if (mountPoint.getSchemaContext() != null) {
+ delegateBuilder.addInitialSchemaContext(mountPoint.getSchemaContext());
}
- notifyMountCreated(mountPoint.getIdentifier());
- // FIXME this shouldnt be null
- return null;
+ ((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 {
ClassToInstanceMap<DOMService> services = MutableClassToInstanceMap.create();
private SimpleDOMMountPoint mountPoint;
- private final InstanceIdentifier path;
+ private final YangInstanceIdentifier path;
private SchemaContext schemaContext;
- public DOMMountPointBuilderImpl(final InstanceIdentifier path) {
+ public DOMMountPointBuilderImpl(final YangInstanceIdentifier path) {
this.path = path;
}
@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);
}
}
Code Review / controller.git / blobdiff