Fix various eclipse warnings

Raw types and method which could be static.

Change-Id: I19dcd742674944877f4b7b53d11068f630c826db
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/yangtools/yang/unified/doc/generator/maven/retest/YangModuleInfoCompilationTest.java b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/yangtools/yang/unified/doc/generator/maven/retest/YangModuleInfoCompilationTest.java
index 239276d108c77b33bcb852e6e570b456f07d00a3..2836f83425c070b1b7eb3cea06b5a0b723f4b2c5 100644 (file)
--- a/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/yangtools/yang/unified/doc/generator/maven/retest/YangModuleInfoCompilationTest.java
+++ b/binding/maven-sal-api-gen-plugin/src/test/java/org/opendaylight/yangtools/yang/unified/doc/generator/maven/retest/YangModuleInfoCompilationTest.java
@@ -129,7 +129,7 @@ public class YangModuleInfoCompilationTest {
         cleanUp(sourcesOutputDir, compiledOutputDir);
     }
 
-    private void generateTestSources(String resourceDirPath, File sourcesOutputDir) throws Exception {
+    private static void generateTestSources(final String resourceDirPath, final File sourcesOutputDir) throws Exception {
         final List<File> sourceFiles = getSourceFiles(resourceDirPath);
         final SchemaContext context = RetestUtils.parseYangSources(sourceFiles);
         CodeGeneratorImpl codegen = new CodeGeneratorImpl();
@@ -137,7 +137,7 @@ public class YangModuleInfoCompilationTest {
         codegen.generateSources(context, sourcesOutputDir, context.getModules());
     }
 
-    private static void testCompilation(File sourcesOutputDir, File compiledOutputDir) {
+    private static void testCompilation(final File sourcesOutputDir, final File compiledOutputDir) {
         JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
         StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, null, null);
         List<File> filesList = getJavaFiles(sourcesOutputDir);
@@ -147,7 +147,7 @@ public class YangModuleInfoCompilationTest {
         assertTrue(compiled);
     }
 
-    private static List<File> getJavaFiles(File directory) {
+    private static List<File> getJavaFiles(final File directory) {
         List<File> result = new ArrayList<>();
         File[] filesToRead = directory.listFiles();
         if (filesToRead != null) {
@@ -165,7 +165,7 @@ public class YangModuleInfoCompilationTest {
         return result;
     }
 
-    private static List<File> getSourceFiles(String path) throws Exception {
+    private static List<File> getSourceFiles(final String path) throws Exception {
         final URI resPath = YangModuleInfoCompilationTest.class.getResource(path).toURI();
         final File sourcesDir = new File(resPath);
         final URI currentDir = new File(System.getProperty("user.dir")).toURI();
@@ -184,7 +184,7 @@ public class YangModuleInfoCompilationTest {
         }
     }
 
-    private static void deleteTestDir(File file) {
+    private static void deleteTestDir(final File file) {
         if (file.isDirectory()) {
             File[] filesToDelete = file.listFiles();
             if (filesToDelete != null) {
@@ -198,7 +198,7 @@ public class YangModuleInfoCompilationTest {
         }
     }
 
-    private static Method assertContainsMethod(Class<?> clazz, Class<?> returnType, String name, Class<?>... args) {
+    private static Method assertContainsMethod(final Class<?> clazz, final Class<?> returnType, final String name, final Class<?>... args) {
         try {
             Method m = clazz.getDeclaredMethod(name, args);
             assertEquals(returnType, m.getReturnType());
@@ -209,7 +209,7 @@ public class YangModuleInfoCompilationTest {
         }
     }
 
-    private static void cleanUp(File... resourceDirs) {
+    private static void cleanUp(final File... resourceDirs) {
         for (File resourceDir : resourceDirs) {
             if (resourceDir.exists()) {
                 deleteTestDir(resourceDir);

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/UnionDependencySort.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/UnionDependencySort.java
index 74b4c77b10624a9caf8f5473985ffda5ce1831dc..dfd4c8f0dbbdf8a2d9e011486ad26d193fc50fc4 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/UnionDependencySort.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/UnionDependencySort.java
@@ -7,10 +7,13 @@
  */
 package org.opendaylight.yangtools.sal.binding.yang.types;
 
+import com.google.common.base.Function;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
 import org.opendaylight.yangtools.yang.model.util.ExtendedType;
@@ -19,21 +22,16 @@ import org.opendaylight.yangtools.yang.parser.util.TopologicalSort.Node;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Function;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
 public class UnionDependencySort {
     private static final Logger LOGGER = LoggerFactory.getLogger(UnionDependencySort.class);
 
     /**
      * Sorts union types by mutual dependencies.
-     * 
+     *
      * At the beginning the union types are selected from
      * <code>typeDefinitions</code> and wrapped to nodes. The nodes are sorted
      * and then the wrapped payload is extracted.
-     * 
+     *
      * @param typeDefinitions
      *            set of type definitions.
      * @return list of extended type which are sorted by mutual dependencies
@@ -53,7 +51,7 @@ public class UnionDependencySort {
         final List<Node> sortedNodes = TopologicalSort.sort(unsorted);
         return Lists.transform(sortedNodes, new Function<Node, ExtendedType>() {
             @Override
-            public ExtendedType apply(Node input) {
+            public ExtendedType apply(final Node input) {
                 return (ExtendedType) (((NodeWrappedType) input).getWrappedType());
             }
         });
@@ -61,12 +59,12 @@ public class UnionDependencySort {
 
     /**
      * Extracts only union types from <code>typeDefinitions</code> set.
-     * 
+     *
      * @param typeDefinitions
      *            set of all type definitions
      * @return set of extended type which are union type definition
      */
-    private Set<ExtendedType> unionsFromTypeDefinitions(final Set<TypeDefinition<?>> typeDefinitions) {
+    private static Set<ExtendedType> unionsFromTypeDefinitions(final Set<TypeDefinition<?>> typeDefinitions) {
         final Set<ExtendedType> unions = Sets.newHashSet();
 
         for (final TypeDefinition<?> typedef : typeDefinitions) {
@@ -81,7 +79,7 @@ public class UnionDependencySort {
     /**
      * Wraps every extended type which represents union to node type and adds to
      * every node information about dependencies.
-     * 
+     *
      * The mapping from union type to node is created. For every created node
      * (next <i>nodeFrom</i>) is for its wrapped union type passed the list of
      * inner types through and only those inner types which represent union type
@@ -89,14 +87,14 @@ public class UnionDependencySort {
      * node (next as <i>nodeTo</i>). This dependency relationship between
      * nodeFrom and all found nodesTo is modeled with creating of one edge from
      * nodeFrom to nodeTo.
-     * 
-     * 
+     *
+     *
      * @param extUnionTypes
      *            set of extended types which represents union types
      * @return set of nodes which contains wrapped union types set of node where
      *         each one contains wrapped one union type
      */
-    private Set<Node> unionTypesToNodes(final Set<ExtendedType> extUnionTypes) {
+    private static Set<Node> unionTypesToNodes(final Set<ExtendedType> extUnionTypes) {
         final Map<ExtendedType, Node> nodeMap = Maps.newHashMap();
         final Set<Node> resultNodes = Sets.newHashSet();
 

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java
index e7c28d7e0202a8f35bfcfb3b89437a602165641d..74b22005d2db4e4a4c8cbe340764d710d0c8a4f3 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java
@@ -12,10 +12,8 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestUtil.containsInterface;
 import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestUtil.containsMethods;
-
 import java.io.IOException;
 import java.util.List;
-
 import org.junit.Test;
 import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator;
 import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject;
@@ -31,7 +29,8 @@ public class ChoiceCaseGenTypesTest extends AbstractTypesTest {
         super(ChoiceCaseGenTypesTest.class.getResource("/choice-case-type-test-models"));
     }
 
-    private GeneratedType checkGeneratedType(final List<Type> genTypes, final String genTypeName, final String packageName, final int occurences) {
+    private static GeneratedType checkGeneratedType(final List<Type> genTypes, final String genTypeName,
+            final String packageName, final int occurences) {
         GeneratedType searchedGenType = null;
         int searchedGenTypeCounter = 0;
         for (Type type : genTypes) {
@@ -50,7 +49,8 @@ public class ChoiceCaseGenTypesTest extends AbstractTypesTest {
 
     }
 
-    private GeneratedType checkGeneratedType(final List<Type> genTypes, final String genTypeName, final String packageName) {
+    private static GeneratedType checkGeneratedType(final List<Type> genTypes, final String genTypeName,
+            final String packageName) {
         return checkGeneratedType(genTypes, genTypeName, packageName, 1);
     }
 

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java
index d48f736fda39319e4ac1ca34c6f6df02c0251081..7e971d843d3d81534143f7feafc6cbf59b4b8ded 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenerateInnerClassForBitsAndUnionInLeavesTest.java
@@ -8,12 +8,10 @@
 package org.opendaylight.yangtools.sal.binding.generator.impl;
 
 import static org.junit.Assert.assertTrue;
-
 import java.io.File;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.junit.Test;
 import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator;
 import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty;
@@ -26,7 +24,7 @@ import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 
 public class GenerateInnerClassForBitsAndUnionInLeavesTest {
 
-    private SchemaContext resolveSchemaContextFromFiles(final URI... yangFiles) throws Exception {
+    private static SchemaContext resolveSchemaContextFromFiles(final URI... yangFiles) throws Exception {
         final YangContextParser parser = new YangParserImpl();
 
         final List<File> inputFiles = new ArrayList<File>();

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesLeafrefTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesLeafrefTest.java
index 70d242ee3f0fb73f94190abefcac8db58171234b..469ae8ecd88eb184851de72b40de0c7625c837e7 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesLeafrefTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesLeafrefTest.java
@@ -11,9 +11,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.fail;
-
 import com.google.common.io.ByteSource;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -24,7 +22,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
-
 import org.junit.Test;
 import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator;
 import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty;
@@ -49,7 +46,7 @@ public class GeneratedTypesLeafrefTest {
         return ctx.getModules();
     }
 
-    private SchemaContext resolveSchemaContextFromFiles(final URI... yangFiles) throws IOException {
+    private static SchemaContext resolveSchemaContextFromFiles(final URI... yangFiles) throws IOException {
         final YangContextParser parser = new YangParserImpl();
 
         final List<File> inputFiles = new ArrayList<File>();

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/stmt/parser/retest/ChoiceCaseGenTypesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/stmt/parser/retest/ChoiceCaseGenTypesTest.java
index 4a5a30231973b8a95a3cc264d92ee2ecd3e655f8..c315d74d9c1296c60be1d3af5386209b9e6e143a 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/stmt/parser/retest/ChoiceCaseGenTypesTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/stmt/parser/retest/ChoiceCaseGenTypesTest.java
@@ -10,21 +10,19 @@ package org.opendaylight.yangtools.sal.binding.generator.impl.stmt.parser.retest
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.opendaylight.yangtools.sal.binding.generator.impl.stmt.parser.retest.SupportTestUtil.containsMethods;
 import static org.opendaylight.yangtools.sal.binding.generator.impl.stmt.parser.retest.SupportTestUtil.containsInterface;
-
-import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
-import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
-
-import org.opendaylight.yangtools.sal.binding.generator.impl.BindingGeneratorImpl;
+import static org.opendaylight.yangtools.sal.binding.generator.impl.stmt.parser.retest.SupportTestUtil.containsMethods;
 import java.io.IOException;
 import java.util.List;
 import org.junit.Test;
 import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator;
+import org.opendaylight.yangtools.sal.binding.generator.impl.BindingGeneratorImpl;
 import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject;
 import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType;
 import org.opendaylight.yangtools.sal.binding.model.api.Type;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
+import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 
 public class ChoiceCaseGenTypesTest extends AbstractTypesTest {
 
@@ -32,7 +30,8 @@ public class ChoiceCaseGenTypesTest extends AbstractTypesTest {
         super(ChoiceCaseGenTypesTest.class.getResource("/choice-case-type-test-models"));
     }
 
-    private GeneratedType checkGeneratedType(final List<Type> genTypes, final String genTypeName, final String packageName, final int occurences) {
+    private static GeneratedType checkGeneratedType(final List<Type> genTypes, final String genTypeName,
+            final String packageName, final int occurences) {
         GeneratedType searchedGenType = null;
         int searchedGenTypeCounter = 0;
         for (Type type : genTypes) {
@@ -51,7 +50,8 @@ public class ChoiceCaseGenTypesTest extends AbstractTypesTest {
 
     }
 
-    private GeneratedType checkGeneratedType(final List<Type> genTypes, final String genTypeName, final String packageName) {
+    private static GeneratedType checkGeneratedType(final List<Type> genTypes, final String genTypeName,
+            final String packageName) {
         return checkGeneratedType(genTypes, genTypeName, packageName, 1);
     }
 

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/stmt/parser/retest/BaseYangTypesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/stmt/parser/retest/BaseYangTypesTest.java
index 41bc5a9ba8c2263b251941f3ee91eb386630e98a..9bae8671d77311fa79f68b2c74bb2f9086659704 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/stmt/parser/retest/BaseYangTypesTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/stmt/parser/retest/BaseYangTypesTest.java
@@ -10,11 +10,6 @@ package org.opendaylight.yangtools.sal.binding.yang.types.stmt.parser.retest;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-
-import org.opendaylight.yangtools.sal.binding.yang.types.BaseYangTypes;
-
-import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
-import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -26,6 +21,7 @@ import org.junit.Test;
 import org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil;
 import org.opendaylight.yangtools.sal.binding.generator.spi.TypeProvider;
 import org.opendaylight.yangtools.sal.binding.model.api.Type;
+import org.opendaylight.yangtools.sal.binding.yang.types.BaseYangTypes;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition;
@@ -38,6 +34,8 @@ import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition;
 import org.opendaylight.yangtools.yang.model.util.ExtendedType;
+import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
+import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 
 /**
  * Test class for testing BaseYangTypes class.
@@ -64,7 +62,6 @@ public class BaseYangTypesTest {
     private static EmptyTypeDefinition empty = null;
     private static BooleanTypeDefinition bool = null;
 
-    @SuppressWarnings("deprecation")
     @BeforeClass
     public static void setup() throws SourceException, ReactorException {
         final List<InputStream> modelsToParse = Collections

diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java
index 5609aeeda59c0b0e2b11b17b96eda4b6774a6ce7..3257d10afdaf0343d6511ab47db5a62403541cb2 100644 (file)
--- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java
+++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java
@@ -263,7 +263,7 @@ public final class BindingGeneratorUtil {
      *             <li>if <code>typeDefinition</code> equals <code>null</code></li>
      *             </ul>
      * @deprecated This method ignores typeDefinition argument and its result is only
-     *             <code>indingMapping.normalizePackageName(basePackageName)</code>.
+     *             <code>BindingMapping.normalizePackageName(basePackageName)</code>.
      *             Aside from tests, there is not a single user in OpenDaylight codebase,
      *             hence it can be considered buggy and defunct. It is scheduled for removal
      *             in Boron release.

diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtil.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtil.java
index cf98712edc383925092acfd9a24735b6508326a0..f4fcf71359e0e63754fec9210d982150b1482c28 100644 (file)
--- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtil.java
+++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtil.java
@@ -268,7 +268,7 @@ public class DataObjectReadingUtil {
         }
 
         @SuppressWarnings("unchecked")
-        private Map<InstanceIdentifier, DataContainer> readUsingIdentifiableItem(final Iterable<Identifiable> dataList,
+        private static Map<InstanceIdentifier, DataContainer> readUsingIdentifiableItem(final Iterable<Identifiable> dataList,
                 final IdentifiableItem childArgument, final InstanceIdentifier parentPath) {
             final Identifier<?> key = childArgument.getKey();
             for (Identifiable item : dataList) {

diff --git a/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtilTest.java b/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtilTest.java
index 29dc602f60122400635544c92c0d462f95ff89ad..2874d5f23bb8b42b8e5f1de2ed2fb23091f835be 100644 (file)
--- a/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtilTest.java
+++ b/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtilTest.java
@@ -7,7 +7,12 @@
  */
 package org.opendaylight.yangtools.yang.binding.util;
 
+import static org.junit.Assert.assertTrue;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.UnmodifiableIterator;
+import java.util.Map;
+import java.util.Map.Entry;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -16,12 +21,6 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.test.mock.Nodes;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import static org.junit.Assert.assertTrue;
-
 public class DataObjectReadingUtilTest {
     @Mock private InstanceIdentifier<? extends DataObject> pathNull;
     @Mock private Map.Entry<InstanceIdentifier<? extends DataObject>, DataObject> entryNull;
@@ -34,35 +33,39 @@ public class DataObjectReadingUtilTest {
         MockitoAnnotations.initMocks(this);
 
         path = InstanceIdentifier.builder(Nodes.class).build();
-        ImmutableMap map = ImmutableMap.<InstanceIdentifier<? extends DataObject>,
-                DataObject>builder().put(path, mockedDataObject).build();
+        ImmutableMap<InstanceIdentifier<? extends DataObject>, DataObject> map =
+                ImmutableMap.<InstanceIdentifier<? extends DataObject>, DataObject>builder()
+                .put(path, mockedDataObject).build();
 
-        Set entries = map.entrySet();
-        Iterator it = entries.iterator();
+        ImmutableSet<Entry<InstanceIdentifier<? extends DataObject>, DataObject>> entries = map.entrySet();
+        UnmodifiableIterator<Entry<InstanceIdentifier<? extends DataObject>, DataObject>> it = entries.iterator();
         while(it.hasNext()) {
-            entry = (Map.Entry)it.next();
+            entry = it.next();
         }
     }
 
+    @SuppressWarnings("unchecked")
     @Test(expected = IllegalArgumentException.class)
     public void testReadDataParentNull() {
-        DataObjectReadingUtil.readData(entryNull.getValue(), (InstanceIdentifier) entryNull.getKey(), pathNull);
+        DataObjectReadingUtil.readData(entryNull.getValue(), (InstanceIdentifier<DataObject>) entryNull.getKey(), pathNull);
     }
 
+    @SuppressWarnings("unchecked")
     @Test(expected = IllegalArgumentException.class)
     public void testReadDataParentPathNull() {
-        DataObjectReadingUtil.readData(entry.getValue(), (InstanceIdentifier) entryNull.getKey(), pathNull);
+        DataObjectReadingUtil.readData(entry.getValue(), (InstanceIdentifier<DataObject>) entryNull.getKey(), pathNull);
     }
 
+    @SuppressWarnings("unchecked")
     @Test
     public void testReadDataWithThreeParams() {
         assertTrue("Check if contains key",
                 DataObjectReadingUtil.readData(entry.getValue(),
-                        (InstanceIdentifier) entry.getKey(), path).containsKey(entry.getKey()));
+                        (InstanceIdentifier<DataObject>) entry.getKey(), path).containsKey(entry.getKey()));
 
         assertTrue("Check if contains value",
                 DataObjectReadingUtil.readData(entry.getValue(),
-                        (InstanceIdentifier) entry.getKey(), path).containsValue(entry.getValue()));
+                        (InstanceIdentifier<DataObject>) entry.getKey(), path).containsValue(entry.getValue()));
     }
 
     @Test(expected = NullPointerException.class)