BUG-865: removed unused code.

Removed unused imports, replaced deprecated code.

Change-Id: Iec9c79dd2592133eb953367f23f38c3626531745
Signed-off-by: Martin Vitez <mvitez@cisco.com>

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/YangSchemaUtils.java b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/YangSchemaUtils.java
index bf6fcec33379460f4971412e3c7096739573991f..3079c556b16293568a699092e0693d20fd4d7389 100644 (file)
--- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/YangSchemaUtils.java
+++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/util/YangSchemaUtils.java
@@ -78,9 +78,6 @@ public final class YangSchemaUtils {
             return null;
         }
         checkArgument(arguments.size() == 1);
-        for (QName qName : arguments) {
-            //previous.getDataChildByName(qName);
-        }
         for(TypeDefinition<?> typedef : previous.getTypeDefinitions()) {
             if(typedef.getQName().equals(typeQName)) {
                 return typedef;

diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java
index e2ca93bbe49db64bf874195c08d584a4edd4c40f..870fcd9ec864546637ff8ed34dd2b75e78c9663c 100644 (file)
--- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java
+++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/generated/type/builder/EnumerationBuilderImpl.java
@@ -7,8 +7,6 @@
  */
 package org.opendaylight.yangtools.binding.generator.util.generated.type.builder;
 
-import static org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil.parseToClassName;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -23,6 +21,7 @@ import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature;
 import org.opendaylight.yangtools.sal.binding.model.api.Type;
 import org.opendaylight.yangtools.sal.binding.model.api.type.builder.AnnotationTypeBuilder;
 import org.opendaylight.yangtools.sal.binding.model.api.type.builder.EnumBuilder;
+import org.opendaylight.yangtools.yang.binding.BindingMapping;
 import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair;
 
@@ -62,7 +61,7 @@ public final class EnumerationBuilderImpl extends AbstractBaseType implements En
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see java.lang.Object#hashCode()
      */
     @Override
@@ -76,7 +75,7 @@ public final class EnumerationBuilderImpl extends AbstractBaseType implements En
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see java.lang.Object#equals(java.lang.Object)
      */
     @Override
@@ -110,7 +109,7 @@ public final class EnumerationBuilderImpl extends AbstractBaseType implements En
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see java.lang.Object#toString()
      */
     @Override
@@ -133,7 +132,7 @@ public final class EnumerationBuilderImpl extends AbstractBaseType implements En
             int listIndex = 0;
             for (final EnumPair enumPair : enums) {
                 if (enumPair != null) {
-                    final String enumPairName = parseToClassName(enumPair.getName());
+                    final String enumPairName = BindingMapping.getClassName(enumPair.getName());
                     Integer enumPairValue = enumPair.getValue();
 
                     if (enumPairValue == null) {
@@ -170,7 +169,7 @@ public final class EnumerationBuilderImpl extends AbstractBaseType implements En
 
         /*
          * (non-Javadoc)
-         * 
+         *
          * @see java.lang.Object#hashCode()
          */
         @Override
@@ -184,7 +183,7 @@ public final class EnumerationBuilderImpl extends AbstractBaseType implements En
 
         /*
          * (non-Javadoc)
-         * 
+         *
          * @see java.lang.Object#equals(java.lang.Object)
          */
         @Override
@@ -218,7 +217,7 @@ public final class EnumerationBuilderImpl extends AbstractBaseType implements En
 
         /*
          * (non-Javadoc)
-         * 
+         *
          * @see java.lang.Object#toString()
          */
         @Override
@@ -314,7 +313,7 @@ public final class EnumerationBuilderImpl extends AbstractBaseType implements En
 
         /*
          * (non-Javadoc)
-         * 
+         *
          * @see java.lang.Object#hashCode()
          */
         @Override
@@ -330,7 +329,7 @@ public final class EnumerationBuilderImpl extends AbstractBaseType implements En
 
         /*
          * (non-Javadoc)
-         * 
+         *
          * @see java.lang.Object#equals(java.lang.Object)
          */
         @Override
@@ -371,7 +370,7 @@ public final class EnumerationBuilderImpl extends AbstractBaseType implements En
 
         /*
          * (non-Javadoc)
-         * 
+         *
          * @see java.lang.Object#toString()
          */
         @Override
@@ -430,7 +429,7 @@ public final class EnumerationBuilderImpl extends AbstractBaseType implements En
             // TODO Auto-generated method stub
             return Collections.emptyList();
         }
-        
+
         @Override
         public List<GeneratedProperty> getProperties() {
             return Collections.emptyList();

diff --git a/code-generator/binding-generator-util/src/test/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtilTest.java b/code-generator/binding-generator-util/src/test/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtilTest.java
index 4b7a86539d126838bdd869b0bfd5472d55414d66..9a572b35db59b94b200648b19d15e1053c96c9e7 100644 (file)
--- a/code-generator/binding-generator-util/src/test/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtilTest.java
+++ b/code-generator/binding-generator-util/src/test/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtilTest.java
@@ -19,6 +19,7 @@ import java.util.List;
 import java.util.Set;
 
 import org.junit.Test;
+import org.opendaylight.yangtools.yang.binding.BindingMapping;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
@@ -149,9 +150,9 @@ public class BindingGeneratorUtilTest {
     public void testParsingMethods() {
         // parseToClassName method testing
         assertEquals("Class name has incorrect format", "SomeTestingClassName",
-                BindingGeneratorUtil.parseToClassName("  some-testing_class name   "));
+                BindingMapping.getClassName("  some-testing_class name   "));
         assertEquals("Class name has incorrect format", "_0SomeTestingClassName",
-                BindingGeneratorUtil.parseToClassName("  0 some-testing_class name   "));
+                BindingMapping.getClassName("  0 some-testing_class name   "));
 
         // parseToValidParamName
         assertEquals("Parameter name has incorrect format", "someTestingParameterName",

diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtil.java b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtil.java
index a04dd7d0f50d2ff61fe29e46eb2e5f02da0841a2..c2b97b090aeffe5235fbb132bb6157c34adf3865 100644 (file)
--- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtil.java
+++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtil.java
@@ -128,8 +128,8 @@ public final class GeneratorUtil {
      */
     public static void putTypeIntoImports(final GeneratedType parentGenType, final Type type,
             final Map<String, String> imports) {
-        checkArgument(parentGenType != null,
-                "Parent Generated Type parameter MUST be specified and cannot be " + "NULL!");
+        checkArgument(parentGenType != null, "Parent Generated Type parameter MUST be specified and cannot be "
+                + "NULL!");
         checkArgument(parentGenType.getName() != null, "Parent Generated Type name cannot be NULL!");
         checkArgument(parentGenType.getPackageName() != null,
                 "Parent Generated Type cannot have Package Name referenced as NULL!");
@@ -141,9 +141,7 @@ public final class GeneratorUtil {
         final String typeName = type.getName();
         final String typePackageName = type.getPackageName();
         final String parentTypeName = parentGenType.getName();
-        final String parentTypePackageName = parentGenType.getPackageName();
-        if (typeName.equals(parentTypeName) || typePackageName.startsWith("java.lang")
-                 || typePackageName.isEmpty()) {
+        if (typeName.equals(parentTypeName) || typePackageName.startsWith("java.lang") || typePackageName.isEmpty()) {
             return;
         }
         if (!imports.containsKey(typeName)) {