X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fdom%2Fbroker%2FBrokerImpl.java;h=33fc2446196d5473f9742883155b92d25110fc77;hb=329dc0e33bd86edbf02b37090fc431607af9b47e;hp=a200793fea651ebb09b32bc53708d4cbbf3d67b3;hpb=0eb621d29daaf08979c356e2148e99c48458e169;p=controller.git diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.java index a200793fea..33fc244619 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.java @@ -7,39 +7,38 @@ */ package org.opendaylight.controller.sal.dom.broker; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.collect.ClassToInstanceMap; +import com.google.common.collect.ImmutableClassToInstanceMap; +import com.google.common.util.concurrent.CheckedFuture; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import java.util.concurrent.Future; - -import org.opendaylight.controller.md.sal.common.api.routing.RouteChangeListener; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcAvailabilityListener; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcException; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcIdentifier; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcImplementation; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcImplementationRegistration; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcService; +import org.opendaylight.controller.md.sal.dom.broker.impl.DOMRpcRouter; import org.opendaylight.controller.sal.core.api.Broker; import org.opendaylight.controller.sal.core.api.BrokerService; import org.opendaylight.controller.sal.core.api.Consumer; import org.opendaylight.controller.sal.core.api.Provider; -import org.opendaylight.controller.sal.core.api.RoutedRpcDefaultImplementation; -import org.opendaylight.controller.sal.core.api.RpcImplementation; -import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry; -import org.opendaylight.controller.sal.core.api.RpcRegistrationListener; -import org.opendaylight.controller.sal.core.api.RpcRoutingContext; -import org.opendaylight.controller.sal.dom.broker.spi.RpcRouter; import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.data.api.CompositeNode; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.google.common.collect.ClassToInstanceMap; -import com.google.common.collect.ImmutableClassToInstanceMap; -import com.google.common.util.concurrent.ListenableFuture; - -public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { - private final static Logger log = LoggerFactory.getLogger(BrokerImpl.class); +public class BrokerImpl implements Broker, DOMRpcProviderService, DOMRpcService, AutoCloseable { + private static final Logger LOG = LoggerFactory.getLogger(BrokerImpl.class); // Broker Generic Context private final Set sessions = Collections @@ -47,17 +46,23 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { private final Set providerSessions = Collections .synchronizedSet(new HashSet()); - private AutoCloseable deactivator = null; + private AutoCloseable deactivator; - private RpcRouter router = null; + private final DOMRpcService rpcService; + private final DOMRpcProviderService rpcProvider; private final ClassToInstanceMap services; - public BrokerImpl(final RpcRouter router,final ClassToInstanceMap services) { - this.router = Preconditions.checkNotNull(router, "RPC Router must not be null"); - this.services = ImmutableClassToInstanceMap.copyOf(services); + public BrokerImpl(final DOMRpcRouter router,final ClassToInstanceMap services) { + this(router, router, services); } + public BrokerImpl(final DOMRpcService rpcService, final DOMRpcProviderService rpcProvider, + final ClassToInstanceMap services) { + this.rpcService = Preconditions.checkNotNull(rpcService, "DOMRpcService must not be null"); + this.rpcProvider = Preconditions.checkNotNull(rpcProvider, "DOMRpcProviderService must not be null"); + this.services = ImmutableClassToInstanceMap.copyOf(services); + } @Override public ConsumerSession registerConsumer(final Consumer consumer, @@ -71,15 +76,10 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { return registerProvider(provider); } - protected Future> invokeRpcAsync(final QName rpc, - final CompositeNode input) { - return router.invokeRpc(rpc, input); - } - // Validation private void checkPredicates(final Provider prov) { Preconditions.checkNotNull(prov, "Provider should not be null."); - for (ProviderContextImpl session : providerSessions) { + for (final ProviderContextImpl session : providerSessions) { if (prov.equals(session.getProvider())) { throw new IllegalStateException("Provider already registered"); } @@ -89,7 +89,7 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { private void checkPredicates(final Consumer cons) { Preconditions.checkNotNull(cons, "Consumer should not be null."); - for (ConsumerContextImpl session : sessions) { + for (final ConsumerContextImpl session : sessions) { if (cons.equals(session.getConsumer())) { throw new IllegalStateException("Consumer already registered"); } @@ -98,12 +98,12 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { // Private Factory methods private ConsumerContextImpl newSessionFor(final Consumer provider) { - ConsumerContextImpl ret = new ConsumerContextImpl(provider, this); + final ConsumerContextImpl ret = new ConsumerContextImpl(provider, this); return ret; } private ProviderContextImpl newSessionFor(final Provider provider) { - ProviderContextImpl ret = new ProviderContextImpl(provider, this); + final ProviderContextImpl ret = new ProviderContextImpl(provider, this); return ret; } @@ -121,48 +121,6 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { } } - @Override - public RpcRegistration addRpcImplementation(final QName rpcType, - final RpcImplementation implementation) - throws IllegalArgumentException { - return router.addRpcImplementation(rpcType, implementation); - } - - @Override - public RoutedRpcRegistration addRoutedRpcImplementation( - final QName rpcType, final RpcImplementation implementation) { - return router.addRoutedRpcImplementation(rpcType, implementation); - } - - @Override - public void setRoutedRpcDefaultDelegate( - final RoutedRpcDefaultImplementation defaultImplementation) { - router.setRoutedRpcDefaultDelegate(defaultImplementation); - } - - @Override - public ListenerRegistration addRpcRegistrationListener( - final RpcRegistrationListener listener) { - return router.addRpcRegistrationListener(listener); - } - - @Override - public > ListenerRegistration registerRouteChangeListener( - final L listener) { - return router.registerRouteChangeListener(listener); - } - - @Override - public Set getSupportedRpcs() { - return router.getSupportedRpcs(); - } - - @Override - public ListenableFuture> invokeRpc( - final QName rpc, final CompositeNode input) { - return router.invokeRpc(rpc, input); - } - /** * @return the deactivator */ @@ -178,30 +136,15 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { this.deactivator = deactivator; } - /** - * @return the router - */ - public RpcRouter getRouter() { - return router; - } - - /** - * @param router - * the router to set - */ - public void setRouter(final RpcRouter router) { - this.router = router; - } - protected Optional getGlobalService(final Class service) { return Optional.fromNullable(services.getInstance(service)); } @Override - public ConsumerSession registerConsumer(Consumer consumer) { + public ConsumerSession registerConsumer(final Consumer consumer) { checkPredicates(consumer); - log.trace("Registering consumer {}", consumer); + LOG.trace("Registering consumer {}", consumer); final ConsumerContextImpl session = newSessionFor(consumer); consumer.onSessionInitiated(session); sessions.add(session); @@ -210,7 +153,7 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { @Override - public ProviderSession registerProvider(Provider provider) { + public ProviderSession registerProvider(final Provider provider) { checkPredicates(provider); final ProviderContextImpl session = newSessionFor(provider); provider.onSessionInitiated(session); @@ -218,4 +161,28 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { return session; } + + @Nonnull + @Override + public DOMRpcImplementationRegistration registerRpcImplementation(@Nonnull final T implementation, @Nonnull final DOMRpcIdentifier... rpcs) { + return rpcProvider.registerRpcImplementation(implementation, rpcs); + } + + @Nonnull + @Override + public DOMRpcImplementationRegistration registerRpcImplementation(@Nonnull final T implementation, @Nonnull final Set rpcs) { + return rpcProvider.registerRpcImplementation(implementation, rpcs); + } + + @Nonnull + @Override + public CheckedFuture invokeRpc(@Nonnull final SchemaPath type, @Nullable final NormalizedNode input) { + return rpcService.invokeRpc(type, input); + } + + @Nonnull + @Override + public ListenerRegistration registerRpcListener(@Nonnull final T listener) { + return rpcService.registerRpcListener(listener); + } }