*/
package org.opendaylight.mdsal.dom.broker;
-import static com.google.common.base.Preconditions.checkState;
import static java.util.Objects.requireNonNull;
import com.google.common.collect.MutableClassToInstanceMap;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
+import javax.inject.Inject;
import javax.inject.Singleton;
import org.kohsuke.MetaInfServices;
import org.opendaylight.mdsal.dom.api.DOMMountPoint;
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.concepts.Registration;
+import org.opendaylight.yangtools.util.ObjectRegistry;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
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)
+@Component
@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<>();
+ private final ObjectRegistry<DOMMountPointListener> listeners =
+ ObjectRegistry.createConcurrent("mount point listeners");
- private final ListenerRegistry<DOMMountPointListener> listeners = ListenerRegistry.create();
+ @Inject
+ @Activate
+ public DOMMountPointServiceImpl() {
+ // Exposed only for DI
+ }
@Override
public Optional<DOMMountPoint> getMountPoint(final YangInstanceIdentifier path) {
}
@Override
- public DOMMountPointBuilder createMountPoint(final YangInstanceIdentifier path) {
- checkState(!mountPoints.containsKey(path), "Mount point already exists");
+ public synchronized DOMMountPointBuilder createMountPoint(final YangInstanceIdentifier path) {
+ checkNotExists(path, mountPoints.get(requireNonNull(path)));
return new DOMMountPointBuilderImpl(path);
}
@Override
- public ListenerRegistration<DOMMountPointListener> registerProvisionListener(final DOMMountPointListener listener) {
+ public Registration registerProvisionListener(final DOMMountPointListener listener) {
return listeners.register(listener);
}
- @Activate
- @SuppressWarnings("static-method")
- void activate() {
- LOG.info("DOMMountPointService activated");
- }
-
- @Deactivate
- @SuppressWarnings("static-method")
- void deactivate() {
- LOG.info("DOMMountPointService deactivated");
- }
-
@SuppressWarnings("checkstyle:IllegalCatch")
private ObjectRegistration<DOMMountPoint> registerMountPoint(final SimpleDOMMountPoint mountPoint) {
final YangInstanceIdentifier mountPointId = mountPoint.getIdentifier();
synchronized (mountPoints) {
- final DOMMountPoint prev = mountPoints.putIfAbsent(mountPointId, mountPoint);
- checkState(prev == null, "Mount point %s already exists as %s", mountPointId, prev);
+ checkNotExists(mountPointId, mountPoints.putIfAbsent(mountPointId, mountPoint));
}
- listeners.streamListeners().forEach(listener -> {
+ listeners.streamObjects().forEach(listener -> {
try {
listener.onMountPointCreated(mountPointId);
} catch (final Exception ex) {
}
}
- listeners.streamListeners().forEach(listener -> {
+ listeners.streamObjects().forEach(listener -> {
try {
listener.onMountPointRemoved(mountPointId);
} catch (final Exception ex) {
});
}
- private final class DOMMountPointBuilderImpl implements DOMMountPointBuilder {
+ private static void checkNotExists(final YangInstanceIdentifier id, final DOMMountPoint mountPoint) {
+ if (mountPoint != null) {
+ throw new IllegalStateException("Mount point " + id + " already exists as " + mountPoint);
+ }
+ }
- private final MutableClassToInstanceMap<DOMService> services = MutableClassToInstanceMap.create();
+ private final class DOMMountPointBuilderImpl implements DOMMountPointBuilder {
+ private final MutableClassToInstanceMap<DOMService<?, ?>> services = MutableClassToInstanceMap.create();
private final YangInstanceIdentifier path;
private SimpleDOMMountPoint mountPoint;
}
@Override
- public <T extends DOMService> DOMMountPointBuilder addService(final Class<T> type, final T impl) {
- services.putInstance(requireNonNull(type), requireNonNull(impl));
+ public <T extends DOMService<T, E>, E extends DOMService.Extension<T, E>> DOMMountPointBuilder addService(
+ final Class<T> type, final T impl) {
+ services.putInstance(type, requireNonNull(impl));
return this;
}
@Override
public ObjectRegistration<DOMMountPoint> register() {
- checkState(mountPoint == null, "Mount point is already built.");
+ if (mountPoint != null) {
+ throw new IllegalStateException("Mount point is already built");
+ }
mountPoint = SimpleDOMMountPoint.create(path, services);
return registerMountPoint(mountPoint);
}