From: Tony Tkacik Date: Mon, 28 Jul 2014 12:24:45 +0000 (+0000) Subject: Merge "BUG-432: migrate users of Registration as appropriate" X-Git-Tag: release/helium~421 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=73bda4f755598599f45cc46cd51c652c0a36e532;hp=af915e9eea61824ff62c7fcfb138d4c81ed08136 Merge "BUG-432: migrate users of Registration as appropriate" --- diff --git a/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FRMRuntimeDataProvider.java b/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FRMRuntimeDataProvider.java index ff68176f1f..0653eeb2a6 100644 --- a/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FRMRuntimeDataProvider.java +++ b/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FRMRuntimeDataProvider.java @@ -38,7 +38,7 @@ public class FRMRuntimeDataProvider implements RuntimeDataProvider, DataCommitHa private DataProviderService dataService; private IForwardingRulesManager manager; - public Registration, DataObject>> init() { + public Registration init() { return this.dataService.registerCommitHandler(FRMRuntimeDataProvider.FLOWS_PATH, this); } diff --git a/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/FlowCapableInventoryProvider.java b/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/FlowCapableInventoryProvider.java index 6ed61e3024..9724d31f9a 100644 --- a/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/FlowCapableInventoryProvider.java +++ b/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/FlowCapableInventoryProvider.java @@ -15,7 +15,7 @@ import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction; import org.opendaylight.controller.sal.binding.api.data.DataProviderService; -import org.opendaylight.yangtools.concepts.Registration; +import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +30,7 @@ class FlowCapableInventoryProvider implements AutoCloseable, Runnable { private final BlockingQueue queue = new LinkedBlockingDeque<>(QUEUE_DEPTH); private final NotificationProviderService notificationService; private final DataProviderService dataService; - private Registration listenerRegistration; + private ListenerRegistration listenerRegistration; private Thread thread; FlowCapableInventoryProvider(final DataProviderService dataService, final NotificationProviderService notificationService) { 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 5aa3b99b30..7fa40b8d07 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 @@ -33,5 +33,5 @@ public interface DataProviderService extends DataBrokerService, DataProvisionSer * @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); + Registration registerDataReader(InstanceIdentifier path,DataReader,DataObject> reader); } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ForwardedBackwardsCompatibleDataBroker.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ForwardedBackwardsCompatibleDataBroker.java index a243e6223a..c924b74a12 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ForwardedBackwardsCompatibleDataBroker.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ForwardedBackwardsCompatibleDataBroker.java @@ -88,7 +88,7 @@ public class ForwardedBackwardsCompatibleDataBroker extends AbstractForwardedDat } @Override - public Registration, DataObject>> registerCommitHandler( + public Registration registerCommitHandler( final InstanceIdentifier path, final DataCommitHandler, DataObject> commitHandler) { @@ -123,7 +123,7 @@ public class ForwardedBackwardsCompatibleDataBroker extends AbstractForwardedDat } @Override - public Registration, DataObject>> registerDataReader( + public Registration registerDataReader( final InstanceIdentifier path, final DataReader, DataObject> reader) { throw new UnsupportedOperationException("Data reader contract is not supported."); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/DataBrokerImpl.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/DataBrokerImpl.java index 9ede01b6a3..d4cfb563f6 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/DataBrokerImpl.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/DataBrokerImpl.java @@ -147,14 +147,14 @@ public class DataBrokerImpl extends } @Override - public Registration, DataObject>> registerConfigurationReader( + public Registration registerConfigurationReader( final InstanceIdentifier path, final DataReader, DataObject> reader) { throw new UnsupportedOperationException("Not supported"); } @Override - public Registration, DataObject>> registerOperationalReader( + public Registration registerOperationalReader( final InstanceIdentifier path, final DataReader, DataObject> reader) { throw new UnsupportedOperationException("Not supported"); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java index 71253d02d6..293a61e0ea 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java @@ -16,7 +16,6 @@ import java.util.Collections; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.opendaylight.controller.md.sal.binding.impl.AbstractForwardedDataBroker; -import org.opendaylight.controller.md.sal.common.api.data.DataCommitHandler; import org.opendaylight.controller.md.sal.common.api.routing.RouteChangePublisher; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; @@ -59,7 +58,7 @@ public class BindingIndependentConnector implements // private final BindingToDomCommitHandler bindingToDomCommitHandler; private final DomToBindingCommitHandler domToBindingCommitHandler; - private Registration> biCommitHandlerRegistration; + private Registration biCommitHandlerRegistration; private RpcProvisionRegistry biRpcRegistry; private RpcProviderRegistry baRpcRegistry; diff --git a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NotificationTest.java b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NotificationTest.java index e6bbaab2d9..9ec5bcf6c2 100644 --- a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NotificationTest.java +++ b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NotificationTest.java @@ -33,7 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.Node import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowListener; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SwitchFlowRemoved; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.FlowCookie; -import org.opendaylight.yangtools.concepts.Registration; +import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.NotificationListener; import org.opendaylight.yangtools.yang.binding.RpcService; @@ -43,8 +43,8 @@ public class NotificationTest extends AbstractTest { private final FlowListener listener1 = new FlowListener(); private final FlowListener listener2 = new FlowListener(); - private Registration listener1Reg; - private Registration listener2Reg; + private ListenerRegistration listener1Reg; + private ListenerRegistration listener2Reg; private NotificationProviderService notifyProviderService; 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 8f367de6c8..830942f337 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 @@ -40,14 +40,14 @@ public abstract class AbstractBindingSalProviderInstance, DataObject>> registerDataReader( + public Registration registerDataReader( InstanceIdentifier path, DataReader, DataObject> reader) { return getDataBrokerChecked().registerDataReader(path, reader); } @Override - public Registration, DataObject>> registerCommitHandler( + public Registration registerCommitHandler( InstanceIdentifier path, DataCommitHandler, DataObject> commitHandler) { return getDataBrokerChecked().registerCommitHandler(path, commitHandler); diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/RegistrationListener.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/RegistrationListener.java index f088c0a0bd..3b3217db6b 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/RegistrationListener.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/RegistrationListener.java @@ -11,7 +11,7 @@ import java.util.EventListener; import org.opendaylight.yangtools.concepts.Registration; -public interface RegistrationListener> extends EventListener { +public interface RegistrationListener extends EventListener { void onRegister(T registration); 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 224751c37d..dceb3de5bf 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 @@ -20,7 +20,7 @@ import org.opendaylight.yangtools.concepts.Registration; * @param */ @Deprecated -public interface DataCommitHandlerRegistration

,D> extends Registration>{ +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/DataProvisionService.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvisionService.java index bd80a53893..6c7166eaee 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 @@ -20,7 +20,7 @@ import org.opendaylight.yangtools.concepts.Registration; @Deprecated public interface DataProvisionService

, D> { - public Registration> registerCommitHandler(P path, DataCommitHandler commitHandler); + public Registration registerCommitHandler(P path, DataCommitHandler commitHandler); public ListenerRegistration>> registerCommitHandlerListener(RegistrationListener> commitHandlerListener); diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationSubscriptionService.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationSubscriptionService.java index bfca8f8bcc..feccbbad92 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationSubscriptionService.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationSubscriptionService.java @@ -7,9 +7,11 @@ */ package org.opendaylight.controller.md.sal.common.api.notify; -import org.opendaylight.yangtools.concepts.Registration; +import java.util.EventListener; -public interface NotificationSubscriptionService { +import org.opendaylight.yangtools.concepts.ListenerRegistration; - Registration registerNotificationListener(T type,L listener); +public interface NotificationSubscriptionService { + + ListenerRegistration registerNotificationListener(T type,L listener); } diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RoutedRegistration.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RoutedRegistration.java index 6fe8d69217..7b1cdeae9f 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RoutedRegistration.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RoutedRegistration.java @@ -17,7 +17,7 @@ import org.opendaylight.yangtools.concepts.Registration; * @param

the path identifier type * @param the RPC implementation type */ -public interface RoutedRegistration, S> extends Registration { +public interface RoutedRegistration, S> extends Registration { /** * Registers the RPC implementation associated with this registration for the given path diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java index ee9af6cb80..5dfb55ebd9 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java @@ -97,13 +97,13 @@ public abstract class AbstractDataReadRouter

, D> implements Da * @param reader Reader instance which is responsible for reading particular subpath. * @return */ - public Registration> registerOperationalReader(P path, DataReader reader) { + public Registration registerOperationalReader(P path, DataReader reader) { OperationalDataReaderRegistration ret = new OperationalDataReaderRegistration<>(path, reader); operationalReaders.put(path, ret); return ret; } - public Registration> registerConfigurationReader(P path, DataReader reader) { + public Registration registerConfigurationReader(P path, DataReader reader) { ConfigurationDataReaderRegistration ret = new ConfigurationDataReaderRegistration<>(path, reader); configReaders.put(path, ret); return ret; diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.java index d8bde3d41a..a732f2f1b9 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.java @@ -230,7 +230,7 @@ public abstract class AbstractDataBroker

, D extends Object, DC } @Override - public final Registration> registerCommitHandler(final P path, + public final Registration registerCommitHandler(final P path, final DataCommitHandler commitHandler) { synchronized (commitHandler) { final DataCommitHandlerRegistrationImpl registration = new DataCommitHandlerRegistrationImpl( @@ -266,8 +266,8 @@ public abstract class AbstractDataBroker

, D extends Object, DC public final CompositeObjectRegistration> registerDataReader(final P path, final DataReader reader) { - final Registration> confReg = getDataReadRouter().registerConfigurationReader(path, reader); - final Registration> dataReg = getDataReadRouter().registerOperationalReader(path, reader); + final Registration confReg = getDataReadRouter().registerConfigurationReader(path, reader); + final Registration dataReg = getDataReadRouter().registerOperationalReader(path, reader); return new CompositeObjectRegistration>(reader, Arrays.asList(confReg, dataReg)); } 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 0810fa3e98..97b640647a 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 @@ -63,9 +63,9 @@ public interface DataProviderService extends void removeRefresher(DataStoreIdentifier store, DataRefresher refresher); - Registration> registerConfigurationReader(InstanceIdentifier path, DataReader reader); + Registration registerConfigurationReader(InstanceIdentifier path, DataReader reader); - Registration> registerOperationalReader(InstanceIdentifier path, DataReader reader); + Registration registerOperationalReader(InstanceIdentifier path, DataReader reader); public interface DataRefresher extends Provider.ProviderFunctionality { diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationService.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationService.java index 1d67ca0824..9c0db42d6c 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationService.java +++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/notify/NotificationService.java @@ -8,7 +8,7 @@ package org.opendaylight.controller.sal.core.api.notify; import org.opendaylight.controller.sal.core.api.BrokerService; -import org.opendaylight.yangtools.concepts.Registration; +import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.common.QName; @@ -38,6 +38,6 @@ public interface NotificationService extends BrokerService { * @param notification * @param listener */ - Registration addNotificationListener(QName notification, + ListenerRegistration addNotificationListener(QName notification, NotificationListener listener); } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/compat/BackwardsCompatibleDataBroker.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/compat/BackwardsCompatibleDataBroker.java index f361af948c..8405a78c33 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/compat/BackwardsCompatibleDataBroker.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/compat/BackwardsCompatibleDataBroker.java @@ -77,7 +77,7 @@ public class BackwardsCompatibleDataBroker implements DataProviderService { } @Override - public Registration> registerCommitHandler( + public Registration registerCommitHandler( final InstanceIdentifier path, final DataCommitHandler commitHandler) { // FIXME Do real forwarding return new AbstractObjectRegistration>(commitHandler) { @@ -117,13 +117,13 @@ public class BackwardsCompatibleDataBroker implements DataProviderService { } @Override - public Registration> registerConfigurationReader( + public Registration registerConfigurationReader( final InstanceIdentifier path, final DataReader reader) { throw new UnsupportedOperationException("Data Reader contract is not supported."); } @Override - public Registration> registerOperationalReader( + public Registration registerOperationalReader( final InstanceIdentifier path, final DataReader reader) { throw new UnsupportedOperationException("Data Reader contract is not supported."); } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/DataBrokerImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/DataBrokerImpl.java index 69f518bb32..32a0ad20ca 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/DataBrokerImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/DataBrokerImpl.java @@ -45,13 +45,13 @@ public class DataBrokerImpl extends AbstractDataBroker> registerConfigurationReader( + public Registration registerConfigurationReader( InstanceIdentifier path, DataReader reader) { return getDataReadRouter().registerConfigurationReader(path, reader); } @Override - public Registration> registerOperationalReader( + public Registration registerOperationalReader( InstanceIdentifier path, DataReader reader) { return getDataReadRouter().registerOperationalReader(path, reader); } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java index 60a7e81c4c..d8174c312a 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java @@ -49,7 +49,7 @@ public class GlobalBundleScanningSchemaServiceImpl implements SchemaContextProvi private final BundleContext context; private ServiceTracker listenerTracker; - private BundleTracker>> bundleTracker; + private BundleTracker> bundleTracker; private boolean starting = true; private static GlobalBundleScanningSchemaServiceImpl instance; @@ -156,9 +156,9 @@ public class GlobalBundleScanningSchemaServiceImpl implements SchemaContextProvi } } - private class BundleScanner implements BundleTrackerCustomizer>> { + private class BundleScanner implements BundleTrackerCustomizer> { @Override - public Iterable> addingBundle(final Bundle bundle, final BundleEvent event) { + public Iterable addingBundle(final Bundle bundle, final BundleEvent event) { if (bundle.getBundleId() == 0) { return Collections.emptyList(); @@ -169,7 +169,7 @@ public class GlobalBundleScanningSchemaServiceImpl implements SchemaContextProvi return Collections.emptyList(); } - final List> urls = new ArrayList<>(); + final List urls = new ArrayList<>(); while (enumeration.hasMoreElements()) { final URL u = enumeration.nextElement(); try { @@ -189,7 +189,7 @@ public class GlobalBundleScanningSchemaServiceImpl implements SchemaContextProvi } @Override - public void modifiedBundle(final Bundle bundle, final BundleEvent event, final Iterable> object) { + public void modifiedBundle(final Bundle bundle, final BundleEvent event, final Iterable object) { LOG.debug("Modified bundle {} {} {}", bundle, event, object); } @@ -200,8 +200,8 @@ public class GlobalBundleScanningSchemaServiceImpl implements SchemaContextProvi */ @Override - public synchronized void removedBundle(final Bundle bundle, final BundleEvent event, final Iterable> urls) { - for (Registration url : urls) { + public synchronized void removedBundle(final Bundle bundle, final BundleEvent event, final Iterable urls) { + for (Registration url : urls) { try { url.close(); } catch (Exception e) { 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 bc77f1d69c..dd47cb41f7 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 @@ -77,7 +77,7 @@ public class MountPointImpl implements MountProvisionInstance, SchemaContextProv } @Override - public Registration addNotificationListener(final QName notification, final NotificationListener listener) { + public ListenerRegistration addNotificationListener(final QName notification, final NotificationListener listener) { return notificationRouter.addNotificationListener(notification, listener); } @@ -92,13 +92,13 @@ public class MountPointImpl implements MountProvisionInstance, SchemaContextProv } @Override - public Registration> registerOperationalReader( + public Registration registerOperationalReader( final InstanceIdentifier path, final DataReader reader) { return dataReader.registerOperationalReader(path, reader); } @Override - public Registration> registerConfigurationReader( + public Registration registerConfigurationReader( final InstanceIdentifier path, final DataReader reader) { return dataReader.registerConfigurationReader(path, reader); } @@ -151,7 +151,7 @@ public class MountPointImpl implements MountProvisionInstance, SchemaContextProv } @Override - public Registration> registerCommitHandler( + public Registration registerCommitHandler( final InstanceIdentifier path, final DataCommitHandler commitHandler) { return dataReader.registerCommitHandler(path, commitHandler); } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/NotificationRouterImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/NotificationRouterImpl.java index 7fba31114f..1e93202007 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/NotificationRouterImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/NotificationRouterImpl.java @@ -12,7 +12,7 @@ import java.util.Collection; import org.opendaylight.controller.sal.core.api.notify.NotificationListener; import org.opendaylight.controller.sal.dom.broker.spi.NotificationRouter; import org.opendaylight.yangtools.concepts.AbstractListenerRegistration; -import org.opendaylight.yangtools.concepts.Registration; +import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.CompositeNode; import org.slf4j.Logger; @@ -25,12 +25,12 @@ import com.google.common.collect.Multimaps; public class NotificationRouterImpl implements NotificationRouter { private static Logger log = LoggerFactory.getLogger(NotificationRouterImpl.class); - private final Multimap listeners = Multimaps.synchronizedSetMultimap(HashMultimap.create()); + private final Multimap listeners = Multimaps.synchronizedSetMultimap(HashMultimap.create()); // private Registration defaultListener; private void sendNotification(CompositeNode notification) { final QName type = notification.getNodeType(); - final Collection toNotify = listeners.get(type); + final Collection toNotify = listeners.get(type); log.trace("Publishing notification " + type); if ((toNotify == null) || toNotify.isEmpty()) { @@ -38,7 +38,7 @@ public class NotificationRouterImpl implements NotificationRouter { return; } - for (ListenerRegistration listener : toNotify) { + for (MyListenerRegistration listener : toNotify) { try { // FIXME: ensure that notification is immutable listener.getInstance().onNotification(notification); @@ -54,17 +54,17 @@ public class NotificationRouterImpl implements NotificationRouter { } @Override - public Registration addNotificationListener(QName notification, NotificationListener listener) { - ListenerRegistration ret = new ListenerRegistration(notification, listener); + public ListenerRegistration addNotificationListener(QName notification, NotificationListener listener) { + MyListenerRegistration ret = new MyListenerRegistration(notification, listener); listeners.put(notification, ret); return ret; } - private class ListenerRegistration extends AbstractListenerRegistration { + private class MyListenerRegistration extends AbstractListenerRegistration { final QName type; - public ListenerRegistration(QName type, NotificationListener instance) { + public MyListenerRegistration(QName type, NotificationListener instance) { super(instance); this.type = type; } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/AbstractBrokerServiceProxy.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/AbstractBrokerServiceProxy.java index 8d33ff7997..275107ed8f 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/AbstractBrokerServiceProxy.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/AbstractBrokerServiceProxy.java @@ -39,9 +39,9 @@ public abstract class AbstractBrokerServiceProxy implem return reference; } - private final Set> registrations = Collections.synchronizedSet(new HashSet>()); + private final Set registrations = Collections.synchronizedSet(new HashSet()); - protected > R addRegistration(final R registration) { + protected R addRegistration(final R registration) { if (registration != null) { registrations.add(registration); } @@ -63,7 +63,7 @@ public abstract class AbstractBrokerServiceProxy implem RuntimeException potentialException = new RuntimeException( "Uncaught exceptions occured during unregistration"); boolean hasSuppressed = false; - for (Registration registration : registrations) { + for (Registration registration : registrations) { try { registration.close(); } catch (Exception e) { diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DataProviderServiceProxy.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DataProviderServiceProxy.java index caae2971f8..5e5b25bdc8 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DataProviderServiceProxy.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DataProviderServiceProxy.java @@ -57,19 +57,19 @@ public class DataProviderServiceProxy extends AbstractBrokerServiceProxy> registerCommitHandler( + public Registration registerCommitHandler( InstanceIdentifier path, DataCommitHandler commitHandler) { return addRegistration(getDelegate().registerCommitHandler(path, commitHandler)); } @Override - public Registration> registerConfigurationReader( + public Registration registerConfigurationReader( InstanceIdentifier path, DataReader reader) { return addRegistration(getDelegate().registerConfigurationReader(path, reader)); } @Override - public Registration> registerOperationalReader( + public Registration registerOperationalReader( InstanceIdentifier path, DataReader reader) { return addRegistration(getDelegate().registerOperationalReader(path, reader)); } 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 cd26c4ea5c..72cd41b933 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 @@ -9,7 +9,7 @@ package org.opendaylight.controller.sal.dom.broker.osgi; import org.opendaylight.controller.sal.core.api.notify.NotificationListener; import org.opendaylight.controller.sal.core.api.notify.NotificationPublishService; -import org.opendaylight.yangtools.concepts.Registration; +import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.CompositeNode; import org.osgi.framework.ServiceReference; @@ -22,7 +22,7 @@ public class NotificationPublishServiceProxy extends AbstractBrokerServiceProxy< } @Override - public Registration addNotificationListener(QName notification, NotificationListener listener) { + public ListenerRegistration addNotificationListener(QName notification, NotificationListener listener) { return addRegistration(getDelegate().addNotificationListener(notification, listener)); } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/NotificationServiceProxy.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/NotificationServiceProxy.java index a0051dc38e..4da7f025b3 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/NotificationServiceProxy.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/NotificationServiceProxy.java @@ -9,7 +9,7 @@ package org.opendaylight.controller.sal.dom.broker.osgi; import org.opendaylight.controller.sal.core.api.notify.NotificationListener; import org.opendaylight.controller.sal.core.api.notify.NotificationService; -import org.opendaylight.yangtools.concepts.Registration; +import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.common.QName; import org.osgi.framework.ServiceReference; @@ -21,7 +21,7 @@ public class NotificationServiceProxy extends AbstractBrokerServiceProxy addNotificationListener(QName notification, NotificationListener listener) { + public ListenerRegistration addNotificationListener(QName notification, NotificationListener listener) { return addRegistration(getDelegate().addNotificationListener(notification, listener)); } } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/spi/NotificationRouter.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/spi/NotificationRouter.java index ebe95d6eb5..2d8bd186c5 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/spi/NotificationRouter.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/spi/NotificationRouter.java @@ -8,7 +8,7 @@ package org.opendaylight.controller.sal.dom.broker.spi; import org.opendaylight.controller.sal.core.api.notify.NotificationListener; -import org.opendaylight.yangtools.concepts.Registration; +import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.CompositeNode; @@ -22,7 +22,7 @@ public interface NotificationRouter { * @param notification * @param listener */ - Registration addNotificationListener(QName notification, + ListenerRegistration addNotificationListener(QName notification, NotificationListener listener); } diff --git a/opendaylight/md-sal/samples/l2switch/implementation/src/main/java/org/opendaylight/controller/sample/l2switch/md/L2SwitchProvider.java b/opendaylight/md-sal/samples/l2switch/implementation/src/main/java/org/opendaylight/controller/sample/l2switch/md/L2SwitchProvider.java index 6f31a7ec76..d123456262 100644 --- a/opendaylight/md-sal/samples/l2switch/implementation/src/main/java/org/opendaylight/controller/sample/l2switch/md/L2SwitchProvider.java +++ b/opendaylight/md-sal/samples/l2switch/implementation/src/main/java/org/opendaylight/controller/sample/l2switch/md/L2SwitchProvider.java @@ -20,7 +20,7 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; import org.opendaylight.controller.sal.binding.api.NotificationService; import org.opendaylight.controller.sal.binding.api.data.DataBrokerService; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService; -import org.opendaylight.yangtools.concepts.Registration; +import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.NotificationListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +33,7 @@ public class L2SwitchProvider extends AbstractBindingAwareConsumer private final static Logger _logger = LoggerFactory.getLogger(L2SwitchProvider.class); - private Registration listenerRegistration; + private ListenerRegistration listenerRegistration; private AddressTracker addressTracker; private TopologyLinkDataChangeHandler topologyLinkDataChangeHandler; diff --git a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/config/yang/config/kitchen_service/impl/KitchenServiceModule.java b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/config/yang/config/kitchen_service/impl/KitchenServiceModule.java index 88281bd593..8d67fb4ed0 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/config/yang/config/kitchen_service/impl/KitchenServiceModule.java +++ b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/config/yang/config/kitchen_service/impl/KitchenServiceModule.java @@ -16,7 +16,7 @@ import org.opendaylight.controller.sample.kitchen.api.KitchenService; import org.opendaylight.controller.sample.kitchen.impl.KitchenServiceImpl; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToastType; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterService; -import org.opendaylight.yangtools.concepts.Registration; +import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.NotificationListener; import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; @@ -50,7 +50,7 @@ public final class KitchenServiceModule extends AbstractKitchenServiceModule { final KitchenServiceImpl kitchenService = new KitchenServiceImpl(toasterService); - final Registration toasterListenerReg = + final ListenerRegistration toasterListenerReg = getNotificationServiceDependency().registerNotificationListener( kitchenService ); final KitchenServiceRuntimeRegistration runtimeReg = diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java index b96d2be47e..8c9b60e43f 100644 --- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java +++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java @@ -28,7 +28,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111. import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.OpendaylightPortStatisticsService; import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.OpendaylightQueueStatisticsService; import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.NotificationListener; import org.slf4j.Logger; @@ -76,7 +75,7 @@ public class StatisticsProvider implements AutoCloseable { private final StatisticsListener updateCommiter = new StatisticsListener(StatisticsProvider.this); - private Registration listenerRegistration; + private ListenerRegistration listenerRegistration; private ListenerRegistration flowCapableTrackerRegistration; diff --git a/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/LLDPDiscoveryProvider.java b/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/LLDPDiscoveryProvider.java index b219722ba8..91db6e264b 100644 --- a/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/LLDPDiscoveryProvider.java +++ b/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/LLDPDiscoveryProvider.java @@ -9,7 +9,7 @@ package org.opendaylight.md.controller.topology.lldp; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.controller.sal.binding.api.data.DataProviderService; -import org.opendaylight.yangtools.concepts.Registration; +import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.NotificationListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,7 +19,7 @@ public class LLDPDiscoveryProvider implements AutoCloseable { private DataProviderService dataService; private NotificationProviderService notificationService; private final LLDPDiscoveryListener commiter = new LLDPDiscoveryListener(LLDPDiscoveryProvider.this); - private Registration listenerRegistration; + private ListenerRegistration listenerRegistration; public DataProviderService getDataService() { return this.dataService; @@ -38,7 +38,7 @@ public class LLDPDiscoveryProvider implements AutoCloseable { } public void start() { - Registration registerNotificationListener = this.getNotificationService().registerNotificationListener(this.commiter); + ListenerRegistration registerNotificationListener = this.getNotificationService().registerNotificationListener(this.commiter); this.listenerRegistration = registerNotificationListener; LLDPLinkAger.getInstance().setManager(this); LOG.info("LLDPDiscoveryListener Started."); diff --git a/opendaylight/md-sal/topology-manager/src/main/java/org/opendaylight/md/controller/topology/manager/FlowCapableTopologyProvider.java b/opendaylight/md-sal/topology-manager/src/main/java/org/opendaylight/md/controller/topology/manager/FlowCapableTopologyProvider.java index d656bda932..a87971bc6b 100644 --- a/opendaylight/md-sal/topology-manager/src/main/java/org/opendaylight/md/controller/topology/manager/FlowCapableTopologyProvider.java +++ b/opendaylight/md-sal/topology-manager/src/main/java/org/opendaylight/md/controller/topology/manager/FlowCapableTopologyProvider.java @@ -19,7 +19,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey; -import org.opendaylight.yangtools.concepts.Registration; +import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.NotificationListener; import org.osgi.framework.BundleContext; @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; public class FlowCapableTopologyProvider extends AbstractBindingAwareProvider implements AutoCloseable { private final static Logger LOG = LoggerFactory.getLogger(FlowCapableTopologyProvider.class); - private Registration listenerRegistration; + private ListenerRegistration listenerRegistration; private Thread thread; /**