From 4971aed628d669fec45185569b43d042ec650421 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Tue, 6 Mar 2018 18:23:30 -0500 Subject: [PATCH] Fix checkstyle violations in sal-dom-broker-config and sal-binding-config Change-Id: I5cbd04bfb598481fc6b107f426cf01819ab8d4b2 Signed-off-by: Tom Pantelis --- .../BindingAsyncDataBrokerImplModule.java | 8 +++--- ...ndingAsyncDataBrokerImplModuleFactory.java | 14 +++------- .../binding/impl/BindingBrokerImplModule.java | 14 ++++++---- .../impl/BindingBrokerImplModuleFactory.java | 4 ++- .../BindingNotificationAdapterModule.java | 9 +++++-- ...ndingNotificationAdapterModuleFactory.java | 4 ++- ...ndingNotificationPublishAdapterModule.java | 11 +++++--- ...tificationPublishAdapterModuleFactory.java | 5 +++- ...oopProvider.java => DummyDOMProvider.java} | 0 .../impl/NotificationBrokerImplModule.java | 2 ++ .../NotificationBrokerImplModuleFactory.java | 5 ++-- .../binding/impl/RuntimeMappingModule.java | 2 ++ .../impl/RuntimeMappingModuleFactory.java | 18 +++++++++---- .../md/sal/dom/impl/DomBrokerImplModule.java | 27 ++++++++++++------- .../dom/impl/DomBrokerImplModuleFactory.java | 5 ++-- .../dom/impl/DomInmemoryDataBrokerModule.java | 20 +++++++------- .../DomInmemoryDataBrokerModuleFactory.java | 7 +++-- .../SchemaServiceImplSingletonModule.java | 11 +++++--- ...hemaServiceImplSingletonModuleFactory.java | 22 ++++++++++----- .../pingpong/PingpongDataBrokerModule.java | 5 +++- .../PingpongDataBrokerModuleFactory.java | 2 ++ 21 files changed, 124 insertions(+), 71 deletions(-) rename opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/{DummyNoopProvider.java => DummyDOMProvider.java} (100%) diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java index 09e790e3b2..92b8d0ca8c 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModule.java @@ -13,11 +13,12 @@ import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCo import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated -public class BindingAsyncDataBrokerImplModule extends - org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractBindingAsyncDataBrokerImplModule { +public class BindingAsyncDataBrokerImplModule extends AbstractBindingAsyncDataBrokerImplModule { public BindingAsyncDataBrokerImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { @@ -27,7 +28,7 @@ public class BindingAsyncDataBrokerImplModule extends public BindingAsyncDataBrokerImplModule( final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, - final org.opendaylight.controller.config.yang.md.sal.binding.impl.BindingAsyncDataBrokerImplModule oldModule, + final BindingAsyncDataBrokerImplModule oldModule, final java.lang.AutoCloseable oldInstance) { super(identifier, dependencyResolver, oldModule, oldInstance); } @@ -43,5 +44,4 @@ public class BindingAsyncDataBrokerImplModule extends final DOMDataBroker domDataBroker = getDomAsyncBrokerDependency(); return new BindingDOMDataBrokerAdapter(domDataBroker, mappingService); } - } diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModuleFactory.java index bbdaf8b8d6..5956d78cd3 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModuleFactory.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingAsyncDataBrokerImplModuleFactory.java @@ -5,22 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - -/* -* Generated file -* -* Generated from: yang module name: opendaylight-sal-binding-broker-impl yang module local name: binding-forwarded-data-broker -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Fri May 16 17:18:18 CEST 2014 -* -* Do not modify this file unless it is present under src/main directory -*/ package org.opendaylight.controller.config.yang.md.sal.binding.impl; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated -public class BindingAsyncDataBrokerImplModuleFactory extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractBindingAsyncDataBrokerImplModuleFactory { +public class BindingAsyncDataBrokerImplModuleFactory extends AbstractBindingAsyncDataBrokerImplModuleFactory { } diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java index 6480080136..f9a64ab071 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java @@ -31,6 +31,8 @@ import org.opendaylight.controller.sal.core.api.Broker; import org.opendaylight.controller.sal.core.api.Broker.ProviderSession; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated @@ -79,23 +81,25 @@ public final class BindingBrokerImplModule extends private BindingDOMRpcProviderServiceAdapter createRpcProvider(final BindingToNormalizedNodeCodec codec, final ProviderSession session) { final DOMRpcProviderService domService = session.getService(DOMRpcProviderService.class); - if(domService != null) { + if (domService != null) { return new BindingDOMRpcProviderServiceAdapter(domService, codec); } return null; } - private BindingDOMRpcServiceAdapter createRpcConsumer(final BindingToNormalizedNodeCodec codec, final ProviderSession session) { + private BindingDOMRpcServiceAdapter createRpcConsumer(final BindingToNormalizedNodeCodec codec, + final ProviderSession session) { final DOMRpcService domService = session.getService(DOMRpcService.class); - if(domService != null) { + if (domService != null) { return new BindingDOMRpcServiceAdapter(domService, codec); } return null; } - private MountPointService createMountPointAdapter(final BindingToNormalizedNodeCodec codec, final ProviderSession session) { + private MountPointService createMountPointAdapter(final BindingToNormalizedNodeCodec codec, + final ProviderSession session) { final DOMMountPointService domService = session.getService(DOMMountPointService.class); - if(domService != null) { + if (domService != null) { return new BindingDOMMountPointServiceAdapter(domService, codec); } return null; diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java index c69e5810e9..e655373302 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModuleFactory.java @@ -17,9 +17,11 @@ package org.opendaylight.controller.config.yang.md.sal.binding.impl; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated -public class BindingBrokerImplModuleFactory extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractBindingBrokerImplModuleFactory { +public class BindingBrokerImplModuleFactory extends AbstractBindingBrokerImplModuleFactory { } diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java index 0a10a1d5f9..a076163262 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModule.java @@ -15,15 +15,20 @@ import org.opendaylight.controller.md.sal.dom.api.DOMNotificationService; import org.opendaylight.controller.sal.core.api.Broker; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated public class BindingNotificationAdapterModule extends AbstractBindingNotificationAdapterModule { - public BindingNotificationAdapterModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver) { + public BindingNotificationAdapterModule(final ModuleIdentifier identifier, + final DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); } - public BindingNotificationAdapterModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver, final org.opendaylight.controller.config.yang.md.sal.binding.impl.BindingNotificationAdapterModule oldModule, final java.lang.AutoCloseable oldInstance) { + public BindingNotificationAdapterModule(final ModuleIdentifier identifier, + final DependencyResolver dependencyResolver, final BindingNotificationAdapterModule oldModule, + final AutoCloseable oldInstance) { super(identifier, dependencyResolver, oldModule, oldInstance); } diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModuleFactory.java index e29fef5410..1a28e80f97 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModuleFactory.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationAdapterModuleFactory.java @@ -8,9 +8,11 @@ package org.opendaylight.controller.config.yang.md.sal.binding.impl; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated -public class BindingNotificationAdapterModuleFactory extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractBindingNotificationAdapterModuleFactory { +public class BindingNotificationAdapterModuleFactory extends AbstractBindingNotificationAdapterModuleFactory { } diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java index 4f91d5b5e8..e394d66a63 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModule.java @@ -15,15 +15,20 @@ import org.opendaylight.controller.md.sal.dom.api.DOMNotificationPublishService; import org.opendaylight.controller.sal.core.api.Broker; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated public class BindingNotificationPublishAdapterModule extends AbstractBindingNotificationPublishAdapterModule { - public BindingNotificationPublishAdapterModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver) { + public BindingNotificationPublishAdapterModule(final ModuleIdentifier identifier, + final DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); } - public BindingNotificationPublishAdapterModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver, final BindingNotificationPublishAdapterModule oldModule, final java.lang.AutoCloseable oldInstance) { + public BindingNotificationPublishAdapterModule(final ModuleIdentifier identifier, + final DependencyResolver dependencyResolver, final BindingNotificationPublishAdapterModule oldModule, + final AutoCloseable oldInstance) { super(identifier, dependencyResolver, oldModule, oldInstance); } @@ -33,7 +38,7 @@ public class BindingNotificationPublishAdapterModule extends AbstractBindingNoti } @Override - public java.lang.AutoCloseable createInstance() { + public AutoCloseable createInstance() { final BindingToNormalizedNodeCodec codec = getBindingMappingServiceDependency(); final Broker.ProviderSession session = getDomAsyncBrokerDependency().registerProvider(new DummyDOMProvider()); final DOMNotificationPublishService publishService = session.getService(DOMNotificationPublishService.class); diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModuleFactory.java index df8eace213..59fec8cbd1 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModuleFactory.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingNotificationPublishAdapterModuleFactory.java @@ -8,9 +8,12 @@ package org.opendaylight.controller.config.yang.md.sal.binding.impl; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated -public class BindingNotificationPublishAdapterModuleFactory extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractBindingNotificationPublishAdapterModuleFactory { +public class BindingNotificationPublishAdapterModuleFactory + extends AbstractBindingNotificationPublishAdapterModuleFactory { } diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/DummyNoopProvider.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/DummyDOMProvider.java similarity index 100% rename from opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/DummyNoopProvider.java rename to opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/DummyDOMProvider.java diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java index 1416cda5d8..6016c4a93c 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java @@ -17,6 +17,8 @@ import org.opendaylight.controller.md.sal.dom.api.DOMNotificationPublishService; import org.opendaylight.controller.md.sal.dom.spi.DOMNotificationSubscriptionListenerRegistry; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModuleFactory.java index 44d7609939..856916ede9 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModuleFactory.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModuleFactory.java @@ -8,10 +8,11 @@ package org.opendaylight.controller.config.yang.md.sal.binding.impl; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated -public class NotificationBrokerImplModuleFactory extends - org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractNotificationBrokerImplModuleFactory { +public class NotificationBrokerImplModuleFactory extends AbstractNotificationBrokerImplModuleFactory { } diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java index 89cdb06d19..ba264635a0 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java @@ -13,6 +13,8 @@ import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCo import org.osgi.framework.BundleContext; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModuleFactory.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModuleFactory.java index c9195c7073..8eaf9d4492 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModuleFactory.java +++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModuleFactory.java @@ -8,10 +8,13 @@ package org.opendaylight.controller.config.yang.md.sal.binding.impl; import static com.google.common.base.Preconditions.checkArgument; + import org.opendaylight.controller.config.api.DependencyResolver; import org.osgi.framework.BundleContext; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated @@ -21,17 +24,22 @@ public class RuntimeMappingModuleFactory extends public static final String SINGLETON_NAME = "runtime-mapping-singleton"; @Override - public RuntimeMappingModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, RuntimeMappingModule oldModule, AutoCloseable oldInstance, BundleContext bundleContext) { - checkArgument(SINGLETON_NAME.equals(instanceName),"Illegal instance name '" + instanceName + "', only allowed name is " + SINGLETON_NAME); - RuntimeMappingModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule, oldInstance, bundleContext); + public RuntimeMappingModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, + RuntimeMappingModule oldModule, AutoCloseable oldInstance, BundleContext bundleContext) { + checkArgument(SINGLETON_NAME.equals(instanceName), + "Illegal instance name '" + instanceName + "', only allowed name is " + SINGLETON_NAME); + RuntimeMappingModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule, oldInstance, + bundleContext); // FIXME bundle context should not be passed around module.setBundleContext(bundleContext); return module; } @Override - public RuntimeMappingModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, BundleContext bundleContext) { - checkArgument(SINGLETON_NAME.equals(instanceName),"Illegal instance name '" + instanceName + "', only allowed name is " + SINGLETON_NAME); + public RuntimeMappingModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, + BundleContext bundleContext) { + checkArgument(SINGLETON_NAME.equals(instanceName), + "Illegal instance name '" + instanceName + "', only allowed name is " + SINGLETON_NAME); RuntimeMappingModule module = super.instantiateModule(instanceName, dependencyResolver, bundleContext); // FIXME bundle context should not be passed around module.setBundleContext(bundleContext); diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java index 1adf404f03..46b23fa825 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java +++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModule.java @@ -12,6 +12,8 @@ import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.MutableClassToInstanceMap; import java.util.ArrayList; import java.util.List; +import org.opendaylight.controller.config.api.DependencyResolver; +import org.opendaylight.controller.config.api.ModuleIdentifier; import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService; @@ -27,19 +29,22 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated -public final class DomBrokerImplModule extends org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractDomBrokerImplModule{ +public final class DomBrokerImplModule extends AbstractDomBrokerImplModule { private static final Logger LOG = LoggerFactory.getLogger(DomBrokerImplModule.class); private BundleContext bundleContext; - public DomBrokerImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { + public DomBrokerImplModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); } - public DomBrokerImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, final DomBrokerImplModule oldModule, final java.lang.AutoCloseable oldInstance) { + public DomBrokerImplModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver, + final DomBrokerImplModule oldModule, final AutoCloseable oldInstance) { super(identifier, dependencyResolver, oldModule, oldInstance); } @@ -47,11 +52,13 @@ public final class DomBrokerImplModule extends org.opendaylight.controller.confi public void validate() { super.validate(); final long depth = getNotificationQueueDepth().getValue(); - Preconditions.checkArgument(Long.lowestOneBit(depth) == Long.highestOneBit(depth), "Queue depth %s is not power-of-two", depth); + Preconditions.checkArgument(Long.lowestOneBit(depth) == Long.highestOneBit(depth), + "Queue depth %s is not power-of-two", depth); } @Override - public java.lang.AutoCloseable createInstance() { + @SuppressWarnings("checkstyle:IllegalCatch") + public AutoCloseable createInstance() { // The services are provided via blueprint so retrieve then from the OSGi service registry for // backwards compatibility. @@ -68,11 +75,11 @@ public final class DomBrokerImplModule extends org.opendaylight.controller.confi DOMRpcProviderService domRpcProvider = newTracker( DOMRpcProviderService.class, closeables).waitForService(WaitingServiceTracker.FIVE_MINUTES); - DOMMountPointService mountService = newTracker(DOMMountPointService.class, closeables). - waitForService(WaitingServiceTracker.FIVE_MINUTES); + DOMMountPointService mountService = newTracker(DOMMountPointService.class, closeables) + .waitForService(WaitingServiceTracker.FIVE_MINUTES); - SchemaService globalSchemaService = newTracker(SchemaService.class, closeables). - waitForService(WaitingServiceTracker.FIVE_MINUTES); + SchemaService globalSchemaService = newTracker(SchemaService.class, closeables) + .waitForService(WaitingServiceTracker.FIVE_MINUTES); final DOMDataBroker dataBroker = getAsyncDataBrokerDependency(); @@ -113,7 +120,7 @@ public final class DomBrokerImplModule extends org.opendaylight.controller.confi private SchemaService getSchemaServiceImpl(SchemaService globalSchemaService) { final SchemaService schemaService; - if(getRootSchemaService() != null) { + if (getRootSchemaService() != null) { schemaService = getRootSchemaServiceDependency(); } else { schemaService = globalSchemaService; diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModuleFactory.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModuleFactory.java index 6c2b422035..87900d88b6 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModuleFactory.java +++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomBrokerImplModuleFactory.java @@ -13,11 +13,12 @@ import org.opendaylight.controller.config.spi.Module; import org.osgi.framework.BundleContext; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated -public class DomBrokerImplModuleFactory extends - org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractDomBrokerImplModuleFactory { +public class DomBrokerImplModuleFactory extends AbstractDomBrokerImplModuleFactory { @Override public Module createModule(String instanceName, DependencyResolver dependencyResolver, diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java index 001b4fdeac..05726e1d1e 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java +++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java @@ -25,6 +25,8 @@ import org.opendaylight.yangtools.util.concurrent.DeadlockDetectingListeningExec import org.opendaylight.yangtools.util.concurrent.SpecialExecutors; /** + * Deprecated. + * * @deprecated Replaced by the clustered data store. */ @Deprecated @@ -54,15 +56,15 @@ public final class DomInmemoryDataBrokerModule extends public java.lang.AutoCloseable createInstance() { //Initializing Operational DOM DataStore defaulting to InMemoryDOMDataStore if one is not configured DOMStore operStore = getOperationalDataStoreDependency(); - if(operStore == null){ - //we will default to InMemoryDOMDataStore creation - operStore = InMemoryDOMDataStoreFactory.create("DOM-OPER", getSchemaServiceDependency()); + if (operStore == null) { + // we will default to InMemoryDOMDataStore creation + operStore = InMemoryDOMDataStoreFactory.create("DOM-OPER", getSchemaServiceDependency()); } DOMStore configStore = getConfigDataStoreDependency(); - if(configStore == null){ - //we will default to InMemoryDOMDataStore creation - configStore = InMemoryDOMDataStoreFactory.create("DOM-CFG", getSchemaServiceDependency()); + if (configStore == null) { + // we will default to InMemoryDOMDataStore creation + configStore = InMemoryDOMDataStoreFactory.create("DOM-CFG", getSchemaServiceDependency()); } final Map datastores = new EnumMap<>(LogicalDatastoreType.class); @@ -104,11 +106,11 @@ public final class DomInmemoryDataBrokerModule extends final AbstractMXBean commitExecutorStatsMXBean = ThreadExecutorStatsMXBeanImpl.create(commitExecutor, "CommitExecutorStats", JMX_BEAN_TYPE, null); - if(commitExecutorStatsMXBean != null) { + if (commitExecutorStatsMXBean != null) { mBeans.add(commitExecutorStatsMXBean); } - if(commitStatsTracker != null) { + if (commitStatsTracker != null) { final CommitStatsMXBeanImpl commitStatsMXBean = new CommitStatsMXBeanImpl( commitStatsTracker, JMX_BEAN_TYPE); commitStatsMXBean.registerMBean(); @@ -118,7 +120,7 @@ public final class DomInmemoryDataBrokerModule extends final AbstractMXBean commitFutureStatsMXBean = ThreadExecutorStatsMXBeanImpl.create(listenableFutureExecutor, "CommitFutureExecutorStats", JMX_BEAN_TYPE, null); - if(commitFutureStatsMXBean != null) { + if (commitFutureStatsMXBean != null) { mBeans.add(commitFutureStatsMXBean); } diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModuleFactory.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModuleFactory.java index 0dc311cf32..9134770087 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModuleFactory.java +++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModuleFactory.java @@ -8,11 +8,10 @@ package org.opendaylight.controller.config.yang.md.sal.dom.impl; /** + * Deprecated. + * * @deprecated Replaced by the clustered data store. */ @Deprecated -public class DomInmemoryDataBrokerModuleFactory extends org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractDomInmemoryDataBrokerModuleFactory -{ - - +public class DomInmemoryDataBrokerModuleFactory extends AbstractDomInmemoryDataBrokerModuleFactory { } diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java index bb02015e4f..e5d1e514df 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java +++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java @@ -22,11 +22,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated -public final class SchemaServiceImplSingletonModule extends -org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractSchemaServiceImplSingletonModule { +public final class SchemaServiceImplSingletonModule extends AbstractSchemaServiceImplSingletonModule { private static final Logger LOG = LoggerFactory.getLogger(SchemaServiceImplSingletonModule.class); @@ -69,7 +70,8 @@ org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractSchemaServiceImp final WaitingServiceTracker sourceProviderTracker = WaitingServiceTracker.create(YangTextSourceProvider.class, bundleContext); - final YangTextSourceProvider sourceProvider = sourceProviderTracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); + final YangTextSourceProvider sourceProvider = + sourceProviderTracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); class GlobalSchemaServiceProxy implements AutoCloseable, SchemaService, YangTextSourceProvider { @Override @@ -94,7 +96,8 @@ org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractSchemaServiceImp } @Override - public ListenerRegistration registerSchemaContextListener(final SchemaContextListener arg0) { + public ListenerRegistration registerSchemaContextListener( + final SchemaContextListener arg0) { return schemaService.registerSchemaContextListener(arg0); } diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModuleFactory.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModuleFactory.java index 5cd753e676..44039b820c 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModuleFactory.java +++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModuleFactory.java @@ -8,10 +8,13 @@ package org.opendaylight.controller.config.yang.md.sal.dom.impl; import static com.google.common.base.Preconditions.checkArgument; + import org.opendaylight.controller.config.api.DependencyResolver; import org.osgi.framework.BundleContext; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated @@ -21,18 +24,25 @@ public class SchemaServiceImplSingletonModuleFactory extends public static final String SINGLETON_NAME = "yang-schema-service"; @Override - public SchemaServiceImplSingletonModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, SchemaServiceImplSingletonModule oldModule, AutoCloseable oldInstance, BundleContext bundleContext) { - checkArgument(SINGLETON_NAME.equals(instanceName),"Illegal instance name '" + instanceName + "', only allowed name is " + SINGLETON_NAME); - SchemaServiceImplSingletonModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule, oldInstance, bundleContext); + public SchemaServiceImplSingletonModule instantiateModule(String instanceName, + DependencyResolver dependencyResolver, SchemaServiceImplSingletonModule oldModule, + AutoCloseable oldInstance, BundleContext bundleContext) { + checkArgument(SINGLETON_NAME.equals(instanceName), + "Illegal instance name '" + instanceName + "', only allowed name is " + SINGLETON_NAME); + SchemaServiceImplSingletonModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule, + oldInstance, bundleContext); // FIXME bundle context should not be passed around module.setBundleContext(bundleContext); return module; } @Override - public SchemaServiceImplSingletonModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, BundleContext bundleContext) { - checkArgument(SINGLETON_NAME.equals(instanceName),"Illegal instance name '" + instanceName + "', only allowed name is " + SINGLETON_NAME); - SchemaServiceImplSingletonModule module = super.instantiateModule(instanceName, dependencyResolver, bundleContext); + public SchemaServiceImplSingletonModule instantiateModule(String instanceName, + DependencyResolver dependencyResolver, BundleContext bundleContext) { + checkArgument(SINGLETON_NAME.equals(instanceName), + "Illegal instance name '" + instanceName + "', only allowed name is " + SINGLETON_NAME); + SchemaServiceImplSingletonModule module = super.instantiateModule(instanceName, dependencyResolver, + bundleContext); // FIXME bundle context should not be passed around module.setBundleContext(bundleContext); return module; diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModule.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModule.java index ffb0e19838..06140f44fd 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModule.java +++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModule.java @@ -12,6 +12,8 @@ import org.opendaylight.controller.config.api.ModuleIdentifier; import org.opendaylight.controller.md.sal.dom.broker.impl.PingPongDataBroker; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated @@ -20,7 +22,8 @@ public class PingpongDataBrokerModule extends AbstractPingpongDataBrokerModule { super(identifier, dependencyResolver); } - public PingpongDataBrokerModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver, final PingpongDataBrokerModule oldModule, final java.lang.AutoCloseable oldInstance) { + public PingpongDataBrokerModule(final ModuleIdentifier identifier, final DependencyResolver dependencyResolver, + final PingpongDataBrokerModule oldModule, final java.lang.AutoCloseable oldInstance) { super(identifier, dependencyResolver, oldModule, oldInstance); } diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModuleFactory.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModuleFactory.java index 468abbd141..c5ed639bb6 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModuleFactory.java +++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/pingpong/PingpongDataBrokerModuleFactory.java @@ -8,6 +8,8 @@ package org.opendaylight.controller.config.yang.md.sal.dom.pingpong; /** + * Deprecated. + * * @deprecated Replaced by blueprint wiring */ @Deprecated -- 2.36.6