X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fbinding%2Fapi%2FBindingAwareBroker.java;h=32984ef3345c04aea17add5706013846219b7d1e;hb=aaea3e9a92ae9d6fac04c4a065db4b35cbca9ed0;hp=84e0561b9fa9c36b33fad20569ffa55b56ea84d6;hpb=a251833f27fd00040904e2df316cd707c8129d1e;p=controller.git diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java index 84e0561b9f..32984ef334 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java @@ -8,10 +8,7 @@ package org.opendaylight.controller.sal.binding.api; import org.opendaylight.controller.md.sal.common.api.routing.RoutedRegistration; -import org.opendaylight.controller.sal.binding.api.BindingAwareProvider.ProviderFunctionality; -import org.opendaylight.controller.sal.binding.api.data.DataBrokerService; -import org.opendaylight.controller.sal.binding.api.data.DataProviderService; -import org.opendaylight.yangtools.concepts.Registration; +import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.yang.binding.BaseIdentity; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.RpcService; @@ -19,58 +16,60 @@ import org.osgi.framework.BundleContext; /** * Binding-aware core of the SAL layer responsible for wiring the SAL consumers. - * + * + *
* The responsibility of the broker is to maintain registration of SAL - * functionality {@link Consumer}s and {@link Provider}s, store provider and + * functionality Consumers and Providers, store provider and * consumer specific context and functionality registration via * {@link ConsumerContext} and provide access to infrastructure services, which * removes direct dependencies between providers and consumers. - * + * + *
* The Binding-aware broker is also responsible for translation from Java - * classes modeling the functionality and data to binding-indpenedent form which + * classes modeling the functionality and data to binding-independent form which * is used in SAL Core. - * - * + * *
* The services are exposed via session. - * + * *
* The providers and consumers needs to register in order to use the * binding-independent SAL layer and to expose functionality via SAL layer. - * + * + *
* For more information about session-based access see {@link ConsumerContext} * and {@link ProviderContext} - * - * - * */ +@Deprecated(forRemoval = true) public interface BindingAwareBroker { + @Deprecated + ConsumerContext registerConsumer(BindingAwareConsumer consumer, BundleContext ctx); + /** * Registers the {@link BindingAwareConsumer}, which will use the SAL layer. - * + * *
* Note that consumer could register additional functionality at later point * by using service and functionality specific APIs. - * + * *
* The consumer is required to use returned session for all communication * with broker or one of the broker services. The session is announced to * the consumer by invoking - * {@link Consumer#onSessionInitiated(ConsumerContext)}. - * - * @param cons + * {@link BindingAwareConsumer#onSessionInitialized(ConsumerContext)}. + * + * @param consumer * Consumer to be registered. * @return a session specific to consumer registration * @throws IllegalArgumentException @@ -78,29 +77,36 @@ public interface BindingAwareBroker { * @throws IllegalStateException * If the consumer is already registered. */ - ConsumerContext registerConsumer(BindingAwareConsumer consumer, BundleContext ctx); + @Deprecated + ConsumerContext registerConsumer(BindingAwareConsumer consumer); + + /* + * @deprecated Use registerProvider(BindingAwareProvider prov) instead (BundleContext is no longer used) + */ + @Deprecated + ProviderContext registerProvider(BindingAwareProvider provider, BundleContext ctx); /** * Registers the {@link BindingAwareProvider}, which will use the SAL layer. - * + * *
* During the registration, the broker obtains the initial functionality * from consumer, using the - * {@link BindingAwareProvider#getImplementations()}, and register that + * BindingAwareProvider#getImplementations(), and register that * functionality into system and concrete infrastructure services. - * + * *
* Note that provider could register additional functionality at later point * by using service and functionality specific APIs. - * + * *
* The consumer is required to use returned session for all * communication with broker or one of the broker services. The session is * announced to the consumer by invoking * {@link BindingAwareProvider#onSessionInitiated(ProviderContext)}. - * - * - * @param prov + * + * + * @param provider * Provider to be registered. * @return a session unique to the provider registration. * @throws IllegalArgumentException @@ -108,110 +114,95 @@ public interface BindingAwareBroker { * @throws IllegalStateException * If the consumer is already registered. */ - ProviderContext registerProvider(BindingAwareProvider provider, BundleContext ctx); + @Deprecated + ProviderContext registerProvider(BindingAwareProvider provider); /** * {@link BindingAwareConsumer} specific access to the SAL functionality. - * + * *
* ConsumerSession is {@link BindingAwareConsumer}-specific access to the * SAL functionality and infrastructure services. - * + * *
* The session serves to store SAL context (e.g. registration of
* functionality) for the consumer and provides access to the SAL
* infrastructure services and other functionality provided by
- * {@link Provider}s.
- *
- *
- *
+ * {@link BindingAwareProvider}s.
*/
- public interface ConsumerContext {
+ @Deprecated
+ interface ConsumerContext extends RpcConsumerRegistry {
/**
- * Returns a session specific instance (implementation) of requested
- * binding-aware infrastructural service
- *
+ * Returns a session specific instance (implementation) of requested binding-aware infrastructure service.
+ *
* @param service
* Broker service
* @return Session specific implementation of service
*/
* ProviderSession is {@link BindingAwareProvider}-specific access to the
* SAL functionality and infrastructure services, which also allows for
* exposing the provider's functionality to the other
* {@link BindingAwareConsumer}s.
- *
+ *
*
* The session serves to store SAL context (e.g. registration of
* functionality) for the providers and exposes access to the SAL
* infrastructure services, dynamic functionality registration and any other
* functionality provided by other {@link BindingAwareConsumer}s.
- *
+ *
*/
- public interface ProviderContext extends ConsumerContext {
- /**
- * Registers an global RpcService implementation.
- *
- * @param type
- * @param implementation
- * @return
- */
-