Bug 309 : Fixed incorrect serialization of instance identifier

with augmented cases.

Added explicit search if child node is augmentation node added
via case.

Fixed serialization of data from grouping used inside augmentation.

Change-Id: I579a7ce46043379657b57135bf8a36601b3f747a
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/InstanceIdentifierCodecImpl.xtend b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/InstanceIdentifierCodecImpl.xtend
index fb85a6312a0db400a542cda484b86cff8ba346a3..7e95b4497115ad221174d6ad5a4d34a169167b49 100644 (file)
--- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/InstanceIdentifierCodecImpl.xtend
+++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/InstanceIdentifierCodecImpl.xtend
@@ -101,7 +101,6 @@ class InstanceIdentifierCodecImpl implements InstanceIdentifierCodec {
         for(baArg : pathArgs) {
 
             if(!Augmentation.isAssignableFrom(baArg.type)) {
-
                 val biArg = serializePathArgument(baArg,previousQName);
                 previousQName = biArg.nodeType;
                 components.add(biArg);
@@ -133,7 +132,7 @@ class InstanceIdentifierCodecImpl implements InstanceIdentifierCodec {
     private def dispatch PathArgument serializePathArgument(Item argument, QName previousQname) {
         val type = argument.type;
         val qname = BindingReflections.findQName(type);
-        if(previousQname == null) {
+        if(previousQname == null || (BindingReflections.isAugmentationChild(argument.type))) {
             return new NodeIdentifier(qname);
         }
         return new NodeIdentifier(QName.create(previousQname,qname.localName));
@@ -144,7 +143,10 @@ class InstanceIdentifierCodecImpl implements InstanceIdentifierCodec {
         val Map<QName,Object> predicates = new HashMap();
         val type = argument.type;
         val keyCodec = codecRegistry.getIdentifierCodecForIdentifiable(type);
-        val qname = BindingReflections.findQName(type);
+        var QName qname = BindingReflections.findQName(type);
+        if(previousQname != null && !(BindingReflections.isAugmentationChild(argument.type))) {
+            qname = QName.create(previousQname,qname.localName);
+        }
         val combinedInput =  new ValueWithQName(previousQname,argument.key)
         val compositeOutput = keyCodec.serialize(combinedInput as ValueWithQName);
         for(outputValue :compositeOutput.value) {
@@ -153,6 +155,6 @@ class InstanceIdentifierCodecImpl implements InstanceIdentifierCodec {
         if(previousQname == null) {
             return new NodeIdentifierWithPredicates(qname,predicates);
         }
-        return new NodeIdentifierWithPredicates(QName.create(previousQname,qname.localName),predicates);
+        return new NodeIdentifierWithPredicates(qname,predicates);
     }
 }

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/RuntimeGeneratedMappingServiceImpl.xtend b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/RuntimeGeneratedMappingServiceImpl.xtend
index 2ee19e89c44bfc9ea43b069ff05322fffb090eb9..f14b15eba756d965a496d1f9527f77ea29992e0d 100644 (file)
--- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/RuntimeGeneratedMappingServiceImpl.xtend
+++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/RuntimeGeneratedMappingServiceImpl.xtend
@@ -143,9 +143,9 @@ class RuntimeGeneratedMappingServiceImpl implements BindingIndependentMappingSer
         val key = toDataDom(entry.key)
         var CompositeNode data;
         if(Augmentation.isAssignableFrom(entry.key.targetType)) {
-            data = toCompositeNodeImpl(key,entry.value);
+            data = toCompositeNodeImplAugument(key,entry.value);
         } else {
-          data = toCompositeNodeImpl(entry.value);
+          data = toCompositeNodeImpl(key,entry.value);
         }
         return new SimpleEntry(key, data);
 
@@ -162,9 +162,18 @@ class RuntimeGeneratedMappingServiceImpl implements BindingIndependentMappingSer
         val ret = codec.serialize(new ValueWithQName(null, object));
         return ret as CompositeNode;
     }
+    
+    private def CompositeNode toCompositeNodeImpl(org.opendaylight.yangtools.yang.data.api.InstanceIdentifier identifier,DataObject object) {
+        val last = identifier.path.last;
+        val cls = object.implementedInterface;
+        waitForSchema(cls);
+        val codec = registry.getCodecForDataObject(cls) as DataContainerCodec<DataObject>;
+        val ret = codec.serialize(new ValueWithQName(last.nodeType, object));
+        return ret as CompositeNode;
+    }
 
 
-    private def CompositeNode toCompositeNodeImpl(org.opendaylight.yangtools.yang.data.api.InstanceIdentifier identifier,DataObject object) {
+    private def CompositeNode toCompositeNodeImplAugument(org.opendaylight.yangtools.yang.data.api.InstanceIdentifier identifier,DataObject object) {
 
         //val cls = object.implementedInterface;
         //waitForSchema(cls);

diff --git a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BindingMapping.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BindingMapping.java
index a6bea0f3f9908ca233b52071d662d035c988c9be..f5db26dedaf01b401247799e607cdd4c674d2b9d 100644 (file)
--- a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BindingMapping.java
+++ b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BindingMapping.java
@@ -31,6 +31,7 @@ public final class BindingMapping {
     public static final String RPC_SERVICE_SUFFIX = "Service";
     public static final String NOTIFICATION_LISTENER_SUFFIX = "Listener";
     public static final String QNAME_STATIC_FIELD_NAME = "QNAME";
+    public static final String PACKAGE_PREFIX = "org.opendaylight.yang.gen.v1";
 
     private static final Splitter SPACE_SPLITTER = Splitter.on(" ").omitEmptyStrings().trimResults();
 

diff --git a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/BindingReflections.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/BindingReflections.java
index 0005f270b654c0600848ce4e7d85ba25935669c2..137640203378d67a2a0ce78837ed01fb173c880c 100644 (file)
--- a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/BindingReflections.java
+++ b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/BindingReflections.java
@@ -12,6 +12,10 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.MatchResult;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.opendaylight.yangtools.concepts.util.ClassLoaderUtils;
 import org.opendaylight.yangtools.yang.binding.Augmentable;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
@@ -33,6 +37,8 @@ import com.google.common.cache.LoadingCache;
 public class BindingReflections {
 
     private static final long EXPIRATION_TIME = 60;
+    private static final String ROOT_PACKAGE_PATTERN_STRING = "(org.opendaylight.yang.gen.v1.[a-z0-9\\.]*.rev[0-9][0-9][0-1][0-9][0-3][0-9])";
+    private static final Pattern ROOT_PACKAGE_PATTERN = Pattern.compile(ROOT_PACKAGE_PATTERN_STRING);
 
     private static final LoadingCache<Class<?>, Optional<QName>> classToQName = CacheBuilder.newBuilder() //
             .weakKeys() //
@@ -135,4 +141,30 @@ public class BindingReflections {
     public static QName getQName(Class<? extends BaseIdentity> context) {
         return findQName(context);
     }
+    
+    public static boolean isAugmentationChild(Class<?> clazz) {
+        // FIXME: Current resolver could be still confused when
+        // child node was added by grouping
+        checkArgument(clazz != null);
+        @SuppressWarnings({ "rawtypes", "unchecked" })
+        Class<?> parent = findHierarchicalParent((Class) clazz);
+        String clazzModelPackage = getModelRootPackageName(clazz.getPackage());
+        String parentModelPackage = getModelRootPackageName(parent.getPackage());
+
+        return !clazzModelPackage.equals(parentModelPackage);
+    }
+
+    public static String getModelRootPackageName(Package pkg) {
+        return getModelRootPackageName(pkg.getName());
+    }
+
+    public static String getModelRootPackageName(String name) {
+        checkArgument(name != null, "Package name should not be null.");
+        checkArgument(name.startsWith(BindingMapping.PACKAGE_PREFIX));
+        Matcher match = ROOT_PACKAGE_PATTERN.matcher(name);
+        checkArgument(match.find());
+        String rootPackage = match.group(0);
+        return rootPackage;
+    }
+
 }