X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-dom-codec%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fdom%2Fcodec%2Fimpl%2FEncapsulatedValueCodec.java;h=3fce3a705273c93e5d4a90e2c5ba9c9d8a2542bc;hb=c225c8c12a35e89168c18d99e48226c141cb8cbc;hp=4bc09db2cc7e8d5d8eff5b3e0b7a5cfbd9560cd1;hpb=c4d4ec8b44becb12d2ea0c2a2be8f24994c2b58d;p=mdsal.git

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 4bc09db2cc..3fce3a7052 100644
--- 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 {
+final class EncapsulatedValueCodec extends 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,33 +39,34 @@ 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(constructor, getter, valueType);
+            }
+        });
 
     private final MethodHandle constructor;
     private final MethodHandle getter;
     private final Class<?> valueType;
 
-    private EncapsulatedValueCodec(final Class<?> typeClz, final MethodHandle constructor, final MethodHandle getter,
+    private EncapsulatedValueCodec(final MethodHandle constructor, final MethodHandle getter,
             final Class<?> valueType) {
-        super(typeClz);
         this.constructor = requireNonNull(constructor);
         this.getter = requireNonNull(getter);
         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 {
+        // FIXME: require base class to be ScalarTypeObject
+        return CACHE.get(typeClz);
     }
 
     /**
@@ -78,7 +81,7 @@ final class EncapsulatedValueCodec extends ReflectionBasedCodec implements Schem
 
     @Override
     @SuppressWarnings("checkstyle:illegalCatch")
-    public Object deserialize(final Object input) {
+    protected Object deserializeImpl(final Object input) {
         try {
             return constructor.invokeExact(input);
         } catch (Throwable e) {
@@ -89,7 +92,7 @@ final class EncapsulatedValueCodec extends ReflectionBasedCodec implements Schem
 
     @Override
     @SuppressWarnings("checkstyle:illegalCatch")
-    public Object serialize(final Object input) {
+    protected Object serializeImpl(final Object input) {
         try {
             return getter.invokeExact(input);
         } catch (Throwable e) {