* 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 static com.google.common.base.Preconditions.checkState;
import static java.util.Objects.requireNonNull;
-import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.MutableClassToInstanceMap;
import java.util.HashMap;
import java.util.Map;
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.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;
+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;
-public class DOMMountPointServiceImpl implements DOMMountPointService {
+@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<>();
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();
final DOMMountPoint prev = mountPoints.putIfAbsent(mountPointId, mountPoint);
checkState(prev == null, "Mount point %s already exists as %s", mountPointId, prev);
}
- listeners.forEach(listener -> {
+ listeners.streamListeners().forEach(listener -> {
try {
- listener.getInstance().onMountPointCreated(mountPointId);
+ listener.onMountPointCreated(mountPointId);
} catch (final Exception ex) {
LOG.error("Listener {} failed on mount point {} created event", listener, mountPoint, ex);
}
});
- return new AbstractObjectRegistration<DOMMountPoint>(mountPoint) {
+ return new AbstractObjectRegistration<>(mountPoint) {
@Override
protected void removeRegistration() {
unregisterMountPoint(getInstance().getIdentifier());
}
}
- listeners.forEach(listener -> {
+ listeners.streamListeners().forEach(listener -> {
try {
- listener.getInstance().onMountPointRemoved(mountPointId);
+ listener.onMountPointRemoved(mountPointId);
} catch (final Exception ex) {
LOG.error("Listener {} failed on mount point {} removed event", listener, mountPointId, ex);
}
});
}
- final class DOMMountPointBuilderImpl implements DOMMountPointBuilder {
+ private final class DOMMountPointBuilderImpl implements DOMMountPointBuilder {
private final MutableClassToInstanceMap<DOMService> services = MutableClassToInstanceMap.create();
private final YangInstanceIdentifier path;
- private SchemaContext schemaContext;
private SimpleDOMMountPoint mountPoint;
this.path = requireNonNull(path);
}
- @VisibleForTesting
- SchemaContext getSchemaContext() {
- return schemaContext;
- }
-
- @VisibleForTesting
- Map<Class<? extends DOMService>, DOMService> getServices() {
- return services;
- }
-
@Override
public <T extends DOMService> DOMMountPointBuilder addService(final Class<T> type, final T impl) {
services.putInstance(requireNonNull(type), requireNonNull(impl));
return this;
}
- @Override
- public DOMMountPointBuilder addInitialSchemaContext(final SchemaContext ctx) {
- schemaContext = requireNonNull(ctx);
- return this;
- }
-
@Override
public ObjectRegistration<DOMMountPoint> register() {
checkState(mountPoint == null, "Mount point is already built.");
- mountPoint = SimpleDOMMountPoint.create(path, services, schemaContext);
+ mountPoint = SimpleDOMMountPoint.create(path, services);
return registerMountPoint(mountPoint);
}
}