From: Robert Varga Date: Tue, 20 Aug 2019 19:29:51 +0000 (+0200) Subject: Suppress modernization X-Git-Tag: release/magnesium~81 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=4ad8e1880cfee424eac9e4f12e461d98445a6e44 Suppress modernization Modernize as much as possible, but as we have legacy APIs in play, we have to add also some suppressions. Change-Id: I844821f129ad0bb0e186b6a4848a6d2937513f7b Signed-off-by: Robert Varga --- diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintBundleTracker.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintBundleTracker.java index ebc6975923..bb13e13a18 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintBundleTracker.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintBundleTracker.java @@ -21,6 +21,7 @@ import org.apache.aries.blueprint.services.BlueprintExtenderService; import org.apache.aries.quiesce.participant.QuiesceParticipant; import org.apache.aries.util.AriesFrameworkUtil; import org.eclipse.jdt.annotation.Nullable; +import org.gaul.modernizer_maven_annotations.SuppressModernizer; import org.opendaylight.controller.blueprint.ext.OpendaylightNamespaceHandler; import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.osgi.framework.Bundle; @@ -88,7 +89,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus bundleTracker = new BundleTracker<>(context, Bundle.ACTIVE, this); - blueprintExtenderServiceTracker = new ServiceTracker<>(context, BlueprintExtenderService.class.getName(), + blueprintExtenderServiceTracker = new ServiceTracker<>(context, BlueprintExtenderService.class, new ServiceTrackerCustomizer() { @Override public BlueprintExtenderService addingService( @@ -108,7 +109,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus }); blueprintExtenderServiceTracker.open(); - quiesceParticipantTracker = new ServiceTracker<>(context, QuiesceParticipant.class.getName(), + quiesceParticipantTracker = new ServiceTracker<>(context, QuiesceParticipant.class, new ServiceTrackerCustomizer() { @Override public QuiesceParticipant addingService( @@ -150,21 +151,25 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus restartService.setBlueprintExtenderService(blueprintExtenderService); - blueprintContainerRestartReg = bundleContext.registerService( - BlueprintContainerRestartService.class.getName(), restartService, new Hashtable<>()); + blueprintContainerRestartReg = bundleContext.registerService(BlueprintContainerRestartService.class, + restartService, null); return blueprintExtenderService; } private void registerNamespaceHandler(final BundleContext context) { - Dictionary props = new Hashtable<>(); + Dictionary props = emptyDict(); props.put("osgi.service.blueprint.namespace", OpendaylightNamespaceHandler.NAMESPACE_1_0_0); - namespaceReg = context.registerService(NamespaceHandler.class.getName(), - new OpendaylightNamespaceHandler(), props); + namespaceReg = context.registerService(NamespaceHandler.class, new OpendaylightNamespaceHandler(), props); } private void registerBlueprintEventHandler(final BundleContext context) { - eventHandlerReg = context.registerService(BlueprintListener.class.getName(), this, new Hashtable<>()); + eventHandlerReg = context.registerService(BlueprintListener.class, this, null); + } + + @SuppressModernizer + private static Dictionary emptyDict() { + return new Hashtable<>(); } /** diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintContainerRestartServiceImpl.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintContainerRestartServiceImpl.java index 0e52cb6fb2..4a8c0157d7 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintContainerRestartServiceImpl.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintContainerRestartServiceImpl.java @@ -16,7 +16,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Deque; -import java.util.Hashtable; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -226,7 +225,7 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo private static ServiceRegistration registerEventHandler(final BundleContext bundleContext, final BlueprintListener listener) { - return bundleContext.registerService(BlueprintListener.class.getName(), listener, new Hashtable<>()); + return bundleContext.registerService(BlueprintListener.class, listener, null); } @Override diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ComponentProcessor.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ComponentProcessor.java index 84847a14b1..2f0709f6af 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ComponentProcessor.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ComponentProcessor.java @@ -20,6 +20,7 @@ import org.apache.aries.blueprint.ext.AbstractPropertyPlaceholder; import org.apache.aries.blueprint.mutable.MutableBeanMetadata; import org.apache.aries.blueprint.mutable.MutableServiceReferenceMetadata; import org.apache.aries.util.AriesFrameworkUtil; +import org.gaul.modernizer_maven_annotations.SuppressModernizer; import org.opendaylight.controller.blueprint.BlueprintContainerRestartService; import org.osgi.framework.Bundle; import org.osgi.framework.Constants; @@ -131,6 +132,7 @@ public class ComponentProcessor implements ComponentDefinitionRegistryProcessor } } + @SuppressModernizer private void registerManagedService(final String persistentId) { // Register a ManagedService so we get updates from the ConfigAdmin when the cfg file corresponding // to the persistentId changes. @@ -158,8 +160,7 @@ public class ComponentProcessor implements ComponentDefinitionRegistryProcessor props.put(Constants.SERVICE_PID, persistentId); props.put(Constants.BUNDLE_SYMBOLICNAME, bundle.getSymbolicName()); props.put(Constants.BUNDLE_VERSION, bundle.getHeaders().get(Constants.BUNDLE_VERSION)); - managedServiceRegs.add(bundle.getBundleContext().registerService(ManagedService.class.getName(), - managedService, props)); + managedServiceRegs.add(bundle.getBundleContext().registerService(ManagedService.class, managedService, props)); } private String logName() { diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractWriteTransaction.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractWriteTransaction.java index d953ef57ff..d66eb1c79a 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractWriteTransaction.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractWriteTransaction.java @@ -7,10 +7,12 @@ */ package org.opendaylight.controller.md.sal.binding.impl; +import static com.google.common.base.Preconditions.checkArgument; + import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FluentFuture; import java.util.Map.Entry; +import org.gaul.modernizer_maven_annotations.SuppressModernizer; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; import org.opendaylight.mdsal.common.api.CommitInfo; @@ -33,7 +35,7 @@ public abstract class AbstractWriteTransaction void put(final LogicalDatastoreType store, final InstanceIdentifier path, final U data, final boolean createParents) { - Preconditions.checkArgument(!path.isWildcarded(), "Cannot put data into wildcarded path %s", path); + checkArgument(!path.isWildcarded(), "Cannot put data into wildcarded path %s", path); final Entry> normalized = getCodec().toNormalizedNode(path, data); if (createParents) { @@ -47,7 +49,7 @@ public abstract class AbstractWriteTransaction void merge(final LogicalDatastoreType store, final InstanceIdentifier path, final U data,final boolean createParents) { - Preconditions.checkArgument(!path.isWildcarded(), "Cannot merge data into wildcarded path %s", path); + checkArgument(!path.isWildcarded(), "Cannot merge data into wildcarded path %s", path); final Entry> normalized = getCodec().toNormalizedNode(path, data); if (createParents) { @@ -94,7 +96,7 @@ public abstract class AbstractWriteTransaction> normalized) { if (Identifiable.class.isAssignableFrom(path.getTargetType())) { YangInstanceIdentifier parentMapPath = normalized.getKey().getParent(); - Preconditions.checkArgument(parentMapPath != null, "Map path %s does not have a parent", path); + checkArgument(parentMapPath != null, "Map path %s does not have a parent", path); NormalizedNode emptyParent = getCodec().getDefaultNodeFor(parentMapPath); getDelegate().merge(store, parentMapPath, emptyParent); @@ -107,6 +109,7 @@ public abstract class AbstractWriteTransaction getParent(final YangInstanceIdentifier child) { return Optional.fromNullable(child.getParent()); } @@ -120,7 +123,7 @@ public abstract class AbstractWriteTransaction path) { - Preconditions.checkArgument(!path.isWildcarded(), "Cannot delete wildcarded path %s", path); + checkArgument(!path.isWildcarded(), "Cannot delete wildcarded path %s", path); final YangInstanceIdentifier normalized = getCodec().toYangInstanceIdentifierBlocking(path); getDelegate().delete(store, normalized); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapter.java index 39c64e7c4d..f6df2c7326 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapter.java @@ -12,6 +12,7 @@ import com.google.common.base.Optional; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import org.gaul.modernizer_maven_annotations.SuppressModernizer; import org.opendaylight.controller.md.sal.binding.api.MountPoint; import org.opendaylight.controller.md.sal.binding.api.MountPointService; import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint; @@ -44,6 +45,7 @@ public class BindingDOMMountPointServiceAdapter implements MountPointService { } @Override + @SuppressModernizer public Optional getMountPoint(final InstanceIdentifier mountPoint) { YangInstanceIdentifier domPath = codec.toYangInstanceIdentifierBlocking(mountPoint); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingMountPointAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingMountPointAdapter.java index 360c94d539..1f45bed848 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingMountPointAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingMountPointAdapter.java @@ -10,6 +10,7 @@ package org.opendaylight.controller.md.sal.binding.impl; import com.google.common.base.Optional; import com.google.common.cache.CacheBuilder; import com.google.common.cache.LoadingCache; +import org.gaul.modernizer_maven_annotations.SuppressModernizer; import org.opendaylight.controller.md.sal.binding.api.BindingService; import org.opendaylight.controller.md.sal.binding.api.MountPoint; import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint; @@ -27,7 +28,7 @@ public class BindingMountPointAdapter implements MountPoint { services = CacheBuilder.newBuilder().build(new BindingDOMAdapterLoader(codec) { @Override - protected DOMService getDelegate(Class reqDeleg) { + protected DOMService getDelegate(final Class reqDeleg) { return domMountPoint.getService(reqDeleg).orNull(); } }); @@ -39,7 +40,8 @@ public class BindingMountPointAdapter implements MountPoint { } @Override - public Optional getService(Class service) { + @SuppressModernizer + public Optional getService(final Class service) { Optional potential = services.getUnchecked(service); if (potential.isPresent()) { return Optional.of(service.cast(potential.get())); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/spi/AdapterLoader.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/spi/AdapterLoader.java index 405d190825..6eab3499fe 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/spi/AdapterLoader.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/spi/AdapterLoader.java @@ -11,11 +11,13 @@ import com.google.common.base.Optional; import com.google.common.cache.CacheLoader; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; +import org.gaul.modernizer_maven_annotations.SuppressModernizer; @Deprecated public abstract class AdapterLoader extends CacheLoader, Optional> { @Override + @SuppressModernizer public Optional load(final Class key) { final AdapterBuilder builder = createBuilder(key); diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapterTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapterTest.java index 0697833d2d..7c022b065b 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapterTest.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapterTest.java @@ -8,13 +8,16 @@ package org.opendaylight.controller.md.sal.binding.impl; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; import com.google.common.base.Optional; import com.google.common.cache.LoadingCache; +import org.gaul.modernizer_maven_annotations.SuppressModernizer; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint; import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService; @@ -38,14 +41,15 @@ public class BindingDOMMountPointServiceAdapterTest { private ClassLoadingStrategy classLoadingStrategy; @Before + @SuppressModernizer public void setUp() { MockitoAnnotations.initMocks(this); - codec = Mockito.spy(new BindingToNormalizedNodeCodec(classLoadingStrategy, codecRegistry)); - Mockito.doAnswer(invocationOnMock -> Optional.of(Mockito.mock(DOMMountPoint.class))) + codec = spy(new BindingToNormalizedNodeCodec(classLoadingStrategy, codecRegistry)); + doReturn(Optional.of(mock(DOMMountPoint.class))) .when(mountService).getMountPoint(any(YangInstanceIdentifier.class)); - Mockito.doReturn(YangInstanceIdentifier.create(new YangInstanceIdentifier.NodeIdentifier(QName.create("(a)b")))) + doReturn(YangInstanceIdentifier.create(new YangInstanceIdentifier.NodeIdentifier(QName.create("(a)b")))) .when(codec).toYangInstanceIdentifierBlocking(any(InstanceIdentifier.class)); - Mockito.doReturn(InstanceIdentifier.create(DataObject.class)) + doReturn(InstanceIdentifier.create(DataObject.class)) .when(codecRegistry).fromYangInstanceIdentifier(any(YangInstanceIdentifier.class)); } diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/CrossBrokerMountPointTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/CrossBrokerMountPointTest.java index b17c5d3a44..7ad1b547f0 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/CrossBrokerMountPointTest.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/CrossBrokerMountPointTest.java @@ -20,6 +20,7 @@ import java.util.Collections; import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import org.gaul.modernizer_maven_annotations.SuppressModernizer; import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.md.sal.binding.api.DataBroker; @@ -138,6 +139,7 @@ public class CrossBrokerMountPointTest { return new DOMDataReadWriteTransaction() { @Override + @SuppressModernizer public CheckedFuture>, ReadFailedException> read( final LogicalDatastoreType store, final YangInstanceIdentifier path) { if (store == LogicalDatastoreType.OPERATIONAL && path.getLastPathArgument() diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java index 2614caf1dd..fa44c8db84 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java @@ -8,9 +8,9 @@ package org.opendaylight.controller.md.sal.common.impl.util.compat; import com.google.common.base.Optional; -import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collections; import java.util.HashSet; @@ -19,6 +19,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import org.eclipse.jdt.annotation.Nullable; +import org.gaul.modernizer_maven_annotations.SuppressModernizer; import org.opendaylight.yangtools.concepts.Identifiable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; @@ -49,7 +51,7 @@ import org.opendaylight.yangtools.yang.model.util.EffectiveAugmentationSchema; public abstract class DataNormalizationOperation implements Identifiable { private final T identifier; - private final Optional dataSchemaNode; + private final DataSchemaNode dataSchemaNode; @Override public T getIdentifier() { @@ -58,11 +60,7 @@ public abstract class DataNormalizationOperation impleme protected DataNormalizationOperation(final T identifier, final SchemaNode schema) { this.identifier = identifier; - if (schema instanceof DataSchemaNode) { - this.dataSchemaNode = Optional.of((DataSchemaNode) schema); - } else { - this.dataSchemaNode = Optional.absent(); - } + dataSchemaNode = schema instanceof DataSchemaNode ? (DataSchemaNode)schema : null; } public boolean isMixin() { @@ -84,9 +82,9 @@ public abstract class DataNormalizationOperation impleme public abstract boolean isLeaf(); + @SuppressModernizer public Optional getDataSchemaNode() { - // FIXME - return dataSchemaNode; + return Optional.fromNullable(dataSchemaNode); } private abstract static class SimpleTypeNormalization @@ -206,14 +204,13 @@ public abstract class DataNormalizationOperation impleme private static DataNormalizationOperation fromSchemaAndQNameChecked(final DataNodeContainer schema, final QName child) throws DataNormalizationException { - final Optional potential = findChildSchemaNode(schema, child); - if (!potential.isPresent()) { + final DataSchemaNode result = findChildSchemaNode(schema, child); + if (result == null) { throw new DataNormalizationException(String.format( "Supplied QName %s is not valid according to schema %s, potential children nodes: %s", child, schema,schema.getChildNodes())); } - final DataSchemaNode result = potential.get(); // We try to look up if this node was added by augmentation if (schema instanceof DataSchemaNode && result.isAugmenting()) { return fromAugmentation(schema, (AugmentationTarget) schema, result); @@ -352,12 +349,11 @@ public abstract class DataNormalizationOperation impleme @Override protected DataNormalizationOperation fromLocalSchemaAndQName(final DataNodeContainer schema, final QName child) { - final Optional potential = findChildSchemaNode(schema, child); - if (!potential.isPresent()) { + final DataSchemaNode result = findChildSchemaNode(schema, child); + if (result == null) { return null; } - final DataSchemaNode result = potential.get(); // We try to look up if this node was added by augmentation if (schema instanceof DataSchemaNode && result.isAugmenting()) { return fromAugmentation(schema, (AugmentationTarget) schema, result); @@ -513,28 +509,20 @@ public abstract class DataNormalizationOperation impleme } } - private static Optional findChildSchemaNode(final DataNodeContainer parent, - final QName child) { - DataSchemaNode potential = parent.getDataChildByName(child); - if (potential == null) { - final Iterable choices = FluentIterable.from(parent.getChildNodes()) - .filter(ChoiceSchemaNode.class); - potential = findChoice(choices, child); - } - return Optional.fromNullable(potential); + private static @Nullable DataSchemaNode findChildSchemaNode(final DataNodeContainer parent, final QName child) { + final DataSchemaNode potential = parent.getDataChildByName(child); + return potential != null ? potential : findChoice(parent, child); } - private static ChoiceSchemaNode findChoice(final Iterable choices, final QName child) { - ChoiceSchemaNode foundChoice = null; - choiceLoop: for (final ChoiceSchemaNode choice : choices) { + private static @Nullable ChoiceSchemaNode findChoice(final DataNodeContainer parent, final QName child) { + for (final ChoiceSchemaNode choice : Iterables.filter(parent.getChildNodes(), ChoiceSchemaNode.class)) { for (final CaseSchemaNode caze : choice.getCases().values()) { - if (findChildSchemaNode(caze, child).isPresent()) { - foundChoice = choice; - break choiceLoop; + if (findChildSchemaNode(caze, child) != null) { + return choice; } } } - return foundChoice; + return null; } public static AugmentationIdentifier augmentationIdentifierFrom(final AugmentationSchemaNode augmentation) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java index 6c6726ca08..6384735cf1 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java @@ -15,11 +15,14 @@ import akka.dispatch.Futures; import akka.pattern.Patterns; import akka.util.Timeout; import com.google.common.base.Throwables; +import com.google.common.collect.Streams; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.stream.Collectors; import org.opendaylight.controller.cluster.datastore.messages.DataTreeListenerInfo; import org.opendaylight.controller.cluster.datastore.messages.GetInfo; import org.opendaylight.controller.cluster.datastore.messages.OnDemandShardState; @@ -68,13 +71,14 @@ public class ShardDataTreeListenerInfoMXBeanImpl extends AbstractMXBean implemen futureList.add(Patterns.ask(actor, GetInfo.INSTANCE, timeout)); } + final Iterable listenerInfos; try { - final List listenerInfoList = new ArrayList<>(); - Await.result(Futures.sequence(futureList, ExecutionContext.Implicits$.MODULE$.global()), - timeout.duration()).forEach(obj -> listenerInfoList.add((DataTreeListenerInfo) obj)); - return listenerInfoList; - } catch (Exception e) { - throw new RuntimeException(e); + listenerInfos = Await.result(Futures.sequence(futureList, ExecutionContext.Implicits$.MODULE$.global()), + timeout.duration()); + } catch (TimeoutException | InterruptedException e) { + throw new IllegalStateException("Failed to acquire listeners", e); } + + return Streams.stream(listenerInfos).map(DataTreeListenerInfo.class::cast).collect(Collectors.toList()); } } diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransactionTest.java b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransactionTest.java index e1a71d6414..8286909920 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransactionTest.java +++ b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransactionTest.java @@ -17,6 +17,7 @@ import static org.mockito.Mockito.verify; import com.google.common.base.Optional; import com.google.common.util.concurrent.Futures; +import org.gaul.modernizer_maven_annotations.SuppressModernizer; import org.junit.Before; import org.junit.Test; import org.mockito.Matchers; @@ -67,6 +68,7 @@ public class ShardedDOMDataBrokerDelegatingReadWriteTransactionTest { } @Test + @SuppressModernizer public void testReadWriteOperations() throws Exception { doReturn(Futures.immediateCheckedFuture(Optional.absent())).when(readTx).read(any(), any()); rwTx.put(LogicalDatastoreType.OPERATIONAL, TestModel.TEST_PATH, testNodeWithOuter(1, 2, 3)); @@ -88,7 +90,7 @@ public class ShardedDOMDataBrokerDelegatingReadWriteTransactionTest { assertEquals(Optional.absent(), rwTx.read(LogicalDatastoreType.OPERATIONAL, TestModel.TEST_PATH).checkedGet()); } - private static DataContainerChild outerNode(int... ids) { + private static DataContainerChild outerNode(final int... ids) { CollectionNodeBuilder outer = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME); for (int id : ids) { outer.addChild(ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, id)); @@ -97,11 +99,11 @@ public class ShardedDOMDataBrokerDelegatingReadWriteTransactionTest { return outer.build(); } - private static NormalizedNode testNodeWithOuter(int... ids) { + private static NormalizedNode testNodeWithOuter(final int... ids) { return testNodeWithOuter(outerNode(ids)); } - private static NormalizedNode testNodeWithOuter(DataContainerChild outer) { + private static NormalizedNode testNodeWithOuter(final DataContainerChild outer) { return ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)).withChild(outer) .build(); diff --git a/opendaylight/md-sal/sal-dom-compat/src/main/java/org/opendaylight/controller/sal/core/compat/DOMMountPointAdapter.java b/opendaylight/md-sal/sal-dom-compat/src/main/java/org/opendaylight/controller/sal/core/compat/DOMMountPointAdapter.java index b78091422a..c6aaed83af 100644 --- a/opendaylight/md-sal/sal-dom-compat/src/main/java/org/opendaylight/controller/sal/core/compat/DOMMountPointAdapter.java +++ b/opendaylight/md-sal/sal-dom-compat/src/main/java/org/opendaylight/controller/sal/core/compat/DOMMountPointAdapter.java @@ -14,6 +14,7 @@ import com.google.common.collect.ForwardingObject; import com.google.common.collect.ImmutableMap; import java.util.Map; import org.eclipse.jdt.annotation.Nullable; +import org.gaul.modernizer_maven_annotations.SuppressModernizer; import org.opendaylight.controller.md.sal.dom.api.DOMActionService; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint; @@ -87,6 +88,7 @@ public class DOMMountPointAdapter extends ForwardingObject implements DOMMountPo } @Override + @SuppressModernizer public Optional getService(final Class cls) { final java.util.Optional found = delegate.getService(cls); if (found.isPresent()) { diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/mount/SimpleDOMMountPoint.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/mount/SimpleDOMMountPoint.java index 99f1ecadd2..b9b58381fd 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/mount/SimpleDOMMountPoint.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/mount/SimpleDOMMountPoint.java @@ -12,6 +12,7 @@ import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.ImmutableClassToInstanceMap; import java.util.Map.Entry; import java.util.Set; +import org.gaul.modernizer_maven_annotations.SuppressModernizer; import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint; import org.opendaylight.controller.md.sal.dom.api.DOMService; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -47,6 +48,7 @@ public final class SimpleDOMMountPoint implements DOMMountPoint { } @Override + @SuppressModernizer public Optional getService(final Class cls) { return Optional.fromNullable(services.getInstance(cls)); } diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/rpc/RpcRoutingStrategy.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/rpc/RpcRoutingStrategy.java index 96bf5a8b64..f55cb87e51 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/rpc/RpcRoutingStrategy.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/rpc/RpcRoutingStrategy.java @@ -10,6 +10,7 @@ package org.opendaylight.controller.md.sal.dom.broker.spi.rpc; import static java.util.Objects.requireNonNull; import com.google.common.base.Optional; +import org.gaul.modernizer_maven_annotations.SuppressModernizer; import org.opendaylight.yangtools.concepts.Identifiable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -71,6 +72,7 @@ public abstract class RpcRoutingStrategy implements Identifiable { return new GlobalRpcStrategy(rpc.getQName()); } + @SuppressModernizer public static Optional getRoutingContext(final DataSchemaNode schemaNode) { for (UnknownSchemaNode extension : schemaNode.getUnknownSchemaNodes()) { if (CONTEXT_REFERENCE.equals(extension.getNodeType())) { @@ -107,7 +109,6 @@ public abstract class RpcRoutingStrategy implements Identifiable { } private static final class GlobalRpcStrategy extends RpcRoutingStrategy { - GlobalRpcStrategy(final QName identifier) { super(identifier); }