Cleanup checkstyle warnings and turn enforcement on in yang-data-impl

[yangtools.git] / yang / yang-data-impl / src / test / java / org / opendaylight / yangtools / yang / data / impl / schema / tree / Bug4454Test.java

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java
index 5313144dd0b5df22019bdfa739a1dd5cd889430f..4181c9afb94cb1d347217afa21edeae202341fd9 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java
@@ -12,6 +12,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.HashMap;
@@ -64,25 +65,18 @@ public class Bug4454Test {
     private static final YangInstanceIdentifier MIN_MAX_LIST_NO_MINMAX_PATH = YangInstanceIdentifier
             .builder(MASTER_CONTAINER_PATH)
             .node(MIN_MAX_LIST_QNAME_NO_MINMAX).build();
-    private static final YangInstanceIdentifier MIN_MAX_LEAF_LIST_PATH = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH)
-            .node(MIN_MAX_LEAF_LIST_QNAME).build();
-
-    private static Map<QName,Object> fooPredicates = new HashMap<>();
-    static {
-        fooPredicates.put(MIN_MAX_KEY_LEAF_QNAME,"foo");
-    }
-
-    private static Map<QName,Object> bazPredicates = new HashMap<>();
-    static {
-        bazPredicates.put(MIN_MAX_KEY_LEAF_QNAME,"baz");
-    }
-
-    private final MapEntryNode fooEntryNodeWithValue = ImmutableMapEntryNodeBuilder.create().withNodeIdentifier(new
-            NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, fooPredicates)).
-            withChild(ImmutableNodes.leafNode(MIN_MAX_VALUE_LEAF_QNAME, "footest")).build();
-    private final MapEntryNode BazEntryNodeWithValue = ImmutableMapEntryNodeBuilder.create().withNodeIdentifier(new
-            NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, bazPredicates)).
-            withChild(ImmutableNodes.leafNode(MIN_MAX_VALUE_LEAF_QNAME, "baztest")).build();
+    private static final YangInstanceIdentifier MIN_MAX_LEAF_LIST_PATH = YangInstanceIdentifier
+            .builder(MASTER_CONTAINER_PATH).node(MIN_MAX_LEAF_LIST_QNAME).build();
+
+    private static final Map<QName, Object> FOO_PREDICATES = ImmutableMap.of(MIN_MAX_KEY_LEAF_QNAME, "foo");
+    private static final Map<QName, Object> BAZ_PREDICATES = ImmutableMap.of(MIN_MAX_KEY_LEAF_QNAME, "baz");
+
+    private final MapEntryNode fooEntryNodeWithValue = ImmutableMapEntryNodeBuilder.create().withNodeIdentifier(
+        new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, FOO_PREDICATES))
+            .withChild(ImmutableNodes.leafNode(MIN_MAX_VALUE_LEAF_QNAME, "footest")).build();
+    private final MapEntryNode bazEntryNodeWithValue = ImmutableMapEntryNodeBuilder.create().withNodeIdentifier(
+        new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, BAZ_PREDICATES))
+            .withChild(ImmutableNodes.leafNode(MIN_MAX_VALUE_LEAF_QNAME, "baztest")).build();
     private final MapEntryNode fooEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME,
             "foo");
     private final MapEntryNode barEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME, MIN_MAX_KEY_LEAF_QNAME,
@@ -91,7 +85,7 @@ public class Bug4454Test {
             "baz");
     private final MapNode mapNodeBazFuzWithNodes = ImmutableNodes.mapNodeBuilder()
             .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LIST_QNAME))
-            .withChild(bazEntryNode).withChild(BazEntryNodeWithValue).withChild(fooEntryNode)
+            .withChild(bazEntryNode).withChild(bazEntryNodeWithValue).withChild(fooEntryNode)
             .build();
     private final MapNode mapNodeFooWithNodes = ImmutableNodes.mapNodeBuilder()
             .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LIST_QNAME))
@@ -134,7 +128,7 @@ public class Bug4454Test {
 
         NodeIdentifierWithPredicates mapEntryPath2 = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME , key);
 
-        YangInstanceIdentifier MIN_MAX_LEAF_FOO = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH)
+        final YangInstanceIdentifier minMaxLeafFoo = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH)
                 .node(MIN_MAX_LIST_QNAME).node(mapEntryPath2).build();
 
         key.clear();
@@ -142,8 +136,8 @@ public class Bug4454Test {
 
         mapEntryPath2 = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, key);
 
-        YangInstanceIdentifier MIN_MAX_LEAF_NEL = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH).node
-                (MIN_MAX_LIST_QNAME).node(mapEntryPath2).build();
+        final YangInstanceIdentifier minMaxLeafNel = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH)
+                .node(MIN_MAX_LIST_QNAME).node(mapEntryPath2).build();
 
         final Map<QName, Object> keyTemp = new HashMap<>();
         keyTemp.put(MIN_MAX_KEY_LEAF_QNAME, "baz");
@@ -164,7 +158,8 @@ public class Bug4454Test {
         keyTemp.clear();
         keyTemp.put(MIN_MAX_KEY_LEAF_QNAME, "foo");
 
-        final NodeIdentifierWithPredicates mapEntryPathTestKey = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME , keyTemp);
+        final NodeIdentifierWithPredicates mapEntryPathTestKey = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME,
+            keyTemp);
 
         final YangInstanceIdentifier pathToKeyFoo = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH)
                 .node(MIN_MAX_LIST_QNAME).node(mapEntryPathTestKey).node(MIN_MAX_KEY_LEAF_QNAME).build();
@@ -189,8 +184,8 @@ public class Bug4454Test {
         modificationTree1.write(pathToBaz, newNode2);
         modificationTree1.write(pathToBaz, newNode1);
         modificationTree1.write(pathToBaz, newNode);
-        modificationTree1.delete(MIN_MAX_LEAF_FOO);
-        modificationTree1.delete(MIN_MAX_LEAF_NEL);
+        modificationTree1.delete(minMaxLeafFoo);
+        modificationTree1.delete(minMaxLeafNel);
 
         modificationTree1.ready();
         inMemoryDataTree.validate(modificationTree1);
@@ -295,8 +290,8 @@ public class Bug4454Test {
         final InMemoryDataTreeSnapshot snapshotAfterCommit = inMemoryDataTree.takeSnapshot();
         final Optional<NormalizedNode<?, ?>> masterContainer = snapshotAfterCommit.readNode(MASTER_CONTAINER_PATH);
         assertTrue(masterContainer.isPresent());
-        final Optional<NormalizedNodeContainer<?, ?, ?>> leafList = ((NormalizedNodeContainer) masterContainer.get()).getChild(
-                new NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME));
+        final Optional<NormalizedNodeContainer<?, ?, ?>> leafList = ((NormalizedNodeContainer) masterContainer.get())
+                .getChild(new NodeIdentifier(MIN_MAX_LEAF_LIST_QNAME));
         assertTrue(leafList.isPresent());
         assertTrue(leafList.get().getValue().size() == 3);
     }
@@ -309,35 +304,33 @@ public class Bug4454Test {
         Map<QName, Object> key = new HashMap<>();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "foo");
 
-        NodeIdentifierWithPredicates mapEntryPath2 = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME , key);
+        NodeIdentifierWithPredicates mapEntryPath2 = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, key);
 
-        YangInstanceIdentifier MIN_MAX_LEAF_FOO = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH)
-                .node(MIN_MAX_LIST_QNAME).node(mapEntryPath2).build();
+        final YangInstanceIdentifier minMaxLeafFoo = MASTER_CONTAINER_PATH
+                .node(MIN_MAX_LIST_QNAME).node(mapEntryPath2);
 
         key.clear();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "bar");
 
         mapEntryPath2 = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, key);
 
-        YangInstanceIdentifier MIN_MAX_LEAF_BAR = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH).node
-                (MIN_MAX_LIST_QNAME)
-                .node(mapEntryPath2).build();
+        final YangInstanceIdentifier minMaxLeafBar = MASTER_CONTAINER_PATH
+                .node(MIN_MAX_LIST_QNAME).node(mapEntryPath2);
 
         key.clear();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "baz");
 
         mapEntryPath2 = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME, key);
 
-        YangInstanceIdentifier MIN_MAX_LEAF_BAZ = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH).node
-                (MIN_MAX_LIST_QNAME)
-                .node(mapEntryPath2).build();
+        final YangInstanceIdentifier minMaxLeafBaz = MASTER_CONTAINER_PATH
+                .node(MIN_MAX_LIST_QNAME).node(mapEntryPath2);
 
         modificationTree.write(MIN_MAX_LIST_PATH, mapNodeFooWithNodes);
         modificationTree.merge(MIN_MAX_LIST_PATH, mapNodeBar);
         modificationTree.merge(MIN_MAX_LIST_PATH, mapNodeBaz);
-        modificationTree.delete(MIN_MAX_LEAF_FOO);
-        modificationTree.delete(MIN_MAX_LEAF_BAR);
-        modificationTree.delete(MIN_MAX_LEAF_BAZ);
+        modificationTree.delete(minMaxLeafFoo);
+        modificationTree.delete(minMaxLeafBar);
+        modificationTree.delete(minMaxLeafBaz);
 
         modificationTree.ready();
 
@@ -348,8 +341,8 @@ public class Bug4454Test {
 
     @Test
     public void minMaxListNoMinMaxDeleteTest() throws DataValidationFailedException {
-        final MapEntryNode fooEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME_NO_MINMAX, MIN_MAX_KEY_LEAF_QNAME
-                , "foo");
+        final MapEntryNode fooEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME_NO_MINMAX, MIN_MAX_KEY_LEAF_QNAME,
+            "foo");
         final MapNode mapNode1 = ImmutableNodes.mapNodeBuilder()
                 .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LIST_QNAME_NO_MINMAX))
                 .withChild(fooEntryNode).build();
@@ -359,23 +352,23 @@ public class Bug4454Test {
         Map<QName, Object> key = new HashMap<>();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "foo");
 
-        NodeIdentifierWithPredicates mapEntryPath2 = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME_NO_MINMAX , key);
+        NodeIdentifierWithPredicates mapEntryPath2 = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME_NO_MINMAX,
+            key);
 
-        YangInstanceIdentifier MIN_MAX_LEAF_FOO = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH).node
-                (MIN_MAX_LIST_QNAME_NO_MINMAX).node(mapEntryPath2).build();
+        final YangInstanceIdentifier minMaxLeafFoo = MASTER_CONTAINER_PATH
+                .node(MIN_MAX_LIST_QNAME_NO_MINMAX).node(mapEntryPath2);
 
         key.clear();
         key.put(MIN_MAX_KEY_LEAF_QNAME, "non-existing-leaf");
 
         mapEntryPath2 = new NodeIdentifierWithPredicates(MIN_MAX_LIST_QNAME_NO_MINMAX, key);
 
-        YangInstanceIdentifier MIN_MAX_LEAF_NEL = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH).node
-                (MIN_MAX_LIST_QNAME_NO_MINMAX)
-                .node(mapEntryPath2).build();
+        YangInstanceIdentifier minMaxLeafNel = YangInstanceIdentifier.builder(MASTER_CONTAINER_PATH)
+                .node(MIN_MAX_LIST_QNAME_NO_MINMAX).node(mapEntryPath2).build();
 
         modificationTree.write(MIN_MAX_LIST_NO_MINMAX_PATH, mapNode1);
-        modificationTree.delete(MIN_MAX_LEAF_FOO);
-        modificationTree.delete(MIN_MAX_LEAF_NEL);
+        modificationTree.delete(minMaxLeafFoo);
+        modificationTree.delete(minMaxLeafNel);
 
         modificationTree.ready();
 
@@ -396,7 +389,7 @@ public class Bug4454Test {
         UnmodifiableCollection<?> collectionChildren = (UnmodifiableCollection<?>) minMaxListRead.get().getValue();
 
         for (Object collectionChild : collectionChildren) {
-            if (collectionChild.toString().contains(first)){
+            if (collectionChild.toString().contains(first)) {
                 assertTrue(collectionChild.toString().contains(first));
             } else {
                 assertTrue(collectionChild.toString().contains(second));