From 0f7fc5e95906aa529be7103040bec4dcded051e6 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Tue, 19 Apr 2016 05:00:39 -0400 Subject: [PATCH] Deprecate md-sal config modules Marked the md-sal dom/binding config yang modules, 01-md-sal.xml and associated Module classes as deprecated. Change-Id: Icbc24a0622f8b83173f656f9fa11003f270eaef3 Signed-off-by: Tom Pantelis --- .../src/main/resources/initial/01-md-sal.xml | 6 +-- .../BindingAsyncDataBrokerImplModule.java | 6 ++- ...ndingAsyncDataBrokerImplModuleFactory.java | 5 ++- .../binding/impl/BindingBrokerImplModule.java | 5 ++- .../impl/BindingBrokerImplModuleFactory.java | 6 +-- .../BindingNotificationAdapterModule.java | 4 ++ ...ndingNotificationAdapterModuleFactory.java | 5 +++ ...ndingNotificationPublishAdapterModule.java | 4 ++ ...tificationPublishAdapterModuleFactory.java | 5 +++ ...CompatibleDataBrokerImplModuleFactory.java | 6 +-- .../impl/NotificationBrokerImplModule.java | 5 ++- .../NotificationBrokerImplModuleFactory.java | 5 ++- .../sal/binding/impl/RpcBrokerImplModule.java | 38 ------------------- .../impl/RpcBrokerImplModuleFactory.java | 16 -------- .../binding/impl/RuntimeMappingModule.java | 5 ++- .../impl/RuntimeMappingModuleFactory.java | 6 +-- .../opendaylight-binding-broker-impl.yang | 36 +++++++++++------- .../md/sal/dom/impl/DomBrokerImplModule.java | 4 ++ .../dom/impl/DomBrokerImplModuleFactory.java | 4 ++ .../dom/impl/DomInmemoryDataBrokerModule.java | 5 ++- .../DomInmemoryDataBrokerModuleFactory.java | 6 +-- .../SchemaServiceImplSingletonModule.java | 4 ++ ...hemaServiceImplSingletonModuleFactory.java | 7 +++- .../pingpong/PingpongDataBrokerModule.java | 4 ++ .../PingpongDataBrokerModuleFactory.java | 4 ++ .../yang/opendaylight-dom-broker-impl.yang | 9 +++++ 26 files changed, 112 insertions(+), 98 deletions(-) delete mode 100644 opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModule.java delete mode 100644 opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModuleFactory.java diff --git a/opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml b/opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml index 4e2a4fb4d7..038f060de0 100644 --- a/opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml +++ b/opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml @@ -6,6 +6,9 @@ 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 + + NOTE: This file is deprecated as wiring is now done via blueprint. This file is kept for backwards + compatibility. Runtime modifications may not be honored. --> @@ -172,9 +175,6 @@ dom:dom-async-data-broker inmemory-data-broker - 65536 - 0 - 0 prefix:binding-data-compatible-broker diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java index 3dc2864a22..09e790e3b2 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java @@ -8,10 +8,14 @@ package org.opendaylight.controller.config.yang.md.sal.binding.impl; -import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec; import org.opendaylight.controller.md.sal.binding.impl.BindingDOMDataBrokerAdapter; +import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public class BindingAsyncDataBrokerImplModule extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractBindingAsyncDataBrokerImplModule { diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModuleFactory.java index eb185dae72..bbdaf8b8d6 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModuleFactory.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModuleFactory.java @@ -17,7 +17,10 @@ */ package org.opendaylight.controller.config.yang.md.sal.binding.impl; - +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public class BindingAsyncDataBrokerImplModuleFactory extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractBindingAsyncDataBrokerImplModuleFactory { } diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java index bae95ffb7c..71bd0017cf 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java @@ -33,8 +33,9 @@ import org.opendaylight.controller.sal.core.api.Broker; import org.opendaylight.controller.sal.core.api.Broker.ProviderSession; /** -* -*/ + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public final class BindingBrokerImplModule extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractBindingBrokerImplModule { diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java index 181b568cf5..c69e5810e9 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java @@ -16,10 +16,10 @@ */ package org.opendaylight.controller.config.yang.md.sal.binding.impl; - /** -* -*/ + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public class BindingBrokerImplModuleFactory extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractBindingBrokerImplModuleFactory { } diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java index 971153bc7b..0a10a1d5f9 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java @@ -14,6 +14,10 @@ import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCo import org.opendaylight.controller.md.sal.dom.api.DOMNotificationService; import org.opendaylight.controller.sal.core.api.Broker; +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public class BindingNotificationAdapterModule extends AbstractBindingNotificationAdapterModule { public BindingNotificationAdapterModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModuleFactory.java index 0a5cb91433..e29fef5410 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModuleFactory.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModuleFactory.java @@ -6,6 +6,11 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ package org.opendaylight.controller.config.yang.md.sal.binding.impl; + +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public class BindingNotificationAdapterModuleFactory extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractBindingNotificationAdapterModuleFactory { } diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java index ebfd5c2219..4f91d5b5e8 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java @@ -14,6 +14,10 @@ import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCo import org.opendaylight.controller.md.sal.dom.api.DOMNotificationPublishService; import org.opendaylight.controller.sal.core.api.Broker; +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public class BindingNotificationPublishAdapterModule extends AbstractBindingNotificationPublishAdapterModule { public BindingNotificationPublishAdapterModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModuleFactory.java index e9a3df6a5f..df8eace213 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModuleFactory.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModuleFactory.java @@ -6,6 +6,11 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ package org.opendaylight.controller.config.yang.md.sal.binding.impl; + +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public class BindingNotificationPublishAdapterModuleFactory extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractBindingNotificationPublishAdapterModuleFactory { } diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModuleFactory.java index 5b5fb45fd9..1dee6fd3c0 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModuleFactory.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModuleFactory.java @@ -7,11 +7,7 @@ */ package org.opendaylight.controller.config.yang.md.sal.binding.impl; - - -/** -* -*/ +@Deprecated public class ForwardedCompatibleDataBrokerImplModuleFactory extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractForwardedCompatibleDataBrokerImplModuleFactory { diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java index ec4bc76f55..46cb7ceee0 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java @@ -19,8 +19,9 @@ import org.opendaylight.controller.md.sal.dom.spi.DOMNotificationSubscriptionLis import org.opendaylight.controller.sal.binding.codegen.impl.SingletonHolder; /** -* -*/ + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public final class NotificationBrokerImplModule extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractNotificationBrokerImplModule { diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModuleFactory.java index 5c5c062db6..44d7609939 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModuleFactory.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModuleFactory.java @@ -8,8 +8,9 @@ package org.opendaylight.controller.config.yang.md.sal.binding.impl; /** -* -*/ + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public class NotificationBrokerImplModuleFactory extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractNotificationBrokerImplModuleFactory { diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModule.java deleted file mode 100644 index 903475caea..0000000000 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModule.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2014 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.config.yang.md.sal.binding.impl; - -/** -* -*/ -public final class RpcBrokerImplModule extends - org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractRpcBrokerImplModule { - - public RpcBrokerImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, - org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public RpcBrokerImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, - org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, - RpcBrokerImplModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void validate() { - super.validate(); - // Add custom validation for module attributes here. - } - - @Override - public java.lang.AutoCloseable createInstance() { - // TODO:implement - throw new java.lang.UnsupportedOperationException("Unimplemented stub method"); - } -} diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModuleFactory.java deleted file mode 100644 index b624087eb0..0000000000 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RpcBrokerImplModuleFactory.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2014 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.config.yang.md.sal.binding.impl; - -/** -* -*/ -public class RpcBrokerImplModuleFactory extends - org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractRpcBrokerImplModuleFactory { - -} diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java index f6b86ebcd1..cc44cd84fb 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java @@ -16,8 +16,9 @@ import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCo import org.osgi.framework.BundleContext; /** - * -**/ + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public final class RuntimeMappingModule extends AbstractRuntimeMappingModule { private static final long WAIT_IN_MINUTES = 5; diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModuleFactory.java index 407b41d29d..c9195c7073 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModuleFactory.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModuleFactory.java @@ -7,14 +7,14 @@ */ package org.opendaylight.controller.config.yang.md.sal.binding.impl; +import static com.google.common.base.Preconditions.checkArgument; import org.opendaylight.controller.config.api.DependencyResolver; import org.osgi.framework.BundleContext; -import static com.google.common.base.Preconditions.checkArgument; - /** - * + * @deprecated Replaced by blueprint wiring */ +@Deprecated public class RuntimeMappingModuleFactory extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractRuntimeMappingModuleFactory { diff --git a/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-binding-broker-impl.yang b/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-binding-broker-impl.yang index a56e2f9e32..159f9f229e 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-binding-broker-impl.yang +++ b/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-binding-broker-impl.yang @@ -24,6 +24,7 @@ module opendaylight-sal-binding-broker-impl { /* FIXME: move to opendaylight-md-sal-binding (cannot be there due to Class name confict with old implementation)*/ identity binding-new-notification-service { + status deprecated; base config:service-type; config:java-class "org.opendaylight.controller.md.sal.binding.api.NotificationService"; config:disable-osgi-service-registration; @@ -31,12 +32,14 @@ module opendaylight-sal-binding-broker-impl { /* TODO: move to opendaylight-md-sal-binding (cannot be there due to Class name confict with old implementation)*/ identity binding-new-notification-publish-service { + status deprecated; base config:service-type; config:java-class "org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"; config:disable-osgi-service-registration; } identity binding-broker-impl { + status deprecated; base config:module-type; config:provided-service sal:binding-broker-osgi-registry; config:provided-service sal:binding-rpc-registry; @@ -44,6 +47,7 @@ module opendaylight-sal-binding-broker-impl { } identity binding-data-compatible-broker { + status deprecated; base config:module-type; config:provided-service sal:binding-data-broker; config:provided-service sal:binding-data-consumer-broker; @@ -51,18 +55,14 @@ module opendaylight-sal-binding-broker-impl { } identity binding-forwarded-data-broker { + status deprecated; base config:module-type; config:provided-service sal:binding-async-data-broker; config:java-name-prefix BindingAsyncDataBrokerImpl; } - identity binding-rpc-broker { - base config:module-type; - config:provided-service sal:binding-rpc-registry; - config:java-name-prefix RpcBrokerImpl; - } - identity binding-notification-broker { + status deprecated; base config:module-type; config:provided-service sal:binding-notification-service; config:provided-service sal:binding-notification-subscription-service; @@ -70,6 +70,7 @@ module opendaylight-sal-binding-broker-impl { } identity runtime-generated-mapping { + status deprecated; base config:module-type; config:provided-service binding-dom-mapping-service; config:provided-service sal:binding-codec-tree-factory; @@ -78,18 +79,21 @@ module opendaylight-sal-binding-broker-impl { } identity binding-notification-adapter { + status deprecated; base config:module-type; config:provided-service binding-new-notification-service; config:java-name-prefix BindingNotificationAdapter; } identity binding-notification-publish-adapter { + status deprecated; base config:module-type; config:provided-service binding-new-notification-publish-service; config:java-name-prefix BindingNotificationPublishAdapter; } grouping dom-forwarding-component { + status deprecated; container dom-async-broker { uses config:service-ref { refine type { @@ -126,6 +130,7 @@ module opendaylight-sal-binding-broker-impl { uses dom-forwarding-component; container data-broker { + status deprecated; uses config:service-ref { refine type { mandatory false; @@ -135,6 +140,7 @@ module opendaylight-sal-binding-broker-impl { } container notification-service { + status deprecated; uses config:service-ref { refine type { mandatory false; @@ -144,6 +150,7 @@ module opendaylight-sal-binding-broker-impl { } container root-data-broker { + status deprecated; uses config:service-ref { refine type { mandatory false; @@ -153,6 +160,7 @@ module opendaylight-sal-binding-broker-impl { } container notification-publish-service { + status deprecated; uses config:service-ref { refine type { mandatory false; @@ -173,6 +181,7 @@ module opendaylight-sal-binding-broker-impl { container binding-data-compatible-broker { container data-broker { + status deprecated; uses config:service-ref { refine type { mandatory false; @@ -189,6 +198,7 @@ module opendaylight-sal-binding-broker-impl { when "/config:modules/config:module/config:type = 'binding-forwarded-data-broker'"; container binding-forwarded-data-broker { container dom-async-broker { + status deprecated; uses config:service-ref { refine type { mandatory true; @@ -198,6 +208,7 @@ module opendaylight-sal-binding-broker-impl { } container binding-mapping-service { + status deprecated; uses config:service-ref { refine type { mandatory true; @@ -207,6 +218,7 @@ module opendaylight-sal-binding-broker-impl { } container schema-service { + status deprecated; uses config:service-ref { refine type { mandatory true; @@ -223,23 +235,18 @@ module opendaylight-sal-binding-broker-impl { case runtime-generated-mapping { when "/config:modules/config:module/config:type = 'runtime-generated-mapping'"; leaf wait-for-schema { + status deprecated; default "false"; type boolean; } } } - augment "/config:modules/config:module/config:state" { - case binding-rpc-broker { - when "/config:modules/config:module/config:type = 'binding-rpc-broker'"; - uses common:rpc-state; - } - } - augment "/config:modules/config:module/config:configuration" { case binding-notification-broker { when "/config:modules/config:module/config:type = 'binding-notification-broker'"; container notification-adapter { + status deprecated; uses config:service-ref { refine type { mandatory false; @@ -249,6 +256,7 @@ module opendaylight-sal-binding-broker-impl { } container notification-publish-adapter { + status deprecated; uses config:service-ref { refine type { mandatory false; @@ -270,6 +278,7 @@ module opendaylight-sal-binding-broker-impl { case binding-notification-adapter { when "/config:modules/config:module/config:type = 'binding-notification-adapter'"; container binding-notification-adapter { + status deprecated; uses dom-forwarding-component; } } @@ -279,6 +288,7 @@ module opendaylight-sal-binding-broker-impl { case binding-notification-publish-adapter { when "/config:modules/config:module/config:type = 'binding-notification-publish-adapter'"; container binding-notification-publish-adapter { + status deprecated; uses dom-forwarding-component; } } diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java index 895d3d2e29..e3d71fb9aa 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java +++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java @@ -27,6 +27,10 @@ import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public final class DomBrokerImplModule extends org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractDomBrokerImplModule{ private static final Logger LOG = LoggerFactory.getLogger(DomBrokerImplModule.class); diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModuleFactory.java index 52230180eb..6c2b422035 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModuleFactory.java +++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModuleFactory.java @@ -12,6 +12,10 @@ import org.opendaylight.controller.config.api.DynamicMBeanWithInstance; import org.opendaylight.controller.config.spi.Module; import org.osgi.framework.BundleContext; +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public class DomBrokerImplModuleFactory extends org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractDomBrokerImplModuleFactory { diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java index fffee73b9e..581a64565c 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java +++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java @@ -25,8 +25,9 @@ import org.opendaylight.yangtools.util.concurrent.DeadlockDetectingListeningExec import org.opendaylight.yangtools.util.concurrent.SpecialExecutors; /** -* -*/ + * @deprecated Replaced by the clustered data store. + */ +@Deprecated public final class DomInmemoryDataBrokerModule extends org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractDomInmemoryDataBrokerModule { diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModuleFactory.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModuleFactory.java index 56a51ed45e..0dc311cf32 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModuleFactory.java +++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModuleFactory.java @@ -7,10 +7,10 @@ */ package org.opendaylight.controller.config.yang.md.sal.dom.impl; - /** -* -*/ + * @deprecated Replaced by the clustered data store. + */ +@Deprecated public class DomInmemoryDataBrokerModuleFactory extends org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractDomInmemoryDataBrokerModuleFactory { diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java index dae7f05cc6..fb4043053b 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java +++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java @@ -23,6 +23,10 @@ import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public final class SchemaServiceImplSingletonModule extends org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractSchemaServiceImplSingletonModule { diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModuleFactory.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModuleFactory.java index 0908fe573b..5cd753e676 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModuleFactory.java +++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModuleFactory.java @@ -7,11 +7,14 @@ */ package org.opendaylight.controller.config.yang.md.sal.dom.impl; +import static com.google.common.base.Preconditions.checkArgument; import org.opendaylight.controller.config.api.DependencyResolver; import org.osgi.framework.BundleContext; -import static com.google.common.base.Preconditions.checkArgument; - +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public class SchemaServiceImplSingletonModuleFactory extends org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractSchemaServiceImplSingletonModuleFactory { diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModule.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModule.java index 1664a3723d..ffb0e19838 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModule.java +++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModule.java @@ -11,6 +11,10 @@ import org.opendaylight.controller.config.api.DependencyResolver; import org.opendaylight.controller.config.api.ModuleIdentifier; import org.opendaylight.controller.md.sal.dom.broker.impl.PingPongDataBroker; +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public class PingpongDataBrokerModule extends AbstractPingpongDataBrokerModule { public PingpongDataBrokerModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModuleFactory.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModuleFactory.java index 8ec17fd6e9..468abbd141 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModuleFactory.java +++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModuleFactory.java @@ -7,6 +7,10 @@ */ package org.opendaylight.controller.config.yang.md.sal.dom.pingpong; +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public class PingpongDataBrokerModuleFactory extends AbstractPingpongDataBrokerModuleFactory { } diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/yang/opendaylight-dom-broker-impl.yang b/opendaylight/md-sal/sal-dom-broker-config/src/main/yang/opendaylight-dom-broker-impl.yang index 05d5b3e186..5bda2d66c1 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/src/main/yang/opendaylight-dom-broker-impl.yang +++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/yang/opendaylight-dom-broker-impl.yang @@ -23,6 +23,7 @@ module opendaylight-sal-dom-broker-impl { } identity dom-broker-impl { + status deprecated; base config:module-type; config:provided-service sal:dom-broker-osgi-registry; config:java-name-prefix DomBrokerImpl; @@ -30,11 +31,13 @@ module opendaylight-sal-dom-broker-impl { identity dom-inmemory-data-broker { + status obsolete; base config:module-type; config:provided-service sal:dom-async-data-broker; } identity schema-service-singleton { + status deprecated; base config:module-type; config:provided-service sal:schema-service; config:provided-service sal:yang-text-source-provider; @@ -61,6 +64,7 @@ module opendaylight-sal-dom-broker-impl { } container root-schema-service { + status obsolete; uses config:service-ref { refine type { mandatory false; @@ -70,17 +74,20 @@ module opendaylight-sal-dom-broker-impl { } leaf notification-queue-depth { + status obsolete; description "Maximum number of elements in the notification queue, must be power-of-two."; type max-queue-depth; default 65536; } leaf notification-queue-spin { + status obsolete; description "Number of milliseconds notification queue should spin for new requests before parking."; type uint16; units milliseconds; default 1; } leaf notification-queue-park { + status obsolete; description "Number of milliseconds notification queue should park for new requests before blocking."; type uint16; units milliseconds; @@ -90,6 +97,7 @@ module opendaylight-sal-dom-broker-impl { } grouping dom-broker-config { + status obsolete; container schema-service { uses config:service-ref { refine type { @@ -137,6 +145,7 @@ module opendaylight-sal-dom-broker-impl { } grouping dom-broker-operational { + status obsolete; leaf total-commits { type uint64; } -- 2.36.6