From: Robert Varga Date: Fri, 28 Feb 2014 12:42:05 +0000 (+0100) Subject: Prune long-deprecated APIs X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~343^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=7396bb6574dc2fb75900514efc7a701e81eb9408 Prune long-deprecated APIs Prune APIs which have been deprecated well before the Hydrogen release. No outside users should be relying on them at this point. Change-Id: I5b966c98733912ece175ce8fa5a4a821c3b2c6d9 Signed-off-by: Robert Varga --- diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationProviderService.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationProviderService.java index 08029dc52f..b94695b83d 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationProviderService.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationProviderService.java @@ -15,24 +15,6 @@ import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.Notification; public interface NotificationProviderService extends NotificationService, NotificationPublishService { - - - /** - * Deprecated. Use {@link #publish(Notification)}. - * - * @param notification - */ - @Deprecated - void notify(Notification notification); - - /** - * Deprecated. Use {@link #publish(Notification,ExecutorService)}. - * - * @param notification - */ - @Deprecated - void notify(Notification notification, ExecutorService service); - /** * Publishes a notification. * diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationService.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationService.java index 24ca2a3de7..6e8bda56d8 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationService.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationService.java @@ -11,39 +11,6 @@ import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.Notification; public interface NotificationService extends BindingAwareService { - /** - * - * Deprecated: use {@link #addNotificationListener(Class, NotificationListener)} istead. - * - * @param listener - */ - @Deprecated - void addNotificationListener(Class notificationType, NotificationListener listener); - - /** - * - * Deprecated: use {@link #addNotificationListener(org.opendaylight.yangtools.yang.binding.NotificationListener)} istead. - * - * @param listener - */ - @Deprecated - void addNotificationListener(org.opendaylight.yangtools.yang.binding.NotificationListener listener); - - /** - * Deprecated: use {@link Registration#close()} istead. - * @param listener - */ - @Deprecated - void removeNotificationListener(org.opendaylight.yangtools.yang.binding.NotificationListener listener); - - /** - * Deprecated: use {@link Registration#close()} istead. - * @param listener - */ - @Deprecated - void removeNotificationListener(Class notificationType, NotificationListener listener); - - /** * Register a generic listener for specified notification type only. * @@ -54,7 +21,6 @@ public interface NotificationService extends BindingAwareService { Registration> registerNotificationListener( Class notificationType, NotificationListener listener); - /** * Register a listener which implements generated notification interfaces derived from * {@link org.opendaylight.yangtools.yang.binding.NotificationListener}. 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 d7cb926775..da6d46d499 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 @@ -22,21 +22,21 @@ import com.google.common.base.Preconditions; /** * Synchronized wrapper for DataModificationTransaction. - * + * * To get instance of synchronized wrapper use {@link #from(DataModificationTransaction)} * */ public final class SynchronizedTransaction implements DataModificationTransaction,Delegator { private final DataModificationTransaction delegate; - + private SynchronizedTransaction(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. */ @@ -73,11 +73,6 @@ public final class SynchronizedTransaction implements DataModificationTransactio return delegate.getUpdatedOperationalData(); } - @Deprecated - public synchronized void putRuntimeData(InstanceIdentifier path, DataObject data) { - delegate.putRuntimeData(path, data); - } - @Override public synchronized Object getIdentifier() { return delegate.getIdentifier(); @@ -108,11 +103,6 @@ public final class SynchronizedTransaction implements DataModificationTransactio return delegate.getUpdatedConfigurationData(); } - @Deprecated - public synchronized void removeRuntimeData(InstanceIdentifier path) { - delegate.removeRuntimeData(path); - } - @Override public synchronized void removeOperationalData(InstanceIdentifier path) { delegate.removeOperationalData(path); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend index bf82302e54..fe2681f1f7 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend @@ -49,43 +49,10 @@ class NotificationBrokerImpl implements NotificationProviderService, AutoCloseab this.executor = executor; } - @Deprecated - override addNotificationListener(Class notificationType, - NotificationListener listener) { - listeners.put(notificationType, listener) - } - - @Deprecated - override removeNotificationListener(Class notificationType, - NotificationListener listener) { - listeners.remove(notificationType, listener) - } - - override notify(Notification notification) { - publish(notification) - } - def getNotificationTypes(Notification notification) { notification.class.interfaces.filter[it != Notification && Notification.isAssignableFrom(it)] } - @Deprecated - override addNotificationListener(org.opendaylight.yangtools.yang.binding.NotificationListener listener) { - throw new UnsupportedOperationException("Deprecated method. Use registerNotificationListener instead."); - - } - - @Deprecated - override removeNotificationListener(org.opendaylight.yangtools.yang.binding.NotificationListener listener) { - throw new UnsupportedOperationException( - "Deprecated method. Use RegisterNotificationListener returned value to close registration.") - } - - @Deprecated - override notify(Notification notification, ExecutorService service) { - publish(notification, service) - } - override publish(Notification notification) { publish(notification, executor) } diff --git a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalConsumerInstance.java b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalConsumerInstance.java index 64c1ad3ab4..7d7e56dae0 100644 --- a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalConsumerInstance.java +++ b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalConsumerInstance.java @@ -71,32 +71,6 @@ public abstract class AbstractBindingSalConsumerInstance void addNotificationListener(Class notificationType, - NotificationListener listener) { - getNotificationBrokerChecked().addNotificationListener(notificationType, listener); - } - - @Override - @Deprecated - public void addNotificationListener(org.opendaylight.yangtools.yang.binding.NotificationListener listener) { - getNotificationBrokerChecked().addNotificationListener(listener); - } - - @Override - @Deprecated - public void removeNotificationListener(org.opendaylight.yangtools.yang.binding.NotificationListener listener) { - getNotificationBrokerChecked().removeNotificationListener(listener); - } - - @Override - @Deprecated - public void removeNotificationListener(Class notificationType, - NotificationListener listener) { - getNotificationBrokerChecked().removeNotificationListener(notificationType, listener); - } - @Override public Registration> registerNotificationListener( Class notificationType, NotificationListener listener) { diff --git a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalProviderInstance.java b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalProviderInstance.java index efa02e0b30..8f367de6c8 100644 --- a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalProviderInstance.java +++ b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalProviderInstance.java @@ -71,18 +71,6 @@ public abstract class AbstractBindingSalProviderInstance, D> extends DataChange, DataReader { - /** * Returns transaction identifier * @@ -24,16 +23,6 @@ public interface DataModification

, D> extends DataChange TransactionStatus getStatus(); - /** - * - * @deprecated Use {@link #putOperationalData(Object, Object)} instead. - * - * @param path - * @param data - */ - @Deprecated - void putRuntimeData(P path, D data); - /** * Store a piece of data at specified path. This acts as a merge operation, * which is to say that any pre-existing data which is not explicitly @@ -76,14 +65,6 @@ public interface DataModification

, D> extends DataChange */ void putConfigurationData(P path, D data); - /** - * @deprecated Use {@link #removeOperationalData(Object)} - * - * @param path - */ - @Deprecated - void removeRuntimeData(P path); - void removeOperationalData(P path); void removeConfigurationData(P path); @@ -112,5 +93,4 @@ public interface DataModification

, D> extends DataChange * {@link TransactionStatus#FAILED} is reached. */ Future> commit(); - } diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/AbstractDataModification.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/AbstractDataModification.java index 4b6a0185ab..3ceeb7e44d 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/AbstractDataModification.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/AbstractDataModification.java @@ -41,7 +41,7 @@ public abstract class AbstractDataModification

, D> implements private final Map unmodifiable_operationalUpdate; private final Set

unmodifiable_configurationRemove; private final Set

unmodifiable_OperationalRemove; - private DataReader reader; + private final DataReader reader; public AbstractDataModification(DataReader reader) { this.reader = reader; @@ -87,11 +87,6 @@ public abstract class AbstractDataModification

, D> implements operationalUpdate.put(path, mergeOperationalData(path,original,data)); } - @Override - public final void putRuntimeData(P path, D data) { - putOperationalData(path, data); - } - @Override public final void removeOperationalData(P path) { checkMutable(); @@ -100,11 +95,6 @@ public abstract class AbstractDataModification

, D> implements operationalRemove.put(path, path); } - @Override - public final void removeRuntimeData(P path) { - removeOperationalData(path); - } - @Override public final void removeConfigurationData(P path) { checkMutable(); @@ -194,11 +184,11 @@ public abstract class AbstractDataModification

, D> implements } return null; } - + protected D mergeOperationalData(P path,D stored, D modified) { return modified; } - + protected D mergeConfigurationData(P path,D stored, D modified) { return modified; } diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationPublishService.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationPublishService.java index 652eab10a7..aa22b90f65 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationPublishService.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationPublishService.java @@ -11,7 +11,6 @@ import org.opendaylight.controller.sal.core.api.Broker; import org.opendaylight.controller.sal.core.api.Provider; import org.opendaylight.yangtools.yang.data.api.CompositeNode; - /** * Notification Publishing Service * @@ -25,12 +24,8 @@ import org.opendaylight.yangtools.yang.data.api.CompositeNode; *

  • For each subscriber {@link Broker} invokes * {@link NotificationListener#onNotification(CompositeNode)} * - * - * - * */ public interface NotificationPublishService extends NotificationService { - /** * Publishes a notification. * @@ -41,8 +36,5 @@ public interface NotificationPublishService extends NotificationService { * @param notification * Notification to publish */ - @Deprecated - void sendNotification(CompositeNode notification); - void publish(CompositeNode notification); } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/MountPointImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/MountPointImpl.java index 5d93f4ee4d..dc554a0727 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/MountPointImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/MountPointImpl.java @@ -47,8 +47,8 @@ public class MountPointImpl implements MountProvisionInstance, SchemaContextProv private final DataBrokerImpl dataReader; private final NotificationRouter notificationRouter; private final DataReader readWrapper; - - + + private final InstanceIdentifier mountPath; private SchemaContext schemaContext; @@ -89,11 +89,13 @@ public class MountPointImpl implements MountProvisionInstance, SchemaContextProv return dataReader.readOperationalData(path); } + @Override public Registration> registerOperationalReader( InstanceIdentifier path, DataReader reader) { return dataReader.registerOperationalReader(path, reader); } + @Override public Registration> registerConfigurationReader( InstanceIdentifier path, DataReader reader) { return dataReader.registerConfigurationReader(path, reader); @@ -115,15 +117,18 @@ public class MountPointImpl implements MountProvisionInstance, SchemaContextProv return rpcs.addRpcImplementation(rpcType, implementation); } + @Override public Set getSupportedRpcs() { return rpcs.getSupportedRpcs(); } - + + @Override public RpcResult invokeRpc(QName rpc, CompositeNode input) { return rpcs.invokeRpc(rpc, input); } + @Override public ListenerRegistration addRpcRegistrationListener(RpcRegistrationListener listener) { return rpcs.addRpcRegistrationListener(listener); } @@ -145,27 +150,22 @@ public class MountPointImpl implements MountProvisionInstance, SchemaContextProv return dataReader.registerDataChangeListener(path, listener); } - @Override - public void sendNotification(CompositeNode notification) { - publish(notification); - } - @Override public Registration> registerCommitHandler( InstanceIdentifier path, DataCommitHandler commitHandler) { return dataReader.registerCommitHandler(path, commitHandler); } - + @Override public void removeRefresher(DataStoreIdentifier store, DataRefresher refresher) { // NOOP } - + @Override public void addRefresher(DataStoreIdentifier store, DataRefresher refresher) { // NOOP } - + @Override public void addValidator(DataStoreIdentifier store, DataValidator validator) { // NOOP @@ -174,18 +174,20 @@ public class MountPointImpl implements MountProvisionInstance, SchemaContextProv public void removeValidator(DataStoreIdentifier store, DataValidator validator) { // NOOP } - + + @Override public SchemaContext getSchemaContext() { return schemaContext; } + @Override public void setSchemaContext(SchemaContext schemaContext) { this.schemaContext = schemaContext; } class ReadWrapper implements DataReader { - - + + private InstanceIdentifier shortenPath(InstanceIdentifier path) { InstanceIdentifier ret = null; if(mountPath.contains(path)) { @@ -194,7 +196,7 @@ public class MountPointImpl implements MountProvisionInstance, SchemaContextProv } return ret; } - + @Override public CompositeNode readConfigurationData(InstanceIdentifier path) { InstanceIdentifier newPath = shortenPath(path); @@ -203,7 +205,7 @@ public class MountPointImpl implements MountProvisionInstance, SchemaContextProv } return MountPointImpl.this.readConfigurationData(newPath); } - + @Override public CompositeNode readOperationalData(InstanceIdentifier path) { InstanceIdentifier newPath = shortenPath(path); diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/NotificationModule.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/NotificationModule.java index bbe017f009..b298a02a63 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/NotificationModule.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/NotificationModule.java @@ -171,18 +171,13 @@ public class NotificationModule implements BrokerModule { NotificationPublishService { @Override - public void sendNotification(CompositeNode notification) { + public void publish(CompositeNode notification) { checkSessionState(); if (notification == null) throw new IllegalArgumentException( "Notification must not be null."); NotificationModule.this.sendNotification(notification); } - - @Override - public void publish(CompositeNode notification) { - sendNotification(notification); - } } @Override diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/NotificationPublishServiceProxy.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/NotificationPublishServiceProxy.java index 8a15d84f99..cd26c4ea5c 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/NotificationPublishServiceProxy.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/NotificationPublishServiceProxy.java @@ -21,15 +21,13 @@ public class NotificationPublishServiceProxy extends AbstractBrokerServiceProxy< super(ref, delegate); } - public void sendNotification(CompositeNode notification) { - getDelegate().sendNotification(notification); - } - + @Override public Registration addNotificationListener(QName notification, NotificationListener listener) { return addRegistration(getDelegate().addNotificationListener(notification, listener)); } + @Override public void publish(CompositeNode notification) { getDelegate().publish(notification); } diff --git a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/impl/NotificationServiceImpl.java b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/impl/NotificationServiceImpl.java index 3272ce5670..617ec4fca1 100644 --- a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/impl/NotificationServiceImpl.java +++ b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/impl/NotificationServiceImpl.java @@ -53,29 +53,6 @@ public class NotificationServiceImpl implements NotificationService { this._executor = executor; } - @Override - public void addNotificationListener(Class notificationType, NotificationListener listener) { - this.listeners.put(notificationType, listener); - } - - @Override - public void addNotificationListener(org.opendaylight.yangtools.yang.binding.NotificationListener listener) { - UnsupportedOperationException _unsupportedOperationException = new UnsupportedOperationException("Deprecated method. Use registerNotificationListener instead."); - throw _unsupportedOperationException; - } - - @Override - public void removeNotificationListener(org.opendaylight.yangtools.yang.binding.NotificationListener listener) { - UnsupportedOperationException _unsupportedOperationException = new UnsupportedOperationException( - "Deprecated method. Use RegisterNotificationListener returned value to close registration."); - throw _unsupportedOperationException; - } - - @Override - public void removeNotificationListener(Class notificationType, NotificationListener listener) { - this.listeners.remove(notificationType, listener); - } - @Override public Registration> registerNotificationListener(Class notificationType, NotificationListener listener) { //TODO implementation using sal-remote diff --git a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/transactions/RemoteDataModificationTransaction.java b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/transactions/RemoteDataModificationTransaction.java index 7f9cc8f6c4..c2ff3b8cf6 100644 --- a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/transactions/RemoteDataModificationTransaction.java +++ b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/transactions/RemoteDataModificationTransaction.java @@ -10,6 +10,7 @@ package org.opendaylight.controller.sal.restconf.broker.transactions; 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.controller.sal.binding.api.data.DataModificationTransaction; import org.opendaylight.yangtools.concepts.ListenerRegistration; @@ -30,11 +31,6 @@ public class RemoteDataModificationTransaction implements DataModificationTransa return null; } - @Override - public void putRuntimeData(InstanceIdentifier path, DataObject data) { - - } - @Override public void putOperationalData(InstanceIdentifier path, DataObject data) { @@ -45,11 +41,6 @@ public class RemoteDataModificationTransaction implements DataModificationTransa } - @Override - public void removeRuntimeData(InstanceIdentifier path) { - - } - @Override public void removeOperationalData(InstanceIdentifier path) { diff --git a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java index a484154edf..e1d69800ca 100644 --- a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java +++ b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java @@ -8,7 +8,6 @@ package org.opendaylight.controller.sample.toaster.provider; import java.util.Collections; - import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -17,7 +16,6 @@ import java.util.concurrent.atomic.AtomicLong; import org.opendaylight.controller.config.yang.config.toaster_provider.impl.ToasterProviderRuntimeMXBean; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; -import org.opendaylight.controller.sal.common.util.Futures; import org.opendaylight.controller.sal.common.util.Rpcs; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.DisplayString; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.MakeToastInput; @@ -33,13 +31,15 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.util.concurrent.Futures; + public class OpendaylightToaster implements ToasterData, ToasterService, ToasterProviderRuntimeMXBean { private static final Logger log = LoggerFactory.getLogger(OpendaylightToaster.class); private static final DisplayString toasterManufacturer = new DisplayString("Opendaylight"); private static final DisplayString toasterModelNumber = new DisplayString("Model 1 - Binding Aware"); - private ToasterStatus toasterStatus; + private final ToasterStatus toasterStatus; private NotificationProviderService notificationProvider; private final ExecutorService executor; @@ -91,7 +91,7 @@ public class OpendaylightToaster implements ToasterData, ToasterService, Toaster currentTask.cancel(true); ToastDoneBuilder toastDone = new ToastDoneBuilder(); toastDone.setToastStatus(ToastStatus.Cancelled); - notificationProvider.notify(toastDone.build()); + notificationProvider.publish(toastDone.build()); } public void setNotificationProvider(NotificationProviderService salService) { @@ -125,7 +125,7 @@ public class OpendaylightToaster implements ToasterData, ToasterService, Toaster ToastDoneBuilder notifyBuilder = new ToastDoneBuilder(); notifyBuilder.setToastStatus(ToastStatus.Done); - notificationProvider.notify(notifyBuilder.build()); + notificationProvider.publish(notifyBuilder.build()); log.trace("Toast Done"); logToastInput(toastRequest); currentTask = null;