Bug 3151: Fix Not a Proxy Instance Exception

[yangtools.git] / code-generator / binding-data-codec / src / main / java / org / opendaylight / yangtools / binding / data / codec / impl / LazyDataObject.java

diff --git a/code-generator/binding-data-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/LazyDataObject.java b/code-generator/binding-data-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/LazyDataObject.java
index 5cfc6f056c63a08d4a9f05c5c4f3fba196c4d6e4..38884816a13c01d049f2edb40e6234eecb083e53 100644 (file)
--- a/code-generator/binding-data-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/LazyDataObject.java
+++ b/code-generator/binding-data-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/LazyDataObject.java
@@ -22,13 +22,14 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.opendaylight.yangtools.binding.data.codec.util.AugmentationReader;
 import org.opendaylight.yangtools.yang.binding.Augmentable;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class LazyDataObject implements InvocationHandler, AugmentationReader {
+class LazyDataObject<D extends DataObject> implements InvocationHandler, AugmentationReader {
 
     private static final Logger LOG = LoggerFactory.getLogger(LazyDataObject.class);
     private static final String GET_IMPLEMENTED_INTERFACE = "getImplementedInterface";
@@ -36,17 +37,18 @@ class LazyDataObject implements InvocationHandler, AugmentationReader {
     private static final String EQUALS = "equals";
     private static final String GET_AUGMENTATION = "getAugmentation";
     private static final String HASHCODE = "hashCode";
+    private static final String AUGMENTATIONS = "augmentations";
     private static final Object NULL_VALUE = new Object();
 
     private final ConcurrentHashMap<Method, Object> cachedData = new ConcurrentHashMap<>();
     private final NormalizedNodeContainer<?, PathArgument, NormalizedNode<?, ?>> data;
-    private final DataObjectCodecContext<?> context;
+    private final DataObjectCodecContext<D,?> context;
 
     private volatile ImmutableMap<Class<? extends Augmentation<?>>, Augmentation<?>> cachedAugmentations = null;
     private volatile Integer cachedHashcode = null;
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    LazyDataObject(final DataObjectCodecContext<?> ctx, final NormalizedNodeContainer data) {
+    LazyDataObject(final DataObjectCodecContext<D,?> ctx, final NormalizedNodeContainer data) {
         this.context = Preconditions.checkNotNull(ctx, "Context must not be null");
         this.data = Preconditions.checkNotNull(data, "Data must not be null");
     }
@@ -56,11 +58,13 @@ class LazyDataObject implements InvocationHandler, AugmentationReader {
         if (method.getParameterTypes().length == 0) {
             final String name = method.getName();
             if (GET_IMPLEMENTED_INTERFACE.equals(name)) {
-                return context.bindingClass();
+                return context.getBindingClass();
             } else if (TO_STRING.equals(name)) {
                 return bindingToString();
             } else if (HASHCODE.equals(name)) {
                 return bindingHashCode();
+            } else if (AUGMENTATIONS.equals(name)) {
+                return getAugmentationsImpl();
             }
             return getBindingData(method);
         } else if (GET_AUGMENTATION.equals(method.getName())) {
@@ -75,7 +79,7 @@ class LazyDataObject implements InvocationHandler, AugmentationReader {
         if (other == null) {
             return false;
         }
-        if (!context.bindingClass().isAssignableFrom(other.getClass())) {
+        if (!context.getBindingClass().isAssignableFrom(other.getClass())) {
             return false;
         }
         try {
@@ -103,10 +107,10 @@ class LazyDataObject implements InvocationHandler, AugmentationReader {
         int result = 1;
         for (final Method m : context.getHashCodeAndEqualsMethods()) {
             final Object value = getBindingData(m);
-            result += prime * result + ((value == null) ? 0 : value.hashCode());
+            result = prime * result + ((value == null) ? 0 : value.hashCode());
         }
-        if (Augmentation.class.isAssignableFrom(context.bindingClass())) {
-            result += prime * result + (getAugmentations(this).hashCode());
+        if (Augmentation.class.isAssignableFrom(context.getBindingClass())) {
+            result = prime * result + (getAugmentations(this).hashCode());
         }
         cachedHashcode = result;
         return result;
@@ -156,23 +160,25 @@ class LazyDataObject implements InvocationHandler, AugmentationReader {
             return aug.get(cls);
         }
         Preconditions.checkNotNull(cls,"Supplied augmentation must not be null.");
-        final Optional<DataContainerCodecContext<?>> augCtx= context.getPossibleStreamChild(cls);
+
+        @SuppressWarnings({"unchecked","rawtypes"})
+        final Optional<DataContainerCodecContext<?,?>> augCtx= context.possibleStreamChild((Class) cls);
         if(augCtx.isPresent()) {
             final Optional<NormalizedNode<?, ?>> augData = data.getChild(augCtx.get().getDomPathArgument());
             if (augData.isPresent()) {
-                return augCtx.get().dataFromNormalizedNode(augData.get());
+                return augCtx.get().deserialize(augData.get());
             }
         }
         return null;
     }
 
     public String bindingToString() {
-        final ToStringHelper helper = MoreObjects.toStringHelper(context.bindingClass()).omitNullValues();
+        final ToStringHelper helper = MoreObjects.toStringHelper(context.getBindingClass()).omitNullValues();
 
         for (final Method m :context.getHashCodeAndEqualsMethods()) {
             helper.add(m.getName(), getBindingData(m));
         }
-        if (Augmentable.class.isAssignableFrom(context.bindingClass())) {
+        if (Augmentable.class.isAssignableFrom(context.getBindingClass())) {
             helper.add("augmentations", getAugmentationsImpl());
         }
         return helper.toString();
@@ -198,7 +204,7 @@ class LazyDataObject implements InvocationHandler, AugmentationReader {
         if (getClass() != obj.getClass()) {
             return false;
         }
-        final LazyDataObject other = (LazyDataObject) obj;
+        final LazyDataObject<?> other = (LazyDataObject<?>) obj;
         if (context == null) {
             if (other.context != null) {
                 return false;