From 805feca65ad7fa68cecaec1973f79a57f88e0b9c Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Wed, 25 Jun 2014 11:32:09 +0200 Subject: [PATCH] Bug 1081 - Deprecate non-asynchronous Data Broker API Change-Id: I8fbe63326a0e396e128b46d96142c7db86b2b83a Signed-off-by: Tony Tkacik --- .../binding/api/data/DataBrokerService.java | 19 ++++++++++++- .../binding/api/data/DataChangeListener.java | 6 +++++ .../api/data/DataModificationTransaction.java | 12 +++++++++ .../binding/api/data/DataProviderService.java | 5 ++++ .../sal/binding/api/data/DataRefresher.java | 3 ++- .../binding/api/data/RuntimeDataProvider.java | 4 ++- .../api/data/SynchronizedTransaction.java | 27 ++++++++++++------- .../sal/common/api/data/DataChangeEvent.java | 9 +++++++ .../common/api/data/DataChangeListener.java | 7 ++++- .../common/api/data/DataChangePublisher.java | 5 ++++ .../common/api/data/DataCommitHandler.java | 2 ++ .../data/DataCommitHandlerRegistration.java | 10 +++++++ .../sal/common/api/data/DataModification.java | 6 ++++- .../DataModificationTransactionFactory.java | 6 ++++- .../md/sal/common/api/data/DataProvider.java | 6 +++++ .../common/api/data/DataProvisionService.java | 7 ++++- .../md/sal/common/api/data/DataReader.java | 2 ++ .../md/sal/common/api/data/DataStore.java | 5 ++++ .../sal/core/api/data/DataBrokerService.java | 3 +++ .../sal/core/api/data/DataChangeListener.java | 5 ++++ .../api/data/DataModificationTransaction.java | 18 ++++++++++--- .../core/api/data/DataProviderService.java | 8 +++++- .../sal/core/api/data/DataStore.java | 6 +++++ .../sal/core/api/data/DataValidator.java | 3 +++ 24 files changed, 162 insertions(+), 22 deletions(-) diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataBrokerService.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataBrokerService.java index d0225768b4..d30ca6beaf 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataBrokerService.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataBrokerService.java @@ -21,7 +21,9 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; * * * @see DataProviderService + * @deprecated Replaced by newer better documented version {@link org.opendaylight.controller.md.sal.binding.api.DataBroker} */ +@Deprecated public interface DataBrokerService extends // BindingAwareService, // DataModificationTransactionFactory, DataObject>, // @@ -31,16 +33,26 @@ public interface DataBrokerService extends // * Creates a data modification transaction. * * @return new blank data modification transaction. + * @deprecated Replaced by more specific transaction types. Please use + * {@link org.opendaylight.controller.md.sal.binding.api.DataBroker#newReadOnlyTransaction(), + * {@link org.opendaylight.controller.md.sal.binding.api.DataBroker#newReadWriteTransaction() + * or + * {@link org.opendaylight.controller.md.sal.binding.api.DataBroker#newWriteOnlyTransaction(). */ + @Deprecated @Override DataModificationTransaction beginTransaction(); /** * Reads data subtree from configurational store. * (Store which is populated by consumer, which is usually used to - * inject state into providers. E.g. Flow configuration)- + * inject state into providers. E.g. Flow configuration) + * + * + * @deprecated Please use {@link org.opendaylight.controller.md.sal.binding.api.DataBroker#newReadOnlyTransaction()} * */ + @Deprecated @Override public DataObject readConfigurationData(InstanceIdentifier path); @@ -49,7 +61,9 @@ public interface DataBrokerService extends // * (Store which is populated by providers, which is usually used to * capture state of providers. E.g. Topology) * + * @deprecated Please use {@link org.opendaylight.controller.md.sal.binding.api.DataBroker#newReadOnlyTransaction()} */ + @Deprecated @Override public DataObject readOperationalData(InstanceIdentifier path); @@ -58,7 +72,10 @@ public interface DataBrokerService extends // * * Callback is invoked each time data in subtree changes. * + * @deprecated Please use {@link org.opendaylight.controller.md.sal.binding.api.DataBroker#registerDataChangeListener(org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType, InstanceIdentifier, org.opendaylight.controller.md.sal.binding.api.DataChangeListener, org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope)} + * which provides more fine-grained registration options. */ + @Deprecated @Override public ListenerRegistration registerDataChangeListener( InstanceIdentifier path, DataChangeListener listener); diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataChangeListener.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataChangeListener.java index 6373cfbf4a..e26cbcef29 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataChangeListener.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataChangeListener.java @@ -11,6 +11,12 @@ import org.opendaylight.controller.md.sal.common.api.data.DataChangeEvent; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +/** + * + * @deprecated Replaced by {@link org.opendaylight.controller.md.sal.binding.api.DataChangeListener} + * + */ +@Deprecated public interface DataChangeListener extends org.opendaylight.controller.md.sal.common.api.data.DataChangeListener, DataObject> { diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataModificationTransaction.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataModificationTransaction.java index 5fafabbd1b..0c250fdbee 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataModificationTransaction.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataModificationTransaction.java @@ -17,6 +17,18 @@ import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; +/** + * + * + * @deprecated Replaced by more specific transaction types. Please use + * {@link org.opendaylight.controller.md.sal.binding.api.DataBroker#newReadOnlyTransaction(), + * {@link org.opendaylight.controller.md.sal.binding.api.DataBroker#newReadWriteTransaction() + * or + * {@link org.opendaylight.controller.md.sal.binding.api.DataBroker#newWriteOnlyTransaction(). + * + * + */ +@Deprecated public interface DataModificationTransaction extends DataModification, DataObject> { /** * Returns an unique identifier for transaction diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataProviderService.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataProviderService.java index b496d1dfb4..5aa3b99b30 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataProviderService.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataProviderService.java @@ -16,7 +16,10 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** * DataProviderService is common access point for {@link org.opendaylight.controller.sal.binding.api.BindingAwareProvider} providers * to access data trees described by the YANG model. + * + * @deprecated Replaced by {@link org.opendaylight.controller.md.sal.common.api.data.AsyncConfigurationCommitCoordinator} service. */ +@Deprecated public interface DataProviderService extends DataBrokerService, DataProvisionService, DataObject> { /** * Registers a data reader for particular subtree of overal YANG data tree. @@ -27,6 +30,8 @@ public interface DataProviderService extends DataBrokerService, DataProvisionSer * @param path Subpath which is handled by registered data reader * @param reader Instance of reader which * @return Registration object for reader. Invoking {@link Registration#close()} will unregister reader. + * @deprecated Data Reader contract is removed from capabilities of MD-SAL and is replaced by replaced by org.opendaylight.controller.sal.core.spi.data.DOMStore contract. */ + @Deprecated Registration,DataObject>> registerDataReader(InstanceIdentifier path,DataReader,DataObject> reader); } diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataRefresher.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataRefresher.java index 3334f2a037..c0c8f4f211 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataRefresher.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataRefresher.java @@ -13,8 +13,9 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; * Trigger for refreshing of the data exposed by the {@link Provider} * * - * + * @deprecated Unused, not supported. Replaced by org.opendaylight.controller.sal.core.spi.data.DOMStore. */ +@Deprecated public interface DataRefresher extends BindingAwareProvider.ProviderFunctionality { /** diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/RuntimeDataProvider.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/RuntimeDataProvider.java index 85a2b82ee0..273f20f01d 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/RuntimeDataProvider.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/RuntimeDataProvider.java @@ -15,9 +15,11 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** * Utility interface which does type capture for BindingAware DataReader. * - * @author + * + * @deprecated Removed, replaced by org.opendaylight.controller.sal.core.spi.data.DOMStore. * */ +@Deprecated public interface RuntimeDataProvider extends ProviderFunctionality,DataReader, DataObject> { diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/SynchronizedTransaction.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/SynchronizedTransaction.java index da6d46d499..fc0d3964ea 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/SynchronizedTransaction.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/SynchronizedTransaction.java @@ -25,12 +25,19 @@ import com.google.common.base.Preconditions; * * To get instance of synchronized wrapper use {@link #from(DataModificationTransaction)} * + * @deprecated Replaced by more specific transaction types. Please use + * {@link org.opendaylight.controller.md.sal.binding.api.DataBroker#newReadOnlyTransaction(), + * {@link org.opendaylight.controller.md.sal.binding.api.DataBroker#newReadWriteTransaction() + * or + * {@link org.opendaylight.controller.md.sal.binding.api.DataBroker#newWriteOnlyTransaction(). + * */ +@Deprecated public final class SynchronizedTransaction implements DataModificationTransaction,Delegator { private final DataModificationTransaction delegate; - private SynchronizedTransaction(DataModificationTransaction delegate) { + private SynchronizedTransaction(final DataModificationTransaction delegate) { this.delegate = delegate; } @@ -40,7 +47,7 @@ public final class SynchronizedTransaction implements DataModificationTransactio * @param transaction Transaction for which synchronized wrapper should be created. * @return Synchronized wrapper over transaction. */ - public static final SynchronizedTransaction from(DataModificationTransaction transaction) { + public static final SynchronizedTransaction from(final DataModificationTransaction transaction) { Preconditions.checkArgument(transaction != null, "Transaction must not be null."); if (transaction instanceof SynchronizedTransaction) { return (SynchronizedTransaction) transaction; @@ -59,7 +66,7 @@ public final class SynchronizedTransaction implements DataModificationTransactio } @Override - public synchronized DataObject readOperationalData(InstanceIdentifier path) { + public synchronized DataObject readOperationalData(final InstanceIdentifier path) { return delegate.readOperationalData(path); } @@ -79,7 +86,7 @@ public final class SynchronizedTransaction implements DataModificationTransactio } @Override - public synchronized DataObject readConfigurationData(InstanceIdentifier path) { + public synchronized DataObject readConfigurationData(final InstanceIdentifier path) { return delegate.readConfigurationData(path); } @@ -89,12 +96,12 @@ public final class SynchronizedTransaction implements DataModificationTransactio } @Override - public synchronized void putOperationalData(InstanceIdentifier path, DataObject data) { + public synchronized void putOperationalData(final InstanceIdentifier path, final DataObject data) { delegate.putOperationalData(path, data); } @Override - public synchronized void putConfigurationData(InstanceIdentifier path, DataObject data) { + public synchronized void putConfigurationData(final InstanceIdentifier path, final DataObject data) { delegate.putConfigurationData(path, data); } @@ -104,12 +111,12 @@ public final class SynchronizedTransaction implements DataModificationTransactio } @Override - public synchronized void removeOperationalData(InstanceIdentifier path) { + public synchronized void removeOperationalData(final InstanceIdentifier path) { delegate.removeOperationalData(path); } @Override - public synchronized void removeConfigurationData(InstanceIdentifier path) { + public synchronized void removeConfigurationData(final InstanceIdentifier path) { delegate.removeConfigurationData(path); } @@ -129,7 +136,7 @@ public final class SynchronizedTransaction implements DataModificationTransactio } @Override - public synchronized ListenerRegistration registerListener(DataTransactionListener listener) { + public synchronized ListenerRegistration registerListener(final DataTransactionListener listener) { return delegate.registerListener(listener); } @@ -152,7 +159,7 @@ public final class SynchronizedTransaction implements DataModificationTransactio } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeEvent.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeEvent.java index 15d1daa1bb..5e5ea0c138 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeEvent.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeEvent.java @@ -10,6 +10,15 @@ package org.opendaylight.controller.md.sal.common.api.data; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.concepts.Path; +/** + * + * + * + * @param

+ * @param + * @deprecated Replaced by {@link AsyncDataChangeEvent} + */ +@Deprecated public interface DataChangeEvent

,D> extends DataChange, Immutable { /** diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeListener.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeListener.java index 669baa8d9e..21006173f2 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeListener.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeListener.java @@ -10,7 +10,12 @@ package org.opendaylight.controller.md.sal.common.api.data; import java.util.EventListener; import org.opendaylight.yangtools.concepts.Path; - +/** + * + * + * @deprecated Replaced by {@link AsyncDataChangeEvent} + */ +@Deprecated public interface DataChangeListener

, D> extends EventListener { /** * Note that this method may be invoked from a shared thread pool, so diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangePublisher.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangePublisher.java index 0c4c6d179f..222dba8eaf 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangePublisher.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangePublisher.java @@ -10,6 +10,11 @@ package org.opendaylight.controller.md.sal.common.api.data; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.concepts.Path; +/** + * + * @deprecated Replaced by {@link AsyncDataBroker} + */ +@Deprecated public interface DataChangePublisher

, D, L extends DataChangeListener> { ListenerRegistration registerDataChangeListener(P path, L listener); diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataCommitHandler.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataCommitHandler.java index 22e95197bb..a9f02a8ee5 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataCommitHandler.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataCommitHandler.java @@ -79,7 +79,9 @@ import org.opendaylight.yangtools.yang.common.RpcResult; * * @param

Class representing a path * @param Superclass from which all data objects are derived from. + * @deprecated Replaced by {@link AsyncConfigurationCommitHandler} */ +@Deprecated public interface DataCommitHandler

, D> { diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataCommitHandlerRegistration.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataCommitHandlerRegistration.java index 86f1f9b138..224751c37d 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataCommitHandlerRegistration.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataCommitHandlerRegistration.java @@ -10,6 +10,16 @@ package org.opendaylight.controller.md.sal.common.api.data; import org.opendaylight.yangtools.concepts.Path; import org.opendaylight.yangtools.concepts.Registration; +/** + * + * + * @deprecated THis was intended as Registration object, normal use of {@link org.opendaylight.yangtools.concepts.ObjectRegistration} + * is suffiecient, since {@link #getPath()} was implementation leak. + * + * @param

+ * @param + */ +@Deprecated public interface DataCommitHandlerRegistration

,D> extends Registration>{ P getPath(); diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModification.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModification.java index 22c5fa0c1d..630078dced 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModification.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModification.java @@ -12,7 +12,11 @@ import java.util.concurrent.Future; import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.yangtools.concepts.Path; import org.opendaylight.yangtools.yang.common.RpcResult; - +/** + * + * @deprecated Replaced by {@link AsyncWriteTransaction} + */ +@Deprecated public interface DataModification

, D> extends DataChange, DataReader { /** * Returns transaction identifier diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModificationTransactionFactory.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModificationTransactionFactory.java index 34f6fe970d..6a370b8cd1 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModificationTransactionFactory.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModificationTransactionFactory.java @@ -8,7 +8,11 @@ package org.opendaylight.controller.md.sal.common.api.data; import org.opendaylight.yangtools.concepts.Path; - +/** + * + * @deprecated Replaced by {@link AsyncDataTransactionFactory} + */ +@Deprecated public interface DataModificationTransactionFactory

,D> { DataModification beginTransaction(); diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvider.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvider.java index dae9a1144b..fdeda2800b 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvider.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvider.java @@ -9,6 +9,12 @@ package org.opendaylight.controller.md.sal.common.api.data; import org.opendaylight.yangtools.concepts.Path; +/** + * + * + * @deprecated Replaced by org.opendaylight.controller.sal.core.spi.data.DOMStore contract. + */ +@Deprecated public interface DataProvider

, D> extends DataReader { } diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvisionService.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvisionService.java index da7efebdfe..bd80a53893 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvisionService.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvisionService.java @@ -12,7 +12,12 @@ import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.concepts.Path; import org.opendaylight.yangtools.concepts.Registration; - +/** + * + * + * @deprecated replaced by {@link AsyncDataBroker} and {@link AsyncConfigurationCommitCoordinator} + */ +@Deprecated public interface DataProvisionService

, D> { public Registration> registerCommitHandler(P path, DataCommitHandler commitHandler); diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataReader.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataReader.java index 14731d688c..2f657b8e50 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataReader.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataReader.java @@ -17,7 +17,9 @@ import org.opendaylight.yangtools.concepts.Path; * * @param

Path Type * @param Data Type + * @deprecated Replaced by org.opendaylight.controller.sal.core.spi.data.DOMStore contract. */ +@Deprecated public interface DataReader

,D> { /** diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataStore.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataStore.java index 3520ba1819..5688dd0988 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataStore.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataStore.java @@ -9,6 +9,11 @@ package org.opendaylight.controller.md.sal.common.api.data; import org.opendaylight.yangtools.concepts.Path; +/** + * + * @deprecated Replaced by org.opendaylight.controller.sal.core.spi.data.DOMStore Contract. + */ +@Deprecated public interface DataStore

, D> extends // DataReader, // DataModificationTransactionFactory { diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataBrokerService.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataBrokerService.java index 266b6976af..9c7deaf406 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataBrokerService.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataBrokerService.java @@ -21,8 +21,10 @@ import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; * * * @see DataProviderService + * @deprecated Replaced by {@link org.opendaylight.controller.md.sal.dom.api.DOMDataBroker} * */ +@Deprecated public interface DataBrokerService extends BrokerService, // DataReader, // @@ -36,5 +38,6 @@ public interface DataBrokerService extends @Override public CompositeNode readOperationalData(InstanceIdentifier path); + @Override DataModificationTransaction beginTransaction(); } diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataChangeListener.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataChangeListener.java index 944ccc5b33..2bf949d208 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataChangeListener.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataChangeListener.java @@ -11,6 +11,11 @@ import org.opendaylight.controller.md.sal.common.api.data.DataChangeEvent; import org.opendaylight.yangtools.yang.data.api.CompositeNode; import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; +/** + * + * @deprecated Replaced by {@link org.opendaylight.controller.md.sal.dom.api.DOMDataChangeListener} + */ +@Deprecated public interface DataChangeListener extends org.opendaylight.controller.md.sal.common.api.data.DataChangeListener { diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataModificationTransaction.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataModificationTransaction.java index 9706bbacdb..82e62255c3 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataModificationTransaction.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataModificationTransaction.java @@ -17,7 +17,17 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.data.api.CompositeNode; import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; -public interface DataModificationTransaction extends DataModification{ +/** + * + * @deprecated Replaced by more specific + * {@link org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction} + * , + * {@link org.opendaylight.controller.md.sal.dom.api.DOMDataReadTransaction} + * or {@link org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction} + * + */ +@Deprecated +public interface DataModificationTransaction extends DataModification { /** * Returns transaction identifier @@ -34,8 +44,8 @@ public interface DataModificationTransaction extends DataModification> commit(); @@ -43,6 +53,6 @@ public interface DataModificationTransaction extends DataModification registerListener(DataTransactionListener listener); public interface DataTransactionListener extends EventListener { - void onStatusUpdated(DataModificationTransaction transaction,TransactionStatus status); + void onStatusUpdated(DataModificationTransaction transaction, TransactionStatus status); } } diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataProviderService.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataProviderService.java index 0538660fd7..0810fa3e98 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataProviderService.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataProviderService.java @@ -8,13 +8,19 @@ package org.opendaylight.controller.sal.core.api.data; import org.opendaylight.controller.md.sal.common.api.data.DataProvisionService; +import org.opendaylight.controller.md.sal.common.api.data.DataReader; import org.opendaylight.controller.sal.common.DataStoreIdentifier; import org.opendaylight.controller.sal.core.api.Provider; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.data.api.CompositeNode; import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; -import org.opendaylight.controller.md.sal.common.api.data.DataReader;; +/** + * + * @deprecated Replaced by {@link org.opendaylight.controller.md.sal.dom.api.DOMDataBroker} + * + */ +@Deprecated public interface DataProviderService extends DataBrokerService, // DataProvisionService diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataStore.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataStore.java index 58ffb38365..56d2e87c2c 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataStore.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataStore.java @@ -12,6 +12,12 @@ import org.opendaylight.controller.md.sal.common.api.data.DataReader; import org.opendaylight.yangtools.yang.data.api.CompositeNode; import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; +/** + * + * @deprecated Replaced by org.opendaylight.controller.sal.core.spi.data.DOMStore. + * + */ +@Deprecated public interface DataStore extends // DataReader, DataCommitHandler { diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataValidator.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataValidator.java index 286770b048..e4e6e2f26d 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataValidator.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/data/DataValidator.java @@ -28,7 +28,10 @@ import org.opendaylight.yangtools.yang.data.api.CompositeNode; * {@link DataProviderService#addValidator(DataStoreIdentifier, DataValidator)} * * + * @deprecated Replaced by {@link org.opendaylight.controller.md.sal.common.api.data.AsyncConfigurationCommitHandler} + * **/ +@Deprecated public interface DataValidator extends Provider.ProviderFunctionality { /** -- 2.36.6