Rework BindingRuntimeTypes

[mdsal.git] / binding / mdsal-binding-dom-codec / src / main / java / org / opendaylight / mdsal / binding / dom / codec / impl / UnionTypeCodec.java

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/UnionTypeCodec.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/UnionTypeCodec.java
index 778104fb68d970705884a050c8044bbaf0431e09..41710c97c77a304a5bb34a02c57b981ed5ec0b55 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/UnionTypeCodec.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/UnionTypeCodec.java
@@ -17,7 +17,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.Callable;
 import org.opendaylight.mdsal.binding.model.api.GeneratedTransferObject;
-import org.opendaylight.mdsal.binding.model.api.GeneratedType;
+import org.opendaylight.mdsal.binding.model.api.Type;
 import org.opendaylight.mdsal.binding.runtime.api.RuntimeGeneratedUnion;
 import org.opendaylight.mdsal.binding.spec.naming.BindingMapping;
 import org.opendaylight.yangtools.concepts.IllegalArgumentCodec;
@@ -36,7 +36,7 @@ final class UnionTypeCodec extends ReflectionBasedCodec {
             final BindingCodecContext codecContext) {
         return () -> {
             final List<String> unionProperties = extractUnionProperties(codecContext.getRuntimeContext()
-                .getTypeWithSchema(unionCls).getKey());
+                .getTypeWithSchema(unionCls).javaType());
             final List<TypeDefinition<?>> unionTypes = unionType.getTypes();
             verify(unionTypes.size() == unionProperties.size(), "Mismatched union types %s and properties %s",
                 unionTypes, unionProperties);
@@ -56,7 +56,7 @@ final class UnionTypeCodec extends ReflectionBasedCodec {
         };
     }
 
-    private static List<String> extractUnionProperties(final GeneratedType type) {
+    private static List<String> extractUnionProperties(final Type type) {
         verify(type instanceof GeneratedTransferObject, "Unexpected runtime type %s", type);
 
         GeneratedTransferObject gto = (GeneratedTransferObject) type;