Ignore empty augmentations at runtime

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

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java
index e32aa88c80d9ddd769e31f37723fb324e1e11b0c..dc0566be9e580609dc2cf15dd7ec1e8ee1b3ad7d 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java
@@ -20,8 +20,6 @@ import java.util.Optional;
 import java.util.Set;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.binding.runtime.api.BindingRuntimeContext;
-import org.opendaylight.binding.runtime.api.ClassLoadingStrategy;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingDataObjectCodecTreeNode;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeCachingCodec;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingStreamEventWriter;
@@ -29,6 +27,10 @@ import org.opendaylight.mdsal.binding.dom.codec.api.IncorrectNestingException;
 import org.opendaylight.mdsal.binding.dom.codec.api.MissingClassInLoadingStrategyException;
 import org.opendaylight.mdsal.binding.dom.codec.api.MissingSchemaException;
 import org.opendaylight.mdsal.binding.dom.codec.api.MissingSchemaForClassException;
+import org.opendaylight.mdsal.binding.model.api.Type;
+import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext;
+import org.opendaylight.mdsal.binding.runtime.api.CompositeRuntimeType;
+import org.opendaylight.mdsal.binding.runtime.api.RuntimeTypeContainer;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
 import org.opendaylight.yangtools.yang.binding.BindingObject;
 import org.opendaylight.yangtools.yang.binding.DataObject;
@@ -41,9 +43,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
-import org.opendaylight.yangtools.yang.model.api.DocumentedNode.WithStatus;
 
-abstract class DataContainerCodecContext<D extends DataObject, T extends WithStatus> extends NodeCodecContext
+abstract class DataContainerCodecContext<D extends DataObject, T extends RuntimeTypeContainer> extends NodeCodecContext
         implements BindingDataObjectCodecTreeNode<D>  {
     private static final VarHandle EVENT_STREAM_SERIALIZER;
 
@@ -66,9 +67,8 @@ abstract class DataContainerCodecContext<D extends DataObject, T extends WithSta
         this.prototype = requireNonNull(prototype);
     }
 
-    @Override
-    public final T getSchema() {
-        return prototype.getSchema();
+    public final @NonNull T getType() {
+        return prototype.getType();
     }
 
     @Override
@@ -162,7 +162,7 @@ abstract class DataContainerCodecContext<D extends DataObject, T extends WithSta
         return new CachingNormalizedNodeCodec<>(this, ImmutableSet.copyOf(cacheSpecifier));
     }
 
-    BindingStreamEventWriter createWriter(final NormalizedNodeStreamWriter domWriter) {
+    @NonNull BindingStreamEventWriter createWriter(final NormalizedNodeStreamWriter domWriter) {
         return BindingToNormalizedStreamWriter.create(this, domWriter);
     }
 
@@ -192,7 +192,7 @@ abstract class DataContainerCodecContext<D extends DataObject, T extends WithSta
 
     private IllegalArgumentException childNullException(final QName child, final String message, final Object... args) {
         final QNameModule module = child.getModule();
-        if (!factory().getRuntimeContext().getSchemaContext().findModule(module).isPresent()) {
+        if (!factory().getRuntimeContext().getEffectiveModelContext().findModule(module).isPresent()) {
             throw new MissingSchemaException("Module " + module + " is not present in current schema context.");
         }
         throw IncorrectNestingException.create(message, args);
@@ -201,9 +201,9 @@ abstract class DataContainerCodecContext<D extends DataObject, T extends WithSta
     private IllegalArgumentException childNullException(final Class<?> childClass, final String message,
             final Object... args) {
         final BindingRuntimeContext runtimeContext = factory().getRuntimeContext();
-        final WithStatus schema;
+        final CompositeRuntimeType schema;
         if (Augmentation.class.isAssignableFrom(childClass)) {
-            schema = runtimeContext.getAugmentationDefinition(childClass);
+            schema = runtimeContext.getAugmentationDefinition(childClass.asSubclass(Augmentation.class));
         } else {
             schema = runtimeContext.getSchemaDefinition(childClass);
         }
@@ -211,12 +211,11 @@ abstract class DataContainerCodecContext<D extends DataObject, T extends WithSta
             throw new MissingSchemaForClassException(childClass);
         }
 
-        final ClassLoadingStrategy strategy = runtimeContext.getStrategy();
         try {
-            strategy.loadClass(childClass.getName());
+            runtimeContext.loadClass(Type.of(childClass));
         } catch (final ClassNotFoundException e) {
             throw new MissingClassInLoadingStrategyException(
-                "User supplied class " + childClass.getName() + " is not available in " + strategy, e);
+                "User supplied class " + childClass.getName() + " is not available in " + runtimeContext, e);
         }
 
         throw IncorrectNestingException.create(message, args);
@@ -244,7 +243,7 @@ abstract class DataContainerCodecContext<D extends DataObject, T extends WithSta
     }
 
     @Override
-    public NormalizedNode<?, ?> serialize(final D data) {
+    public NormalizedNode serialize(final D data) {
         final NormalizedNodeResult result = new NormalizedNodeResult();
         // We create DOM stream writer which produces normalized nodes
         final NormalizedNodeStreamWriter domWriter = ImmutableNormalizedNodeStreamWriter.from(result);