From a018ee2797110cbbd47516bf5dffd93d2532532e Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 11 Dec 2020 03:10:02 +0100
Subject: [PATCH] Cleanup DataObjectCodecContext

We have an unneeded if/else here, merge it together for better
expresiveness. Also clean up comments a bit and log exceptions
encountered.

Change-Id: Ie8e1eca4b2019906fe653f07659aafd85bd88c3d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../dom/codec/impl/DataObjectCodecContext.java   | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java
index 6277a058e9..3c771227b4 100644
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java
@@ -279,16 +279,15 @@ public abstract class DataObjectCodecContext<D extends DataObject, T extends Dat
         try {
             sameName = getSchema().getDataChildByName(origDef.getQName());
         } catch (final IllegalArgumentException e) {
+            LOG.trace("Failed to find schema for {}", origDef, e);
             sameName = null;
         }
         final DataSchemaNode childSchema;
         if (sameName != null) {
-            // Exactly same schema node
-            if (origDef.equals(sameName)) {
-                childSchema = sameName;
-                // We check if instantiated node was added via uses
-                // statement and is instantiation of same grouping
-            } else if (origDef.equals(SchemaNodeUtils.getRootOriginalIfPossible(sameName))) {
+            // Check if it is:
+            // - exactly same schema node, or
+            // - instantiated node was added via uses statement and is instantiation of same grouping
+            if (origDef.equals(sameName) || origDef.equals(SchemaNodeUtils.getRootOriginalIfPossible(sameName))) {
                 childSchema = sameName;
             } else {
                 // Node has same name, but clearly is different
@@ -298,8 +297,7 @@ public abstract class DataObjectCodecContext<D extends DataObject, T extends Dat
             // We are looking for instantiation via uses in other module
             final QName instantiedName = origDef.getQName().bindTo(namespace());
             final DataSchemaNode potential = getSchema().getDataChildByName(instantiedName);
-            // We check if it is really instantiated from same
-            // definition as class was derived
+            // We check if it is really instantiated from same definition as class was derived
             if (potential != null && origDef.equals(SchemaNodeUtils.getRootOriginalIfPossible(potential))) {
                 childSchema = potential;
             } else {
@@ -386,7 +384,7 @@ public abstract class DataObjectCodecContext<D extends DataObject, T extends Dat
         try {
             loaded = ctx.loadClass(DefaultType.of(cls));
         } catch (ClassNotFoundException e) {
-            LOG.debug("Proposed {} cannot be loaded in {}", cls, ctx);
+            LOG.debug("Proposed {} cannot be loaded in {}", cls, ctx, e);
             return false;
         }
         return cls.equals(loaded);
-- 
2.36.6