Fix checkstyle 08/94208/2
authorRobert Varga <robert.varga@pantheon.tech>
Fri, 11 Dec 2020 10:56:56 +0000 (11:56 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Fri, 11 Dec 2020 11:07:26 +0000 (12:07 +0100)
Upgraded checkstyle is a bit touchier about anonymous classes,
fix reported violations.

Change-Id: I98d060ed9c44d49ae57f1b9fce33527fa6bcd48d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/impl/Bug5524augmentUses.java
common/mdsal-common-api/src/main/java/org/opendaylight/mdsal/common/api/ReadFailedException.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/AbstractDOMShardTreeChangePublisher.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisher.java

index 17abafa0b471b58b6c676aa9ee345c262a5c7117..2b9920f6f41a4f98f83b6a2ecde8a37d262836cc 100644 (file)
@@ -9,7 +9,7 @@ package org.opendaylight.mdsal.binding.dom.codec.impl;
 
 import static org.junit.Assert.assertNotNull;
 
-import java.util.Collections;
+import java.util.List;
 import org.junit.Test;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingDataObjectCodecTreeNode;
 import org.opendaylight.yang.gen.v1.urn.test.opendaylight.bug._5524.module1.rev160101.grouping.module1.ListModule11Builder;
@@ -33,29 +33,41 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 public class Bug5524augmentUses extends AbstractBindingCodecTest {
     @Test
     public void testBug5224() throws Exception {
-        final Module4Main module4Main = new Module4MainBuilder().setContainerModule4(
-                new ContainerModule4Builder().setListModule11(Collections.singletonList(
-                        new ListModule11Builder().setListModule12(Collections.singletonList(
-                                new ListModule12Builder().setContainerModule1(new ContainerModule1Builder()
-                                    .addAugmentation(new ContainerModule11Builder().build()).build())
-                                .build())).build())).build()).build();
+        final Module4Main module4Main = new Module4MainBuilder()
+            .setContainerModule4(new ContainerModule4Builder()
+                .setListModule11(List.of(new ListModule11Builder()
+                    .setListModule12(List.of(new ListModule12Builder()
+                        .setContainerModule1(new ContainerModule1Builder()
+                            .addAugmentation(new ContainerModule11Builder().build())
+                            .build())
+                        .build()))
+                    .build()))
+                .build())
+            .build();
 
-        final Module4Main manualModule4Main = new Module4MainBuilder().setContainerModule4(
-                new ContainerModule4Builder().setManualListModule11(Collections.singletonList(
-                        new ManualListModule11Builder().setManualListModule12(Collections.singletonList(
-                                new ManualListModule12Builder().setManualContainerModule1(
-                                        new ManualContainerModule1Builder().addAugmentation(
-                                            new ManualContainerModule11Builder().build())
-                                        .build()).build())).build())).build()).build();
+        final Module4Main manualModule4Main = new Module4MainBuilder()
+            .setContainerModule4(new ContainerModule4Builder()
+                .setManualListModule11(List.of(new ManualListModule11Builder()
+                    .setManualListModule12(List.of(new ManualListModule12Builder()
+                        .setManualContainerModule1(new ManualContainerModule1Builder()
+                            .addAugmentation(new ManualContainerModule11Builder().build())
+                            .build())
+                        .build()))
+                    .build()))
+                .build())
+            .build();
 
-        final Module4Main contManualModule4Main = new Module4MainBuilder().setContainerModule4(
-                new ContainerModule4Builder().setContainerManualListModule11(Collections.singletonList(
-                        new ContainerManualListModule11Builder().setContainerManualListModule12(
-                                Collections.singletonList(
-                                new ContainerManualListModule12Builder().setContainerManualContainerModule1(
-                                        new ContainerManualContainerModule1Builder().setContainerManualContainerModule2(
-                                                new ContainerManualContainerModule2Builder().build()).build())
-                                        .build())).build())).build()).build();
+        final Module4Main contManualModule4Main = new Module4MainBuilder()
+            .setContainerModule4(new ContainerModule4Builder()
+                .setContainerManualListModule11(List.of(new ContainerManualListModule11Builder()
+                    .setContainerManualListModule12(List.of(new ContainerManualListModule12Builder()
+                        .setContainerManualContainerModule1(new ContainerManualContainerModule1Builder()
+                            .setContainerManualContainerModule2(new ContainerManualContainerModule2Builder().build())
+                            .build())
+                        .build()))
+                    .build()))
+                .build())
+            .build();
 
         final BindingDataObjectCodecTreeNode<Module4Main> subtreeCodec = codecContext.getSubtreeCodec(
                 InstanceIdentifier.create(Module4Main.class));
index bab6ef308f37fc595484e7fbf7aeee21700b0956..fe5202c4074b39d435ad9f89fac85787680316b5 100644 (file)
@@ -20,12 +20,12 @@ public class ReadFailedException extends OperationFailedException {
     private static final long serialVersionUID = 1L;
 
     public static final ExceptionMapper<ReadFailedException> MAPPER =
-            new ExceptionMapper<ReadFailedException>("read", ReadFailedException.class) {
-        @Override
-        protected ReadFailedException newWithCause(String message, Throwable cause) {
-            return new ReadFailedException(message, cause);
-        }
-    };
+        new ExceptionMapper<ReadFailedException>("read", ReadFailedException.class) {
+            @Override
+            protected ReadFailedException newWithCause(String message, Throwable cause) {
+                return new ReadFailedException(message, cause);
+            }
+        };
 
     public ReadFailedException(String message, RpcError... errors) {
         super(message, errors);
index 10533f9ff050712c18b23a8d7cc6a0da9068b169..62b27ee2e3c4a3c6a0c9b3d4157dc1cdd25017b1 100644 (file)
@@ -158,8 +158,7 @@ abstract class AbstractDOMShardTreeChangePublisher extends AbstractDOMStoreTreeC
         final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> node =
                 findNodeFor(listenerPath.getPathArguments());
         @SuppressWarnings("unchecked")
-        final AbstractDOMDataTreeChangeListenerRegistration<L> registration =
-                new AbstractDOMDataTreeChangeListenerRegistration<>((L) listener) {
+        final var registration = new AbstractDOMDataTreeChangeListenerRegistration<>((L) listener) {
             @Override
             protected void removeRegistration() {
                 listener.close();
index 8bc0499f6bd1a7aca8bf1fd094baec752f06e4b5..d486237d54efd3d7e3ff27f8af504dbaaf44e525 100644 (file)
@@ -98,8 +98,7 @@ public abstract class AbstractDOMStoreTreeChangePublisher
         try {
             final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> node =
                     findNodeFor(treeId.getPathArguments());
-            final AbstractDOMDataTreeChangeListenerRegistration<L> reg =
-                    new AbstractDOMDataTreeChangeListenerRegistration<L>(listener) {
+            final var reg = new AbstractDOMDataTreeChangeListenerRegistration<>(listener) {
                 @Override
                 protected void removeRegistration() {
                     AbstractDOMStoreTreeChangePublisher.this.removeRegistration(node, this);