From 70c7abc96ca2c174c6d12e220ae07370dd1f4c32 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 11 Jun 2015 12:40:28 +0200 Subject: [PATCH 1/1] Make methods static All these can be made static, so improve their efficiency. Change-Id: Ie6aa238eab7fef728dd22af12a64a155a9db776e Signed-off-by: Robert Varga (cherry picked from commit 12beaed7c9f1953562f79ef9699273d0ea53926c) --- .../generator/test/GeneratorJavaFileTest.java | 2 +- .../binding/yang/types/TypeProviderImpl.java | 32 +++++++++---------- .../binding/yang/types/TypeProviderTest.java | 6 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GeneratorJavaFileTest.java b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GeneratorJavaFileTest.java index 573282f394..06054e2a3b 100644 --- a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GeneratorJavaFileTest.java +++ b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GeneratorJavaFileTest.java @@ -54,7 +54,7 @@ public class GeneratorJavaFileTest { assertTrue(filesList.contains("Type4Builder.java")); } - private GeneratedType createGeneratedType(String pkgName, String name) { + private static GeneratedType createGeneratedType(String pkgName, String name) { GeneratedTypeBuilder builder = new GeneratedTypeBuilderImpl(pkgName, name); builder.addImplementsType(BindingTypes.DATA_OBJECT); return builder.toInstance(); diff --git a/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java b/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java index bd81da916a..274ba77e07 100644 --- a/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java +++ b/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java @@ -217,7 +217,7 @@ public final class TypeProviderImpl implements TypeProvider { return returnType; } - private GeneratedTransferObject shadedTOWithRestrictions(final GeneratedTransferObject gto, final Restrictions r) { + private static GeneratedTransferObject shadedTOWithRestrictions(final GeneratedTransferObject gto, final Restrictions r) { GeneratedTOBuilder gtob = new GeneratedTOBuilderImpl(gto.getPackageName(), gto.getName()); GeneratedTransferObject parent = gto.getSuperType(); if (parent != null) { @@ -465,7 +465,7 @@ public final class TypeProviderImpl implements TypeProvider { *
  • false - other cases
    • * */ - private boolean leafContainsEnumDefinition(final SchemaNode dataNode) { + private static boolean leafContainsEnumDefinition(final SchemaNode dataNode) { if (dataNode instanceof LeafSchemaNode) { final LeafSchemaNode leaf = (LeafSchemaNode) dataNode; if (leaf.getType() instanceof EnumTypeDefinition) { @@ -489,7 +489,7 @@ public final class TypeProviderImpl implements TypeProvider { *
  • false - other cases
    • * */ - private boolean leafListContainsEnumDefinition(final SchemaNode dataNode) { + private static boolean leafListContainsEnumDefinition(final SchemaNode dataNode) { if (dataNode instanceof LeafListSchemaNode) { final LeafListSchemaNode leafList = (LeafListSchemaNode) dataNode; if (leafList.getType() instanceof EnumTypeDefinition) { @@ -564,7 +564,7 @@ public final class TypeProviderImpl implements TypeProvider { * * */ - private Enumeration addInnerEnumerationToTypeBuilder(final EnumTypeDefinition enumTypeDef, final String enumName, + private static Enumeration addInnerEnumerationToTypeBuilder(final EnumTypeDefinition enumTypeDef, final String enumName, final GeneratedTypeBuilderBase typeBuilder) { Preconditions.checkArgument(enumTypeDef != null, "EnumTypeDefinition reference cannot be NULL!"); Preconditions.checkArgument(enumTypeDef.getValues() != null, @@ -1021,7 +1021,7 @@ public final class TypeProviderImpl implements TypeProvider { * string with name of property which should be added to * unionGentransObject */ - private void updateUnionTypeAsProperty(final GeneratedTOBuilder unionGenTransObject, final Type type, + private static void updateUnionTypeAsProperty(final GeneratedTOBuilder unionGenTransObject, final Type type, final String propertyName) { if (unionGenTransObject != null && type != null && !unionGenTransObject.containsProperty(propertyName)) { final GeneratedPropertyBuilder propBuilder = unionGenTransObject @@ -1044,7 +1044,7 @@ public final class TypeProviderImpl implements TypeProvider { * @return generated TO builder which contains data from * typedef and basePackageName */ - private GeneratedTOBuilderImpl typedefToTransferObject(final String basePackageName, + private static GeneratedTOBuilderImpl typedefToTransferObject(final String basePackageName, final TypeDefinition typedef, final String moduleName) { final String packageName = packageNameForGeneratedType(basePackageName, typedef.getPath()); @@ -1166,7 +1166,7 @@ public final class TypeProviderImpl implements TypeProvider { *
  • if regularExpressions equals null
    • * */ - private void addStringRegExAsConstant(final GeneratedTOBuilder genTOBuilder, final List regularExpressions) { + private static void addStringRegExAsConstant(final GeneratedTOBuilder genTOBuilder, final List regularExpressions) { if (genTOBuilder == null) { throw new IllegalArgumentException("Generated transfer object builder can't be null"); } @@ -1255,7 +1255,7 @@ public final class TypeProviderImpl implements TypeProvider { * @param gto * transfer object which needs to be serializable */ - private void makeSerializable(final GeneratedTOBuilderImpl gto) { + private static void makeSerializable(final GeneratedTOBuilderImpl gto) { gto.addImplementsType(Types.typeForClass(Serializable.class)); GeneratedPropertyBuilder prop = new GeneratedPropertyBuilderImpl("serialVersionUID"); prop.setValue(Long.toString(BindingGeneratorUtil.computeDefaultSUID(gto))); @@ -1341,7 +1341,7 @@ public final class TypeProviderImpl implements TypeProvider { * string with name of augmented node * @return string with the number suffix incremented by one (or 1 is added) */ - private String provideAvailableNameForGenTOBuilder(final String name) { + private static String provideAvailableNameForGenTOBuilder(final String name) { Matcher mtch = NUMBERS_PATTERN.matcher(name); if (mtch.find()) { final int newSuffix = Integer.valueOf(name.substring(mtch.start())) + 1; @@ -1369,9 +1369,9 @@ public final class TypeProviderImpl implements TypeProvider { TypeDefinition type = node.getType(); QName typeQName = type.getQName(); TypeDefinition base = baseTypeDefForExtendedType(type); - Preconditions.checkNotNull(type, "Cannot provide default construction for null type of " + node); - Preconditions.checkNotNull(defaultValue, "Cannot provide default construction for null default statement of " - + node); + Preconditions.checkNotNull(type, "Cannot provide default construction for null type of %s", node); + Preconditions.checkNotNull(defaultValue, "Cannot provide default construction for null default statement of %s", + node); StringBuilder sb = new StringBuilder(); String result = null; @@ -1462,11 +1462,11 @@ public final class TypeProviderImpl implements TypeProvider { return sb.toString(); } - private String typeToDef(final Class clazz, final String defaultValue) { + private static String typeToDef(final Class clazz, final String defaultValue) { return "new " + clazz.getName() + "(\"" + defaultValue + "\")"; } - private String binaryToDef(final String defaultValue) { + private static String binaryToDef(final String defaultValue) { StringBuilder sb = new StringBuilder(); BaseEncoding en = BaseEncoding.base64(); byte[] encoded = en.decode(defaultValue); @@ -1481,7 +1481,7 @@ public final class TypeProviderImpl implements TypeProvider { return sb.toString(); } - private String bitsToDef(final BitsTypeDefinition type, final String className, final String defaultValue, + private static String bitsToDef(final BitsTypeDefinition type, final String className, final String defaultValue, final boolean isExt) { List bits = new ArrayList<>(type.getBits()); Collections.sort(bits, new Comparator() { @@ -1602,7 +1602,7 @@ public final class TypeProviderImpl implements TypeProvider { return union(className, node.getDefault(), node); } - private String union(final String className, final String defaultValue, final LeafSchemaNode node) { + private static String union(final String className, final String defaultValue, final LeafSchemaNode node) { StringBuilder sb = new StringBuilder(); sb.append("new "); sb.append(className); diff --git a/code-generator/binding-type-provider/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderTest.java b/code-generator/binding-type-provider/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderTest.java index e34afda879..ee40141b08 100644 --- a/code-generator/binding-type-provider/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderTest.java +++ b/code-generator/binding-type-provider/src/test/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderTest.java @@ -116,7 +116,7 @@ public class TypeProviderTest { provider.javaTypeForSchemaDefinitionType(testTypedef, null, null); } - private LeafSchemaNode provideLeafNodeFromTopLevelContainer(final Module module, final String containerName, final String leafNodeName) { + private static LeafSchemaNode provideLeafNodeFromTopLevelContainer(final Module module, final String containerName, final String leafNodeName) { final DataSchemaNode rootNode = module.getDataChildByName(containerName); assertNotNull("Container foo is not present in root of module "+ module.getName(), rootNode); assertTrue(rootNode instanceof DataNodeContainer); @@ -128,7 +128,7 @@ public class TypeProviderTest { return (LeafSchemaNode) node; } - private LeafListSchemaNode provideLeafListNodeFromTopLevelContainer(final Module module, final String containerName, final String leafListNodeName) { + private static LeafListSchemaNode provideLeafListNodeFromTopLevelContainer(final Module module, final String containerName, final String leafListNodeName) { final DataSchemaNode rootNode = module.getDataChildByName(containerName); assertNotNull("Container foo is not present in root of module "+ module.getName(), rootNode); assertTrue(rootNode instanceof DataNodeContainer); @@ -200,7 +200,7 @@ public class TypeProviderTest { assertTrue(result instanceof GeneratedTransferObject); } - private TypeDefinition resolveTypeDefinitionFromModule(final Module module, final String typedefName) { + private static TypeDefinition resolveTypeDefinitionFromModule(final Module module, final String typedefName) { TypeDefinition result = null; final Set> typeDefs = module.getTypeDefinitions(); for (final TypeDefinition typedef : typeDefs) { -- 2.36.6