X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fbinding%2Fimpl%2FRootBindingAwareBroker.java;h=d91737154754750a1e3a2aa309c9c8953ee63854;hp=3ad1dabffe0b39958b65019274b459fae167d8bb;hb=ad5299f05589b508b89f40c97b62016ed1806ae8;hpb=d17dcf6c084be6f33515ea2d957884918fbe7a1c diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java index 3ad1dabffe..d917371547 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java @@ -7,7 +7,12 @@ */ package org.opendaylight.controller.sal.binding.impl; +import static com.google.common.base.Preconditions.checkState; + import com.google.common.collect.ImmutableClassToInstanceMap; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.controller.md.sal.binding.api.MountPointService; +import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; import org.opendaylight.controller.md.sal.binding.util.AbstractBindingSalProviderInstance; import org.opendaylight.controller.md.sal.binding.util.BindingContextUtils; import org.opendaylight.controller.md.sal.common.api.routing.RouteChangeListener; @@ -19,10 +24,6 @@ import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.controller.sal.binding.api.NotificationService; import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.controller.sal.binding.api.data.DataBrokerService; -import org.opendaylight.controller.sal.binding.api.data.DataProviderService; -import org.opendaylight.controller.sal.binding.api.mount.MountProviderService; -import org.opendaylight.controller.sal.binding.api.mount.MountService; import org.opendaylight.controller.sal.binding.api.rpc.RpcContextIdentifier; import org.opendaylight.yangtools.concepts.Identifiable; import org.opendaylight.yangtools.concepts.ListenerRegistration; @@ -32,12 +33,8 @@ import org.opendaylight.yangtools.yang.binding.RpcService; import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.google.common.base.Preconditions.checkState; -public class RootBindingAwareBroker implements // - Mutable, // - Identifiable, // - BindingAwareBroker, AutoCloseable, +public class RootBindingAwareBroker implements Mutable, Identifiable, BindingAwareBroker, AutoCloseable, RpcProviderRegistry { private final static Logger LOG = LoggerFactory.getLogger(RootBindingAwareBroker.class); @@ -50,27 +47,21 @@ public class RootBindingAwareBroker implements // private NotificationProviderService notificationBroker; - private DataProviderService dataBroker; + private NotificationPublishService notificationPublishService; - private MountPointManagerImpl mountManager; - - public MountPointManagerImpl getMountManager() { - return mountManager; - } - - public void setMountManager(MountPointManagerImpl mountManager) { - this.mountManager = mountManager; - } + private DataBroker dataBroker; private ImmutableClassToInstanceMap supportedConsumerServices; private ImmutableClassToInstanceMap supportedProviderServices; - public RootBindingAwareBroker(String instanceName) { + private MountPointService mountService; + + public RootBindingAwareBroker(final String instanceName) { this.identifier = instanceName; - mountManager = new MountPointManagerImpl(); } + @Override public String getIdentifier() { return identifier; } @@ -79,14 +70,14 @@ public class RootBindingAwareBroker implements // return controllerRoot; } - public DataProviderService getDataBroker() { - return this.dataBroker; - } - public NotificationProviderService getNotificationBroker() { return this.notificationBroker; } + public NotificationPublishService getNotificationPublishService() { + return this.notificationPublishService; + } + public RpcProviderRegistry getRpcProviderRegistry() { return this.rpcBroker; } @@ -95,47 +86,76 @@ public class RootBindingAwareBroker implements // return rpcBroker; } - public void setRpcBroker(RpcProviderRegistry rpcBroker) { + public MountPointService getMountService() { + return mountService; + } + + public void setDataBroker(final DataBroker asyncDataBroker) { + dataBroker = asyncDataBroker; + } + + public void setMountService(final MountPointService mount) { + this.mountService = mount; + } + + public void setRpcBroker(final RpcProviderRegistry rpcBroker) { this.rpcBroker = rpcBroker; } - public void setNotificationBroker(NotificationProviderService notificationBroker) { + public void setNotificationBroker(final NotificationProviderService notificationBroker) { this.notificationBroker = notificationBroker; } - public void setDataBroker(DataProviderService dataBroker) { - this.dataBroker = dataBroker; + public void setNotificationPublishService(final NotificationPublishService notificationPublishService) { + this.notificationPublishService = notificationPublishService; } public void start() { checkState(controllerRoot == null, "Binding Aware Broker was already started."); LOG.info("Starting Binding Aware Broker: {}", identifier); - controllerRoot = new RootSalInstance(getRpcProviderRegistry(), getNotificationBroker(), getDataBroker()); - + controllerRoot = new RootSalInstance(getRpcProviderRegistry(), getNotificationBroker()); + + final ImmutableClassToInstanceMap.Builder consBuilder = ImmutableClassToInstanceMap + .builder(); - supportedConsumerServices = ImmutableClassToInstanceMap. builder() - .put(NotificationService.class, getRoot()) // - .put(DataBrokerService.class, getRoot()) // - .put(RpcConsumerRegistry.class, getRoot()) // - .put(MountService.class, mountManager).build(); + consBuilder.put(NotificationService.class, getRoot()); + consBuilder.put(RpcConsumerRegistry.class, getRoot()); + if (dataBroker != null) { + consBuilder.put(DataBroker.class, dataBroker); + } + consBuilder.put(MountPointService.class, mountService); + + supportedConsumerServices = consBuilder.build(); + final ImmutableClassToInstanceMap.Builder provBuilder = ImmutableClassToInstanceMap + .builder(); + provBuilder.putAll(supportedConsumerServices).put(NotificationProviderService.class, getRoot()) + .put(RpcProviderRegistry.class, getRoot()); + if (notificationPublishService != null) { + provBuilder.put(NotificationPublishService.class, notificationPublishService); + } - supportedProviderServices = ImmutableClassToInstanceMap. builder() - .putAll(supportedConsumerServices) - .put(NotificationProviderService.class, getRoot()) // - .put(DataProviderService.class, getRoot()) // - .put(RpcProviderRegistry.class, getRoot()) // - .put(MountProviderService.class, mountManager).build(); + supportedProviderServices = provBuilder.build(); } @Override - public ConsumerContext registerConsumer(BindingAwareConsumer consumer, BundleContext ctx) { + public ConsumerContext registerConsumer(final BindingAwareConsumer consumer, final BundleContext ctx) { + return registerConsumer(consumer); + } + + @Override + public ProviderContext registerProvider(final BindingAwareProvider provider, final BundleContext ctx) { + return registerProvider(provider); + } + + @Override + public ConsumerContext registerConsumer(final BindingAwareConsumer consumer) { checkState(supportedConsumerServices != null, "Broker is not initialized."); return BindingContextUtils.createConsumerContextAndInitialize(consumer, supportedConsumerServices); } @Override - public ProviderContext registerProvider(BindingAwareProvider provider, BundleContext ctx) { + public ProviderContext registerProvider(final BindingAwareProvider provider) { checkState(supportedProviderServices != null, "Broker is not initialized."); return BindingContextUtils.createProviderContextAndInitialize(provider, supportedProviderServices); } @@ -144,36 +164,37 @@ public class RootBindingAwareBroker implements // public void close() throws Exception { // FIXME: Close all sessions } - + @Override - public RoutedRpcRegistration addRoutedRpcImplementation(Class type, T implementation) - throws IllegalStateException { + public RoutedRpcRegistration addRoutedRpcImplementation(final Class type, + final T implementation) throws IllegalStateException { return getRoot().addRoutedRpcImplementation(type, implementation); } - + @Override - public RpcRegistration addRpcImplementation(Class type, T implementation) + public RpcRegistration addRpcImplementation(final Class type, final T implementation) throws IllegalStateException { return getRoot().addRpcImplementation(type, implementation); } - + @Override - public T getRpcService(Class module) { + public T getRpcService(final Class module) { return getRoot().getRpcService(module); } + @Override public >> ListenerRegistration registerRouteChangeListener( - L arg0) { + final L arg0) { return getRoot().registerRouteChangeListener(arg0); } - public class RootSalInstance extends - AbstractBindingSalProviderInstance { + AbstractBindingSalProviderInstance { - public RootSalInstance(RpcProviderRegistry rpcRegistry, NotificationProviderService notificationBroker, - DataProviderService dataBroker) { - super(rpcRegistry, notificationBroker, dataBroker); + public RootSalInstance(final RpcProviderRegistry rpcRegistry, + final NotificationProviderService notificationBroker) { + super(rpcRegistry, notificationBroker); } } + }