BUG-1902: reuse ConcreteTypeImpl instances

Instantiate a cache which will act as a lookup for commonly-shared
instances. Also creates shared instances for byte[] and char[] primitive
types and reuses them as much as possible.

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

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.java b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.java
index 0b45713b56dbe1da209cfac1bd7b51280bcfb8f7..00abec0db68d4006ec7561bf4b9174ddd66ee7ab 100644 (file)
--- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.java
+++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.java
@@ -1928,7 +1928,7 @@ public class BindingGeneratorImpl implements BindingGenerator {
             }
 
             final GeneratedPropertyBuilder genPropBuilder = resultTOBuilder.addProperty("value");
-            genPropBuilder.setReturnType(Types.primitiveType("char[]", null));
+            genPropBuilder.setReturnType(Types.CHAR_ARRAY);
             resultTOBuilder.addEqualsIdentity(genPropBuilder);
             resultTOBuilder.addHashIdentity(genPropBuilder);
             resultTOBuilder.addToStringProperty(genPropBuilder);

diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java
index 91d56a3562bbcfcdff2f62e263c46e7e05fc3085..605c989bbad18f52111d62e9677299ee110711de 100644 (file)
--- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java
+++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/Types.java
@@ -7,6 +7,9 @@
  */
 package org.opendaylight.yangtools.binding.generator.util;
 
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -21,6 +24,16 @@ import org.opendaylight.yangtools.yang.binding.Augmentable;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
 
 public final class Types {
+    private static final CacheLoader<Class<?>, ConcreteType> TYPE_LOADER =
+            new CacheLoader<Class<?>, ConcreteType>() {
+                @Override
+                public ConcreteType load(final Class<?> key) {
+                    return new ConcreteTypeImpl(key.getPackage().getName(), key.getSimpleName(), null);
+                }
+    };
+    private static final LoadingCache<Class<?>, ConcreteType> TYPE_CACHE =
+            CacheBuilder.newBuilder().weakKeys().softValues().build(TYPE_LOADER);
+
     private static final Type SET_TYPE = typeForClass(Set.class);
     private static final Type LIST_TYPE = typeForClass(List.class);
     private static final Type MAP_TYPE = typeForClass(Map.class);
@@ -29,6 +42,8 @@ public final class Types {
     public static final ConcreteType FUTURE = typeForClass(Future.class);
     public static final ConcreteType STRING = typeForClass(String.class);
     public static final ConcreteType VOID = typeForClass(Void.class);
+    public static final ConcreteType BYTE_ARRAY = primitiveType("byte[]", null);
+    public static final ConcreteType CHAR_ARRAY = primitiveType("char[]", null);
 
     /**
      * It is not desirable to create instance of this class
@@ -55,12 +70,12 @@ public final class Types {
      * doesn't exist.
      *
      * @param primitiveType
-     *            string containing programaticall construction based on
+     *            string containing programmatic construction based on
      *            primitive type (e.g byte[])
-     * @return <code>ConcreteType</code> instance which represents programatic
+     * @return <code>ConcreteType</code> instance which represents programmatic
      *         construction with primitive JAVA type
      */
-    public static Type primitiveType(final String primitiveType, final Restrictions restrictions) {
+    public static ConcreteType primitiveType(final String primitiveType, final Restrictions restrictions) {
         return new ConcreteTypeImpl("", primitiveType, restrictions);
     }
 
@@ -71,12 +86,16 @@ public final class Types {
      *            Class to describe
      * @return Description of class
      */
-    public static ConcreteType typeForClass(Class<?> cls) {
-        return typeForClass(cls, null);
+    public static ConcreteType typeForClass(final Class<?> cls) {
+        return TYPE_CACHE.getUnchecked(cls);
     }
 
-    public static ConcreteType typeForClass(Class<?> cls, Restrictions restrictions) {
-        return new ConcreteTypeImpl(cls.getPackage().getName(), cls.getSimpleName(), restrictions);
+    public static ConcreteType typeForClass(final Class<?> cls, final Restrictions restrictions) {
+        if (restrictions != null) {
+            return new ConcreteTypeImpl(cls.getPackage().getName(), cls.getSimpleName(), restrictions);
+        } else {
+            return typeForClass(cls);
+        }
     }
 
     /**
@@ -89,7 +108,7 @@ public final class Types {
      *            Value Type
      * @return Description of generic type instance
      */
-    public static ParameterizedType mapTypeFor(Type keyType, Type valueType) {
+    public static ParameterizedType mapTypeFor(final Type keyType, final Type valueType) {
         return parameterizedTypeFor(MAP_TYPE, keyType, valueType);
     }
 
@@ -101,7 +120,7 @@ public final class Types {
      *            Value Type
      * @return Description of generic type instance of Set
      */
-    public static ParameterizedType setTypeFor(Type valueType) {
+    public static ParameterizedType setTypeFor(final Type valueType) {
         return parameterizedTypeFor(SET_TYPE, valueType);
     }
 
@@ -113,7 +132,7 @@ public final class Types {
      *            Value Type
      * @return Description of type instance of List
      */
-    public static ParameterizedType listTypeFor(Type valueType) {
+    public static ParameterizedType listTypeFor(final Type valueType) {
         return parameterizedTypeFor(LIST_TYPE, valueType);
     }
 
@@ -129,7 +148,7 @@ public final class Types {
      * @return <code>ParametrizedType</code> reprezentation of <code>type</code>
      *         and its parameters <code>parameters</code>
      */
-    public static ParameterizedType parameterizedTypeFor(Type type, Type... parameters) {
+    public static ParameterizedType parameterizedTypeFor(final Type type, final Type... parameters) {
         return new ParametrizedTypeImpl(type, parameters);
     }
 
@@ -142,10 +161,10 @@ public final class Types {
      *            string with the package name
      * @param typeName
      *            string with the type name
-     * @return <code>WildcardType</code> reprezentation of
+     * @return <code>WildcardType</code> representation of
      *         <code>packageName</code> and <code>typeName</code>
      */
-    public static WildcardType wildcardTypeFor(String packageName, String typeName) {
+    public static WildcardType wildcardTypeFor(final String packageName, final String typeName) {
         return new WildcardTypeImpl(packageName, typeName);
     }
 
@@ -158,11 +177,11 @@ public final class Types {
      *
      * @param valueType
      *            JAVA <code>Type</code> with actual parameter
-     * @return <code>ParametrizedType</code> reprezentation of raw type
+     * @return <code>ParametrizedType</code> representation of raw type
      *         <code>Augmentable</code> with actual parameter
      *         <code>valueType</code>
      */
-    public static ParameterizedType augmentableTypeFor(Type valueType) {
+    public static ParameterizedType augmentableTypeFor(final Type valueType) {
         final Type augmentable = typeForClass(Augmentable.class);
         return parameterizedTypeFor(augmentable, valueType);
     }
@@ -180,7 +199,7 @@ public final class Types {
      *         <code>Augmentation</code> with actual parameter
      *         <code>valueType</code>
      */
-    public static ParameterizedType augmentationTypeFor(Type valueType) {
+    public static ParameterizedType augmentationTypeFor(final Type valueType) {
         final Type augmentation = typeForClass(Augmentation.class);
         return parameterizedTypeFor(augmentation, valueType);
     }
@@ -202,7 +221,7 @@ public final class Types {
          * @param name
          *            string with the name of the type
          */
-        private ConcreteTypeImpl(String pkName, String name, Restrictions restrictions) {
+        private ConcreteTypeImpl(final String pkName, final String name, final Restrictions restrictions) {
             super(pkName, name);
             this.restrictions = restrictions;
         }
@@ -222,12 +241,12 @@ public final class Types {
         /**
          * Array of JAVA actual type parameters.
          */
-        private Type[] actualTypes;
+        private final Type[] actualTypes;
 
         /**
          * JAVA raw type (like List, Set, Map...)
          */
-        private Type rawType;
+        private final Type rawType;
 
         @Override
         public Type[] getActualTypeArguments() {
@@ -249,7 +268,7 @@ public final class Types {
          * @param actTypes
          *            array of actual parameters
          */
-        public ParametrizedTypeImpl(Type rawType, Type[] actTypes) {
+        public ParametrizedTypeImpl(final Type rawType, final Type[] actTypes) {
             super(rawType.getPackageName(), rawType.getName());
             this.rawType = rawType;
             this.actualTypes = Arrays.copyOf(actTypes, actTypes.length);
@@ -271,7 +290,7 @@ public final class Types {
          * @param typeName
          *            string with the name of type
          */
-        public WildcardTypeImpl(String packageName, String typeName) {
+        public WildcardTypeImpl(final String packageName, final String typeName) {
             super(packageName, typeName);
         }
     }

diff --git a/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java b/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java
index 86b40c027efada8b0e20fe16e2f421f1e31d65e8..987850821c582ecb2284fc507fe333117edf4f5d 100644 (file)
--- a/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java
+++ b/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/BaseYangTypes.java
@@ -144,7 +144,7 @@ public final class BaseYangTypes {
          * @return java <code>Type</code> representation of <code>type</code>
          */
         @Override
-        public Type javaTypeForYangType(String type) {
+        public Type javaTypeForYangType(final String type) {
             return typeMap.get(type);
         }
 
@@ -159,7 +159,7 @@ public final class BaseYangTypes {
          *         returned.
          */
         @Override
-        public Type javaTypeForSchemaDefinitionType(TypeDefinition<?> type, SchemaNode parentNode) {
+        public Type javaTypeForSchemaDefinitionType(final TypeDefinition<?> type, final SchemaNode parentNode) {
             if (type != null) {
                 return typeMap.get(type.getQName().getLocalName());
             }
@@ -168,12 +168,12 @@ public final class BaseYangTypes {
         }
 
         @Override
-        public Type javaTypeForSchemaDefinitionType(TypeDefinition<?> type, SchemaNode parentNode,
-                Restrictions restrictions) {
+        public Type javaTypeForSchemaDefinitionType(final TypeDefinition<?> type, final SchemaNode parentNode,
+                final Restrictions restrictions) {
             String typeName = type.getQName().getLocalName();
             switch (typeName) {
             case "binary":
-                return Types.primitiveType("byte[]", restrictions);
+                return restrictions == null ? Types.BYTE_ARRAY : Types.primitiveType("byte[]", restrictions);
             case "decimal64":
                 return Types.typeForClass(BigDecimal.class, restrictions);
             case "enumeration":
@@ -204,17 +204,17 @@ public final class BaseYangTypes {
         }
 
         @Override
-        public String getTypeDefaultConstruction(LeafSchemaNode node) {
+        public String getTypeDefaultConstruction(final LeafSchemaNode node) {
             return null;
         }
 
         @Override
-        public String getConstructorPropertyName(SchemaNode node) {
+        public String getConstructorPropertyName(final SchemaNode node) {
             return null;
         }
 
         @Override
-        public String getParamNameFromType(TypeDefinition<?> type) {
+        public String getParamNameFromType(final TypeDefinition<?> type) {
             return "_" + BindingGeneratorUtil.parseToValidParamName(type.getQName().getLocalName());
         }
     };

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 8f57b987ea868a4da017067a6cb6e3e5a2394b19..dd3038baca608d4e9489fcde2a59509d6ad9b0a1 100644 (file)
--- 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
@@ -13,7 +13,6 @@ import static org.opendaylight.yangtools.binding.generator.util.BindingGenerator
 import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.findDataSchemaNode;
 import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.findDataSchemaNodeForRelativeXPath;
 import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.findParentModule;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Sets;
 import com.google.common.io.BaseEncoding;
@@ -220,7 +219,7 @@ public final class TypeProviderImpl implements TypeProvider {
         return returnType;
     }
 
-    private GeneratedTransferObject shadedTOWithRestrictions(GeneratedTransferObject gto, Restrictions r) {
+    private GeneratedTransferObject shadedTOWithRestrictions(final GeneratedTransferObject gto, final Restrictions r) {
         GeneratedTOBuilder gtob = new GeneratedTOBuilderImpl(gto.getPackageName(), gto.getName());
         GeneratedTransferObject parent = gto.getSuperType();
         if (parent != null) {
@@ -805,7 +804,7 @@ public final class TypeProviderImpl implements TypeProvider {
         }
 
         final GeneratedPropertyBuilder genPropBuilder = resultTOBuilder.addProperty("value");
-        genPropBuilder.setReturnType(Types.primitiveType("char[]", null));
+        genPropBuilder.setReturnType(Types.CHAR_ARRAY);
         resultTOBuilder.addEqualsIdentity(genPropBuilder);
         resultTOBuilder.addHashIdentity(genPropBuilder);
         resultTOBuilder.addToStringProperty(genPropBuilder);

diff --git a/code-generator/maven-sal-api-gen-plugin/pom.xml b/code-generator/maven-sal-api-gen-plugin/pom.xml
index f8ccd295a21b245bc927a267b9821857177939cf..ec862465669992981b907c253a7a25a1b664ca06 100644 (file)
--- a/code-generator/maven-sal-api-gen-plugin/pom.xml
+++ b/code-generator/maven-sal-api-gen-plugin/pom.xml
@@ -53,6 +53,13 @@
             <artifactId>plexus-slf4j-logging</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.sonatype.sisu</groupId>
+            <artifactId>sisu-guava</artifactId>
+            <version>0.11.1</version>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>