From: Tony Tkacik Date: Tue, 20 May 2014 13:23:59 +0000 (+0000) Subject: Merge "BUG-865: removed unused code." X-Git-Tag: release/helium~537 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=43d5af91a182d28501b1b78166371ac806f25943;hp=93fd0fc61341275a37811a34862150a5c71900d4;p=yangtools.git Merge "BUG-865: removed unused code." --- 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 bf6fcec333..3079c556b1 100644 --- 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 e2ca93bbe4..870fcd9ec8 100644 --- 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 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 4b7a86539d..9a572b35db 100644 --- 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 a04dd7d0f5..c2b97b090a 100644 --- 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 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)) { diff --git a/integration-test/yang-runtime-tests/src/test/java/org/opendaylight/yangtools/it/yang/runtime/tests/MultipleRevisionsSupportTest.java b/integration-test/yang-runtime-tests/src/test/java/org/opendaylight/yangtools/it/yang/runtime/tests/MultipleRevisionsSupportTest.java index 654dc11b43..16f408c243 100644 --- a/integration-test/yang-runtime-tests/src/test/java/org/opendaylight/yangtools/it/yang/runtime/tests/MultipleRevisionsSupportTest.java +++ b/integration-test/yang-runtime-tests/src/test/java/org/opendaylight/yangtools/it/yang/runtime/tests/MultipleRevisionsSupportTest.java @@ -128,9 +128,7 @@ public class MultipleRevisionsSupportTest { } private void verifyBindingDifference(SchemaContext schemaContext, YangModuleInfo oldModule, YangModuleInfo newModule) { - - Map generatedTypes = generatedTypesVerified(schemaContext, oldModule, newModule); - + generatedTypesVerified(schemaContext, oldModule, newModule); } private Map generatedTypesVerified(SchemaContext schemaContext, YangModuleInfo oldModule, diff --git a/restconf/restconf-util/src/main/java/org/opendaylight/yangtools/restconf/utils/RestconfUtils.java b/restconf/restconf-util/src/main/java/org/opendaylight/yangtools/restconf/utils/RestconfUtils.java index 9144870dd6..c14210c4f3 100644 --- a/restconf/restconf-util/src/main/java/org/opendaylight/yangtools/restconf/utils/RestconfUtils.java +++ b/restconf/restconf-util/src/main/java/org/opendaylight/yangtools/restconf/utils/RestconfUtils.java @@ -43,7 +43,6 @@ import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java index 5b130f59b5..0b194bcc86 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/AbstractNodeTO.java @@ -7,15 +7,9 @@ */ package org.opendaylight.yangtools.yang.data.impl; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.*; -import java.net.URI; -import java.util.Map; - /** * @author michal.rehak * @param diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java index 45d7b10269..68d0cd871a 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/SimpleNodeTOImpl.java @@ -17,7 +17,6 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; -import java.util.Map; /** * @author michal.rehak diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableChoiceNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableChoiceNodeSchemaAwareBuilder.java index 670ca5bf25..37e2eab586 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableChoiceNodeSchemaAwareBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableChoiceNodeSchemaAwareBuilder.java @@ -18,7 +18,6 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.valid.DataV import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; import com.google.common.base.Preconditions; -import com.google.common.base.Supplier; public class ImmutableChoiceNodeSchemaAwareBuilder extends ImmutableChoiceNodeBuilder { diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/test/NormalizedNodeUtilsTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/test/NormalizedNodeUtilsTest.java index 36d6067cf1..ebf2c0bf58 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/test/NormalizedNodeUtilsTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/test/NormalizedNodeUtilsTest.java @@ -49,7 +49,6 @@ public class NormalizedNodeUtilsTest { "root"); private static final QName LIST_A_QNAME = QName.create(ROOT_QNAME, "list-a"); private static final QName LIST_B_QNAME = QName.create(ROOT_QNAME, "list-b"); - private static final QName CHOICE_A_QNAME = QName.create(ROOT_QNAME, "choice-a"); private static final QName LEAF_A_QNAME = QName.create(ROOT_QNAME, "leaf-a"); private static final QName LEAF_B_QNAME = QName.create(ROOT_QNAME, "leaf-b"); private static final String FOO = "foo"; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java index 5154f773c2..fd4716fe3a 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java @@ -33,7 +33,6 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import org.custommonkey.xmlunit.Diff; -import org.custommonkey.xmlunit.XMLAssert; import org.custommonkey.xmlunit.XMLUnit; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java b/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java index 3389839e32..a5c7c146fc 100644 --- a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java +++ b/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java @@ -21,7 +21,6 @@ import java.util.Map; import java.util.Set; import org.apache.maven.model.Plugin; -import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; import org.junit.Before;