From b360de75e327e8a416b33b7113ea2bed350f8dce Mon Sep 17 00:00:00 2001
From: Robert Varga <rovarga@cisco.com>
Date: Tue, 14 Mar 2017 20:45:19 +0100
Subject: [PATCH] BUG-7759: return deserialized type

Union codec should not be returning the string representation,
but rather the proper deserialized type.

Change-Id: I4c452ecd59ee72b9b69ead39c3c36868bcd74444
Signed-off-by: Robert Varga <rovarga@cisco.com>
---
 .../yang/data/impl/codec/UnionStringCodec.java         |  3 +--
 .../yang/data/impl/codecs/UnionCodecStringTest.java    | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionStringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionStringCodec.java
index 5dea5939e7..1ec5ba5c25 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionStringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionStringCodec.java
@@ -55,8 +55,7 @@ final class UnionStringCodec extends TypeDefinitionAwareCodec<Object, UnionTypeD
             }
 
             try {
-                typeAwareCodec.deserialize(stringRepresentation);
-                return stringRepresentation;
+                return typeAwareCodec.deserialize(stringRepresentation);
             } catch (final Exception e) {
                 LOG.debug("Value {} did not matched representation for {}",stringRepresentation,type,e);
                 // invalid - try the next union type.
diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/UnionCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/UnionCodecStringTest.java
index 3819cf03ad..e210b6acb6 100644
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/UnionCodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/UnionCodecStringTest.java
@@ -48,7 +48,7 @@ public class UnionCodecStringTest {
         assertEquals("serialize", "123", codec.serialize("123"));
         assertEquals("serialize", "123", codec.serialize(123));
         assertEquals("serialize", "", codec.serialize(null));
-        assertEquals("serialize", "", codec.serialize("" ));
+        assertEquals("serialize", "", codec.serialize(""));
     }
 
     @SuppressWarnings("unchecked")
@@ -59,10 +59,10 @@ public class UnionCodecStringTest {
                 UnionCodec.class);
 
         assertEquals("deserialize", "enum1", codec.deserialize("enum1"));
-        assertEquals("deserialize", "123", codec.deserialize("123"));
-        assertEquals("deserialize", "-123", codec.deserialize("-123"));
-        assertEquals("deserialize", "41234567890", codec.deserialize("41234567890"));
-        assertEquals("deserialize", "", codec.deserialize(""));
+        assertEquals("deserialize", 123, codec.deserialize("123"));
+        assertEquals("deserialize", -123, codec.deserialize("-123"));
+        assertEquals("deserialize", 41234567890L, codec.deserialize("41234567890"));
+        assertEquals("deserialize", null, codec.deserialize(""));
         assertEquals("deserialize", null, codec.deserialize(null));
 
         deserializeWithExpectedIllegalArgEx(codec, "enum3");
-- 
2.36.6