EncapsulatedValueCodec does not use TypeDefinition

The class does not use the definition at all, hence we can neatly
switch to using a LoadingCache, making things a lot clearer.

JIRA: MDSAL-704
Change-Id: I6563e7f97c168fc9a06bcddc0668060104ea0f0a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/EncapsulatedValueCodec.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/EncapsulatedValueCodec.java
index 4bc09db2cc7e8d5d8eff5b3e0b7a5cfbd9560cd1..2613416a5235befee75b617492e7a7e5bc33e6bd 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/EncapsulatedValueCodec.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/EncapsulatedValueCodec.java
@@ -10,8 +10,9 @@ package org.opendaylight.mdsal.binding.dom.codec.impl;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.Throwables;
-import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodHandles.Lookup;
@@ -20,13 +21,14 @@ import java.lang.reflect.Method;
 import java.util.concurrent.ExecutionException;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.spec.naming.BindingMapping;
-import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 /**
  * Derived YANG types are just immutable value holders for simple value
  * types, which are same as in NormalizedNode model.
  */
 final class EncapsulatedValueCodec extends ReflectionBasedCodec implements SchemaUnawareCodec {
+    private static final MethodType OBJ_METHOD = MethodType.methodType(Object.class, Object.class);
+
     /*
      * Use identity comparison for keys and allow classes to be GCd themselves.
      *
@@ -37,9 +39,19 @@ final class EncapsulatedValueCodec extends ReflectionBasedCodec implements Schem
      *     "Virtual machine implementations are, however, encouraged to bias against clearing recently-created or
      *      recently-used soft references."
      */
-    private static final Cache<Class<?>, EncapsulatedValueCodec> CACHE = CacheBuilder.newBuilder().weakKeys()
-        .softValues().build();
-    private static final MethodType OBJ_METHOD = MethodType.methodType(Object.class, Object.class);
+    private static final LoadingCache<Class<?>, EncapsulatedValueCodec> CACHE = CacheBuilder.newBuilder().weakKeys()
+        .softValues().build(new CacheLoader<>() {
+            @Override
+            public EncapsulatedValueCodec load(final Class<?> key) throws ReflectiveOperationException {
+                final Method m = key.getMethod(BindingMapping.SCALAR_TYPE_OBJECT_GET_VALUE_NAME);
+                final Lookup lookup = MethodHandles.publicLookup();
+                final MethodHandle getter = lookup.unreflect(m).asType(OBJ_METHOD);
+                final Class<?> valueType = m.getReturnType();
+                final MethodHandle constructor = lookup.findConstructor(key,
+                    MethodType.methodType(void.class, valueType)).asType(OBJ_METHOD);
+                return new EncapsulatedValueCodec(key, constructor, getter, valueType);
+            }
+        });
 
     private final MethodHandle constructor;
     private final MethodHandle getter;
@@ -53,17 +65,8 @@ final class EncapsulatedValueCodec extends ReflectionBasedCodec implements Schem
         this.valueType = requireNonNull(valueType);
     }
 
-    static @NonNull EncapsulatedValueCodec of(final Class<?> typeClz, final TypeDefinition<?> typeDef)
-            throws ExecutionException {
-        return CACHE.get(typeClz, () -> {
-            final Method m = typeClz.getMethod(BindingMapping.SCALAR_TYPE_OBJECT_GET_VALUE_NAME);
-            final Lookup lookup = MethodHandles.publicLookup();
-            final MethodHandle getter = lookup.unreflect(m).asType(OBJ_METHOD);
-            final Class<?> valueType = m.getReturnType();
-            final MethodHandle constructor = lookup.findConstructor(typeClz,
-                MethodType.methodType(void.class, valueType)).asType(OBJ_METHOD);
-            return new EncapsulatedValueCodec(typeClz, constructor, getter, valueType);
-        });
+    static @NonNull EncapsulatedValueCodec of(final Class<?> typeClz) throws ExecutionException {
+        return CACHE.get(typeClz);
     }
 
     /**

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/SchemaUnawareCodec.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/SchemaUnawareCodec.java
index e5f54760e05e50da11d87e75e27d6f1f69de6c7a..892f80cecb1fbadd01303d9ad23b7a0598ac622a 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/SchemaUnawareCodec.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/SchemaUnawareCodec.java
@@ -65,7 +65,7 @@ interface SchemaUnawareCodec extends IllegalArgumentCodec<Object, Object> {
             } else if (rootType instanceof BitsTypeDefinition) {
                 return BitsCodec.of(typeClz, (BitsTypeDefinition) rootType);
             } else {
-                return EncapsulatedValueCodec.of(typeClz, def);
+                return EncapsulatedValueCodec.of(typeClz);
             }
         } catch (ExecutionException e) {
             throw new IllegalStateException(e);