Fix raw type warnings

[controller.git] / opendaylight / md-sal / sal-clustering-commons / src / test / java / org / opendaylight / controller / cluster / datastore / node / utils / PathUtilsTest.java

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/PathUtilsTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/PathUtilsTest.java
index d1e3eb202f8faefcafeb548cf2b48ca013b42e91..a12f15010c359c791d54f0a86c8140419248f441 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/PathUtilsTest.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/PathUtilsTest.java
@@ -1,22 +1,33 @@
+/*
+ * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 package org.opendaylight.controller.cluster.datastore.node.utils;
 
+import com.google.common.collect.ImmutableSet;
 import org.junit.Test;
 import org.opendaylight.controller.cluster.datastore.util.TestModel;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-
 import static junit.framework.TestCase.assertEquals;
 
 public class PathUtilsTest {
 
     @Test
     public void toStringNodeIdentifier(){
-        YangInstanceIdentifier.PathArgument pathArgument = nodeIdentifier();
+        PathArgument pathArgument = nodeIdentifier();
 
         String expected = "(urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test?revision=2014-03-13)test";
 
@@ -27,7 +38,7 @@ public class PathUtilsTest {
     public void toStringAugmentationIdentifier(){
         String expected = "AugmentationIdentifier{childNames=[(urn:opendaylight:flow:table:statistics?revision=2013-12-15)flow-table-statistics]}";
 
-        YangInstanceIdentifier.PathArgument pathArgument = augmentationIdentifier();
+        PathArgument pathArgument = augmentationIdentifier();
 
         assertEquals(expected, PathUtils.toString(pathArgument));
     }
@@ -35,7 +46,7 @@ public class PathUtilsTest {
     @Test
     public void toStringNodeWithValue(){
 
-        YangInstanceIdentifier.PathArgument pathArgument = nodeWithValue();
+        PathArgument pathArgument = nodeWithValue();
 
         String expected = "(urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test?revision=2014-03-13)test[100]";
 
@@ -46,7 +57,7 @@ public class PathUtilsTest {
     @Test
     public void toStringNodeIdentifierWithPredicates(){
 
-        YangInstanceIdentifier.PathArgument pathArgument = nodeIdentifierWithPredicates();
+        PathArgument pathArgument = nodeIdentifierWithPredicates();
 
         String expected = "(urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test?revision=2014-03-13)test[{(urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test?revision=2014-03-13)id=100}]";
 
@@ -87,26 +98,25 @@ public class PathUtilsTest {
 
     }
 
-    private YangInstanceIdentifier.NodeIdentifier nodeIdentifier(){
-        return new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME);
+    private static NodeIdentifier nodeIdentifier(){
+        return new NodeIdentifier(TestModel.TEST_QNAME);
     }
 
-    private YangInstanceIdentifier.AugmentationIdentifier augmentationIdentifier(){
-        Set<QName> childNames = new HashSet();
-        childNames.add(QNameFactory.create("(urn:opendaylight:flow:table:statistics?revision=2013-12-15)flow-table-statistics"));
+    private static AugmentationIdentifier augmentationIdentifier(){
+        Set<QName> childNames = ImmutableSet.of(QNameFactory.create("(urn:opendaylight:flow:table:statistics?revision=2013-12-15)flow-table-statistics"));
 
-        return new YangInstanceIdentifier.AugmentationIdentifier(childNames);
+        return new AugmentationIdentifier(childNames);
     }
 
-    private YangInstanceIdentifier.NodeWithValue nodeWithValue(){
-        return new YangInstanceIdentifier.NodeWithValue(TestModel.TEST_QNAME, Integer.valueOf(100));
+    private static NodeWithValue<?> nodeWithValue(){
+        return new NodeWithValue<>(TestModel.TEST_QNAME, Integer.valueOf(100));
     }
 
-    private YangInstanceIdentifier.NodeIdentifierWithPredicates nodeIdentifierWithPredicates(){
+    private static NodeIdentifierWithPredicates nodeIdentifierWithPredicates(){
         Map<QName, Object> keys = new HashMap<>();
 
         keys.put(TestModel.ID_QNAME, Integer.valueOf(100));
 
-        return new YangInstanceIdentifier.NodeIdentifierWithPredicates(TestModel.TEST_QNAME, keys);
+        return new NodeIdentifierWithPredicates(TestModel.TEST_QNAME, keys);
     }
 }