From e92f6d2d512c869dd83a3ce004cffa5a6bc03a22 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Wed, 31 May 2017 07:53:30 -0400 Subject: [PATCH] Bug 8568: Remove DataProviderService/DataBrokerService APIs Change-Id: If9b8bc26c3f4d1c5eea09c1c5ad993732fbc5f6c Signed-off-by: Tom Pantelis --- .../sal/binding/api/BindingAwareBroker.java | 3 - .../binding/api/data/DataBrokerService.java | 75 ------- .../binding/api/data/DataChangeListener.java | 25 --- .../api/data/DataModificationTransaction.java | 79 ------- .../binding/api/data/DataProviderService.java | 20 -- .../api/data/SynchronizedTransaction.java | 183 ---------------- .../sal/binding/api/mount/MountInstance.java | 4 +- .../api/mount/MountProviderInstance.java | 2 - .../compat/HydrogenDataChangeEvent.java | 206 ------------------ .../compat/HydrogenMountInstanceAdapter.java | 25 --- .../opendaylight-binding-broker-impl.yang | 10 - .../yang/opendaylight-md-sal-binding.yang | 12 +- .../sal/common/api/data/DataChangeEvent.java | 53 ----- .../common/api/data/DataChangeListener.java | 28 --- .../sal/core/spi/data/DOMStore.java | 2 +- 15 files changed, 3 insertions(+), 724 deletions(-) delete mode 100644 opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataBrokerService.java delete mode 100644 opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataChangeListener.java delete mode 100644 opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataModificationTransaction.java delete mode 100644 opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataProviderService.java delete mode 100644 opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/SynchronizedTransaction.java delete mode 100644 opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenDataChangeEvent.java delete mode 100644 opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeEvent.java delete mode 100644 opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeListener.java 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 b934800d98..2841bb77b0 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 @@ -35,9 +35,6 @@ import org.osgi.framework.BundleContext; * {@link ProviderContext} *
  • Notification Service - see {@link NotificationService} and * {@link NotificationProviderService} - *
  • Functionality and Data model - *
  • Data Store access and modification - see {@link org.opendaylight.controller.sal.binding.api.data.DataBrokerService} and - * {@link org.opendaylight.controller.sal.binding.api.data.DataProviderService} * * * The services are exposed via session. 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 deleted file mode 100644 index 47855da301..0000000000 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataBrokerService.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2013 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.sal.binding.api.data; - -import org.opendaylight.controller.md.sal.common.api.data.DataReader; -import org.opendaylight.controller.sal.binding.api.BindingAwareService; -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.yang.binding.DataObject; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - -/** - * DataBrokerService provides unified access to the data stores available in the - * system. - * - * - * @see DataProviderService - * @deprecated Replaced by newer better documented version {@link org.opendaylight.controller.md.sal.binding.api.DataBroker} - */ -@Deprecated -public interface DataBrokerService extends BindingAwareService, - DataReader, DataObject> { - /** - * 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 - 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) - * - * - * @deprecated Please use {@link org.opendaylight.controller.md.sal.binding.api.DataBroker#newReadOnlyTransaction()} - * - */ - @Override - @Deprecated - DataObject readConfigurationData(InstanceIdentifier path); - - /** - * Reads data subtree from operational store. - * (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()} - */ - @Override - @Deprecated - DataObject readOperationalData(InstanceIdentifier path); - - /** - * Register a data change listener for particular subtree. - * - * 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 - 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 deleted file mode 100644 index 7df92bf620..0000000000 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataChangeListener.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2013 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.sal.binding.api.data; - -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> { - - @Override - void onDataChanged(DataChangeEvent, DataObject> change); -} 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 deleted file mode 100644 index 7e72bd488f..0000000000 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataModificationTransaction.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2013 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.sal.binding.api.data; - -import java.util.EventListener; -import java.util.concurrent.Future; -import org.opendaylight.controller.md.sal.common.api.TransactionStatus; -import org.opendaylight.controller.md.sal.common.api.data.DataModification; -import org.opendaylight.yangtools.concepts.ListenerRegistration; -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 - * - */ - @Override - Object getIdentifier(); - - /** - * Initiates a two-phase commit of candidate data. - * - *

    - * The Consumer could initiate a commit of candidate data - * - *

    - * The successful commit changes the state of the system and may affect - * several components. - * - *

    - * The effects of successful commit of data are described in the - * specifications and YANG models describing the Provider components - * of controller. It is assumed that the Consumer has an understanding - * of this changes. - * - * - * @return Result of the commit, containing success information or list of - * encountered errors, if commit was not successful. - */ - @Override - Future> commit(); - - /** - * Register a listener for transaction - * - * @param listener - * @return - */ - ListenerRegistration registerListener(DataTransactionListener listener); - - /** - * Listener for transaction state changes - */ - interface DataTransactionListener extends EventListener { - /** - * Callback is invoked after each transaction status change. - * - * @param transaction Transaction - * @param status New status - */ - void onStatusUpdated(DataModificationTransaction transaction,TransactionStatus status); - } -} 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 deleted file mode 100644 index 14a1e8ab49..0000000000 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataProviderService.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2013 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.sal.binding.api.data; - - -/** - * 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 { - -} 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 deleted file mode 100644 index cc3ee4b26f..0000000000 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/SynchronizedTransaction.java +++ /dev/null @@ -1,183 +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.sal.binding.api.data; - -import java.util.Map; -import java.util.Set; -import java.util.concurrent.Future; - -import org.opendaylight.controller.md.sal.common.api.TransactionStatus; -import org.opendaylight.yangtools.concepts.Delegator; -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.yang.binding.DataObject; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.RpcResult; - -import com.google.common.base.Preconditions; - -/** - * Synchronized wrapper for DataModificationTransaction. - * - * 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(final DataModificationTransaction delegate) { - this.delegate = delegate; - } - - /** - * Returns synchronized wrapper on supplied transaction. - * - * @param transaction Transaction for which synchronized wrapper should be created. - * @return Synchronized wrapper over 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; - } - return new SynchronizedTransaction(transaction); - } - - @Override - public synchronized Map, DataObject> getCreatedOperationalData() { - return delegate.getCreatedOperationalData(); - } - - @Override - public synchronized Map, DataObject> getCreatedConfigurationData() { - return delegate.getCreatedConfigurationData(); - } - - @Override - public synchronized DataObject readOperationalData(final InstanceIdentifier path) { - return delegate.readOperationalData(path); - } - - @Override - public synchronized TransactionStatus getStatus() { - return delegate.getStatus(); - } - - @Override - public synchronized Map, DataObject> getUpdatedOperationalData() { - return delegate.getUpdatedOperationalData(); - } - - @Override - public synchronized Object getIdentifier() { - return delegate.getIdentifier(); - } - - @Override - public synchronized DataObject readConfigurationData(final InstanceIdentifier path) { - return delegate.readConfigurationData(path); - } - - @Override - public synchronized Future> commit() { - return delegate.commit(); - } - - @Override - public synchronized void putOperationalData(final InstanceIdentifier path, final DataObject data) { - delegate.putOperationalData(path, data); - } - - @Override - public synchronized void putConfigurationData(final InstanceIdentifier path, final DataObject data) { - delegate.putConfigurationData(path, data); - } - - @Override - public synchronized Map, DataObject> getUpdatedConfigurationData() { - return delegate.getUpdatedConfigurationData(); - } - - @Override - public synchronized void removeOperationalData(final InstanceIdentifier path) { - delegate.removeOperationalData(path); - } - - @Override - public synchronized void removeConfigurationData(final InstanceIdentifier path) { - delegate.removeConfigurationData(path); - } - - @Override - public synchronized Set> getRemovedConfigurationData() { - return delegate.getRemovedConfigurationData(); - } - - @Override - public synchronized Set> getRemovedOperationalData() { - return delegate.getRemovedOperationalData(); - } - - @Override - public synchronized Map, DataObject> getOriginalConfigurationData() { - return delegate.getOriginalConfigurationData(); - } - - @Override - public synchronized ListenerRegistration registerListener(final DataTransactionListener listener) { - return delegate.registerListener(listener); - } - - @Override - public synchronized Map, DataObject> getOriginalOperationalData() { - return delegate.getOriginalOperationalData(); - } - - @Override - public synchronized DataModificationTransaction getDelegate() { - return delegate; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((delegate == null) ? 0 : delegate.hashCode()); - return result; - } - - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()){ - return false; - } - SynchronizedTransaction other = (SynchronizedTransaction) obj; - if (delegate == null) { - if (other.delegate != null) { - return false; - } - } else if (!delegate.equals(other.delegate)) { - return false; - } - return true; - } -} - diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/mount/MountInstance.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/mount/MountInstance.java index b4441601cb..8d12725319 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/mount/MountInstance.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/mount/MountInstance.java @@ -9,7 +9,6 @@ package org.opendaylight.controller.sal.binding.api.mount; import org.opendaylight.controller.sal.binding.api.NotificationService; import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry; -import org.opendaylight.controller.sal.binding.api.data.DataBrokerService; import org.opendaylight.yangtools.concepts.Identifiable; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -17,7 +16,6 @@ public interface MountInstance // extends // RpcConsumerRegistry, // Identifiable>, // - NotificationService, // - DataBrokerService { + NotificationService { } diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/mount/MountProviderInstance.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/mount/MountProviderInstance.java index 0d9a90286e..d883495ff3 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/mount/MountProviderInstance.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/mount/MountProviderInstance.java @@ -9,7 +9,6 @@ package org.opendaylight.controller.sal.binding.api.mount; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.controller.sal.binding.api.data.DataProviderService; /** * Provider's version of Mount Point, this version allows access to MD-SAL @@ -22,7 +21,6 @@ import org.opendaylight.controller.sal.binding.api.data.DataProviderService; public interface MountProviderInstance // extends // MountInstance, // - DataProviderService, // RpcProviderRegistry, // NotificationProviderService { diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenDataChangeEvent.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenDataChangeEvent.java deleted file mode 100644 index 77f156eb62..0000000000 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenDataChangeEvent.java +++ /dev/null @@ -1,206 +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.md.sal.binding.compat; - -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; -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 -public abstract class HydrogenDataChangeEvent implements - DataChangeEvent, DataObject> { - - private HydrogenDataChangeEvent() { - } - - public static final DataChangeEvent, DataObject> createOperational( - final AsyncDataChangeEvent, DataObject> change) { - return new OperationalChangeEvent(change); - } - - public static final DataChangeEvent, DataObject> createConfiguration( - final AsyncDataChangeEvent, DataObject> change) { - return new ConfigurationChangeEvent(change); - } - - @Override - public Map, DataObject> getCreatedOperationalData() { - return Collections.emptyMap(); - } - - @Override - public Map, DataObject> getCreatedConfigurationData() { - return Collections.emptyMap(); - } - - @Override - public Map, DataObject> getUpdatedOperationalData() { - return Collections.emptyMap(); - } - - @Override - public Map, DataObject> getUpdatedConfigurationData() { - return Collections.emptyMap(); - } - - @Override - public Set> getRemovedConfigurationData() { - return Collections.emptySet(); - } - - @Override - public Set> getRemovedOperationalData() { - return Collections.emptySet(); - } - - @Override - public Map, DataObject> getOriginalConfigurationData() { - return Collections.emptyMap(); - } - - @Override - public Map, DataObject> getOriginalOperationalData() { - return Collections.emptyMap(); - } - - @Override - public DataObject getOriginalConfigurationSubtree() { - return null; - } - - @Override - public DataObject getOriginalOperationalSubtree() { - return null; - } - - @Override - public DataObject getUpdatedConfigurationSubtree() { - return null; - } - - @Override - public DataObject getUpdatedOperationalSubtree() { - return null; - } - - private static final class OperationalChangeEvent extends HydrogenDataChangeEvent { - - private final AsyncDataChangeEvent, DataObject> delegate; - private Map, DataObject> updatedCache; - - public OperationalChangeEvent(final AsyncDataChangeEvent, DataObject> change) { - this.delegate = change; - } - - @Override - public Map, DataObject> getCreatedOperationalData() { - return delegate.getCreatedData(); - } - - @Override - public Set> getRemovedOperationalData() { - return delegate.getRemovedPaths(); - } - - @Override - public DataObject getOriginalOperationalSubtree() { - return delegate.getOriginalSubtree(); - } - - @Override - public DataObject getUpdatedOperationalSubtree() { - return delegate.getUpdatedSubtree(); - } - - @Override - public Map, DataObject> getOriginalOperationalData() { - return delegate.getOriginalData(); - } - - @Override - public Map, DataObject> getUpdatedOperationalData() { - if(updatedCache == null) { - final Map, DataObject> created = delegate.getCreatedData(); - final Map, DataObject> updated = delegate.getUpdatedData(); - final Map, DataObject> updatedComposite = - new HashMap<>(created.size() + updated.size()); - updatedComposite.putAll(created); - updatedComposite.putAll(updated); - updatedCache = Collections.unmodifiableMap(updatedComposite); - } - return updatedCache; - } - - @Override - public String toString() { - return "OperationalChangeEvent [delegate=" + delegate + "]"; - } - - } - - private static final class ConfigurationChangeEvent extends HydrogenDataChangeEvent { - - private final AsyncDataChangeEvent, DataObject> delegate; - private Map, DataObject> updatedCache; - - public ConfigurationChangeEvent(final AsyncDataChangeEvent, DataObject> change) { - this.delegate = change; - } - - @Override - public Map, DataObject> getCreatedConfigurationData() { - return delegate.getCreatedData(); - } - - @Override - public Set> getRemovedConfigurationData() { - return delegate.getRemovedPaths(); - } - - @Override - public DataObject getOriginalConfigurationSubtree() { - return delegate.getOriginalSubtree(); - } - - @Override - public DataObject getUpdatedConfigurationSubtree() { - return delegate.getUpdatedSubtree(); - } - - @Override - public Map, DataObject> getOriginalConfigurationData() { - return delegate.getOriginalData(); - } - - @Override - public Map, DataObject> getUpdatedConfigurationData() { - if(updatedCache == null) { - final Map, DataObject> created = delegate.getCreatedData(); - final Map, DataObject> updated = delegate.getUpdatedData(); - final Map, DataObject> updatedComposite = - new HashMap<>(created.size() + updated.size()); - updatedComposite.putAll(created); - updatedComposite.putAll(updated); - updatedCache = Collections.unmodifiableMap(updatedComposite); - } - return updatedCache; - } - - @Override - public String toString() { - return "ConfigurationChangeEvent [delegate=" + delegate + "]"; - } - - } - -} diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenMountInstanceAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenMountInstanceAdapter.java index 35f7d87f74..3a4d785b92 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenMountInstanceAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenMountInstanceAdapter.java @@ -22,13 +22,9 @@ import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.controller.sal.binding.api.NotificationService; import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.controller.sal.binding.api.data.DataBrokerService; -import org.opendaylight.controller.sal.binding.api.data.DataChangeListener; -import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction; import org.opendaylight.controller.sal.binding.api.mount.MountProviderInstance; import org.opendaylight.controller.sal.binding.api.rpc.RpcContextIdentifier; import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.Notification; import org.opendaylight.yangtools.yang.binding.RpcService; @@ -84,27 +80,6 @@ public class HydrogenMountInstanceAdapter implements MountProviderInstance { return service(NotificationService.class).registerNotificationListener(listener); } - @Override - public DataModificationTransaction beginTransaction() { - return service(DataBrokerService.class).beginTransaction(); - } - - @Override - public DataObject readConfigurationData(final InstanceIdentifier path) { - return service(DataBrokerService.class).readConfigurationData(path); - } - - @Override - public DataObject readOperationalData(final InstanceIdentifier path) { - return service(DataBrokerService.class).readOperationalData(path); - } - - @Override - public ListenerRegistration registerDataChangeListener( - final InstanceIdentifier path, final DataChangeListener listener) { - return service(DataBrokerService.class).registerDataChangeListener(path,listener); - } - @Override public RoutedRpcRegistration addRoutedRpcImplementation(final Class serviceInterface, final T implementation) throws IllegalStateException { 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 0316b115a6..ad6ae4c2d3 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 @@ -124,16 +124,6 @@ module opendaylight-sal-binding-broker-impl { container binding-broker-impl { uses dom-forwarding-component; - container data-broker { - status deprecated; - uses config:service-ref { - refine type { - mandatory false; - config:required-identity sal:binding-data-broker; - } - } - } - container notification-service { status deprecated; uses config:service-ref { diff --git a/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-md-sal-binding.yang b/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-md-sal-binding.yang index f1f19b4c1e..bd7244e59e 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-md-sal-binding.yang +++ b/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-md-sal-binding.yang @@ -1,5 +1,5 @@ module opendaylight-md-sal-binding { - yang-version 1; + yang-version 1; namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding"; prefix "md-sal-binding"; @@ -18,22 +18,12 @@ module opendaylight-md-sal-binding { config:java-class "org.opendaylight.controller.sal.binding.api.BindingAwareBroker"; } - identity binding-data-broker { - base "config:service-type"; - config:java-class "org.opendaylight.controller.sal.binding.api.data.DataProviderService"; - } - identity binding-async-data-broker { base "config:service-type"; config:java-class "org.opendaylight.controller.md.sal.binding.api.DataBroker"; config:disable-osgi-service-registration; } - identity binding-data-consumer-broker { - base "config:service-type"; - config:java-class "org.opendaylight.controller.sal.binding.api.data.DataBrokerService"; - } - identity binding-rpc-registry { base "config:service-type"; config:java-class "org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"; 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 deleted file mode 100644 index 5e5ea0c138..0000000000 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeEvent.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2013 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.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 { - - /** - * Returns a orignal subtree of data, which starts at the path - * where listener was registered. - * - */ - D getOriginalConfigurationSubtree(); - - /** - * Returns a new subtree of data, which starts at the path - * where listener was registered. - * - */ - D getOriginalOperationalSubtree(); - - - - /** - * Returns a updated subtree of data, which starts at the path - * where listener was registered. - * - */ - D getUpdatedConfigurationSubtree(); - - /** - * Returns a udpated subtree of data, which starts at the path - * where listener was registered. - * - */ - D getUpdatedOperationalSubtree(); -} 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 deleted file mode 100644 index 21006173f2..0000000000 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeListener.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2013 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.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 - * implementations SHOULD NOT perform CPU-intensive operations and they - * definitely MUST NOT invoke any potentially blocking operations. - * - * @param change Data Change Event being delivered. - **/ - void onDataChanged(DataChangeEvent change); -} diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStore.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStore.java index 0bab570bd1..7a51df9f56 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStore.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStore.java @@ -29,7 +29,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public interface DOMStore extends DOMStoreTransactionFactory { /** - * Registers {@link org.opendaylight.controller.md.sal.common.api.data.DataChangeListener} for Data Change callbacks which will + * Registers {@link org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeListener} for Data Change callbacks which will * be triggered on the change of provided subpath. What constitutes a change * depends on the @scope parameter. * -- 2.36.6