From c1f7f0df2053b8492e56c9f94fe193fa660c7e0e Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Fri, 25 Jul 2014 07:00:14 -0500 Subject: [PATCH] Removed BundleContext from Broker.register{Consumer,Provider} Don't freak out... the old methods are still there, just deprecated. Change-Id: I6f37af7d93948bbf0d3b23635c73803645028ec7 Signed-off-by: Ed Warnicke --- .../controller/sal/core/api/Broker.java | 14 ++++++++++++-- .../controller/sal/dom/broker/BrokerImpl.java | 12 ++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java index 724cbe75f4..b48f6cb61a 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java @@ -78,13 +78,18 @@ public interface Broker { * * @param cons * Consumer to be registered. - * @param context * @return a session specific to consumer registration * @throws IllegalArgumentException * If the consumer is null. * @throws IllegalStateException * If the consumer is already registered. */ + ConsumerSession registerConsumer(Consumer cons); + + /* + * @deprecated Use registerConsumer(Consumer cons) instead (BundleContext is no longer used) + */ + @Deprecated ConsumerSession registerConsumer(Consumer cons, BundleContext context); /** @@ -110,13 +115,18 @@ public interface Broker { * * @param prov * Provider to be registered. - * @param context * @return a session unique to the provider registration. * @throws IllegalArgumentException * If the provider is null. * @throws IllegalStateException * If the consumer is already registered. */ + ProviderSession registerProvider(Provider prov); + + /* + * @deprecated Use registerProvider(Provider cons) instead (BundleContext is no longer used) + */ + @Deprecated ProviderSession registerProvider(Provider prov, BundleContext context); /** 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..c15582e953 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 @@ -208,4 +208,16 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { return Optional.fromNullable(services.getInstance(service)); } + + @Override + public ConsumerSession registerConsumer(Consumer cons) { + return registerConsumer(cons,null); + } + + + @Override + public ProviderSession registerProvider(Provider prov) { + return registerProvider(prov,null); + } + } -- 2.36.6