Separate out DataContainerPrototype

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

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerAnalysis.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerAnalysis.java
index f6cf8b627615c1b475c0b36f28d79ce13621fa12..cbb3a974196eb3e9289d3ab719c19eb36dfb7a1c 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerAnalysis.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerAnalysis.java
@@ -52,7 +52,7 @@ final class DataContainerAnalysis<R extends CompositeRuntimeType> {
     final @NonNull ImmutableMap<Class<?>, PropertyInfo> daoProperties;
 
     DataContainerAnalysis(final CommonDataObjectCodecPrototype<R> prototype, final CodecItemFactory itemFactory) {
-        this(prototype.getBindingClass(), prototype.getType(), prototype.getFactory(), itemFactory);
+        this(prototype.javaClass(), prototype.runtimeType(), prototype.contextFactory(), itemFactory);
     }
 
     DataContainerAnalysis(final Class<?> bindingClass, final R runtimeType, final CodecContextFactory factory,
@@ -90,12 +90,12 @@ final class DataContainerAnalysis<R extends CompositeRuntimeType> {
             daoPropertiesBuilder.put(retClass, new PropertyInfo.Getter(method));
 
             final var childProto = getChildPrototype(runtimeType, factory, itemFactory, retClass);
-            byStreamClassBuilder.put(childProto.getBindingClass(), childProto);
+            byStreamClassBuilder.put(childProto.javaClass(), childProto);
             byYangBuilder.put(childProto.getYangArg(), childProto);
 
             // FIXME: It really feels like we should be specializing DataContainerCodecPrototype so as to ditch
             //        createInstance() and then we could do an instanceof check instead.
-            if (childProto.getType() instanceof ChoiceRuntimeType) {
+            if (childProto.runtimeType() instanceof ChoiceRuntimeType) {
                 final var choice = (ChoiceCodecContext<?>) childProto.getCodecContext();
                 for (var cazeChild : choice.getCaseChildrenClasses()) {
                     byBindingArgClassBuilder.put(cazeChild, childProto);