* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.mdsal.dom.broker;
-import org.opendaylight.mdsal.dom.api.DOMMountPointListener;
+import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
-import org.opendaylight.mdsal.dom.api.DOMMountPoint;
-import org.opendaylight.mdsal.dom.api.DOMMountPointService;
-import org.opendaylight.mdsal.dom.api.DOMService;
-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.broker.spi.mount.SimpleDOMMountPoint;
+import java.util.Optional;
+import javax.inject.Singleton;
+import org.kohsuke.MetaInfServices;
+import org.opendaylight.mdsal.dom.api.DOMMountPoint;
+import org.opendaylight.mdsal.dom.api.DOMMountPointListener;
+import org.opendaylight.mdsal.dom.api.DOMMountPointService;
+import org.opendaylight.mdsal.dom.api.DOMService;
+import org.opendaylight.mdsal.dom.spi.SimpleDOMMountPoint;
+import org.opendaylight.yangtools.concepts.AbstractObjectRegistration;
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.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Component(immediate = true)
+@MetaInfServices
+@Singleton
+public final class DOMMountPointServiceImpl implements DOMMountPointService {
+ private static final Logger LOG = LoggerFactory.getLogger(DOMMountPointServiceImpl.class);
private final Map<YangInstanceIdentifier, DOMMountPoint> mountPoints = new HashMap<>();
@Override
public Optional<DOMMountPoint> getMountPoint(final YangInstanceIdentifier path) {
- return Optional.fromNullable(mountPoints.get(path));
+ return Optional.ofNullable(mountPoints.get(path));
}
@Override
public DOMMountPointBuilder createMountPoint(final YangInstanceIdentifier path) {
- Preconditions.checkState(!mountPoints.containsKey(path), "Mount point already exists");
+ checkState(!mountPoints.containsKey(path), "Mount point already exists");
return new DOMMountPointBuilderImpl(path);
}
- public void notifyMountCreated(final YangInstanceIdentifier identifier) {
- for (final ListenerRegistration<DOMMountPointListener> listener : listeners
- .getListeners()) {
- listener.getInstance().onMountPointCreated(identifier);
- }
+ @Override
+ public ListenerRegistration<DOMMountPointListener> registerProvisionListener(final DOMMountPointListener listener) {
+ return listeners.register(listener);
}
- public void notifyMountRemoved(final YangInstanceIdentifier identifier) {
- for (final ListenerRegistration<DOMMountPointListener> listener : listeners
- .getListeners()) {
- listener.getInstance().onMountPointRemoved(identifier);
- }
+ @Activate
+ @SuppressWarnings("static-method")
+ void activate() {
+ LOG.info("DOMMountPointService activated");
}
- @Override
- public ListenerRegistration<DOMMountPointListener> registerProvisionListener(
- final DOMMountPointListener listener) {
- return listeners.register(listener);
+ @Deactivate
+ @SuppressWarnings("static-method")
+ void deactivate() {
+ LOG.info("DOMMountPointService deactivated");
}
- public ObjectRegistration<DOMMountPoint> registerMountPoint(final DOMMountPoint mountPoint) {
+ @SuppressWarnings("checkstyle:IllegalCatch")
+ private ObjectRegistration<DOMMountPoint> registerMountPoint(final SimpleDOMMountPoint mountPoint) {
+ final YangInstanceIdentifier mountPointId = mountPoint.getIdentifier();
synchronized (mountPoints) {
- Preconditions.checkState(!mountPoints.containsKey(mountPoint.getIdentifier()), "Mount point already exists");
- mountPoints.put(mountPoint.getIdentifier(), mountPoint);
+ final DOMMountPoint prev = mountPoints.putIfAbsent(mountPointId, mountPoint);
+ checkState(prev == null, "Mount point %s already exists as %s", mountPointId, prev);
}
- notifyMountCreated(mountPoint.getIdentifier());
-
- return new MountRegistration(mountPoint);
+ listeners.streamListeners().forEach(listener -> {
+ try {
+ listener.onMountPointCreated(mountPointId);
+ } catch (final Exception ex) {
+ LOG.error("Listener {} failed on mount point {} created event", listener, mountPoint, ex);
+ }
+ });
+
+ return new AbstractObjectRegistration<>(mountPoint) {
+ @Override
+ protected void removeRegistration() {
+ unregisterMountPoint(getInstance().getIdentifier());
+ }
+ };
}
- public void unregisterMountPoint(final YangInstanceIdentifier mountPointId) {
+ @SuppressWarnings("checkstyle:IllegalCatch")
+ private void unregisterMountPoint(final YangInstanceIdentifier mountPointId) {
synchronized (mountPoints) {
- Preconditions.checkState(mountPoints.containsKey(mountPointId), "Mount point does not exist");
- mountPoints.remove(mountPointId);
+ if (mountPoints.remove(mountPointId) == null) {
+ LOG.warn("Removing non-existent mount point {} at", mountPointId, new Throwable());
+ return;
+ }
}
- notifyMountRemoved(mountPointId);
+
+ listeners.streamListeners().forEach(listener -> {
+ try {
+ listener.onMountPointRemoved(mountPointId);
+ } catch (final Exception ex) {
+ LOG.error("Listener {} failed on mount point {} removed event", listener, mountPointId, ex);
+ }
+ });
}
- public class DOMMountPointBuilderImpl implements DOMMountPointBuilder {
+ private final class DOMMountPointBuilderImpl implements DOMMountPointBuilder {
- ClassToInstanceMap<DOMService> services = MutableClassToInstanceMap.create();
- private SimpleDOMMountPoint mountPoint;
+ private final MutableClassToInstanceMap<DOMService> services = MutableClassToInstanceMap.create();
private final YangInstanceIdentifier path;
- private SchemaContext schemaContext;
- public DOMMountPointBuilderImpl(final YangInstanceIdentifier path) {
- this.path = path;
- }
+ private SimpleDOMMountPoint mountPoint;
- @Override
- public <T extends DOMService> DOMMountPointBuilder addService(final Class<T> type, final T impl) {
- services.putInstance(type, impl);
- return this;
+ DOMMountPointBuilderImpl(final YangInstanceIdentifier path) {
+ this.path = requireNonNull(path);
}
@Override
- public DOMMountPointBuilder addInitialSchemaContext(final SchemaContext ctx) {
- schemaContext = ctx;
+ public <T extends DOMService> DOMMountPointBuilder addService(final Class<T> type, final T impl) {
+ services.putInstance(requireNonNull(type), requireNonNull(impl));
return this;
}
@Override
public ObjectRegistration<DOMMountPoint> register() {
- Preconditions.checkState(mountPoint == null, "Mount point is already built.");
- mountPoint = SimpleDOMMountPoint.create(path, services,schemaContext);
+ checkState(mountPoint == null, "Mount point is already built.");
+ mountPoint = SimpleDOMMountPoint.create(path, services);
return registerMountPoint(mountPoint);
}
}
-
- private final class MountRegistration implements ObjectRegistration<DOMMountPoint> {
- private final DOMMountPoint mountPoint;
-
- public MountRegistration(final DOMMountPoint mountPoint) {
- this.mountPoint = mountPoint;
- }
-
- @Override
- public DOMMountPoint getInstance() {
- return mountPoint;
- }
-
- @Override
- public void close() throws Exception {
- unregisterMountPoint(mountPoint.getIdentifier());
- }
- }
}
Code Review / mdsal.git / blobdiff