Cleanup code

Unused imports, static methods, missing generics.

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

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/ModuleInfoBackedContext.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/ModuleInfoBackedContext.java
index 5894e329d894cbdd69dc9b4ac81bdc7b494d29a9..e2f6b6c56148b797fabec40db9581efe71e54fd2 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/ModuleInfoBackedContext.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/ModuleInfoBackedContext.java
@@ -117,7 +117,7 @@ public class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy
         return true;
     }
 
-    private YangTextSchemaSource toYangTextSource(SourceIdentifier identifier, final YangModuleInfo moduleInfo) {
+    private static YangTextSchemaSource toYangTextSource(final SourceIdentifier identifier, final YangModuleInfo moduleInfo) {
         return new YangTextSchemaSource(identifier) {
 
             @Override
@@ -126,7 +126,7 @@ public class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy
             }
 
             @Override
-            protected ToStringHelper addToStringAttributes(ToStringHelper toStringHelper) {
+            protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) {
                 return toStringHelper;
             }
         };

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/IdentityrefTypeTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/IdentityrefTypeTest.java
index 78fbf7014fa4c08cc06f3e88cecc4f95721f8a38..b21413fb3b8b1a91943500b3f84c93a9a559e1b7 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/IdentityrefTypeTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/IdentityrefTypeTest.java
@@ -9,10 +9,6 @@ package org.opendaylight.yangtools.sal.binding.generator.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-
-import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
-import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -26,8 +22,9 @@ import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType;
 import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature;
 import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType;
 import org.opendaylight.yangtools.sal.binding.model.api.Type;
-import org.opendaylight.yangtools.sal.binding.yang.types.TypeProviderImpl;
 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 IdentityrefTypeTest {
 

diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java
index 26277e87f23932c2110085c3c80c02038edb3d9e..da3531aa2a9e4a0e0499d4e4d9cb079b7a14d1b0 100644 (file)
--- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java
+++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java
@@ -349,8 +349,8 @@ public final class Types {
         }
     }
 
-    public static <T extends Number> DefaultRestrictions getDefaultRestrictions(final T min, final T max) {
-        return new DefaultRestrictions(min, max);
+    public static <T extends Number> DefaultRestrictions<T> getDefaultRestrictions(final T min, final T max) {
+        return new DefaultRestrictions<>(min, max);
     }
 
     private static final class DefaultRestrictions<T extends Number> implements Restrictions {

diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CompilationTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CompilationTest.java
index 751be2a1b9eff7c46f381d78aae87e8fc070acd4..4456846e4266b4165fcf800a05009547e6096575 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CompilationTest.java
+++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/CompilationTest.java
@@ -10,8 +10,6 @@ package org.opendaylight.yangtools.sal.java.api.generator.test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-
-import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Range;
@@ -30,7 +28,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import org.junit.Test;
 import org.opendaylight.yangtools.sal.binding.model.api.Type;
@@ -52,12 +49,7 @@ public class CompilationTest extends BaseCompilationTest {
      */
     private static Collection<Method> abstractMethods(final Class<?> clazz) {
         // Filter out
-        return Collections2.filter(Arrays.asList(clazz.getDeclaredMethods()), new Predicate<Method>() {
-            @Override
-            public boolean apply(final Method input) {
-                return Modifier.isAbstract(input.getModifiers());
-            }
-        });
+        return Collections2.filter(Arrays.asList(clazz.getDeclaredMethods()), input -> Modifier.isAbstract(input.getModifiers()));
     }
 
     @Test
@@ -590,15 +582,15 @@ public class CompilationTest extends BaseCompilationTest {
 
         final String pkg = CompilationTestUtils.BASE_PKG + ".urn.yang.foo.rev160102";
         final ClassLoader loader = new URLClassLoader(new URL[] { compiledOutputDir.toURI().toURL() });
-        final Class cls = loader.loadClass(pkg + ".FooData");
-        final Class clsContainer = loader.loadClass(pkg + ".ContainerMain");
-        final Class clsTypedefDepr = loader.loadClass(pkg + ".TypedefDeprecated");
-        final Class clsTypedefCur = loader.loadClass(pkg + ".TypedefCurrent");
-        final Class clsGroupingDepr = loader.loadClass(pkg + ".GroupingDeprecated");
-        final Class clsGroupingCur = loader.loadClass(pkg + ".GroupingCurrent");
-        final Class clsTypeDef1 = loader.loadClass(pkg + ".Typedef1");
-        final Class clsTypeDef2 = loader.loadClass(pkg + ".Typedef2");
-        final Class clsTypeDef3 = loader.loadClass(pkg + ".Typedef3");
+        final Class<?> cls = loader.loadClass(pkg + ".FooData");
+        final Class<?> clsContainer = loader.loadClass(pkg + ".ContainerMain");
+        final Class<?> clsTypedefDepr = loader.loadClass(pkg + ".TypedefDeprecated");
+        final Class<?> clsTypedefCur = loader.loadClass(pkg + ".TypedefCurrent");
+        final Class<?> clsGroupingDepr = loader.loadClass(pkg + ".GroupingDeprecated");
+        final Class<?> clsGroupingCur = loader.loadClass(pkg + ".GroupingCurrent");
+        final Class<?> clsTypeDef1 = loader.loadClass(pkg + ".Typedef1");
+        final Class<?> clsTypeDef2 = loader.loadClass(pkg + ".Typedef2");
+        final Class<?> clsTypeDef3 = loader.loadClass(pkg + ".Typedef3");
         assertTrue(clsTypedefDepr.getAnnotations()[0].toString().contains("Deprecated"));
         assertTrue(clsTypedefCur.getAnnotations().length == 0);
         assertTrue(clsGroupingDepr.getAnnotations()[0].toString().contains("Deprecated"));
@@ -672,12 +664,7 @@ public class CompilationTest extends BaseCompilationTest {
         final List<File> sourceFiles = CompilationTestUtils.getSourceFiles(resourceDirPath);
         final SchemaContext context = TestUtils.parseYangSources(sourceFiles);
         final List<Type> types = bindingGenerator.generateTypes(context);
-        Collections.sort(types, new Comparator<Type>() {
-            @Override
-            public int compare(final Type o1, final Type o2) {
-                return o2.getName().compareTo(o1.getName());
-            }
-        });
+        Collections.sort(types, (o1, o2) -> o2.getName().compareTo(o1.getName()));
         final GeneratorJavaFile generator = new GeneratorJavaFile(ImmutableSet.copyOf(types));
         generator.generateToFile(sourcesOutputDir);
     }

diff --git a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/TypedefCompilationTest.java b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/TypedefCompilationTest.java
index 4d1aea9981d95af71231a69fd0c5dc531dc149b7..c890a92ff66055a9c1588476ebc45993f29a2bb9 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/TypedefCompilationTest.java
+++ b/binding/mdsal-binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/TypedefCompilationTest.java
@@ -10,10 +10,6 @@ package org.opendaylight.yangtools.sal.java.api.generator.test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.assertContainsFieldWithValue;
-import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.assertContainsMethod;
-import static org.opendaylight.yangtools.sal.java.api.generator.test.CompilationTestUtils.assertContainsRestrictionCheck;
-
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Range;
 import java.io.File;