Bump upstreams

[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 e628568644d9ba6c3381afba0055315814681528..bb3250c87e31755f475521d9356a0d13c3ff861e 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
@@ -9,33 +9,29 @@ package org.opendaylight.mdsal.binding.dom.codec.impl;
 
 import static java.util.Objects.requireNonNull;
 
-import java.lang.reflect.Method;
-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.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;
 
-class LeafNodeCodecContext extends ValueNodeCodecContext.WithCodec {
+sealed class LeafNodeCodecContext extends ValueNodeCodecContext.WithCodec {
     static final class OfTypeObject<T extends TypeObject> extends LeafNodeCodecContext
             implements BindingTypeObjectCodecTreeNode<T> {
         private final @NonNull Class<T> bindingClass;
 
-        OfTypeObject(final LeafSchemaNode schema, final Codec<Object, Object> codec, final Method getter,
-                final SchemaContext schemaContext, final Class<T> bindingClass) {
-            super(schema, codec, getter, schemaContext);
+        OfTypeObject(final LeafSchemaNode schema, final ValueCodec<Object, Object> codec, final String getterName,
+                final EffectiveModelContext schemaContext, final Class<T> bindingClass) {
+            super(schema, codec, getterName, schemaContext);
             this.bindingClass = requireNonNull(bindingClass);
         }
 
@@ -45,76 +41,77 @@ 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 Method getter, final SchemaContext schemaContext) {
-        super(schema, codec, getter, createDefaultObject(schema, codec, schemaContext));
+    LeafNodeCodecContext(final LeafSchemaNode schema, final ValueCodec<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 Method getter, final Class<?> valueType, final SchemaContext schemaContext) {
+    static LeafNodeCodecContext of(final LeafSchemaNode schema, final ValueCodec<Object, Object> codec,
+            final String getterName, final Class<?> valueType, final EffectiveModelContext schemaContext) {
         return TypeObject.class.isAssignableFrom(valueType)
-                ? new OfTypeObject<>(schema, codec, getter, schemaContext, valueType.asSubclass(TypeObject.class))
-                        : new LeafNodeCodecContext(schema, codec, getter, schemaContext);
+                ? 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) {
-        Optional<? extends Object> defaultValue = schema.getType().getDefaultValue();
+    private static Object createDefaultObject(final LeafSchemaNode schema, final ValueCodec<Object, Object> codec,
+            final EffectiveModelContext schemaContext) {
+        var optDefaultValue = schema.getType().getDefaultValue();
         TypeDefinition<?> type = schema.getType();
-        if (defaultValue.isPresent()) {
+        if (optDefaultValue.isPresent()) {
+            final var defaultValue = optDefaultValue.orElseThrow();
             if (type instanceof IdentityrefTypeDefinition) {
-                return qnameDomValueFromString(codec, schema, (String) defaultValue.get(), schemaContext);
+                return qnameDomValueFromString(codec, schema, (String) defaultValue, schemaContext);
             }
-            return domValueFromString(codec, type, defaultValue.get());
+            return domValueFromString(codec, type, defaultValue);
         }
 
-        while (type.getBaseType() != null && !type.getDefaultValue().isPresent()) {
+        while (type.getBaseType() != null && type.getDefaultValue().isEmpty()) {
             type = type.getBaseType();
         }
 
-        defaultValue = type.getDefaultValue();
-        if (defaultValue.isPresent()) {
+        optDefaultValue = type.getDefaultValue();
+        if (optDefaultValue.isPresent()) {
+            final var defaultValue = optDefaultValue.orElseThrow();
             if (type instanceof IdentityrefTypeDefinition) {
-                return qnameDomValueFromString(codec, schema, (String) defaultValue.get(), schemaContext);
+                return qnameDomValueFromString(codec, schema, (String) defaultValue, schemaContext);
             }
             return domValueFromString(codec, type, defaultValue);
         }
         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 ValueCodec<Object, Object> codec, final DataSchemaNode schema,
+            final String defaultValue, final EffectiveModelContext schemaContext) {
         int prefixEndIndex = defaultValue.indexOf(':');
         QName qname;
         if (prefixEndIndex != -1) {
             String defaultValuePrefix = defaultValue.substring(0, prefixEndIndex);
 
-            Module module = schemaContext.findModule(schema.getQName().getModule()).get();
+            Module module = schemaContext.findModule(schema.getQName().getModule()).orElseThrow();
             if (module.getPrefix().equals(defaultValuePrefix)) {
                 qname = QName.create(module.getQNameModule(), defaultValue.substring(prefixEndIndex + 1));
                 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();
+                    Module importedModule = schemaContext.findModule(moduleImport.getModuleName().getLocalName(),
+                        moduleImport.getRevision()).orElseThrow();
                     qname = QName.create(importedModule.getQNameModule(), defaultValue.substring(prefixEndIndex + 1));
                     return codec.deserialize(qname);
                 }
@@ -126,7 +123,7 @@ class LeafNodeCodecContext extends ValueNodeCodecContext.WithCodec {
         return codec.deserialize(qname);
     }
 
-    private static Object domValueFromString(final Codec<Object, Object> codec, final TypeDefinition<?> type,
+    private static Object domValueFromString(final ValueCodec<Object, Object> codec, final TypeDefinition<?> type,
             final Object defaultValue) {
         TypeDefinitionAwareCodec<?, ?> typeDefAwareCodec = TypeDefinitionAwareCodec.from(type);
         if (typeDefAwareCodec != null) {