From 67d0d71b7218015f5eaf311d732a0db1dd079021 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 15 Nov 2017 13:30:58 +0100 Subject: [PATCH] Fix odlparent-3.0.0 checkstyle issues This fixes issues identitifed by checkstyle in odlparent-3.0.0, split out of the bump proper to keep the migration patch smaller. Change-Id: Ib42dbebb0bdbcec770cb9e4daaf24fb14dccde6b Signed-off-by: Robert Varga --- .../maven/YangModuleInfoCompilationTest.java | 2 +- .../binding/dom/adapter/AdapterBuilder.java | 2 +- .../dom/adapter/BindingDOMAdapterBuilder.java | 4 ++-- ...OMDataTreeCommitCohortRegistryAdapter.java | 9 ++++---- .../dom/adapter/RpcServiceAdapter.java | 5 +++-- .../AbstractForwardedDataBrokerTest.java | 16 +++++++------- .../adapter/BindingNormalizedCodecTest.java | 4 ++-- .../adapter/LazyDOMRpcResultFutureTest.java | 4 ++-- .../adapter/test/AbstractDataBrokerTest.java | 5 +---- .../test/DataTreeChangeListenerTest.java | 9 ++++---- .../impl/BindingToNormalizedStreamWriter.java | 4 ++-- .../codec/impl/DataObjectCodecContext.java | 2 +- .../dom/codec/impl/IdentifiableItemCodec.java | 2 +- .../impl/MissingSchemaForClassException.java | 2 +- .../codec/util/ChoiceDispatchSerializer.java | 4 ++-- .../binding/testutils/ExampleYangObjects.java | 5 ++++- .../binding/testutils/ExpectedObjects.java | 6 ++++- .../yang/binding/util/BindingReflections.java | 8 +++---- .../binding/util/DataObjectReadingUtil.java | 22 +++++++++---------- .../yang/binding/BindingMappingTest.java | 2 +- .../binding/util/BindingReflectionsTest.java | 2 +- .../util/DataObjectReadingUtilTest.java | 2 +- .../util/NotificationListenerInvokerTest.java | 2 +- ...OMDataTreeCommitCohortRegistryAdapter.java | 2 +- .../BindingDOMDataTreeProducerAdapter.java | 2 +- .../BindingDOMDataTreeServiceAdapter.java | 2 +- .../impl/operation/RpcServiceAdapter.java | 5 +++-- .../adapter/spi/builder/AdapterBuilder.java | 2 +- .../spi/builder/BindingDOMAdapterBuilder.java | 2 +- .../adapter/test/AbstractDataBrokerTest.java | 2 +- .../generator/impl/StreamWriterGenerator.java | 3 +-- .../dom/codec/impl/IdentifiableItemCodec.java | 2 +- .../base/MissingSchemaForClassException.java | 2 +- .../context/base/TreeNodeCodecContext.java | 2 +- .../BindingToNormalizedStreamWriter.java | 4 ++-- .../serializer/ChoiceDispatchSerializer.java | 4 ++-- .../LazyDataTreeModification.java | 2 +- .../AbstractDOMRpcRoutingTableEntry.java | 21 +++++++++--------- .../broker/DOMNotificationRouterEvent.java | 9 ++------ .../mdsal/dom/broker/DOMRpcRoutingTable.java | 12 +++++----- .../mdsal/dom/broker/ProducerLayout.java | 4 ++-- .../mdsal/dom/broker/ShardedDOMDataTree.java | 2 +- .../broker/ShardedDOMDataTreeProducer.java | 3 ++- .../ShardedDOMDataTreeWriteTransaction.java | 22 +++++++++---------- ...tDOMForwardedCompositeTransactionTest.java | 6 ++--- .../mdsal/dom/broker/MockingUtilities.java | 2 +- .../dom/broker/MountPointServiceTest.java | 12 +++++----- .../ScanningSchemaServiceProviderTest.java | 4 ++-- .../mdsal/dom/broker/util/TestModel.java | 6 ++++- .../InMemoryDOMDataStoreConfigProperties.java | 17 +++++++------- .../inmemory/InMemoryDOMDataTreeShard.java | 20 ++++++++--------- ...emoryDOMDataTreeShardWriteTransaction.java | 22 +++++++++---------- .../dom/store/impl/InMemoryDataStoreTest.java | 2 +- .../md/sal/dom/store/impl/TestModel.java | 6 ++++- ...oryDOMStoreThreePhaseCommitCohortTest.java | 19 ++++++++-------- .../mdsal/dom/spi/SimpleDOMMountPoint.java | 4 ++-- .../shard/DOMDataTreeListenerAggregator.java | 12 +++++----- .../shard/WriteableSubshardBoundaryNode.java | 2 +- .../shard/WriteableNodeWithSubshardTest.java | 6 ++--- .../SnapshotBackedReadTransactionTest.java | 6 ++--- ...napshotBackedReadWriteTransactionTest.java | 13 ++++++----- .../store/SnapshotBackedTransactionsTest.java | 2 +- .../SnapshotBackedWriteTransactionTest.java | 9 ++++---- 63 files changed, 207 insertions(+), 195 deletions(-) diff --git a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/YangModuleInfoCompilationTest.java b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/YangModuleInfoCompilationTest.java index c63824a1b1..76163c7742 100644 --- a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/YangModuleInfoCompilationTest.java +++ b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/YangModuleInfoCompilationTest.java @@ -232,7 +232,7 @@ public class YangModuleInfoCompilationTest { return method; } catch (NoSuchMethodException e) { throw new AssertionError("Method " + name + " with args " + Arrays.toString(args) - + " does not exists in class " + clazz.getSimpleName()); + + " does not exists in class " + clazz.getSimpleName(), e); } } diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterBuilder.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterBuilder.java index b125acad12..dd48e7ac9b 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterBuilder.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterBuilder.java @@ -20,7 +20,7 @@ public abstract class AdapterBuilder implements Builder { public abstract Set> getRequiredDelegates(); - protected abstract T createInstance(ClassToInstanceMap delegates); + protected abstract T createInstance(ClassToInstanceMap immutableDelegates); private void checkAllRequiredServices() { for (final Class type : getRequiredDelegates()) { diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMAdapterBuilder.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMAdapterBuilder.java index bfcdbc8fde..f3609ff591 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMAdapterBuilder.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMAdapterBuilder.java @@ -30,9 +30,9 @@ abstract class BindingDOMAdapterBuilder extends Adapte @Override protected final T createInstance(final ClassToInstanceMap delegates) { Preconditions.checkState(codec != null); - return createInstance(codec,delegates); + return createInstance(codec, delegates); } - protected abstract T createInstance(BindingToNormalizedNodeCodec codec2, ClassToInstanceMap delegates); + protected abstract T createInstance(BindingToNormalizedNodeCodec myCodec, ClassToInstanceMap delegates); } diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeCommitCohortRegistryAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeCommitCohortRegistryAdapter.java index 6ebc7c654a..750a31cdb1 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeCommitCohortRegistryAdapter.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeCommitCohortRegistryAdapter.java @@ -23,19 +23,20 @@ public class BindingDOMDataTreeCommitCohortRegistryAdapter implements DataTreeCo private final BindingToNormalizedNodeCodec codec; private final DOMDataTreeCommitCohortRegistry registry; - BindingDOMDataTreeCommitCohortRegistryAdapter(BindingToNormalizedNodeCodec codec, - DOMDataTreeCommitCohortRegistry registry) { + BindingDOMDataTreeCommitCohortRegistryAdapter(final BindingToNormalizedNodeCodec codec, + final DOMDataTreeCommitCohortRegistry registry) { this.codec = Preconditions.checkNotNull(codec); this.registry = Preconditions.checkNotNull(registry); } - DataTreeCommitCohortRegistry from(BindingToNormalizedNodeCodec codec, DOMDataTreeCommitCohortRegistry registry) { + static DataTreeCommitCohortRegistry from(final BindingToNormalizedNodeCodec codec, + final DOMDataTreeCommitCohortRegistry registry) { return new BindingDOMDataTreeCommitCohortRegistryAdapter(codec, registry); } @Override public > ObjectRegistration registerCommitCohort( - DataTreeIdentifier subtree, final T cohort) { + final DataTreeIdentifier subtree, final T cohort) { final BindingDOMDataTreeCommitCohortAdapter adapter = new BindingDOMDataTreeCommitCohortAdapter<>(codec, cohort); final DOMDataTreeIdentifier domPath = codec.toDOMDataTreeIdentifier(subtree); diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapter.java index 6f92bb1b19..8652b99ba7 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapter.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapter.java @@ -74,6 +74,7 @@ class RpcServiceAdapter implements InvocationHandler { } @Override + @SuppressWarnings("checkstyle:hiddenField") public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { final RpcInvocationStrategy rpc = rpcNames.get(method); @@ -152,13 +153,13 @@ class RpcServiceAdapter implements InvocationHandler { } private ListenableFuture> transformFuture(final SchemaPath rpc, - final ListenableFuture domFuture, final BindingNormalizedNodeCodecRegistry codec) { + final ListenableFuture domFuture, final BindingNormalizedNodeCodecRegistry resultCodec) { return Futures.transform(domFuture, (Function>) input -> { final NormalizedNode domData = input.getResult(); final DataObject bindingResult; if (domData != null) { final SchemaPath rpcOutput = rpc.createChild(QName.create(rpc.getLastComponent(), "output")); - bindingResult = codec.fromNormalizedNodeRpcData(rpcOutput, (ContainerNode) domData); + bindingResult = resultCodec.fromNormalizedNodeRpcData(rpcOutput, (ContainerNode) domData); } else { bindingResult = null; } diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedDataBrokerTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedDataBrokerTest.java index 09d33e19cb..9a176e29ca 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedDataBrokerTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedDataBrokerTest.java @@ -39,7 +39,7 @@ public class AbstractForwardedDataBrokerTest { private NormalizedNode normalizedNode; @Before - public void basicTest() throws Exception { + public void basicTest() { final BindingBrokerTestFactory testFactory = new BindingBrokerTestFactory(); testFactory.setExecutor(Executors.newCachedThreadPool()); @@ -53,24 +53,24 @@ public class AbstractForwardedDataBrokerTest { } @Test - public void toBindingTestWithMap() throws Exception { - final NormalizedNode normalizedNode = mock(NormalizedNode.class); - assertNotNull(forwardedDataBroker.toBinding(BA_TREE_LEAF_ONLY, ImmutableMap.of(data, normalizedNode))); + public void toBindingTestWithMap() { + final NormalizedNode mockNode = mock(NormalizedNode.class); + assertNotNull(forwardedDataBroker.toBinding(BA_TREE_LEAF_ONLY, ImmutableMap.of(data, mockNode))); } @Test - public void toBindingTestWithSet() throws Exception { + public void toBindingTestWithSet() { assertNotNull(forwardedDataBroker.toBinding(BA_TREE_LEAF_ONLY, ImmutableSet.of(data))); } @Test - public void toBindingDataTest() throws Exception { + public void toBindingDataTest() { assertNotNull(forwardedDataBroker.toBindingData(BA_TOP_LEVEL_LIST, normalizedNode)); } - private class AbstractForwardedDataBrokerImpl extends AbstractForwardedDataBroker { + private static final class AbstractForwardedDataBrokerImpl extends AbstractForwardedDataBroker { - private AbstractForwardedDataBrokerImpl(final DOMDataBroker domDataBroker, + AbstractForwardedDataBrokerImpl(final DOMDataBroker domDataBroker, final BindingToNormalizedNodeCodec codec) { super(domDataBroker, codec); } diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingNormalizedCodecTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingNormalizedCodecTest.java index 686f4bc92c..b58cc23c01 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingNormalizedCodecTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingNormalizedCodecTest.java @@ -67,8 +67,8 @@ public class BindingNormalizedCodecTest extends AbstractSchemaAwareTest { private SchemaContext context; @Override - protected void setupWithSchema(final SchemaContext context) { - this.context = context; + protected void setupWithSchema(final SchemaContext schemaContext) { + this.context = schemaContext; final DataObjectSerializerGenerator streamWriter = StreamWriterGenerator.create(JavassistUtils.forClassPool( ClassPool.getDefault())); final BindingNormalizedNodeCodecRegistry registry = new BindingNormalizedNodeCodecRegistry(streamWriter); diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDOMRpcResultFutureTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDOMRpcResultFutureTest.java index 7a6a49a795..4afcadbbf8 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDOMRpcResultFutureTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDOMRpcResultFutureTest.java @@ -81,7 +81,7 @@ public class LazyDOMRpcResultFutureTest { assertNotNull(lazyDOMRpcResultFuture.get()); } - @SuppressWarnings({"checkstyle:IllegalThrows","checkstyle:IllegalCatch"}) + @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:IllegalCatch", "checkstyle:avoidHidingCauseException"}) @Test(expected = InterruptedException.class) public void checkedGetWithException() throws Throwable { doThrow(InterruptedException.class).when(future).get(); @@ -92,7 +92,7 @@ public class LazyDOMRpcResultFutureTest { } } - @SuppressWarnings({"checkstyle:IllegalThrows","checkstyle:IllegalCatch"}) + @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:IllegalCatch", "checkstyle:avoidHidingCauseException"}) @Test(expected = InterruptedException.class) public void checkedGetWithException2() throws Throwable { doThrow(InterruptedException.class).when(future).get(1, TimeUnit.SECONDS); diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractDataBrokerTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractDataBrokerTest.java index c1e3d62953..0b842c1902 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractDataBrokerTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractDataBrokerTest.java @@ -21,7 +21,6 @@ public class AbstractDataBrokerTest extends AbstractSchemaAwareTest { private DataBroker dataBroker; private DOMDataBroker domBroker; - @Override protected void setupWithSchema(final SchemaContext context) { testCustomizer = createDataBrokerTestCustomizer(); @@ -31,7 +30,7 @@ public class AbstractDataBrokerTest extends AbstractSchemaAwareTest { setupWithDataBroker(dataBroker); } - protected void setupWithDataBroker(final DataBroker dataBroker) { + protected void setupWithDataBroker(final DataBroker broker) { // Intentionally left No-op, subclasses may customize it } @@ -54,6 +53,4 @@ public class AbstractDataBrokerTest extends AbstractSchemaAwareTest { throw new IllegalStateException(e); } } - - } diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/DataTreeChangeListenerTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/DataTreeChangeListenerTest.java index 3de9a66922..e51936493c 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/DataTreeChangeListenerTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/DataTreeChangeListenerTest.java @@ -63,20 +63,19 @@ public class DataTreeChangeListenerTest extends AbstractDataBrokerTest { private static final class EventCapturingListener implements DataTreeChangeListener { - private SettableFuture>> changes = SettableFuture.create(); + private SettableFuture>> futureChanges = SettableFuture.create(); @Override public void onDataTreeChanged(final Collection> changes) { - this.changes.set(changes); + this.futureChanges.set(changes); } Collection> nextEvent() throws Exception { - final Collection> result = changes.get(200,TimeUnit.MILLISECONDS); - changes = SettableFuture.create(); + final Collection> result = futureChanges.get(200,TimeUnit.MILLISECONDS); + futureChanges = SettableFuture.create(); return result; } - } @Override diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingToNormalizedStreamWriter.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingToNormalizedStreamWriter.java index 1c5b6eb26a..fc982428b8 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingToNormalizedStreamWriter.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingToNormalizedStreamWriter.java @@ -44,8 +44,8 @@ final class BindingToNormalizedStreamWriter implements BindingStreamEventWriter, return new BindingToNormalizedStreamWriter(schema, delegate); } - private void emitSchema(final Object schema) { - delegate.nextDataSchemaNode((DataSchemaNode) schema); + private void emitSchema(final Object schemaNode) { + delegate.nextDataSchemaNode((DataSchemaNode) schemaNode); } NodeCodecContext current() { diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java index 584c3474b2..fd063d0512 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java @@ -124,7 +124,7 @@ abstract class DataObjectCodecContext * By serialization / deserialization of this exception {@link #getBindingClass()} will return null. */ -public class MissingSchemaForClassException extends MissingSchemaException { +public final class MissingSchemaForClassException extends MissingSchemaException { private static final long serialVersionUID = 1L; diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/util/ChoiceDispatchSerializer.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/util/ChoiceDispatchSerializer.java index 5734d8e49c..31c4645da1 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/util/ChoiceDispatchSerializer.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/util/ChoiceDispatchSerializer.java @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.binding.DataObjectSerializerRegistry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ChoiceDispatchSerializer implements DataObjectSerializerImplementation { +public final class ChoiceDispatchSerializer implements DataObjectSerializerImplementation { private static final Logger LOG = LoggerFactory.getLogger(ChoiceDispatchSerializer.class); @@ -30,7 +30,7 @@ public class ChoiceDispatchSerializer implements DataObjectSerializerImplementat this.choiceClass = Preconditions.checkNotNull(choiceClass); } - public static final ChoiceDispatchSerializer from(final Class choiceClass) { + public static ChoiceDispatchSerializer from(final Class choiceClass) { return new ChoiceDispatchSerializer(choiceClass); } diff --git a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExampleYangObjects.java b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExampleYangObjects.java index 9e4402d9cc..340a9a138c 100644 --- a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExampleYangObjects.java +++ b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExampleYangObjects.java @@ -18,7 +18,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.te import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.two.level.list.TopLevelList; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -public class ExampleYangObjects { +public final class ExampleYangObjects { + private ExampleYangObjects() { + + } public static AbstractMap.SimpleImmutableEntry, Top> topEmpty() { return new SimpleImmutableEntry<>(InstanceIdentifier.create(Top.class), new TopBuilder().build()); diff --git a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExpectedObjects.java b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExpectedObjects.java index 88bec30def..9ea90152d9 100644 --- a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExpectedObjects.java +++ b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExpectedObjects.java @@ -26,7 +26,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.te * @see AssertDataObjects * @see AssertDataObjectsTest */ -public class ExpectedObjects { +public final class ExpectedObjects { + + private ExpectedObjects() { + + } public static TopLevelList topLevelList() { TopLevelListBuilder it = new TopLevelListBuilder(); diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/BindingReflections.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/BindingReflections.java index cd93affaf9..98a50b51ec 100644 --- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/BindingReflections.java +++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/BindingReflections.java @@ -50,7 +50,7 @@ import org.opendaylight.yangtools.yang.common.QNameModule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class BindingReflections { +public final class BindingReflections { private static final long EXPIRATION_TIME = 60; @@ -118,7 +118,7 @@ public class BindingReflections { * QName, but QName with correct namespace revision, but virtual local name, since augmentations do not * have name. May return null if QName is not present. */ - public static final QName findQName(final Class dataType) { + public static QName findQName(final Class dataType) { return CLASS_TO_QNAME.getUnchecked(dataType).orNull(); } @@ -228,7 +228,7 @@ public class BindingReflections { } @SuppressWarnings("checkstyle:illegalCatch") - public static final QNameModule getQNameModule(final Class clz) { + public static QNameModule getQNameModule(final Class clz) { if (DataContainer.class.isAssignableFrom(clz) || BaseIdentity.class.isAssignableFrom(clz)) { return findQName(clz).getModule(); } @@ -240,7 +240,7 @@ public class BindingReflections { } } - public static final QNameModule getQNameModule(final YangModuleInfo modInfo) { + public static QNameModule getQNameModule(final YangModuleInfo modInfo) { return QNameModule.create(URI.create(modInfo.getNamespace()), QName.parseRevision(modInfo.getRevision())); } diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtil.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtil.java index 4202833f9c..3e706dc6f1 100644 --- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtil.java +++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtil.java @@ -32,7 +32,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.IdentifiableIt import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.Item; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument; -public class DataObjectReadingUtil { +public final class DataObjectReadingUtil { private static final DataObjectReadingStrategy REAUSABLE_AUGMENTATION_READING_STRATEGY = new AugmentationReadingStrategy(); @@ -52,7 +52,7 @@ public class DataObjectReadingUtil { * Path, which is nested to parent, and should be read. * @return Value of object. */ - public static final Map, T> readData( + public static Map, T> readData( final P parent, final InstanceIdentifier

parentPath, final InstanceIdentifier childPath) { checkArgument(parent != null, "Parent must not be null."); checkArgument(parentPath != null, "Parent path must not be null"); @@ -84,7 +84,7 @@ public class DataObjectReadingUtil { return readData(entry.getValue(), entry.getKey(), pathArgument); } - public static final Optional readData(final DataObject source, final Class child) { + public static Optional readData(final DataObject source, final Class child) { checkArgument(source != null, "Object should not be null."); checkArgument(child != null, "Child type should not be null"); Class parentClass = source.getImplementedInterface(); @@ -169,7 +169,7 @@ public class DataObjectReadingUtil { public abstract Map readUsingPathArgument(DataContainer parent, PathArgument childArgument, InstanceIdentifier targetBuilder); - public abstract DataContainer read(DataContainer parent, Class childType); + public abstract DataContainer read(DataContainer parent, Class child); private static Method resolveGetterMethod(final Class parent, final Class child) { String methodName = "get" + child.getSimpleName(); @@ -185,7 +185,7 @@ public class DataObjectReadingUtil { } @SuppressWarnings("rawtypes") - private static class ContainerReadingStrategy extends DataObjectReadingStrategy { + private static final class ContainerReadingStrategy extends DataObjectReadingStrategy { ContainerReadingStrategy(final Class parent, final Class child) { super(parent, child); @@ -205,7 +205,7 @@ public class DataObjectReadingUtil { } @Override - public DataContainer read(final DataContainer parent, final Class childType) { + public DataContainer read(final DataContainer parent, final Class child) { try { Object potentialData = getGetterMethod().invoke(parent); checkState(potentialData instanceof DataContainer); @@ -218,14 +218,14 @@ public class DataObjectReadingUtil { } @SuppressWarnings("rawtypes") - private static class ListItemReadingStrategy extends DataObjectReadingStrategy { + private static final class ListItemReadingStrategy extends DataObjectReadingStrategy { ListItemReadingStrategy(final Class parent, final Class child) { super(parent, child); checkArgument(Iterable.class.isAssignableFrom(getGetterMethod().getReturnType())); } @Override - public DataContainer read(final DataContainer parent, final Class childType) { + public DataContainer read(final DataContainer parent, final Class child) { // This will always fail since we do not have key. return null; } @@ -302,12 +302,12 @@ public class DataObjectReadingUtil { } @Override - public DataContainer read(final DataContainer parent, final Class childType) { - checkArgument(Augmentation.class.isAssignableFrom(childType), "Parent must be Augmentable."); + public DataContainer read(final DataContainer parent, final Class child) { + checkArgument(Augmentation.class.isAssignableFrom(child), "Child must be Augmentation."); checkArgument(parent instanceof Augmentable, "Parent must be Augmentable."); @SuppressWarnings({ "rawtypes", "unchecked" }) - Augmentation potential = ((Augmentable) parent).getAugmentation(childType); + Augmentation potential = ((Augmentable) parent).getAugmentation(child); checkState(potential instanceof DataContainer, "Readed augmention must be data object"); return (DataContainer) potential; } diff --git a/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/BindingMappingTest.java b/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/BindingMappingTest.java index f3348eaed3..396920f119 100644 --- a/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/BindingMappingTest.java +++ b/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/BindingMappingTest.java @@ -44,7 +44,7 @@ public class BindingMappingTest { } @Test(expected = UnsupportedOperationException.class) - @SuppressWarnings("checkstyle:illegalThrows") + @SuppressWarnings({ "checkstyle:illegalThrows", "checkstyle:avoidHidingCauseException" }) public void privateConstructTest() throws Throwable { final Constructor bindingMappingConstructor = BindingMapping.class.getDeclaredConstructor(); assertFalse(bindingMappingConstructor.isAccessible()); diff --git a/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/BindingReflectionsTest.java b/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/BindingReflectionsTest.java index 11fa38a6e3..bcd64d86b2 100644 --- a/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/BindingReflectionsTest.java +++ b/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/BindingReflectionsTest.java @@ -62,7 +62,7 @@ public class BindingReflectionsTest { } @Test(expected = UnsupportedOperationException.class) - @SuppressWarnings("checkstyle:illegalThrows") + @SuppressWarnings({ "checkstyle:illegalThrows", "checkstyle:avoidHidingCauseException" }) public void testPrivateConstructor() throws Throwable { assertFalse(BindingReflections.class.getDeclaredConstructor().isAccessible()); final Constructor constructor = BindingReflections.class.getDeclaredConstructor(); diff --git a/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtilTest.java b/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtilTest.java index 21114d1aba..b7f6054d99 100644 --- a/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtilTest.java +++ b/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtilTest.java @@ -102,7 +102,7 @@ public class DataObjectReadingUtilTest { } @Test(expected = UnsupportedOperationException.class) - @SuppressWarnings("checkstyle:illegalThrows") + @SuppressWarnings({ "checkstyle:illegalThrows", "checkstyle:avoidHidingCauseException" }) public void testPrivateConstructor() throws Throwable { assertFalse(DataObjectReadingUtil.class.getDeclaredConstructor().isAccessible()); final Constructor constructor = DataObjectReadingUtil.class.getDeclaredConstructor(); diff --git a/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/NotificationListenerInvokerTest.java b/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/NotificationListenerInvokerTest.java index cc28bbdc73..7689bc643e 100644 --- a/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/NotificationListenerInvokerTest.java +++ b/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/NotificationListenerInvokerTest.java @@ -29,7 +29,7 @@ public class NotificationListenerInvokerTest { } @Test(expected = IllegalStateException.class) - @SuppressWarnings("checkstyle:illegalThrows") + @SuppressWarnings({ "checkstyle:illegalThrows", "checkstyle:avoidHidingCauseException" }) public void fromWithExceptionTest() throws Throwable { try { NotificationListenerInvoker.from(TestPrivateInterface.class); diff --git a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeCommitCohortRegistryAdapter.java b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeCommitCohortRegistryAdapter.java index 2a15d0865f..a80cc08766 100644 --- a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeCommitCohortRegistryAdapter.java +++ b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeCommitCohortRegistryAdapter.java @@ -24,7 +24,7 @@ import org.opendaylight.yangtools.concepts.ObjectRegistration; * Data tree commit cohort registry adapter. */ @Beta -public class BindingDOMDataTreeCommitCohortRegistryAdapter implements DataTreeCommitCohortRegistry { +public final class BindingDOMDataTreeCommitCohortRegistryAdapter implements DataTreeCommitCohortRegistry { private final BindingToNormalizedNodeCodec codec; private final DOMDataTreeCommitCohortRegistry registry; diff --git a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeProducerAdapter.java b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeProducerAdapter.java index a9d59c826c..772c42672e 100644 --- a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeProducerAdapter.java +++ b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeProducerAdapter.java @@ -25,7 +25,7 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeProducerException; * Producer adapter. */ @Beta -public class BindingDOMDataTreeProducerAdapter implements DataTreeProducer { +public final class BindingDOMDataTreeProducerAdapter implements DataTreeProducer { private final DOMDataTreeProducer delegate; private final BindingToNormalizedNodeCodec codec; diff --git a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeServiceAdapter.java b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeServiceAdapter.java index 5edda40fb2..34dbe1667a 100644 --- a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeServiceAdapter.java +++ b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeServiceAdapter.java @@ -27,7 +27,7 @@ import org.opendaylight.yangtools.concepts.ListenerRegistration; * */ @Beta -public class BindingDOMDataTreeServiceAdapter implements DataTreeService { +public final class BindingDOMDataTreeServiceAdapter implements DataTreeService { private final DOMDataTreeService delegate; private final BindingToNormalizedNodeCodec codec; diff --git a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/operation/RpcServiceAdapter.java b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/operation/RpcServiceAdapter.java index 7681df8db5..c6df3b681c 100644 --- a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/operation/RpcServiceAdapter.java +++ b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/operation/RpcServiceAdapter.java @@ -80,6 +80,7 @@ class RpcServiceAdapter implements InvocationHandler { } @Override + @SuppressWarnings("checkstyle:hiddenField") public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { final RpcInvocationStrategy rpc = rpcNames.get(method); @@ -159,13 +160,13 @@ class RpcServiceAdapter implements InvocationHandler { } private ListenableFuture> transformFuture(final SchemaPath rpc, - final ListenableFuture domFuture, final BindingNormalizedNodeCodecRegistry codec) { + final ListenableFuture domFuture, final BindingNormalizedNodeCodecRegistry resultCodec) { return Futures.transform(domFuture, (Function>) input -> { final NormalizedNode domData = input.getResult(); final TreeNode bindingResult; if (domData != null) { final SchemaPath rpcOutput = rpc.createChild(QName.create(rpc.getLastComponent(), "output")); - bindingResult = codec.fromNormalizedNodeOperationData(rpcOutput, (ContainerNode) domData); + bindingResult = resultCodec.fromNormalizedNodeOperationData(rpcOutput, (ContainerNode) domData); } else { bindingResult = null; } diff --git a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/builder/AdapterBuilder.java b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/builder/AdapterBuilder.java index cefc6c1a6c..af86fe1128 100644 --- a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/builder/AdapterBuilder.java +++ b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/builder/AdapterBuilder.java @@ -28,7 +28,7 @@ public abstract class AdapterBuilder implements Builder { private final ClassToInstanceMap delegates = MutableClassToInstanceMap.create(); - protected abstract T createInstance(ClassToInstanceMap delegates); + protected abstract T createInstance(ClassToInstanceMap immutableDelegates); /** * Get required delegates. diff --git a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/builder/BindingDOMAdapterBuilder.java b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/builder/BindingDOMAdapterBuilder.java index 125fdcba54..b7dace6bf9 100644 --- a/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/builder/BindingDOMAdapterBuilder.java +++ b/binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/builder/BindingDOMAdapterBuilder.java @@ -25,7 +25,7 @@ public abstract class BindingDOMAdapterBuilder extends private BindingToNormalizedNodeCodec codec; - protected abstract T createInstance(BindingToNormalizedNodeCodec codec, ClassToInstanceMap delegates); + protected abstract T createInstance(BindingToNormalizedNodeCodec myCodec, ClassToInstanceMap delegates); @Override protected final T createInstance(final ClassToInstanceMap delegates) { diff --git a/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/test/AbstractDataBrokerTest.java b/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/test/AbstractDataBrokerTest.java index 39f7fe0c8d..21b4657649 100644 --- a/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/test/AbstractDataBrokerTest.java +++ b/binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/test/AbstractDataBrokerTest.java @@ -32,7 +32,7 @@ public class AbstractDataBrokerTest extends AbstractSchemaAwareTest { setupWithDataBroker(dataBroker); } - protected void setupWithDataBroker(final DataBroker dataBroker) { + protected void setupWithDataBroker(final DataBroker broker) { // Intentionally left No-op, subclasses may customize it } diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/impl/StreamWriterGenerator.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/impl/StreamWriterGenerator.java index 824badbe45..a8ad1e9a14 100644 --- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/impl/StreamWriterGenerator.java +++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/impl/StreamWriterGenerator.java @@ -38,10 +38,9 @@ import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; * properties of parent codec and stateless implementations are used ( * {@link ChoiceDispatchSerializer}, {@link AugmentableDispatchSerializer}, * which uses registry to dispatch to concrete item codec. - * */ @Beta -public class StreamWriterGenerator extends AbstractStreamWriterGenerator { +public final class StreamWriterGenerator extends AbstractStreamWriterGenerator { private static final String UNKNOWN_SIZE = BindingStreamEventWriter.class.getName() + ".UNKNOWN_SIZE"; diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/IdentifiableItemCodec.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/IdentifiableItemCodec.java index c6e502dd8a..88ff275b0d 100644 --- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/IdentifiableItemCodec.java +++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/IdentifiableItemCodec.java @@ -61,7 +61,7 @@ public final class IdentifiableItemCodec implements Codec> choiceClass) { + public static ChoiceDispatchSerializer from(final Class> choiceClass) { return new ChoiceDispatchSerializer(choiceClass); } diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/modification/LazyDataTreeModification.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/modification/LazyDataTreeModification.java index d310714b22..39804fbb57 100644 --- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/modification/LazyDataTreeModification.java +++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/modification/LazyDataTreeModification.java @@ -34,7 +34,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; * */ @Beta -public class LazyDataTreeModification implements DataTreeModification { +public final class LazyDataTreeModification implements DataTreeModification { private final DataTreeIdentifier path; private final TreeNodeModification rootNode; diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRpcRoutingTableEntry.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRpcRoutingTableEntry.java index 9a5f47ffab..ff7b0fd4ef 100644 --- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRpcRoutingTableEntry.java +++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRpcRoutingTableEntry.java @@ -27,13 +27,13 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; abstract class AbstractDOMRpcRoutingTableEntry { - private final Map> impls; + private final Map> implementations; private final SchemaPath schemaPath; AbstractDOMRpcRoutingTableEntry(final SchemaPath schemaPath, final Map> impls) { + List> implementations) { this.schemaPath = Preconditions.checkNotNull(schemaPath); - this.impls = Preconditions.checkNotNull(impls); + this.implementations = Preconditions.checkNotNull(implementations); } final SchemaPath getSchemaPath() { @@ -41,24 +41,25 @@ abstract class AbstractDOMRpcRoutingTableEntry { } final List getImplementations(final YangInstanceIdentifier context) { - return impls.get(context); + return implementations.get(context); } final Map> getImplementations() { - return impls; + return implementations; } final boolean containsContext(final YangInstanceIdentifier contextReference) { - return impls.containsKey(contextReference); + return implementations.containsKey(contextReference); } final Set registeredIdentifiers(final DOMRpcAvailabilityListener listener) { - return Maps.filterValues(impls, list -> list.stream().anyMatch(listener::acceptsImplementation)).keySet(); + return Maps.filterValues(implementations, list -> list.stream() + .anyMatch(listener::acceptsImplementation)).keySet(); } @VisibleForTesting final Set registeredIdentifiers() { - return impls.keySet(); + return implementations.keySet(); } /** @@ -71,7 +72,7 @@ abstract class AbstractDOMRpcRoutingTableEntry { final AbstractDOMRpcRoutingTableEntry add( final DOMRpcImplementation implementation, final List newRpcs) { final Builder> vb = ImmutableMap.builder(); - for (final Entry> ve : impls.entrySet()) { + for (final Entry> ve : implementations.entrySet()) { if (newRpcs.remove(ve.getKey())) { final List i = new ArrayList<>(ve.getValue().size() + 1); i.addAll(ve.getValue()); @@ -97,7 +98,7 @@ abstract class AbstractDOMRpcRoutingTableEntry { final AbstractDOMRpcRoutingTableEntry remove( final DOMRpcImplementation implementation, final List removed) { final Builder> vb = ImmutableMap.builder(); - for (final Entry> ve : impls.entrySet()) { + for (final Entry> ve : implementations.entrySet()) { if (removed.remove(ve.getKey())) { final List i = new ArrayList<>(ve.getValue()); i.remove(implementation); diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouterEvent.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouterEvent.java index e75adebfd2..ea79cae321 100644 --- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouterEvent.java +++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouterEvent.java @@ -21,13 +21,7 @@ import org.opendaylight.yangtools.concepts.ListenerRegistration; * so they do have mutable state. */ final class DOMNotificationRouterEvent { - public static final EventFactory FACTORY = - new EventFactory() { - @Override - public DOMNotificationRouterEvent newInstance() { - return new DOMNotificationRouterEvent(); - } - }; + static final EventFactory FACTORY = DOMNotificationRouterEvent::new; private Collection> subscribers; private DOMNotification notification; @@ -37,6 +31,7 @@ final class DOMNotificationRouterEvent { // Hidden on purpose, initialized in initialize() } + @SuppressWarnings("checkstyle:hiddenField") ListenableFuture initialize(final DOMNotification notification, final Collection> subscribers) { this.notification = Preconditions.checkNotNull(notification); diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRoutingTable.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRoutingTable.java index be14139de1..4a9fe4cf43 100644 --- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRoutingTable.java +++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRoutingTable.java @@ -60,13 +60,13 @@ final class DOMRpcRoutingTable { return ret; } - DOMRpcRoutingTable add(final DOMRpcImplementation implementation, final Set rpcs) { - if (rpcs.isEmpty()) { + DOMRpcRoutingTable add(final DOMRpcImplementation implementation, final Set rpcsToAdd) { + if (rpcsToAdd.isEmpty()) { return this; } // First decompose the identifiers to a multimap - final ListMultimap toAdd = decomposeIdentifiers(rpcs); + final ListMultimap toAdd = decomposeIdentifiers(rpcsToAdd); // Now iterate over existing entries, modifying them as appropriate... final Builder mb = ImmutableMap.builder(); @@ -94,13 +94,13 @@ final class DOMRpcRoutingTable { return new DOMRpcRoutingTable(mb.build(), schemaContext); } - DOMRpcRoutingTable remove(final DOMRpcImplementation implementation, final Set rpcs) { - if (rpcs.isEmpty()) { + DOMRpcRoutingTable remove(final DOMRpcImplementation implementation, final Set rpcIds) { + if (rpcIds.isEmpty()) { return this; } // First decompose the identifiers to a multimap - final ListMultimap toRemove = decomposeIdentifiers(rpcs); + final ListMultimap toRemove = decomposeIdentifiers(rpcIds); // Now iterate over existing entries, modifying them as appropriate... final Builder b = ImmutableMap.builder(); diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ProducerLayout.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ProducerLayout.java index 059b322436..e383d5be6a 100644 --- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ProducerLayout.java +++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ProducerLayout.java @@ -86,8 +86,8 @@ final class ProducerLayout { return new ProducerLayout(shardMap, idToProducer, cb.build()); } - ProducerLayout reshard(final Map shardMap) { - return new ProducerLayout(shardMap, mapIdsToProducer(shardMap), children); + ProducerLayout reshard(final Map newShardMap) { + return new ProducerLayout(newShardMap, mapIdsToProducer(newShardMap), children); } boolean haveSubtree(final DOMDataTreeIdentifier subtree) { diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTree.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTree.java index 0bd4393fd3..df706739ac 100644 --- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTree.java +++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTree.java @@ -174,7 +174,7 @@ public final class ShardedDOMDataTree implements DOMDataTreeService, DOMDataTree return createProducer(subtrees, shardMap); } - @SuppressWarnings("checkstyle:IllegalCatch") + @SuppressWarnings({ "checkstyle:IllegalCatch", "checkstyle:hiddenField" }) @Override public synchronized ListenerRegistration registerListener(final T listener, final Collection subtrees, final boolean allowRxMerges, diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeProducer.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeProducer.java index 87f321db66..a7f3f6d2b1 100644 --- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeProducer.java +++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeProducer.java @@ -54,7 +54,7 @@ class ShardedDOMDataTreeProducer implements DOMDataTreeProducer { private volatile DOMDataTreeListener attachedListener; private volatile ProducerLayout layout; - private ShardedDOMDataTreeProducer(final ShardedDOMDataTree dataTree, + ShardedDOMDataTreeProducer(final ShardedDOMDataTree dataTree, final Collection subtrees, final Map shardMap) { this.dataTree = Preconditions.checkNotNull(dataTree); @@ -150,6 +150,7 @@ class ShardedDOMDataTreeProducer implements DOMDataTreeProducer { } @Override + @SuppressWarnings("checkstyle:hiddenField") public DOMDataTreeProducer createProducer(final Collection subtrees) { checkNotClosed(); checkIdle(); diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeWriteTransaction.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeWriteTransaction.java index 5068e87a6d..2d95022888 100644 --- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeWriteTransaction.java +++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeWriteTransaction.java @@ -134,7 +134,7 @@ final class ShardedDOMDataTreeWriteTransaction implements DOMDataTreeCursorAware final BiConsumer failure) { LOG.debug("Readying tx {}", identifier); - final ListenableFuture future; + final ListenableFuture internalFuture; switch (transactions.size()) { case 0: success.accept(this); @@ -142,17 +142,17 @@ final class ShardedDOMDataTreeWriteTransaction implements DOMDataTreeCursorAware case 1: { final DOMDataTreeShardWriteTransaction tx = transactions.values().iterator().next(); tx.ready(); - future = tx.submit(); + internalFuture = tx.submit(); break; } default: - future = Futures.allAsList(transactions.values().stream().map(tx -> { + internalFuture = Futures.allAsList(transactions.values().stream().map(tx -> { tx.ready(); return tx.submit(); }).collect(Collectors.toList())); } - Futures.addCallback(future, new FutureCallback() { + Futures.addCallback(internalFuture, new FutureCallback() { @Override public void onSuccess(final Object result) { success.accept(ShardedDOMDataTreeWriteTransaction.this); @@ -178,21 +178,21 @@ final class ShardedDOMDataTreeWriteTransaction implements DOMDataTreeCursorAware } private class DelegatingCursor implements DOMDataTreeWriteCursor { - private final Deque path = new ArrayDeque<>(); + private final Deque currentArgs = new ArrayDeque<>(); private final DOMDataTreeWriteCursor delegate; private final DOMDataTreeIdentifier rootPosition; DelegatingCursor(final DOMDataTreeWriteCursor delegate, final DOMDataTreeIdentifier rootPosition) { this.delegate = Preconditions.checkNotNull(delegate); this.rootPosition = Preconditions.checkNotNull(rootPosition); - path.addAll(rootPosition.getRootIdentifier().getPathArguments()); + currentArgs.addAll(rootPosition.getRootIdentifier().getPathArguments()); } @Override public void enter(@Nonnull final PathArgument child) { checkAvailable(child); delegate.enter(child); - path.push(child); + currentArgs.push(child); } @Override @@ -212,20 +212,20 @@ final class ShardedDOMDataTreeWriteTransaction implements DOMDataTreeCursorAware @Override public void exit() { delegate.exit(); - path.pop(); + currentArgs.pop(); } @Override public void exit(final int depth) { delegate.exit(depth); for (int i = 0; i < depth; i++) { - path.pop(); + currentArgs.pop(); } } @Override public void close() { - int depthEntered = path.size() - rootPosition.getRootIdentifier().getPathArguments().size(); + int depthEntered = currentArgs.size() - rootPosition.getRootIdentifier().getPathArguments().size(); if (depthEntered > 0) { // clean up existing modification cursor in case this tx will be reused for batching delegate.exit(depthEntered); @@ -254,7 +254,7 @@ final class ShardedDOMDataTreeWriteTransaction implements DOMDataTreeCursorAware } void checkAvailable(final PathArgument child) { - layout.checkAvailable(path, child); + layout.checkAvailable(currentArgs, child); } } diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/AbstractDOMForwardedCompositeTransactionTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/AbstractDOMForwardedCompositeTransactionTest.java index ac50e2678c..e6be4f11c4 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/AbstractDOMForwardedCompositeTransactionTest.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/AbstractDOMForwardedCompositeTransactionTest.java @@ -32,11 +32,11 @@ public class AbstractDOMForwardedCompositeTransactionTest { domForwardedCompositeTransaction.closeSubtransactions(); } - private static class DOMForwardedCompositeTransactionTestImpl + private static final class DOMForwardedCompositeTransactionTestImpl extends AbstractDOMForwardedCompositeTransaction { - private DOMForwardedCompositeTransactionTestImpl(final Object identifier, - final Map backingTxs) { + DOMForwardedCompositeTransactionTestImpl(final Object identifier, + final Map backingTxs) { super(identifier, backingTxs); } } diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/MockingUtilities.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/MockingUtilities.java index cf72ee24fb..c283ece795 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/MockingUtilities.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/MockingUtilities.java @@ -10,7 +10,7 @@ package org.opendaylight.mdsal.dom.broker; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -class MockingUtilities { +final class MockingUtilities { private MockingUtilities() { throw new UnsupportedOperationException("Utility class"); diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/MountPointServiceTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/MountPointServiceTest.java index 8c60649b37..adea584bc8 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/MountPointServiceTest.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/MountPointServiceTest.java @@ -58,15 +58,15 @@ public class MountPointServiceTest { final DOMMountPointListener listener = mock(DOMMountPointListener.class); doNothing().when(listener).onMountPointCreated(PATH); doNothing().when(listener).onMountPointRemoved(PATH); - final DOMMountPointServiceImpl mountService = new DOMMountPointServiceImpl(); - mountService.registerProvisionListener(listener); - mountService.createMountPoint(PATH).register(); + final DOMMountPointServiceImpl service = new DOMMountPointServiceImpl(); + service.registerProvisionListener(listener); + service.createMountPoint(PATH).register(); - assertTrue(mountService.getMountPoint(PATH).isPresent()); + assertTrue(service.getMountPoint(PATH).isPresent()); - mountService.unregisterMountPoint(PATH); + service.unregisterMountPoint(PATH); - assertFalse(mountService.getMountPoint(PATH).isPresent()); + assertFalse(service.getMountPoint(PATH).isPresent()); } @Test diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/schema/ScanningSchemaServiceProviderTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/schema/ScanningSchemaServiceProviderTest.java index 80c982119f..c56318c960 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/schema/ScanningSchemaServiceProviderTest.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/schema/ScanningSchemaServiceProviderTest.java @@ -168,8 +168,8 @@ public class ScanningSchemaServiceProviderTest { schemaService.getSessionContext(); } - private void addYangs(final ScanningSchemaServiceProvider schemaService) { - final List registerAvailableYangs = schemaService.registerAvailableYangs(yangs); + private void addYangs(final ScanningSchemaServiceProvider service) { + final List registerAvailableYangs = service.registerAvailableYangs(yangs); assertTrue(!registerAvailableYangs.isEmpty()); } diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/util/TestModel.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/util/TestModel.java index 2f97daa948..11f27b1d09 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/util/TestModel.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/util/TestModel.java @@ -15,7 +15,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; -public class TestModel { +public final class TestModel { public static final QName TEST_QNAME = QName.create("urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test", "2014-03-13", "test"); @@ -49,6 +49,10 @@ public class TestModel { YangInstanceIdentifier.builder(ANOTHER_SHARD_PATH).node(NEW_SHARD_LIST).build(); private static final String DATASTORE_TEST_YANG = "/odl-datastore-test.yang"; + private TestModel() { + throw new UnsupportedOperationException(); + } + public static SchemaContext createTestContext() throws ReactorException { return YangParserTestUtils.parseYangStreams(Collections.singletonList(getInputStream())); } diff --git a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataStoreConfigProperties.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataStoreConfigProperties.java index b6dbfd9df1..f23d66daf4 100644 --- a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataStoreConfigProperties.java +++ b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataStoreConfigProperties.java @@ -15,7 +15,7 @@ package org.opendaylight.mdsal.dom.store.inmemory; * @author Thomas Pantelis * @see InMemoryDOMDataStoreFactory */ -public class InMemoryDOMDataStoreConfigProperties { +public final class InMemoryDOMDataStoreConfigProperties { public static final int DEFAULT_MAX_DATA_CHANGE_EXECUTOR_QUEUE_SIZE = 1000; public static final int DEFAULT_MAX_DATA_CHANGE_EXECUTOR_POOL_SIZE = 20; @@ -33,8 +33,9 @@ public class InMemoryDOMDataStoreConfigProperties { private final int maxDataChangeListenerQueueSize; private final int maxDataStoreExecutorQueueSize; - private InMemoryDOMDataStoreConfigProperties(int maxDataChangeExecutorPoolSize, int maxDataChangeExecutorQueueSize, - int maxDataChangeListenerQueueSize, int maxDataStoreExecutorQueueSize) { + private InMemoryDOMDataStoreConfigProperties(final int maxDataChangeExecutorPoolSize, + final int maxDataChangeExecutorQueueSize, final int maxDataChangeListenerQueueSize, + final int maxDataStoreExecutorQueueSize) { this.maxDataChangeExecutorQueueSize = maxDataChangeExecutorQueueSize; this.maxDataChangeExecutorPoolSize = maxDataChangeExecutorPoolSize; this.maxDataChangeListenerQueueSize = maxDataChangeListenerQueueSize; @@ -53,16 +54,16 @@ public class InMemoryDOMDataStoreConfigProperties { * @param maxDataStoreExecutorQueueSize * maximum queue size for the data store executor. */ - public static InMemoryDOMDataStoreConfigProperties create(int maxDataChangeExecutorPoolSize, - int maxDataChangeExecutorQueueSize, int maxDataChangeListenerQueueSize, - int maxDataStoreExecutorQueueSize) { + public static InMemoryDOMDataStoreConfigProperties create(final int maxDataChangeExecutorPoolSize, + final int maxDataChangeExecutorQueueSize, final int maxDataChangeListenerQueueSize, + final int maxDataStoreExecutorQueueSize) { return new InMemoryDOMDataStoreConfigProperties(maxDataChangeExecutorPoolSize, maxDataChangeExecutorQueueSize, maxDataChangeListenerQueueSize, maxDataStoreExecutorQueueSize); } - public static InMemoryDOMDataStoreConfigProperties create(int maxDataChangeExecutorPoolSize, - int maxDataChangeExecutorQueueSize, int maxDataChangeListenerQueueSize) { + public static InMemoryDOMDataStoreConfigProperties create(final int maxDataChangeExecutorPoolSize, + final int maxDataChangeExecutorQueueSize, final int maxDataChangeListenerQueueSize) { return new InMemoryDOMDataStoreConfigProperties(maxDataChangeExecutorPoolSize, maxDataChangeExecutorQueueSize, maxDataChangeListenerQueueSize, DEFAULT_MAX_DATA_STORE_EXECUTOR_QUEUE_SIZE); diff --git a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataTreeShard.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataTreeShard.java index 6449653ad7..f6c95b8054 100644 --- a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataTreeShard.java +++ b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataTreeShard.java @@ -61,8 +61,8 @@ public class InMemoryDOMDataTreeShard implements ReadableWriteableDOMDataTreeSha private final DOMDataTreeIdentifier prefix; private final DataTree dataTree; - private InMemoryDOMDataTreeShard(final DOMDataTreeIdentifier prefix, final Executor dataTreeChangeExecutor, - final int maxDataChangeListenerQueueSize, final int submitQueueSize) { + InMemoryDOMDataTreeShard(final DOMDataTreeIdentifier prefix, final Executor dataTreeChangeExecutor, + final int maxDataChangeListenerQueueSize, final int submitQueueSize) { this.prefix = Preconditions.checkNotNull(prefix); final TreeType treeType = treeTypeFor(prefix.getDatastoreType()); @@ -97,20 +97,20 @@ public class InMemoryDOMDataTreeShard implements ReadableWriteableDOMDataTreeSha } @Override - public void onChildAttached(final DOMDataTreeIdentifier prefix, final DOMDataTreeShard child) { + public void onChildAttached(final DOMDataTreeIdentifier childPrefix, final DOMDataTreeShard child) { Preconditions.checkArgument(child != this, "Attempted to attach child %s onto self", this); - reparentChildShards(prefix, child); + reparentChildShards(childPrefix, child); - final ChildShardContext context = createContextFor(prefix, child); - childShards.put(prefix, context); - childShardsTable.store(prefix, context); + final ChildShardContext context = createContextFor(childPrefix, child); + childShards.put(childPrefix, context); + childShardsTable.store(childPrefix, context); updateProducers(); } @Override - public void onChildDetached(final DOMDataTreeIdentifier prefix, final DOMDataTreeShard child) { - childShards.remove(prefix); - childShardsTable.remove(prefix); + public void onChildDetached(final DOMDataTreeIdentifier childPrefix, final DOMDataTreeShard child) { + childShards.remove(childPrefix); + childShardsTable.remove(childPrefix); updateProducers(); } diff --git a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InmemoryDOMDataTreeShardWriteTransaction.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InmemoryDOMDataTreeShardWriteTransaction.java index ca5cd2c007..caa4f17ee3 100644 --- a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InmemoryDOMDataTreeShardWriteTransaction.java +++ b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InmemoryDOMDataTreeShardWriteTransaction.java @@ -39,29 +39,29 @@ class InmemoryDOMDataTreeShardWriteTransaction implements DOMDataTreeShardWriteT private enum SimpleCursorOperation { MERGE { @Override - void applyOnLeaf(final DOMDataTreeWriteCursor cursor, final PathArgument child, + void applyOnLeaf(final DOMDataTreeWriteCursor cur, final PathArgument child, final NormalizedNode data) { - cursor.merge(child, data); + cur.merge(child, data); } }, DELETE { @Override - void applyOnLeaf(final DOMDataTreeWriteCursor cursor, final PathArgument child, + void applyOnLeaf(final DOMDataTreeWriteCursor cur, final PathArgument child, final NormalizedNode data) { - cursor.delete(child); + cur.delete(child); } }, WRITE { @Override - void applyOnLeaf(final DOMDataTreeWriteCursor cursor, final PathArgument child, + void applyOnLeaf(final DOMDataTreeWriteCursor cur, final PathArgument child, final NormalizedNode data) { - cursor.write(child, data); + cur.write(child, data); } }; - abstract void applyOnLeaf(DOMDataTreeWriteCursor cursor, PathArgument child, NormalizedNode data); + abstract void applyOnLeaf(DOMDataTreeWriteCursor cur, PathArgument child, NormalizedNode data); - void apply(final DOMDataTreeWriteCursor cursor, final YangInstanceIdentifier path, + void apply(final DOMDataTreeWriteCursor cur, final YangInstanceIdentifier path, final NormalizedNode data) { int enterCount = 0; final Iterator it = path.getPathArguments().iterator(); @@ -69,17 +69,17 @@ class InmemoryDOMDataTreeShardWriteTransaction implements DOMDataTreeShardWriteT while (true) { final PathArgument currentArg = it.next(); if (!it.hasNext()) { - applyOnLeaf(cursor, currentArg, data); + applyOnLeaf(cur, currentArg, data); break; } // We need to enter one level deeper, we are not at leaf (modified) node - cursor.enter(currentArg); + cur.enter(currentArg); enterCount++; } } - cursor.exit(enterCount); + cur.exit(enterCount); } } diff --git a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java index 9748505cbf..868e86355d 100644 --- a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java +++ b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java @@ -304,7 +304,7 @@ public class InMemoryDataStoreTest { doReadAndThrowEx(readTx); } - @SuppressWarnings("checkstyle:IllegalThrows") + @SuppressWarnings({ "checkstyle:IllegalThrows", "checkstyle:avoidHidingCauseException" }) private static void doReadAndThrowEx(final DOMStoreReadTransaction readTx) throws Throwable { try { readTx.read(TestModel.TEST_PATH).get(); diff --git a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java index 8e4cf2b8f7..38fd827a52 100644 --- a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java +++ b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java @@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; -public class TestModel { +public final class TestModel { public static final QName TEST_QNAME = QName.create("urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test", "2014-03-13", "test"); @@ -34,6 +34,10 @@ public class TestModel { YangInstanceIdentifier.builder(TEST_PATH).node(OUTER_LIST_QNAME).build(); private static final String DATASTORE_TEST_YANG = "/odl-datastore-test.yang"; + private TestModel() { + throw new UnsupportedOperationException(); + } + public static SchemaContext createTestContext() throws IOException, YangSyntaxErrorException, ReactorException { return YangParserTestUtils.parseYangStreams(Collections.singletonList(getInputStream())); } diff --git a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMStoreThreePhaseCommitCohortTest.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMStoreThreePhaseCommitCohortTest.java index 2a9b39145d..1b87b0f937 100644 --- a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMStoreThreePhaseCommitCohortTest.java +++ b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMStoreThreePhaseCommitCohortTest.java @@ -20,6 +20,7 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; import java.lang.reflect.Field; +import java.util.concurrent.ExecutionException; import org.junit.Before; import org.junit.Test; import org.opendaylight.mdsal.common.api.OptimisticLockFailedException; @@ -43,7 +44,7 @@ public class InMemoryDOMStoreThreePhaseCommitCohortTest { public void setUp() throws Exception { reset(IN_MEMORY_DOM_DATA_STORE); DataTreeSnapshot dataTreeSnapshot = mock(DataTreeSnapshot.class); - TransactionReadyPrototype transactionReadyPrototype = mock(TransactionReadyPrototype.class); + TransactionReadyPrototype transactionReadyPrototype = mock(TransactionReadyPrototype.class); DataTreeModification dataTreeModification = mock(DataTreeModification.class); doReturn(dataTreeModification).when(dataTreeSnapshot).newModification(); doReturn("testModification").when(dataTreeModification).toString(); @@ -62,7 +63,7 @@ public class InMemoryDOMStoreThreePhaseCommitCohortTest { verify(IN_MEMORY_DOM_DATA_STORE).validate(any()); } - @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:IllegalCatch"}) + @SuppressWarnings({ "checkstyle:IllegalThrows", "checkstyle:avoidHidingCauseException" }) @Test(expected = OptimisticLockFailedException.class) public void canCommitTestWithOptimisticLockFailedException() throws Throwable { doThrow(new ConflictingModificationAppliedException(YangInstanceIdentifier.EMPTY, "testException")) @@ -70,13 +71,13 @@ public class InMemoryDOMStoreThreePhaseCommitCohortTest { try { inMemoryDOMStoreThreePhaseCommitCohort.canCommit().get(); fail("Expected exception"); - } catch (Exception e) { + } catch (ExecutionException e) { assertTrue(e.getCause() instanceof OptimisticLockFailedException); throw e.getCause(); } } - @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:IllegalCatch"}) + @SuppressWarnings({ "checkstyle:IllegalThrows", "checkstyle:avoidHidingCauseException" }) @Test(expected = TransactionCommitFailedException.class) public void canCommitTestWithTransactionCommitFailedException() throws Throwable { doThrow(new DataValidationFailedException(YangInstanceIdentifier.EMPTY, "testException")) @@ -84,13 +85,13 @@ public class InMemoryDOMStoreThreePhaseCommitCohortTest { try { inMemoryDOMStoreThreePhaseCommitCohort.canCommit().get(); fail("Expected exception"); - } catch (Exception e) { + } catch (ExecutionException e) { assertTrue(e.getCause() instanceof TransactionCommitFailedException); throw e.getCause(); } } - @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:IllegalCatch"}) + @SuppressWarnings({ "checkstyle:IllegalThrows", "checkstyle:avoidHidingCauseException" }) @Test(expected = UnsupportedOperationException.class) public void canCommitTestWithUnknownException() throws Throwable { doThrow(new UnsupportedOperationException("testException")) @@ -98,7 +99,7 @@ public class InMemoryDOMStoreThreePhaseCommitCohortTest { try { inMemoryDOMStoreThreePhaseCommitCohort.canCommit().get(); fail("Expected exception"); - } catch (Exception e) { + } catch (ExecutionException e) { assertTrue(e.getCause() instanceof UnsupportedOperationException); throw e.getCause(); } @@ -111,7 +112,7 @@ public class InMemoryDOMStoreThreePhaseCommitCohortTest { verify(IN_MEMORY_DOM_DATA_STORE).prepare(any()); } - @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:IllegalCatch"}) + @SuppressWarnings({ "checkstyle:IllegalThrows", "checkstyle:avoidHidingCauseException" }) @Test(expected = UnsupportedOperationException.class) public void preCommitTestWithUnknownException() throws Throwable { doThrow(new UnsupportedOperationException("testException")) @@ -119,7 +120,7 @@ public class InMemoryDOMStoreThreePhaseCommitCohortTest { try { inMemoryDOMStoreThreePhaseCommitCohort.preCommit().get(); fail("Expected exception"); - } catch (Exception e) { + } catch (ExecutionException e) { assertTrue(e.getCause() instanceof UnsupportedOperationException); throw e.getCause(); } diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java index 75eaed9226..32badc0a64 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java @@ -16,7 +16,7 @@ import org.opendaylight.mdsal.dom.api.DOMService; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -public class SimpleDOMMountPoint implements DOMMountPoint { +public final class SimpleDOMMountPoint implements DOMMountPoint { private final YangInstanceIdentifier identifier; private final ClassToInstanceMap services; @@ -29,7 +29,7 @@ public class SimpleDOMMountPoint implements DOMMountPoint { this.schemaContext = ctx; } - public static final SimpleDOMMountPoint create(final YangInstanceIdentifier identifier, + public static SimpleDOMMountPoint create(final YangInstanceIdentifier identifier, final ClassToInstanceMap services, final SchemaContext ctx) { return new SimpleDOMMountPoint(identifier, services, ctx); } diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeListenerAggregator.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeListenerAggregator.java index 98b1905c08..d4c16db583 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeListenerAggregator.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeListenerAggregator.java @@ -94,9 +94,9 @@ public final class DOMDataTreeListenerAggregator @Override protected void append(final State state) { if (state instanceof Changes) { - final Changes changes = (Changes) state; - this.changes.addAll(changes.changes); - subtrees = ImmutableMap.copyOf(changes.subtrees); + final Changes changesState = (Changes) state; + this.changes.addAll(changesState.changes); + subtrees = ImmutableMap.copyOf(changesState.subtrees); } else if (state instanceof Failure) { causes.addAll(((Failure) state).causes); } else { @@ -108,9 +108,9 @@ public final class DOMDataTreeListenerAggregator protected synchronized void appendInitial(final State state) { // TODO: we could index and compress state changes here if (state instanceof Changes) { - final Changes changes = (Changes) state; - this.changes.addAll(changes.changes); - subtrees = ImmutableMap.copyOf(changes.subtrees); + final Changes changesState = (Changes) state; + this.changes.addAll(changesState.changes); + subtrees = ImmutableMap.copyOf(changesState.subtrees); } else if (state instanceof Failure) { causes.addAll(((Failure) state).causes); } else { diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/WriteableSubshardBoundaryNode.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/WriteableSubshardBoundaryNode.java index 3a76fccb33..493c89732f 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/WriteableSubshardBoundaryNode.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/WriteableSubshardBoundaryNode.java @@ -22,7 +22,7 @@ public class WriteableSubshardBoundaryNode extends WriteableModificationNode { private final ForeignShardModificationContext boundary; - private WriteableSubshardBoundaryNode(final ForeignShardModificationContext boundary) { + WriteableSubshardBoundaryNode(final ForeignShardModificationContext boundary) { this.boundary = Preconditions.checkNotNull(boundary); } diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/shard/WriteableNodeWithSubshardTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/shard/WriteableNodeWithSubshardTest.java index 369e8d2e62..db325bd50e 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/shard/WriteableNodeWithSubshardTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/shard/WriteableNodeWithSubshardTest.java @@ -49,14 +49,14 @@ public class WriteableNodeWithSubshardTest { TestUtils.resetMocks(); } - private class WriteableNodeWithSubshardImpl extends WriteableNodeWithSubshard { + private static final class WriteableNodeWithSubshardImpl extends WriteableNodeWithSubshard { - private WriteableNodeWithSubshardImpl(Map children) { + WriteableNodeWithSubshardImpl(final Map children) { super(children); } @Override - public WriteCursorStrategy createOperation(DOMDataTreeWriteCursor parentCursor) { + public WriteCursorStrategy createOperation(final DOMDataTreeWriteCursor parentCursor) { return null; } diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransactionTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransactionTest.java index fb73921c61..1ea902b80c 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransactionTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransactionTest.java @@ -51,7 +51,7 @@ public class SnapshotBackedReadTransactionTest { assertNull(stableSnapshot); } - @SuppressWarnings("checkstyle:IllegalThrows") + @SuppressWarnings({ "checkstyle:IllegalThrows", "checkstyle:avoidHidingCauseException" }) @Test(expected = ReadFailedException.class) public void readTestWithException() throws Throwable { snapshotBackedReadTransaction.close(); @@ -63,7 +63,7 @@ public class SnapshotBackedReadTransactionTest { } } - @SuppressWarnings("checkstyle:IllegalThrows") + @SuppressWarnings({ "checkstyle:IllegalThrows", "checkstyle:avoidHidingCauseException" }) @Test(expected = ReadFailedException.class) public void readNodeTestWithException() throws Throwable { doThrow(new NullPointerException("no Node")).when(DATA_TREE_SNAPSHOT).readNode(any()); @@ -76,7 +76,7 @@ public class SnapshotBackedReadTransactionTest { } } - @SuppressWarnings("checkstyle:IllegalThrows") + @SuppressWarnings({ "checkstyle:IllegalThrows", "checkstyle:avoidHidingCauseException" }) @Test(expected = ReadFailedException.class) public void existsTestWithException() throws Throwable { doThrow(new NullPointerException("no Node")).when(DATA_TREE_SNAPSHOT).readNode(any()); diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadWriteTransactionTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadWriteTransactionTest.java index 31fbf03329..cbe5eea479 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadWriteTransactionTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadWriteTransactionTest.java @@ -16,6 +16,7 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import com.google.common.base.Optional; +import java.util.concurrent.ExecutionException; import org.junit.Before; import org.junit.Test; import org.opendaylight.mdsal.common.api.ReadFailedException; @@ -50,38 +51,38 @@ public class SnapshotBackedReadWriteTransactionTest { assertEquals(optional, snapshotBackedReadWriteTransaction.read(YangInstanceIdentifier.EMPTY).get()); } - @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:IllegalCatch"}) + @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:avoidHidingCauseException" }) @Test(expected = ReadFailedException.class) public void readTestWithNullException() throws Throwable { doReturn(null).when(DATA_TREE_MODIFICATION).readNode(YangInstanceIdentifier.EMPTY); try { snapshotBackedReadWriteTransaction.read(YangInstanceIdentifier.EMPTY).get(); fail("Expected ReadFailedException"); - } catch (Exception e) { + } catch (ExecutionException e) { throw e.getCause(); } } - @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:IllegalCatch"}) + @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:avoidHidingCauseException"}) @Test(expected = ReadFailedException.class) public void readNodeTestWithException() throws Throwable { doThrow(new NullPointerException("no Node")).when(DATA_TREE_MODIFICATION).readNode(any()); try { snapshotBackedReadWriteTransaction.read(YangInstanceIdentifier.EMPTY).get(); fail("Expected ReadFailedException"); - } catch (Exception e) { + } catch (ExecutionException e) { throw e.getCause(); } } - @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:IllegalCatch"}) + @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:avoidHidingCauseException"}) @Test(expected = ReadFailedException.class) public void existsTestWithException() throws Throwable { doThrow(new NullPointerException("no Node")).when(DATA_TREE_MODIFICATION).readNode(any()); try { snapshotBackedReadWriteTransaction.exists(YangInstanceIdentifier.EMPTY).get(); fail("Expected ReadFailedException"); - } catch (Exception e) { + } catch (ExecutionException e) { throw e.getCause(); } } diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedTransactionsTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedTransactionsTest.java index edf1e79ea2..72b4c27f2e 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedTransactionsTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedTransactionsTest.java @@ -34,7 +34,7 @@ public class SnapshotBackedTransactionsTest { new Object(), false, dataTreeSnapshot, transactionReadyPrototype)); } - @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:IllegalCatch"}) + @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:IllegalCatch", "checkstyle:avoidHidingCauseException" }) @Test(expected = UnsupportedOperationException.class) public void constructorTest() throws Throwable { Constructor constructor = SnapshotBackedTransactions.class.getDeclaredConstructor(); diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransactionTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransactionTest.java index 8b7f4e9aea..6eb33c285b 100644 --- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransactionTest.java +++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransactionTest.java @@ -77,12 +77,11 @@ public class SnapshotBackedWriteTransactionTest { @Test public void readyTest() throws Exception { - SnapshotBackedWriteTransaction snapshotBackedWriteTransaction = - new SnapshotBackedWriteTransaction<>( - new Object(), false, DATA_TREE_SNAPSHOT, TRANSACTION_READY_PROTOTYPE); - Assert.assertNotNull(snapshotBackedWriteTransaction.ready()); + SnapshotBackedWriteTransaction tx = new SnapshotBackedWriteTransaction<>(new Object(), false, + DATA_TREE_SNAPSHOT, TRANSACTION_READY_PROTOTYPE); + Assert.assertNotNull(tx.ready()); verify(TRANSACTION_READY_PROTOTYPE).transactionReady(any(), any()); - snapshotBackedWriteTransaction.close(); + tx.close(); } @Test(expected = IllegalArgumentException.class) -- 2.36.6