X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fdom%2Fbroker%2FBrokerImpl.java;h=17d8229675376242a5d3c843ee4f198e08eabde3;hp=1af03e50465e2acc922f19ad66f15a3c640bfc34;hb=1e884647502a8d91f8a57bde8193c60b9bbcce0d;hpb=ab935690fe544f82095c57f998fc9c0fd03c0a51 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 1af03e5046..17d8229675 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,38 +7,38 @@ */ package org.opendaylight.controller.sal.dom.broker; -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 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 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.InstanceIdentifier; +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; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; -public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { +public class BrokerImpl implements Broker, DOMRpcProviderService, DOMRpcService, AutoCloseable { private final static Logger log = LoggerFactory.getLogger(BrokerImpl.class); // Broker Generic Context @@ -49,11 +49,11 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { private AutoCloseable deactivator = null; - private RpcRouter router = null; + private DOMRpcRouter router = null; private final ClassToInstanceMap services; - public BrokerImpl(final RpcRouter router,final ClassToInstanceMap services) { + public BrokerImpl(final DOMRpcRouter router,final ClassToInstanceMap services) { this.router = Preconditions.checkNotNull(router, "RPC Router must not be null"); this.services = ImmutableClassToInstanceMap.copyOf(services); } @@ -62,27 +62,13 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { @Override public ConsumerSession registerConsumer(final Consumer consumer, final BundleContext ctx) { - checkPredicates(consumer); - log.trace("Registering consumer {}", consumer); - final ConsumerContextImpl session = newSessionFor(consumer, ctx); - consumer.onSessionInitiated(session); - sessions.add(session); - return session; + return registerConsumer(consumer); } @Override public ProviderSession registerProvider(final Provider provider, final BundleContext ctx) { - checkPredicates(provider); - final ProviderContextImpl session = newSessionFor(provider, ctx); - provider.onSessionInitiated(session); - providerSessions.add(session); - return session; - } - - protected Future> invokeRpcAsync(final QName rpc, - final CompositeNode input) { - return router.invokeRpc(rpc, input); + return registerProvider(provider); } // Validation @@ -106,14 +92,12 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { } // Private Factory methods - private ConsumerContextImpl newSessionFor(final Consumer provider, - final BundleContext ctx) { + private ConsumerContextImpl newSessionFor(final Consumer provider) { ConsumerContextImpl ret = new ConsumerContextImpl(provider, this); return ret; } - private ProviderContextImpl newSessionFor(final Provider provider, - final BundleContext ctx) { + private ProviderContextImpl newSessionFor(final Provider provider) { ProviderContextImpl ret = new ProviderContextImpl(provider, this); return ret; } @@ -132,48 +116,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 */ @@ -192,7 +134,7 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { /** * @return the router */ - public RpcRouter getRouter() { + public DOMRpcRouter getRouter() { return router; } @@ -200,7 +142,7 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { * @param router * the router to set */ - public void setRouter(final RpcRouter router) { + public void setRouter(final DOMRpcRouter router) { this.router = router; } @@ -208,4 +150,49 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { return Optional.fromNullable(services.getInstance(service)); } + + @Override + public ConsumerSession registerConsumer(Consumer consumer) { + checkPredicates(consumer); + log.trace("Registering consumer {}", consumer); + final ConsumerContextImpl session = newSessionFor(consumer); + consumer.onSessionInitiated(session); + sessions.add(session); + return session; + } + + + @Override + public ProviderSession registerProvider(Provider provider) { + checkPredicates(provider); + final ProviderContextImpl session = newSessionFor(provider); + provider.onSessionInitiated(session); + providerSessions.add(session); + return session; + } + + + @Nonnull + @Override + public DOMRpcImplementationRegistration registerRpcImplementation(@Nonnull final T implementation, @Nonnull final DOMRpcIdentifier... rpcs) { + return router.registerRpcImplementation(implementation, rpcs); + } + + @Nonnull + @Override + public DOMRpcImplementationRegistration registerRpcImplementation(@Nonnull final T implementation, @Nonnull final Set rpcs) { + return router.registerRpcImplementation(implementation, rpcs); + } + + @Nonnull + @Override + public CheckedFuture invokeRpc(@Nonnull final SchemaPath type, @Nullable final NormalizedNode input) { + return router.invokeRpc(type, input); + } + + @Nonnull + @Override + public ListenerRegistration registerRpcListener(@Nonnull final T listener) { + return router.registerRpcListener(listener); + } }