Fix odlparent-3.0.0 checkstyle issues 44/65544/6
authorRobert Varga <robert.varga@pantheon.tech>
Wed, 15 Nov 2017 12:30:58 +0000 (13:30 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Thu, 16 Nov 2017 02:12:42 +0000 (03:12 +0100)
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 <robert.varga@pantheon.tech>
63 files changed:
binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/mdsal/binding/yang/unified/doc/generator/maven/YangModuleInfoCompilationTest.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterBuilder.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMAdapterBuilder.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeCommitCohortRegistryAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapter.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedDataBrokerTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingNormalizedCodecTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDOMRpcResultFutureTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractDataBrokerTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/DataTreeChangeListenerTest.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingToNormalizedStreamWriter.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/IdentifiableItemCodec.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MissingSchemaForClassException.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/util/ChoiceDispatchSerializer.java
binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExampleYangObjects.java
binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/ExpectedObjects.java
binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/BindingReflections.java
binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtil.java
binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/BindingMappingTest.java
binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/BindingReflectionsTest.java
binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtilTest.java
binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/NotificationListenerInvokerTest.java
binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeCommitCohortRegistryAdapter.java
binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeProducerAdapter.java
binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeServiceAdapter.java
binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/operation/RpcServiceAdapter.java
binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/builder/AdapterBuilder.java
binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/spi/builder/BindingDOMAdapterBuilder.java
binding2/mdsal-binding2-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/test/AbstractDataBrokerTest.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/impl/StreamWriterGenerator.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/IdentifiableItemCodec.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/MissingSchemaForClassException.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/TreeNodeCodecContext.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/serializer/BindingToNormalizedStreamWriter.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/serializer/ChoiceDispatchSerializer.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/modification/LazyDataTreeModification.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRpcRoutingTableEntry.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouterEvent.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRoutingTable.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ProducerLayout.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTree.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeProducer.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeWriteTransaction.java
dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/AbstractDOMForwardedCompositeTransactionTest.java
dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/MockingUtilities.java
dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/MountPointServiceTest.java
dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/schema/ScanningSchemaServiceProviderTest.java
dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/util/TestModel.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataStoreConfigProperties.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataTreeShard.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InmemoryDOMDataTreeShardWriteTransaction.java
dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java
dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java
dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMStoreThreePhaseCommitCohortTest.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeListenerAggregator.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/WriteableSubshardBoundaryNode.java
dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/shard/WriteableNodeWithSubshardTest.java
dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransactionTest.java
dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadWriteTransactionTest.java
dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedTransactionsTest.java
dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransactionTest.java

index c63824a1b1df5c150f79eeff9242a98444e3101a..76163c774209b830158a2af5384835219b57aadb 100644 (file)
@@ -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);
         }
     }
 
index b125acad121d9bb25be3b8bf1b8920c32cc64da1..dd48e7ac9b4b25c0c9133d36849fac8edbf831d2 100644 (file)
@@ -20,7 +20,7 @@ public abstract class AdapterBuilder<T,D> implements Builder<T> {
 
     public abstract Set<? extends Class<? extends D>> getRequiredDelegates();
 
-    protected abstract T createInstance(ClassToInstanceMap<D> delegates);
+    protected abstract T createInstance(ClassToInstanceMap<D> immutableDelegates);
 
     private void checkAllRequiredServices() {
         for (final Class<? extends D> type : getRequiredDelegates()) {
index bfcdbc8fde78cb9c9980dfbacb70e6f8eb18ed03..f3609ff591bf1404857330416e6b4ce2a318d4b6 100644 (file)
@@ -30,9 +30,9 @@ abstract class BindingDOMAdapterBuilder<T extends BindingService> extends Adapte
     @Override
     protected final T createInstance(final ClassToInstanceMap<DOMService> delegates) {
         Preconditions.checkState(codec != null);
-        return createInstance(codec,delegates);
+        return createInstance(codec, delegates);
     }
 
-    protected abstract T createInstance(BindingToNormalizedNodeCodec codec2, ClassToInstanceMap<DOMService> delegates);
+    protected abstract T createInstance(BindingToNormalizedNodeCodec myCodec, ClassToInstanceMap<DOMService> delegates);
 
 }
index 6ebc7c654a7b639a6405fd2b547cb5fa24e7996f..750a31cdb142dbe10c0b43e42b3217e76802231d 100644 (file)
@@ -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 <D extends DataObject, T extends DataTreeCommitCohort<D>> ObjectRegistration<T> registerCommitCohort(
-            DataTreeIdentifier<D> subtree, final T cohort) {
+            final DataTreeIdentifier<D> subtree, final T cohort) {
         final BindingDOMDataTreeCommitCohortAdapter<D> adapter =
                 new BindingDOMDataTreeCommitCohortAdapter<>(codec, cohort);
         final DOMDataTreeIdentifier domPath = codec.toDOMDataTreeIdentifier(subtree);
index 6f92bb1b1917c6e925e0918975b58c12ed222d65..8652b99ba7e60bda340d9757e3d4343aa5023316 100644 (file)
@@ -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<RpcResult<?>> transformFuture(final SchemaPath rpc,
-                final ListenableFuture<DOMRpcResult> domFuture, final BindingNormalizedNodeCodecRegistry codec) {
+                final ListenableFuture<DOMRpcResult> domFuture, final BindingNormalizedNodeCodecRegistry resultCodec) {
             return Futures.transform(domFuture, (Function<DOMRpcResult, RpcResult<?>>) 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;
                 }
index 09d33e19cb1cfe7f72ab8ce1f418c89faf08224a..9a176e29ca203ee6b5d29eb655ab46a12f310539 100644 (file)
@@ -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);
         }
index 686f4bc92cb37053aa0f36c4947ad33a879615c6..b58cc23c018dbb274d409e2698280e812cbdd9b4 100644 (file)
@@ -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);
index 7a6a49a795cdbb5fd58087eefb005b52f4750755..4afcadbbf887a625db05ba78c0e02a96b61e3737 100644 (file)
@@ -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);
index c1e3d629533532197329117c646fc6c2018fe75f..0b842c190258afc2476faf6473b06df002f52724 100644 (file)
@@ -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);
         }
     }
-
-
 }
index 3de9a66922e7198973510388d305c86e1ded2c42..e51936493cc69473d1149b8ff569e5a243ea74fe 100644 (file)
@@ -63,20 +63,19 @@ public class DataTreeChangeListenerTest extends AbstractDataBrokerTest {
 
     private static final class EventCapturingListener<T extends DataObject> implements DataTreeChangeListener<T> {
 
-        private SettableFuture<Collection<DataTreeModification<T>>> changes = SettableFuture.create();
+        private SettableFuture<Collection<DataTreeModification<T>>> futureChanges = SettableFuture.create();
 
         @Override
         public void onDataTreeChanged(final Collection<DataTreeModification<T>> changes) {
-            this.changes.set(changes);
+            this.futureChanges.set(changes);
 
         }
 
         Collection<DataTreeModification<T>> nextEvent() throws Exception {
-            final Collection<DataTreeModification<T>> result = changes.get(200,TimeUnit.MILLISECONDS);
-            changes = SettableFuture.create();
+            final Collection<DataTreeModification<T>> result = futureChanges.get(200,TimeUnit.MILLISECONDS);
+            futureChanges = SettableFuture.create();
             return result;
         }
-
     }
 
     @Override
index 1c5b6eb26a593017b050f1a46f48566342f9092d..fc982428b8427d02e061d3aab26250daeb2cfaf9 100644 (file)
@@ -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() {
index 584c3474b22da68638ad5be2b7aff16f14208f11..fd063d0512612ae25c344d594247789a1098b703 100644 (file)
@@ -124,7 +124,7 @@ abstract class DataObjectCodecContext<D extends DataObject, T extends DataNodeCo
             proxyConstructor = MethodHandles.publicLookup().findConstructor(proxyClass, CONSTRUCTOR_TYPE)
                     .asType(DATAOBJECT_TYPE);
         } catch (NoSuchMethodException | IllegalAccessException e) {
-            throw new IllegalStateException("Failed to find contructor for class " + proxyClass);
+            throw new IllegalStateException("Failed to find contructor for class " + proxyClass, e);
         }
     }
 
index 63d60bb3770acf85cdd7160bb425a8804c10d43b..57b45a2d7199e1efec7f590dbb64cfa710165eaa 100644 (file)
@@ -42,7 +42,7 @@ final class IdentifiableItemCodec implements Codec<NodeIdentifierWithPredicates,
         try {
             ctor = MethodHandles.publicLookup().unreflectConstructor(getConstructor(keyClass));
         } catch (IllegalAccessException e) {
-            throw new IllegalArgumentException("Missing construct in class " + keyClass);
+            throw new IllegalArgumentException("Missing constructor in class " + keyClass, e);
         }
         final MethodHandle inv = MethodHandles.spreadInvoker(ctor.type(), 0);
         this.ctorInvoker = inv.asType(inv.type().changeReturnType(Identifier.class));
index 366371114180bb5133df87c2b0faa5a2935007d9..87a57819458147ad0f2c384575b73beb78c98743 100644 (file)
@@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.binding.Augmentation;
  * <p>
  * 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;
 
index 5734d8e49ce423fe838da691ca5fe9277304e0fd..31c4645da1002cb9e8bbef65a2ba7e19603d08fa 100644 (file)
@@ -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<? extends DataContainer> choiceClass) {
+    public static ChoiceDispatchSerializer from(final Class<? extends DataContainer> choiceClass) {
         return new ChoiceDispatchSerializer(choiceClass);
     }
 
index 9e4402d9ccc85f746f1b8cea7491f4e447b45f5d..340a9a138cbbc5bf3b947b148578936eec480c27 100644 (file)
@@ -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<InstanceIdentifier<Top>, Top> topEmpty() {
         return new SimpleImmutableEntry<>(InstanceIdentifier.create(Top.class), new TopBuilder().build());
index 88bec30def7325f244478c03c2e2ab8078b9cd74..9ea90152d9f84a28a41403dd6bf8304c72eebd24 100644 (file)
@@ -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();
index cd93affaf9dfad19b7be4836333c77fd6b03380b..98a50b51ec10c02d2a003a6dc818b7de82697d1b 100644 (file)
@@ -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()));
     }
 
index 4202833f9c5d7748e7a61d721f3bfeb5afb01475..3e706dc6f1dfa12159cb8ba86c95812355a6b1ac 100644 (file)
@@ -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 <T extends DataObject, P extends DataObject> Map<InstanceIdentifier<T>, T> readData(
+    public static <T extends DataObject, P extends DataObject> Map<InstanceIdentifier<T>, T> readData(
             final P parent, final InstanceIdentifier<P> parentPath, final InstanceIdentifier<T> 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 <T extends DataObject> Optional<T> readData(final DataObject source, final Class<T> child) {
+    public static <T extends DataObject> Optional<T> readData(final DataObject source, final Class<T> child) {
         checkArgument(source != null, "Object should not be null.");
         checkArgument(child != null, "Child type should not be null");
         Class<? extends DataContainer> parentClass = source.getImplementedInterface();
@@ -169,7 +169,7 @@ public class DataObjectReadingUtil {
         public abstract Map<InstanceIdentifier, DataContainer> 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<? extends DataContainer> 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<? extends DataContainer> parent,
                 final Class<? extends DataContainer> 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<? extends DataContainer> 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;
         }
index f3348eaed3252033dab3edbfc321ba0c46af87b9..396920f1196fde8619c42d207dfca2f38cb5b1e0 100644 (file)
@@ -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<BindingMapping> bindingMappingConstructor = BindingMapping.class.getDeclaredConstructor();
         assertFalse(bindingMappingConstructor.isAccessible());
index 11fa38a6e33cec679b1a6f8c09ccab85a0df2e08..bcd64d86b2202252dec5fc9bba346e4693c29201 100644 (file)
@@ -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();
index 21114d1abab6772fb9afb9bf8af44203755ef8b1..b7f6054d9946eb7d76b80b86361ef81a32aadaf1 100644 (file)
@@ -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();
index cc28bbdc7379a35bf9eb23bf91c13a44fa790781..7689bc643e2aea7dbf9a64f57f91ac3de93553b7 100644 (file)
@@ -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);
index 2a15d0865f29a5c63cd3c80d5b9f2984994478eb..a80cc08766805fde6dddfdcbce9f7bec4891c988 100644 (file)
@@ -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;
index a9d59c826c30bd1dc9041ade8bde636b075b4753..772c42672ec16be823fded0b86f5bdf134615116 100644 (file)
@@ -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;
index 5edda40fb27c1014c47d4f4c2a0dd691ffd89c85..34dbe1667af383732d64db73cf91d6b3e224a08e 100644 (file)
@@ -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;
index 7681df8db5caf6ad3f42dec7037ce56b458b5d8f..c6df3b681c1f6f1b2d707320c7ad2cd27eaa7e36 100644 (file)
@@ -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<RpcResult<?>> transformFuture(final SchemaPath rpc,
-                final ListenableFuture<DOMRpcResult> domFuture, final BindingNormalizedNodeCodecRegistry codec) {
+                final ListenableFuture<DOMRpcResult> domFuture, final BindingNormalizedNodeCodecRegistry resultCodec) {
             return Futures.transform(domFuture, (Function<DOMRpcResult, RpcResult<?>>) 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;
                 }
index cefc6c1a6c1d521c4eb096e36218bf75851858d0..af86fe11281831a539f1a99dfa618fdfc3675c7c 100644 (file)
@@ -28,7 +28,7 @@ public abstract class AdapterBuilder<T, D> implements Builder<T> {
 
     private final ClassToInstanceMap<D> delegates = MutableClassToInstanceMap.create();
 
-    protected abstract T createInstance(ClassToInstanceMap<D> delegates);
+    protected abstract T createInstance(ClassToInstanceMap<D> immutableDelegates);
 
     /**
      * Get required delegates.
index 125fdcba54cb8c63ba226b3f17fc0123c6a26971..b7dace6bf973f2cac2e46d1c960d08b2680bc5c7 100644 (file)
@@ -25,7 +25,7 @@ public abstract class BindingDOMAdapterBuilder<T extends BindingService> extends
 
     private BindingToNormalizedNodeCodec codec;
 
-    protected abstract T createInstance(BindingToNormalizedNodeCodec codec, ClassToInstanceMap<DOMService> delegates);
+    protected abstract T createInstance(BindingToNormalizedNodeCodec myCodec, ClassToInstanceMap<DOMService> delegates);
 
     @Override
     protected final T createInstance(final ClassToInstanceMap<DOMService> delegates) {
index 39f7fe0c8d575d3928bb1355303e9328feabc1f1..21b465764981fb335382a938aa93228f47a1ca5e 100644 (file)
@@ -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
     }
 
index 824badbe45239f537ab6729980929ddb35fdc19f..a8ad1e9a1445b0cc14d8ff8002274a62fedc2841 100644 (file)
@@ -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";
 
index c6e502dd8ada98191ea5f69557296af09f90d26d..88ff275b0d0ed3695a4e9a65f71cbe955c74df3b 100644 (file)
@@ -61,7 +61,7 @@ public final class IdentifiableItemCodec implements Codec<NodeIdentifierWithPred
         try {
             ctor = MethodHandles.publicLookup().unreflectConstructor(getConstructor(keyClass));
         } catch (final IllegalAccessException e) {
-            throw new IllegalArgumentException("Missing construct in class " + keyClass);
+            throw new IllegalArgumentException("Missing construct in class " + keyClass, e);
         }
         final MethodHandle inv = MethodHandles.spreadInvoker(ctor.type(), 0);
         this.ctorInvoker = inv.asType(inv.type().changeReturnType(Identifier.class));
index 6e9dfd30cd180631ce51beb1fff306be999f3497..e0e1749d34615423cfcd1f674c239dd28f00cd5a 100644 (file)
@@ -23,7 +23,7 @@ import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentation;
  * will return null.
  */
 @Beta
-public class MissingSchemaForClassException extends MissingSchemaException {
+public final class MissingSchemaForClassException extends MissingSchemaException {
 
     private static final long serialVersionUID = 1L;
 
index 69362d7e804ff956992b1f76552a1d2d90790754..bc121b836bc57e3251cae771cceb65dbe828b72e 100644 (file)
@@ -124,7 +124,7 @@ public abstract class TreeNodeCodecContext<D extends TreeNode, T extends DataNod
             proxyConstructor = MethodHandles.publicLookup().findConstructor(proxyClass, CONSTRUCTOR_TYPE)
                     .asType(TREENODE_TYPE);
         } catch (NoSuchMethodException | IllegalAccessException e) {
-            throw new IllegalStateException("Failed to find contructor for class " + proxyClass);
+            throw new IllegalStateException("Failed to find contructor for class " + proxyClass, e);
         }
     }
 
index 324ee64b8cdce2bde397e3269e3d2ae963cfebf6..204bf5397829cc6fb5a4c9b9b1eb29ecd5ade7d2 100644 (file)
@@ -65,8 +65,8 @@ public final class BindingToNormalizedStreamWriter
         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);
     }
 
     /**
index 452b71b8e54afd0fbcb022768ed8e4df540308c5..d1dc638ccc09ae5c8b62b817f618e909c36bb35d 100644 (file)
@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
  * Dispatch serializer, which emit DOM data from Binding v2 via stream writer.
  */
 @Beta
-public class ChoiceDispatchSerializer implements TreeNodeSerializerImplementation {
+public final class ChoiceDispatchSerializer implements TreeNodeSerializerImplementation {
 
     private static final Logger LOG = LoggerFactory.getLogger(ChoiceDispatchSerializer.class);
 
@@ -43,7 +43,7 @@ public class ChoiceDispatchSerializer implements TreeNodeSerializerImplementatio
      *            - class choice
      * @return instance of serializer
      */
-    public static final ChoiceDispatchSerializer from(final Class<? extends Instantiable<?>> choiceClass) {
+    public static ChoiceDispatchSerializer from(final Class<? extends Instantiable<?>> choiceClass) {
         return new ChoiceDispatchSerializer(choiceClass);
     }
 
index d310714b221767a48cd4ded5d6edf2d349c45a60..39804fbb5760bbd8c0d4f3eec016978127535ded 100644 (file)
@@ -34,7 +34,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
  *
  */
 @Beta
-public class LazyDataTreeModification<T extends TreeNode> implements DataTreeModification<T> {
+public final class LazyDataTreeModification<T extends TreeNode> implements DataTreeModification<T> {
 
     private final DataTreeIdentifier<T> path;
     private final TreeNodeModification<T> rootNode;
index 9a5f47ffab91fad51f6b8cac20f6fb84f7eab9df..ff7b0fd4ef80803cf5edf1845a75d123cf121d30 100644 (file)
@@ -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<YangInstanceIdentifier, List<DOMRpcImplementation>> impls;
+    private final Map<YangInstanceIdentifier, List<DOMRpcImplementation>> implementations;
     private final SchemaPath schemaPath;
 
     AbstractDOMRpcRoutingTableEntry(final SchemaPath schemaPath, final Map<YangInstanceIdentifier,
-            List<DOMRpcImplementation>> impls) {
+            List<DOMRpcImplementation>> 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<DOMRpcImplementation> getImplementations(final YangInstanceIdentifier context) {
-        return impls.get(context);
+        return implementations.get(context);
     }
 
     final Map<YangInstanceIdentifier, List<DOMRpcImplementation>> getImplementations() {
-        return impls;
+        return implementations;
     }
 
     final boolean containsContext(final YangInstanceIdentifier contextReference) {
-        return impls.containsKey(contextReference);
+        return implementations.containsKey(contextReference);
     }
 
     final Set<YangInstanceIdentifier> 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<YangInstanceIdentifier> registeredIdentifiers() {
-        return impls.keySet();
+        return implementations.keySet();
     }
 
     /**
@@ -71,7 +72,7 @@ abstract class AbstractDOMRpcRoutingTableEntry {
     final AbstractDOMRpcRoutingTableEntry add(
             final DOMRpcImplementation implementation, final List<YangInstanceIdentifier> newRpcs) {
         final Builder<YangInstanceIdentifier, List<DOMRpcImplementation>> vb = ImmutableMap.builder();
-        for (final Entry<YangInstanceIdentifier, List<DOMRpcImplementation>> ve : impls.entrySet()) {
+        for (final Entry<YangInstanceIdentifier, List<DOMRpcImplementation>> ve : implementations.entrySet()) {
             if (newRpcs.remove(ve.getKey())) {
                 final List<DOMRpcImplementation> 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<YangInstanceIdentifier> removed) {
         final Builder<YangInstanceIdentifier, List<DOMRpcImplementation>> vb = ImmutableMap.builder();
-        for (final Entry<YangInstanceIdentifier, List<DOMRpcImplementation>> ve : impls.entrySet()) {
+        for (final Entry<YangInstanceIdentifier, List<DOMRpcImplementation>> ve : implementations.entrySet()) {
             if (removed.remove(ve.getKey())) {
                 final List<DOMRpcImplementation> i = new ArrayList<>(ve.getValue());
                 i.remove(implementation);
index e75adebfd29384971da0a9b696d427096268ba45..ea79cae321a0842cee33c14410fd09778876598f 100644 (file)
@@ -21,13 +21,7 @@ import org.opendaylight.yangtools.concepts.ListenerRegistration;
  * so they do have mutable state.
  */
 final class DOMNotificationRouterEvent {
-    public static final EventFactory<DOMNotificationRouterEvent> FACTORY =
-            new EventFactory<DOMNotificationRouterEvent>() {
-        @Override
-        public DOMNotificationRouterEvent newInstance() {
-            return new DOMNotificationRouterEvent();
-        }
-    };
+    static final EventFactory<DOMNotificationRouterEvent> FACTORY = DOMNotificationRouterEvent::new;
 
     private Collection<ListenerRegistration<? extends DOMNotificationListener>> subscribers;
     private DOMNotification notification;
@@ -37,6 +31,7 @@ final class DOMNotificationRouterEvent {
         // Hidden on purpose, initialized in initialize()
     }
 
+    @SuppressWarnings("checkstyle:hiddenField")
     ListenableFuture<Void> initialize(final DOMNotification notification,
             final Collection<ListenerRegistration<? extends DOMNotificationListener>> subscribers) {
         this.notification = Preconditions.checkNotNull(notification);
index be14139de1a4799c915549d4670ca1aa4285c2bd..4a9fe4cf434b14aba717e86f6d996824ff7a39b8 100644 (file)
@@ -60,13 +60,13 @@ final class DOMRpcRoutingTable {
         return ret;
     }
 
-    DOMRpcRoutingTable add(final DOMRpcImplementation implementation, final Set<DOMRpcIdentifier> rpcs) {
-        if (rpcs.isEmpty()) {
+    DOMRpcRoutingTable add(final DOMRpcImplementation implementation, final Set<DOMRpcIdentifier> rpcsToAdd) {
+        if (rpcsToAdd.isEmpty()) {
             return this;
         }
 
         // First decompose the identifiers to a multimap
-        final ListMultimap<SchemaPath, YangInstanceIdentifier> toAdd = decomposeIdentifiers(rpcs);
+        final ListMultimap<SchemaPath, YangInstanceIdentifier> toAdd = decomposeIdentifiers(rpcsToAdd);
 
         // Now iterate over existing entries, modifying them as appropriate...
         final Builder<SchemaPath, AbstractDOMRpcRoutingTableEntry> mb = ImmutableMap.builder();
@@ -94,13 +94,13 @@ final class DOMRpcRoutingTable {
         return new DOMRpcRoutingTable(mb.build(), schemaContext);
     }
 
-    DOMRpcRoutingTable remove(final DOMRpcImplementation implementation, final Set<DOMRpcIdentifier> rpcs) {
-        if (rpcs.isEmpty()) {
+    DOMRpcRoutingTable remove(final DOMRpcImplementation implementation, final Set<DOMRpcIdentifier> rpcIds) {
+        if (rpcIds.isEmpty()) {
             return this;
         }
 
         // First decompose the identifiers to a multimap
-        final ListMultimap<SchemaPath, YangInstanceIdentifier> toRemove = decomposeIdentifiers(rpcs);
+        final ListMultimap<SchemaPath, YangInstanceIdentifier> toRemove = decomposeIdentifiers(rpcIds);
 
         // Now iterate over existing entries, modifying them as appropriate...
         final Builder<SchemaPath, AbstractDOMRpcRoutingTableEntry> b = ImmutableMap.builder();
index 059b322436d1106d9d86d62235daa8e4730cc1da..e383d5be6a0a4849c03d0149922cb65d2964beed 100644 (file)
@@ -86,8 +86,8 @@ final class ProducerLayout {
         return new ProducerLayout(shardMap, idToProducer, cb.build());
     }
 
-    ProducerLayout reshard(final Map<DOMDataTreeIdentifier, DOMDataTreeShard> shardMap) {
-        return new ProducerLayout(shardMap, mapIdsToProducer(shardMap), children);
+    ProducerLayout reshard(final Map<DOMDataTreeIdentifier, DOMDataTreeShard> newShardMap) {
+        return new ProducerLayout(newShardMap, mapIdsToProducer(newShardMap), children);
     }
 
     boolean haveSubtree(final DOMDataTreeIdentifier subtree) {
index 0bd4393fd39f398efd77be61b34b294b42c08522..df706739ac13a7ff1c3c3613058622b5d4271b43 100644 (file)
@@ -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 <T extends DOMDataTreeListener> ListenerRegistration<T> registerListener(final T listener,
             final Collection<DOMDataTreeIdentifier> subtrees, final boolean allowRxMerges,
index 87f321db663c9b203f507e086a7ce7a874502ab2..a7f3f6d2b15c986026a9226b277dd16b31f6599a 100644 (file)
@@ -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<DOMDataTreeIdentifier> subtrees,
                                final Map<DOMDataTreeIdentifier, DOMDataTreeShard> shardMap) {
         this.dataTree = Preconditions.checkNotNull(dataTree);
@@ -150,6 +150,7 @@ class ShardedDOMDataTreeProducer implements DOMDataTreeProducer {
     }
 
     @Override
+    @SuppressWarnings("checkstyle:hiddenField")
     public DOMDataTreeProducer createProducer(final Collection<DOMDataTreeIdentifier> subtrees) {
         checkNotClosed();
         checkIdle();
index 5068e87a6d7244dfb9419701e416368a53b69252..2d95022888d0d476172d08d9c01bc799807fd6c1 100644 (file)
@@ -134,7 +134,7 @@ final class ShardedDOMDataTreeWriteTransaction implements DOMDataTreeCursorAware
             final BiConsumer<ShardedDOMDataTreeWriteTransaction, Throwable> 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<Object>() {
+        Futures.addCallback(internalFuture, new FutureCallback<Object>() {
             @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<PathArgument> path = new ArrayDeque<>();
+        private final Deque<PathArgument> 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);
         }
     }
 
index ac50e2678c31fb5664585774e1bd57902242531b..e6be4f11c4d1bb47c45be763db765329f2cebbff 100644 (file)
@@ -32,11 +32,11 @@ public class AbstractDOMForwardedCompositeTransactionTest {
         domForwardedCompositeTransaction.closeSubtransactions();
     }
 
-    private static class DOMForwardedCompositeTransactionTestImpl
+    private static final class DOMForwardedCompositeTransactionTestImpl
             extends AbstractDOMForwardedCompositeTransaction<String, DOMStoreTransaction> {
 
-        private DOMForwardedCompositeTransactionTestImpl(final Object identifier,
-                                                         final Map<String, DOMStoreTransaction> backingTxs) {
+        DOMForwardedCompositeTransactionTestImpl(final Object identifier,
+                                                 final Map<String, DOMStoreTransaction> backingTxs) {
             super(identifier, backingTxs);
         }
     }
index cf72ee24fbd82d36b77d9b9736ecd64bb2393478..c283ece795965e2714b0c23138ccb5a2b0c54689 100644 (file)
@@ -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");
index 8c60649b3725439404ecd4449ce2899d2ec42da3..adea584bc89d04b2c7657df3bad85f903cb5d6de 100644 (file)
@@ -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
index 80c982119fb86b247063fbd34f2186cf14a70484..c56318c960f2042858dc361a5075b9fdcd8b9564 100644 (file)
@@ -168,8 +168,8 @@ public class ScanningSchemaServiceProviderTest {
         schemaService.getSessionContext();
     }
 
-    private void addYangs(final ScanningSchemaServiceProvider schemaService) {
-        final List<Registration> registerAvailableYangs = schemaService.registerAvailableYangs(yangs);
+    private void addYangs(final ScanningSchemaServiceProvider service) {
+        final List<Registration> registerAvailableYangs = service.registerAvailableYangs(yangs);
         assertTrue(!registerAvailableYangs.isEmpty());
     }
 
index 2f97daa948ac67378f80bc5081d501f523dfda3e..11f27b1d094a749cbe9fb7ce5f86695b0348f284 100644 (file)
@@ -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()));
     }
index b6dbfd9df134755090173d16433ec938182bdbab..f23d66daf4e3fb4bfffb6e0593028f7c3c6b03e8 100644 (file)
@@ -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);
index 6449653ad7207b9da94067befae64a404c47f7f2..f6c95b80548c77ba1086b615ac36533601144ebf 100644 (file)
@@ -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();
     }
 
index ca5cd2c0075f617fc94f4855897a136ba3cde717..caa4f17ee36e4fcf38b85306eeb6802799b1351e 100644 (file)
@@ -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<PathArgument> 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);
         }
     }
 
index 9748505cbff2ce7d7af447cccc60b0539e754c3c..868e86355d412f9ce99fb897bfd83812a0d8711a 100644 (file)
@@ -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();
index 8e4cf2b8f7401a553bae3c3b6cc0fd2ef280aa8f..38fd827a5237875ecb7495649d8573f5be89d21c 100644 (file)
@@ -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()));
     }
index 2a9b39145d2bab243b675b4725487e04551e3403..1b87b0f937c3e657701bb512a1b5fcb9de40ee48 100644 (file)
@@ -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<String> 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();
         }
index 75eaed9226adfa66bf8b3e479589f6ac0b31917f..32badc0a6436e507a779c210dacc8ba3b2e7224d 100644 (file)
@@ -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<DOMService> 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<DOMService> services, final SchemaContext ctx) {
         return new SimpleDOMMountPoint(identifier, services, ctx);
     }
index 98b1905c08c07cb755c900d7ab1cf61d47a1fcc4..d4c16db5839e78fa118bff1a343221460ad2cdc8 100644 (file)
@@ -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 {
index 3a76fccb336045b8c84ae3620c0ad47d31fa7be5..493c89732fc99dade9b5f4303185656492682b21 100644 (file)
@@ -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);
     }
 
index 369e8d2e620d3acbbe2cf9c0c97948a1bd217b1d..db325bd50e23543eb9a5a431ad7575465289b609 100644 (file)
@@ -49,14 +49,14 @@ public class WriteableNodeWithSubshardTest {
         TestUtils.resetMocks();
     }
 
-    private class WriteableNodeWithSubshardImpl extends WriteableNodeWithSubshard {
+    private static final class WriteableNodeWithSubshardImpl extends WriteableNodeWithSubshard {
 
-        private WriteableNodeWithSubshardImpl(Map<PathArgument, WriteableModificationNode> children) {
+        WriteableNodeWithSubshardImpl(final Map<PathArgument, WriteableModificationNode> children) {
             super(children);
         }
 
         @Override
-        public WriteCursorStrategy createOperation(DOMDataTreeWriteCursor parentCursor) {
+        public WriteCursorStrategy createOperation(final DOMDataTreeWriteCursor parentCursor) {
             return null;
         }
 
index fb73921c61726d45e7cc77d53d3e36b796f7cff9..1ea902b80cdfb9b0d19507c0f4ff3187ab1b4db1 100644 (file)
@@ -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());
index 31fbf03329cfd0486ce02e05bc9b1ff5ac1a47f0..cbe5eea479852798f08b63bfdc59074068b979d9 100644 (file)
@@ -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();
         }
     }
index edf1e79ea2d84bf4243b2d7e00f64e29fdecf998..72b4c27f2e475ec9b6d1b0251f7529a9f12ae659 100644 (file)
@@ -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<SnapshotBackedTransactions> constructor = SnapshotBackedTransactions.class.getDeclaredConstructor();
index 8b7f4e9aeae5274e20b61cc612c56ce5b20138e7..6eb33c285b1e946e88e741594b8958be62c1fb72 100644 (file)
@@ -77,12 +77,11 @@ public class SnapshotBackedWriteTransactionTest {
 
     @Test
     public void readyTest() throws Exception {
-        SnapshotBackedWriteTransaction<Object> snapshotBackedWriteTransaction =
-                new SnapshotBackedWriteTransaction<>(
-                        new Object(), false, DATA_TREE_SNAPSHOT, TRANSACTION_READY_PROTOTYPE);
-        Assert.assertNotNull(snapshotBackedWriteTransaction.ready());
+        SnapshotBackedWriteTransaction<Object> 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)