From: Tom Pantelis Date: Fri, 23 Mar 2018 22:02:03 +0000 (-0400) Subject: Deprecate Broker and related APIs X-Git-Tag: release/fluorine~135 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=23655e49a8048b17b8c78be16b83d19a1500f2bb Deprecate Broker and related APIs These are remnants of the config system and not needed for blueprint. If we remove the config system in Flourine, perhaps we can just remove these classes as well but deprecate for now. Change-Id: I6c14ab3a86b11137da12a8655848a6810e47a5f6 Signed-off-by: Tom Pantelis --- diff --git a/opendaylight/md-sal/messagebus-util/src/main/java/org/opendaylight/controller/messagebus/app/util/Providers.java b/opendaylight/md-sal/messagebus-util/src/main/java/org/opendaylight/controller/messagebus/app/util/Providers.java deleted file mode 100644 index ca6993664f..0000000000 --- a/opendaylight/md-sal/messagebus-util/src/main/java/org/opendaylight/controller/messagebus/app/util/Providers.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.messagebus.app.util; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; -import org.opendaylight.controller.sal.core.api.AbstractProvider; -import org.opendaylight.controller.sal.core.api.Broker; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class Providers { - private static final Logger LOG = LoggerFactory.getLogger(Providers.class); - - public static class BindingAware implements BindingAwareProvider, AutoCloseable { - - - @Override - public void onSessionInitiated(final BindingAwareBroker.ProviderContext session) { - LOG.info("BindingAwareBroker.ProviderContext initialized"); - } - - @Override - public void close() throws Exception {} - } - - public static class BindingIndependent extends AbstractProvider implements AutoCloseable { - - @Override - public void onSessionInitiated(final Broker.ProviderSession session) { - LOG.info("Broker.ProviderSession initialized"); - } - - @Override - public void close() throws Exception {} - } - -} diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java index 46e9cdcd71..2bd1235292 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java @@ -15,6 +15,12 @@ import org.osgi.framework.ServiceReference; import org.osgi.util.tracker.ServiceTracker; import org.osgi.util.tracker.ServiceTrackerCustomizer; +/** + * Deprecated. + * + * @deprecated Use blueprint instead for code wiring. + */ +@Deprecated public abstract class AbstractConsumer implements Consumer, BundleActivator,ServiceTrackerCustomizer { private BundleContext context; diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java index b621e5f989..5c5abe2f05 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java @@ -15,6 +15,12 @@ import org.osgi.framework.ServiceReference; import org.osgi.util.tracker.ServiceTracker; import org.osgi.util.tracker.ServiceTrackerCustomizer; +/** + * Deprecated. + * + * @deprecated Use blueprint instead for code wiring. + */ +@Deprecated public abstract class AbstractProvider implements BundleActivator, Provider,ServiceTrackerCustomizer { private Broker broker; 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 680a24c254..ce64e8e7c0 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 @@ -31,7 +31,10 @@ import org.osgi.framework.BundleContext; *

* For more information about session-based access see {@link ConsumerSession} * and {@link ProviderSession} + * + * @deprecated Use blueprint instead for code wiring. */ +@Deprecated public interface Broker { /** diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/BrokerService.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/BrokerService.java index 77622d0e7a..27bf9c21aa 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/BrokerService.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/BrokerService.java @@ -28,8 +28,9 @@ package org.opendaylight.controller.sal.core.api; * YANG and to reuse it in the development of {@link Consumer}s and * {@link Provider}s. * - * + * @deprecated Use blueprint instead for code wiring. */ +@Deprecated public interface BrokerService { } diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java index b9ac87ae19..0e398e5578 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java @@ -18,7 +18,10 @@ import org.opendaylight.controller.sal.core.api.Broker.ConsumerSession; *

* A user-implemented component (application) which facilitates the SAL and SAL * services to access infrastructure services or providers' functionality. + * + * @deprecated Use blueprint instead for code wiring. */ +@Deprecated public interface Consumer { /** diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java index e6ba1cc76e..72968e6163 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java @@ -19,7 +19,10 @@ import org.opendaylight.controller.sal.core.api.Broker.ProviderSession; * A user-implemented component (application) which facilitates the SAL and SAL * services to access infrastructure services and to provide functionality to * {@link Consumer}s and other providers. + * + * @deprecated Use blueprint instead for code wiring. */ +@Deprecated public interface Provider { /** 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 581a2f9cf8..dbf08758d6 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 @@ -37,6 +37,7 @@ import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@Deprecated public class BrokerImpl implements Broker, DOMRpcProviderService, DOMRpcService, AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(BrokerImpl.class); diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/ConsumerContextImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/ConsumerContextImpl.java index a4f67df0f0..0e0088f62a 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/ConsumerContextImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/ConsumerContextImpl.java @@ -19,6 +19,7 @@ import org.opendaylight.controller.sal.core.api.Consumer; import org.opendaylight.controller.sal.dom.broker.osgi.AbstractBrokerServiceProxy; import org.opendaylight.controller.sal.dom.broker.osgi.ProxyFactory; +@Deprecated class ConsumerContextImpl implements ConsumerSession { private final ClassToInstanceMap instantiatedServices = MutableClassToInstanceMap.create(); diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/ProviderContextImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/ProviderContextImpl.java index 6bfb5d24f7..836e72cba8 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/ProviderContextImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/ProviderContextImpl.java @@ -10,6 +10,7 @@ package org.opendaylight.controller.sal.dom.broker; import org.opendaylight.controller.sal.core.api.Broker.ProviderSession; import org.opendaylight.controller.sal.core.api.Provider; +@Deprecated class ProviderContextImpl extends ConsumerContextImpl implements ProviderSession { private final Provider provider; diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/BrokerModule.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/BrokerModule.java index 21e41f9218..d91a136880 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/BrokerModule.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/BrokerModule.java @@ -13,6 +13,12 @@ import org.opendaylight.controller.sal.core.api.BrokerService; import org.opendaylight.controller.sal.core.api.Consumer.ConsumerFunctionality; import org.opendaylight.controller.sal.core.api.Provider.ProviderFunctionality; +/** + * Deprecated. + * + * @deprecated Use blueprint instead for code wiring. + */ +@Deprecated public interface BrokerModule { Set> getProvidedServices(); diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingConsumerSession.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingConsumerSession.java index a8c2d3e5f1..c76ee64b1f 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingConsumerSession.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingConsumerSession.java @@ -10,6 +10,12 @@ package org.opendaylight.controller.sal.core.spi; import org.opendaylight.controller.sal.core.api.Broker.ConsumerSession; import org.opendaylight.controller.sal.core.api.BrokerService; +/** + * Deprecated. + * + * @deprecated Use blueprint instead for code wiring. + */ +@Deprecated public abstract class ForwardingConsumerSession implements ConsumerSession { protected abstract ConsumerSession delegate(); diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingProviderSession.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingProviderSession.java index 87cce9775c..ecd6785df7 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingProviderSession.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingProviderSession.java @@ -11,6 +11,12 @@ package org.opendaylight.controller.sal.core.spi; import org.opendaylight.controller.sal.core.api.Broker.ProviderSession; import org.opendaylight.controller.sal.core.api.BrokerService; +/** + * Deprecated. + * + * @deprecated Use blueprint instead for code wiring. + */ +@Deprecated public abstract class ForwardingProviderSession implements ProviderSession { protected abstract ProviderSession delegate();