Ignore empty augmentations at runtime

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

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LeafNodeCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LeafNodeCodecContext.java
index 3b1890819c2a86a8858996adc0e6c4da5dab6d7c..573b476b12efcb58c0aedbaa9ab4b0e1be520a61 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LeafNodeCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/LeafNodeCodecContext.java
@@ -10,20 +10,19 @@ package org.opendaylight.mdsal.binding.dom.codec.impl;
 import static java.util.Objects.requireNonNull;
 
 import java.util.Optional;
-import java.util.Set;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingTypeObjectCodecTreeNode;
-import org.opendaylight.yangtools.concepts.Codec;
+import org.opendaylight.yangtools.concepts.IllegalArgumentCodec;
 import org.opendaylight.yangtools.yang.binding.TypeObject;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwareCodec;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.ModuleImport;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition;
 
@@ -32,8 +31,8 @@ class LeafNodeCodecContext extends ValueNodeCodecContext.WithCodec {
             implements BindingTypeObjectCodecTreeNode<T> {
         private final @NonNull Class<T> bindingClass;
 
-        OfTypeObject(final LeafSchemaNode schema, final Codec<Object, Object> codec, final String getterName,
-                final SchemaContext schemaContext, final Class<T> bindingClass) {
+        OfTypeObject(final LeafSchemaNode schema, final IllegalArgumentCodec<Object, Object> codec,
+                final String getterName, final EffectiveModelContext schemaContext, final Class<T> bindingClass) {
             super(schema, codec, getterName, schemaContext);
             this.bindingClass = requireNonNull(bindingClass);
         }
@@ -44,35 +43,36 @@ class LeafNodeCodecContext extends ValueNodeCodecContext.WithCodec {
         }
 
         @Override
-        public T deserialize(final NormalizedNode<?, ?> data) {
+        public T deserialize(final NormalizedNode data) {
             return bindingClass.cast(deserializeObject(data));
         }
 
         @Override
-        public NormalizedNode<?, ?> serialize(final T data) {
+        public NormalizedNode serialize(final T data) {
             return ImmutableNodes.leafNode(getDomPathArgument(), getValueCodec().serialize(data));
         }
     }
 
-    LeafNodeCodecContext(final LeafSchemaNode schema, final Codec<Object, Object> codec,
-            final String getterName, final SchemaContext schemaContext) {
+    LeafNodeCodecContext(final LeafSchemaNode schema, final IllegalArgumentCodec<Object, Object> codec,
+            final String getterName, final EffectiveModelContext schemaContext) {
         super(schema, codec, getterName, createDefaultObject(schema, codec, schemaContext));
     }
 
-    static LeafNodeCodecContext of(final LeafSchemaNode schema, final Codec<Object, Object> codec,
-            final String getterName, final Class<?> valueType, final SchemaContext schemaContext) {
+    static LeafNodeCodecContext of(final LeafSchemaNode schema, final IllegalArgumentCodec<Object, Object> codec,
+            final String getterName, final Class<?> valueType, final EffectiveModelContext schemaContext) {
         return TypeObject.class.isAssignableFrom(valueType)
                 ? new OfTypeObject<>(schema, codec, getterName, schemaContext, valueType.asSubclass(TypeObject.class))
                         : new LeafNodeCodecContext(schema, codec, getterName, schemaContext);
     }
 
     @Override
-    protected Object deserializeObject(final NormalizedNode<?, ?> normalizedNode) {
-        return normalizedNode != null ? getValueCodec().deserialize(normalizedNode.getValue()) : null;
+    protected Object deserializeObject(final NormalizedNode normalizedNode) {
+        return normalizedNode != null ? getValueCodec().deserialize(normalizedNode.body()) : null;
     }
 
-    private static Object createDefaultObject(final LeafSchemaNode schema, final Codec<Object, Object> codec,
-                                              final SchemaContext schemaContext) {
+    private static Object createDefaultObject(final LeafSchemaNode schema,
+                                              final IllegalArgumentCodec<Object, Object> codec,
+                                              final EffectiveModelContext schemaContext) {
         Optional<? extends Object> defaultValue = schema.getType().getDefaultValue();
         TypeDefinition<?> type = schema.getType();
         if (defaultValue.isPresent()) {
@@ -96,8 +96,9 @@ class LeafNodeCodecContext extends ValueNodeCodecContext.WithCodec {
         return null;
     }
 
-    private static Object qnameDomValueFromString(final Codec<Object, Object> codec, final DataSchemaNode schema,
-                                                  final String defaultValue, final SchemaContext schemaContext) {
+    private static Object qnameDomValueFromString(final IllegalArgumentCodec<Object, Object> codec,
+                                                  final DataSchemaNode schema, final String defaultValue,
+                                                  final EffectiveModelContext schemaContext) {
         int prefixEndIndex = defaultValue.indexOf(':');
         QName qname;
         if (prefixEndIndex != -1) {
@@ -109,8 +110,7 @@ class LeafNodeCodecContext extends ValueNodeCodecContext.WithCodec {
                 return codec.deserialize(qname);
             }
 
-            Set<ModuleImport> imports = module.getImports();
-            for (ModuleImport moduleImport : imports) {
+            for (ModuleImport moduleImport : module.getImports()) {
                 if (moduleImport.getPrefix().equals(defaultValuePrefix)) {
                     Module importedModule = schemaContext.findModule(moduleImport.getModuleName(),
                         moduleImport.getRevision()).get();
@@ -125,8 +125,8 @@ class LeafNodeCodecContext extends ValueNodeCodecContext.WithCodec {
         return codec.deserialize(qname);
     }
 
-    private static Object domValueFromString(final Codec<Object, Object> codec, final TypeDefinition<?> type,
-            final Object defaultValue) {
+    private static Object domValueFromString(final IllegalArgumentCodec<Object, Object> codec,
+            final TypeDefinition<?> type, final Object defaultValue) {
         TypeDefinitionAwareCodec<?, ?> typeDefAwareCodec = TypeDefinitionAwareCodec.from(type);
         if (typeDefAwareCodec != null) {
             Object castedDefaultValue = typeDefAwareCodec.deserialize((String) defaultValue);