X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-dom-codec%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fdom%2Fcodec%2Fimpl%2FDataObjectCodecContext.java;h=fd1c2eea8bd9ee66a94922fbd777e740d8f4c5d6;hb=8b1e58079a50002c89bf6b5f8cc6f585f23abead;hp=e89391524850c9991406fa73e769dbea6e040610;hpb=3a764b001fa95704ad88446089db45ea4f38abd5;p=mdsal.git diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java index e893915248..fd1c2eea8b 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java @@ -7,97 +7,132 @@ */ package org.opendaylight.mdsal.binding.dom.codec.impl; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Verify.verify; + +import com.google.common.annotations.Beta; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSortedMap; +import com.google.common.collect.ImmutableMap.Builder; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; -import java.lang.reflect.InvocationHandler; +import java.lang.invoke.VarHandle; import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.util.Collection; -import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.SortedMap; -import java.util.TreeMap; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy; +import java.util.Optional; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; +import org.opendaylight.mdsal.binding.dom.codec.api.IncorrectNestingException; import org.opendaylight.mdsal.binding.model.api.Type; +import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext; import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; import org.opendaylight.yangtools.yang.binding.Augmentable; import org.opendaylight.yangtools.yang.binding.Augmentation; -import org.opendaylight.yangtools.yang.binding.AugmentationHolder; +import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.Item; -import org.opendaylight.yangtools.yang.common.QName; +import org.opendaylight.yangtools.yang.binding.OpaqueObject; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode; +import org.opendaylight.yangtools.yang.data.api.schema.DistinctNodeContainer; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.DocumentedNode.WithStatus; -import org.opendaylight.yangtools.yang.model.util.SchemaNodeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -abstract class DataObjectCodecContext +/** + * This class is an implementation detail. It is public only due to technical reasons and may change at any time. + */ +@Beta +public abstract class DataObjectCodecContext extends DataContainerCodecContext { private static final Logger LOG = LoggerFactory.getLogger(DataObjectCodecContext.class); - private static final MethodType CONSTRUCTOR_TYPE = MethodType.methodType(void.class, InvocationHandler.class); - private static final MethodType DATAOBJECT_TYPE = MethodType.methodType(DataObject.class, InvocationHandler.class); - private static final Comparator METHOD_BY_ALPHABET = Comparator.comparing(Method::getName); + private static final MethodType CONSTRUCTOR_TYPE = MethodType.methodType(void.class, + DataObjectCodecContext.class, DistinctNodeContainer.class); + private static final MethodType DATAOBJECT_TYPE = MethodType.methodType(DataObject.class, + DataObjectCodecContext.class, DistinctNodeContainer.class); + private static final VarHandle MISMATCHED_AUGMENTED; + + static { + try { + MISMATCHED_AUGMENTED = MethodHandles.lookup().findVarHandle(DataObjectCodecContext.class, + "mismatchedAugmented", ImmutableMap.class); + } catch (NoSuchFieldException | IllegalAccessException e) { + throw new ExceptionInInitializerError(e); + } + } - private final ImmutableMap> leafChild; + private final ImmutableMap leafChild; private final ImmutableMap byYang; - private final ImmutableSortedMap byMethod; private final ImmutableMap, DataContainerCodecPrototype> byStreamClass; private final ImmutableMap, DataContainerCodecPrototype> byBindingArgClass; - private final ImmutableMap possibleAugmentations; + private final ImmutableMap> augmentationByYang; + private final ImmutableMap, DataContainerCodecPrototype> augmentationByStream; + private final @NonNull Class> generatedClass; private final MethodHandle proxyConstructor; - private final ConcurrentMap> byYangAugmented = - new ConcurrentHashMap<>(); - private final ConcurrentMap, DataContainerCodecPrototype> byStreamAugmented = new ConcurrentHashMap<>(); + // Note this the content of this field depends only of invariants expressed as this class's fields or + // BindingRuntimeContext. It is only accessed via MISMATCHED_AUGMENTED above. + @SuppressWarnings("unused") + private volatile ImmutableMap, DataContainerCodecPrototype> mismatchedAugmented = ImmutableMap.of(); DataObjectCodecContext(final DataContainerCodecPrototype prototype) { + this(prototype, null); + } + + DataObjectCodecContext(final DataContainerCodecPrototype prototype, final Method keyMethod) { super(prototype); - this.leafChild = factory().getLeafNodes(getBindingClass(), getSchema()); + final Class bindingClass = getBindingClass(); - final Map, Method> clsToMethod = BindingReflections.getChildrenClassToMethod(getBindingClass()); + final ImmutableMap tmpLeaves = factory().getLeafNodes(bindingClass, getSchema()); + final Map, Method> clsToMethod = + BindingReflections.getChildrenClassToMethod(bindingClass); final Map byYangBuilder = new HashMap<>(); - final SortedMap byMethodBuilder = new TreeMap<>(METHOD_BY_ALPHABET); final Map, DataContainerCodecPrototype> byStreamClassBuilder = new HashMap<>(); final Map, DataContainerCodecPrototype> byBindingArgClassBuilder = new HashMap<>(); // Adds leaves to mapping - for (final LeafNodeCodecContext leaf : leafChild.values()) { - byMethodBuilder.put(leaf.getGetter(), leaf); + final Builder leafChildBuilder = + ImmutableMap.builderWithExpectedSize(tmpLeaves.size()); + for (final ValueNodeCodecContext leaf : tmpLeaves.values()) { + leafChildBuilder.put(leaf.getSchema().getQName().getLocalName(), leaf); byYangBuilder.put(leaf.getDomPathArgument(), leaf); } + this.leafChild = leafChildBuilder.build(); - for (final Entry, Method> childDataObj : clsToMethod.entrySet()) { - final DataContainerCodecPrototype childProto = loadChildPrototype(childDataObj.getKey()); - byMethodBuilder.put(childDataObj.getValue(), childProto); - byStreamClassBuilder.put(childProto.getBindingClass(), childProto); + final Map> tmpDataObjects = new HashMap<>(); + for (final Entry, Method> childDataObj : clsToMethod.entrySet()) { + final Method method = childDataObj.getValue(); + verify(!method.isDefault(), "Unexpected default method %s in %s", method, bindingClass); + + final Class retClass = childDataObj.getKey(); + if (OpaqueObject.class.isAssignableFrom(retClass)) { + // Filter OpaqueObjects, they are not containers + continue; + } + + final DataContainerCodecPrototype childProto = loadChildPrototype(retClass); + final Class childClass = childProto.getBindingClass(); + tmpDataObjects.put(method, childClass); + byStreamClassBuilder.put(childClass, 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.isChoice()) { final ChoiceNodeCodecContext choice = (ChoiceNodeCodecContext) childProto.get(); for (final Class cazeChild : choice.getCaseChildrenClasses()) { @@ -105,38 +140,53 @@ abstract class DataObjectCodecContext possibleAugmentations; + if (Augmentable.class.isAssignableFrom(bindingClass)) { + possibleAugmentations = factory().getRuntimeContext().getAvailableAugmentationTypes(getSchema()); + generatedClass = CodecDataObjectGenerator.generateAugmentable(prototype.getFactory().getLoader(), + bindingClass, tmpLeaves, tmpDataObjects, keyMethod); } else { - this.possibleAugmentations = ImmutableMap.of(); + possibleAugmentations = ImmutableMap.of(); + generatedClass = CodecDataObjectGenerator.generate(prototype.getFactory().getLoader(), bindingClass, + tmpLeaves, tmpDataObjects, keyMethod); + } + + // Iterate over all possible augmentations, indexing them as needed + final Map> augByYang = new HashMap<>(); + final Map, DataContainerCodecPrototype> augByStream = new HashMap<>(); + for (final Type augment : possibleAugmentations.values()) { + final DataContainerCodecPrototype augProto = getAugmentationPrototype(augment); + final PathArgument augYangArg = augProto.getYangArg(); + if (augByYang.putIfAbsent(augYangArg, augProto) == null) { + LOG.trace("Discovered new YANG mapping {} -> {} in {}", augYangArg, augProto, this); + } + final Class augBindingClass = augProto.getBindingClass(); + if (augByStream.putIfAbsent(augBindingClass, augProto) == null) { + LOG.trace("Discovered new class mapping {} -> {} in {}", augBindingClass, augProto, this); + } } - reloadAllAugmentations(); + augmentationByYang = ImmutableMap.copyOf(augByYang); + augmentationByStream = ImmutableMap.copyOf(augByStream); - final Class proxyClass = Proxy.getProxyClass(getBindingClass().getClassLoader(), getBindingClass(), - AugmentationHolder.class); + final MethodHandle ctor; try { - proxyConstructor = MethodHandles.publicLookup().findConstructor(proxyClass, CONSTRUCTOR_TYPE) - .asType(DATAOBJECT_TYPE); + ctor = MethodHandles.publicLookup().findConstructor(generatedClass, CONSTRUCTOR_TYPE); } catch (NoSuchMethodException | IllegalAccessException e) { - throw new IllegalStateException("Failed to find contructor for class " + proxyClass, e); + throw new LinkageError("Failed to find contructor for class " + generatedClass, e); } - } - private void reloadAllAugmentations() { - for (final Entry augment : possibleAugmentations.entrySet()) { - final DataContainerCodecPrototype augProto = getAugmentationPrototype(augment.getValue()); - if (augProto != null) { - byYangAugmented.putIfAbsent(augProto.getYangArg(), augProto); - byStreamAugmented.putIfAbsent(augProto.getBindingClass(), augProto); - } - } + proxyConstructor = ctor.asType(DATAOBJECT_TYPE); } @SuppressWarnings("unchecked") @@ -166,7 +216,7 @@ abstract class DataObjectCodecContext) childProto.get()); } - return Optional.absent(); + return Optional.empty(); } @Override @@ -178,13 +228,13 @@ abstract class DataObjectCodecContext context = - childNonNull(ctxProto, argType, "Class %s is not valid child of %s", argType, getBindingClass()).get(); + final DataContainerCodecContext context = childNonNull(ctxProto, argType, + "Class %s is not valid child of %s", argType, getBindingClass()).get(); if (context instanceof ChoiceNodeCodecContext) { final ChoiceNodeCodecContext choice = (ChoiceNodeCodecContext) context; choice.addYangPathArgument(arg, builder); - final java.util.Optional> caseType = arg.getCaseType(); + final Optional> caseType = arg.getCaseType(); final Class type = arg.getType(); final DataContainerCodecContext caze; if (caseType.isPresent()) { @@ -201,201 +251,186 @@ abstract class DataObjectCodecContext yangPathArgumentChild(final YangInstanceIdentifier.PathArgument arg) { + public NodeCodecContext yangPathArgumentChild(final YangInstanceIdentifier.PathArgument arg) { final NodeContextSupplier childSupplier; if (arg instanceof NodeIdentifierWithPredicates) { childSupplier = byYang.get(new NodeIdentifier(arg.getNodeType())); } else if (arg instanceof AugmentationIdentifier) { - childSupplier = yangAugmentationChild((AugmentationIdentifier) arg); + childSupplier = augmentationByYang.get(arg); } else { childSupplier = byYang.get(arg); } - return (NodeCodecContext) childNonNull(childSupplier, arg, - "Argument %s is not valid child of %s", arg, getSchema()).get(); + return childNonNull(childSupplier, arg, "Argument %s is not valid child of %s", arg, getSchema()).get(); } - protected final LeafNodeCodecContext getLeafChild(final String name) { - final LeafNodeCodecContext value = leafChild.get(name); - return IncorrectNestingException.checkNonNull(value, "Leaf %s is not valid for %s", name, getBindingClass()); + protected final ValueNodeCodecContext getLeafChild(final String name) { + final ValueNodeCodecContext value = leafChild.get(name); + if (value == null) { + throw IncorrectNestingException.create("Leaf %s is not valid for %s", name, getBindingClass()); + } + return value; } - private DataContainerCodecPrototype loadChildPrototype(final Class childClass) { - final DataSchemaNode origDef = factory().getRuntimeContext().getSchemaDefinition(childClass); - // Direct instantiation or use in same module in which grouping - // was defined. - DataSchemaNode sameName; - try { - sameName = getSchema().getDataChildByName(origDef.getQName()); - } catch (final IllegalArgumentException e) { - sameName = null; - } - final DataSchemaNode childSchema; - if (sameName != null) { - // Exactly same schema node - if (origDef.equals(sameName)) { - childSchema = sameName; - // We check if instantiated node was added via uses - // statement and is instantiation of same grouping - } else if (origDef.equals(SchemaNodeUtils.getRootOriginalIfPossible(sameName))) { - childSchema = sameName; - } else { - // Node has same name, but clearly is different - childSchema = null; - } - } else { - // We are looking for instantiation via uses in other module - final QName instantiedName = origDef.getQName().withModule(namespace()); - final DataSchemaNode potential = getSchema().getDataChildByName(instantiedName); - // We check if it is really instantiated from same - // definition as class was derived - if (potential != null && origDef.equals(SchemaNodeUtils.getRootOriginalIfPossible(potential))) { - childSchema = potential; - } else { - childSchema = null; - } - } - final DataSchemaNode nonNullChild = - childNonNull(childSchema, childClass, "Node %s does not have child named %s", getSchema(), childClass); - return DataContainerCodecPrototype.from(createBindingArg(childClass, nonNullChild), nonNullChild, factory()); + private DataContainerCodecPrototype loadChildPrototype(final Class childClass) { + final DataSchemaNode childSchema = childNonNull( + factory().getRuntimeContext().findChildSchemaDefinition(getSchema(), namespace(), childClass), childClass, + "Node %s does not have child named %s", getSchema(), childClass); + return DataContainerCodecPrototype.from(createBindingArg(childClass, childSchema), childSchema, factory()); } + // FIXME: MDSAL-697: move this method into BindingRuntimeContext + // This method is only called from loadChildPrototype() and exists only to be overridden by + // CaseNodeCodecContext. Since we are providing childClass and our schema to BindingRuntimeContext + // and receiving childSchema from it via findChildSchemaDefinition, we should be able to receive + // the equivalent of Map.Entry, along with the override we create here. One + // more input we may need to provide is our bindingClass(). @SuppressWarnings("unchecked") Item createBindingArg(final Class childClass, final DataSchemaNode childSchema) { return Item.of((Class) childClass); } - private DataContainerCodecPrototype yangAugmentationChild(final AugmentationIdentifier arg) { - final DataContainerCodecPrototype firstTry = byYangAugmented.get(arg); - if (firstTry != null) { - return firstTry; - } - if (possibleAugmentations.containsKey(arg)) { - reloadAllAugmentations(); - return byYangAugmented.get(arg); - } - return null; - } - - @Nullable - private DataContainerCodecPrototype augmentationByClass(@Nonnull final Class childClass) { - final DataContainerCodecPrototype firstTry = augmentationByClassOrEquivalentClass(childClass); - if (firstTry != null) { - return firstTry; - } - reloadAllAugmentations(); - return augmentationByClassOrEquivalentClass(childClass); + private @Nullable DataContainerCodecPrototype augmentationByClass(final @NonNull Class childClass) { + final DataContainerCodecPrototype childProto = augmentationByStream.get(childClass); + return childProto != null ? childProto : mismatchedAugmentationByClass(childClass); } - @Nullable - private DataContainerCodecPrototype augmentationByClassOrEquivalentClass(@Nonnull final Class childClass) { - final DataContainerCodecPrototype childProto = byStreamAugmented.get(childClass); - if (childProto != null) { - return childProto; - } - + private @Nullable DataContainerCodecPrototype mismatchedAugmentationByClass(final @NonNull Class childClass) { /* - * It is potentially mismatched valid augmentation - we look up equivalent augmentation - * using reflection and walk all stream child and compare augmenations classes if they are - * equivalent. - * - * FIXME: Cache mapping of mismatched augmentation to real one, to speed up lookup. + * It is potentially mismatched valid augmentation - we look up equivalent augmentation using reflection + * and walk all stream child and compare augmentations classes if they are equivalent. When we find a match + * we'll cache it so we do not need to perform reflection operations again. */ + final ImmutableMap, DataContainerCodecPrototype> local = + (ImmutableMap, DataContainerCodecPrototype>) MISMATCHED_AUGMENTED.getAcquire(this); + final DataContainerCodecPrototype mismatched = local.get(childClass); + return mismatched != null ? mismatched : loadMismatchedAugmentation(local, childClass); + + } + + private @Nullable DataContainerCodecPrototype loadMismatchedAugmentation( + final ImmutableMap, DataContainerCodecPrototype> oldMismatched, + final @NonNull Class childClass) { @SuppressWarnings("rawtypes") final Class augTarget = BindingReflections.findAugmentationTarget((Class) childClass); - if (getBindingClass().equals(augTarget)) { - for (final DataContainerCodecPrototype realChild : byStreamAugmented.values()) { + // Do not bother with proposals which are not augmentations of our class, or do not match what the runtime + // context would load. + if (getBindingClass().equals(augTarget) && belongsToRuntimeContext(childClass)) { + for (final DataContainerCodecPrototype realChild : augmentationByStream.values()) { if (Augmentation.class.isAssignableFrom(realChild.getBindingClass()) && BindingReflections.isSubstitutionFor(childClass, realChild.getBindingClass())) { - return realChild; + return cacheMismatched(oldMismatched, childClass, realChild); } } } + LOG.trace("Failed to resolve {} as a valid augmentation in {}", childClass, this); return null; } - private DataContainerCodecPrototype getAugmentationPrototype(final Type value) { - final ClassLoadingStrategy loader = factory().getRuntimeContext().getStrategy(); - @SuppressWarnings("rawtypes") - final Class augClass; - try { - augClass = loader.loadClass(value); - } catch (final ClassNotFoundException e) { - LOG.debug("Failed to load augmentation prototype for {}. Will be retried when needed.", value, e); - return null; + private @NonNull DataContainerCodecPrototype cacheMismatched( + final @NonNull ImmutableMap, DataContainerCodecPrototype> oldMismatched, + final @NonNull Class childClass, final @NonNull DataContainerCodecPrototype prototype) { + + ImmutableMap, DataContainerCodecPrototype> expected = oldMismatched; + while (true) { + final Map, DataContainerCodecPrototype> newMismatched = + ImmutableMap., DataContainerCodecPrototype>builderWithExpectedSize(expected.size() + 1) + .putAll(expected) + .put(childClass, prototype) + .build(); + + final Object witness = MISMATCHED_AUGMENTED.compareAndExchangeRelease(this, expected, newMismatched); + if (witness == expected) { + LOG.trace("Cached mismatched augmentation {} -> {} in {}", childClass, prototype, this); + return prototype; + } + + expected = (ImmutableMap, DataContainerCodecPrototype>) witness; + final DataContainerCodecPrototype existing = expected.get(childClass); + if (existing != null) { + LOG.trace("Using raced mismatched augmentation {} -> {} in {}", childClass, existing, this); + return existing; + } } + } - @SuppressWarnings("unchecked") - final Entry augSchema = factory().getRuntimeContext() - .getResolvedAugmentationSchema(getSchema(), augClass); - return DataContainerCodecPrototype.from(augClass, augSchema.getKey(), augSchema.getValue(), factory()); + private boolean belongsToRuntimeContext(final Class cls) { + final BindingRuntimeContext ctx = factory().getRuntimeContext(); + final Class loaded; + try { + loaded = ctx.loadClass(Type.of(cls)); + } catch (ClassNotFoundException e) { + LOG.debug("Proposed {} cannot be loaded in {}", cls, ctx, e); + return false; + } + return cls.equals(loaded); } - @SuppressWarnings("rawtypes") - Object getBindingChildValue(final Method method, final NormalizedNodeContainer domData) { - final NodeCodecContext childContext = byMethod.get(method).get(); - @SuppressWarnings("unchecked") - final java.util.Optional> domChild = domData.getChild(childContext.getDomPathArgument()); - if (domChild.isPresent()) { - return childContext.deserializeObject(domChild.get()); - } else if (childContext instanceof LeafNodeCodecContext) { - return ((LeafNodeCodecContext)childContext).defaultObject(); - } else { - return null; + private @NonNull DataContainerCodecPrototype getAugmentationPrototype(final Type value) { + final BindingRuntimeContext ctx = factory().getRuntimeContext(); + + final Class> augClass; + try { + augClass = ctx.loadClass(value); + } catch (final ClassNotFoundException e) { + throw new IllegalStateException("RuntimeContext references type " + value + " but failed to its class", e); } + + final Entry augSchema = + ctx.getResolvedAugmentationSchema(getSchema(), augClass); + return DataContainerCodecPrototype.from(augClass, augSchema.getKey(), augSchema.getValue(), factory()); } @SuppressWarnings("checkstyle:illegalCatch") - protected final D createBindingProxy(final NormalizedNodeContainer node) { + protected final @NonNull D createBindingProxy(final DistinctNodeContainer node) { try { - return (D) proxyConstructor.invokeExact((InvocationHandler)new LazyDataObject<>(this, node)); + return (D) proxyConstructor.invokeExact(this, node); } catch (final Throwable e) { Throwables.throwIfUnchecked(e); - throw new RuntimeException(e); + throw new IllegalStateException(e); } } @SuppressWarnings("unchecked") Map>, Augmentation> getAllAugmentationsFrom( - final NormalizedNodeContainer> data) { + final DistinctNodeContainer data) { @SuppressWarnings("rawtypes") final Map map = new HashMap<>(); - for (final NormalizedNode childValue : data.getValue()) { + for (final NormalizedNode childValue : data.body()) { if (childValue instanceof AugmentationNode) { final AugmentationNode augDomNode = (AugmentationNode) childValue; - final DataContainerCodecPrototype codecProto = yangAugmentationChild(augDomNode.getIdentifier()); + final DataContainerCodecPrototype codecProto = augmentationByYang.get(augDomNode.getIdentifier()); if (codecProto != null) { final DataContainerCodecContext codec = codecProto.get(); map.put(codec.getBindingClass(), codec.deserializeObject(augDomNode)); } } } - for (final DataContainerCodecPrototype value : byStreamAugmented.values()) { - final java.util.Optional> augData = data.getChild(value.getYangArg()); - if (augData.isPresent()) { - map.put(value.getBindingClass(), value.get().deserializeObject(augData.get())); + for (final DataContainerCodecPrototype value : augmentationByStream.values()) { + final NormalizedNode augData = data.childByArg(value.getYangArg()); + if (augData != null) { + map.put(value.getBindingClass(), value.get().deserializeObject(augData)); } } return map; } - Collection getHashCodeAndEqualsMethods() { - return byMethod.keySet(); + final @NonNull Class> generatedClass() { + return generatedClass; } @Override public InstanceIdentifier.PathArgument deserializePathArgument(final YangInstanceIdentifier.PathArgument arg) { - Preconditions.checkArgument(getDomPathArgument().equals(arg)); + checkArgument(getDomPathArgument().equals(arg)); return bindingArg(); } @Override public YangInstanceIdentifier.PathArgument serializePathArgument(final InstanceIdentifier.PathArgument arg) { - Preconditions.checkArgument(bindingArg().equals(arg)); + checkArgument(bindingArg().equals(arg)); return getDomPathArgument(); } }