*/
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 static com.google.common.base.Verify.verifyNotNull;
+import static java.util.Objects.requireNonNull;
+
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.io.IOException;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
-import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Collection;
+import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap;
+import java.util.Iterator;
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 java.util.Optional;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import javassist.CannotCompileException;
+import javassist.CtClass;
+import javassist.NotFoundException;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.mdsal.binding.dom.codec.loader.StaticClassPool;
import org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy;
+import org.opendaylight.mdsal.binding.model.api.JavaTypeName;
import org.opendaylight.mdsal.binding.model.api.Type;
+import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections;
+import org.opendaylight.yangtools.concepts.Immutable;
+import org.opendaylight.yangtools.util.ClassLoaderUtils;
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.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.Item;
+import org.opendaylight.yangtools.yang.binding.OpaqueObject;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
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.AugmentationSchema;
+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<D extends DataObject, T extends DataNodeContainer>
+abstract class DataObjectCodecContext<D extends DataObject, T extends DataNodeContainer & WithStatus>
extends DataContainerCodecContext<D, T> {
- 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> METHOD_BY_ALPHABET = (o1, o2) -> o1.getName().compareTo(o2.getName());
+ private static final class Augmentations implements Immutable {
+ final ImmutableMap<YangInstanceIdentifier.PathArgument, DataContainerCodecPrototype<?>> byYang;
+ final ImmutableMap<Class<?>, DataContainerCodecPrototype<?>> byStream;
+
+ Augmentations(final ImmutableMap<YangInstanceIdentifier.PathArgument, DataContainerCodecPrototype<?>> byYang,
+ final ImmutableMap<Class<?>, DataContainerCodecPrototype<?>> byStream) {
+ this.byYang = requireNonNull(byYang);
+ this.byStream = requireNonNull(byStream);
+ }
+ }
- private final ImmutableMap<String, LeafNodeCodecContext<?>> leafChild;
+ private static final Logger LOG = LoggerFactory.getLogger(DataObjectCodecContext.class);
+ private static final MethodType CONSTRUCTOR_TYPE = MethodType.methodType(void.class, NormalizedNodeContainer.class);
+ private static final MethodType AUGMENTABLE_CONSTRUCTOR_TYPE = MethodType.methodType(void.class,
+ DataObjectCodecContext.class, NormalizedNodeContainer.class);
+ private static final MethodType DATAOBJECT_TYPE = MethodType.methodType(DataObject.class,
+ NormalizedNodeContainer.class);
+ private static final MethodType AUGMENTABLE_DATAOBJECT_TYPE = MethodType.methodType(DataObject.class,
+ DataObjectCodecContext.class, NormalizedNodeContainer.class);
+ private static final Comparator<Method> METHOD_BY_ALPHABET = Comparator.comparing(Method::getName);
+ private static final Augmentations EMPTY_AUGMENTATIONS = new Augmentations(ImmutableMap.of(), ImmutableMap.of());
+ private static final CtClass SUPERCLASS = StaticClassPool.findClass(CodecDataObject.class);
+ private static final CtClass AUGMENTABLE_SUPERCLASS = StaticClassPool.findClass(
+ AugmentableCodecDataObject.class);
+
+ private final ImmutableMap<String, ValueNodeCodecContext> leafChild;
private final ImmutableMap<YangInstanceIdentifier.PathArgument, NodeContextSupplier> byYang;
- private final ImmutableSortedMap<Method, NodeContextSupplier> byMethod;
private final ImmutableMap<Class<?>, DataContainerCodecPrototype<?>> byStreamClass;
private final ImmutableMap<Class<?>, DataContainerCodecPrototype<?>> byBindingArgClass;
private final ImmutableMap<AugmentationIdentifier, Type> possibleAugmentations;
private final MethodHandle proxyConstructor;
- private final ConcurrentMap<YangInstanceIdentifier.PathArgument, DataContainerCodecPrototype<?>> byYangAugmented =
- new ConcurrentHashMap<>();
- private final ConcurrentMap<Class<?>, DataContainerCodecPrototype<?>> byStreamAugmented = new ConcurrentHashMap<>();
+ // FIXME: the presence of these two volatile fields may be preventing us from being able to improve
+ // DataContainerCodecPrototype.get() publication.
+ @SuppressWarnings("rawtypes")
+ private static final AtomicReferenceFieldUpdater<DataObjectCodecContext, Augmentations>
+ AUGMENTATIONS_UPDATER = AtomicReferenceFieldUpdater.newUpdater(DataObjectCodecContext.class,
+ Augmentations.class, "augmentations");
+ private volatile Augmentations augmentations = EMPTY_AUGMENTATIONS;
+
+ private volatile ImmutableMap<Class<?>, DataContainerCodecPrototype<?>> mismatchedAugmented = ImmutableMap.of();
+ DataObjectCodecContext(final DataContainerCodecPrototype<T> prototype) {
+ this(prototype, null);
+ }
- protected DataObjectCodecContext(final DataContainerCodecPrototype<T> prototype) {
+ DataObjectCodecContext(final DataContainerCodecPrototype<T> prototype,
+ final Entry<Method, IdentifiableItemCodec> keyMethod) {
super(prototype);
- this.leafChild = factory().getLeafNodes(getBindingClass(), getSchema());
+ final Class<D> bindingClass = getBindingClass();
+ this.leafChild = factory().getLeafNodes(bindingClass, getSchema());
- final Map<Class<?>, Method> clsToMethod = BindingReflections.getChildrenClassToMethod(getBindingClass());
+ final Map<Class<?>, Method> clsToMethod = BindingReflections.getChildrenClassToMethod(bindingClass);
final Map<YangInstanceIdentifier.PathArgument, NodeContextSupplier> byYangBuilder = new HashMap<>();
- final SortedMap<Method, NodeContextSupplier> byMethodBuilder = new TreeMap<>(METHOD_BY_ALPHABET);
+ final Map<Method, NodeContextSupplier> tmpMethodToSupplier = new HashMap<>();
final Map<Class<?>, DataContainerCodecPrototype<?>> byStreamClassBuilder = new HashMap<>();
final Map<Class<?>, DataContainerCodecPrototype<?>> byBindingArgClassBuilder = new HashMap<>();
// Adds leaves to mapping
- for (final LeafNodeCodecContext<?> leaf : leafChild.values()) {
- byMethodBuilder.put(leaf.getGetter(), leaf);
+ for (final ValueNodeCodecContext leaf : leafChild.values()) {
+ tmpMethodToSupplier.put(leaf.getGetter(), leaf);
byYangBuilder.put(leaf.getDomPathArgument(), leaf);
}
for (final Entry<Class<?>, Method> childDataObj : clsToMethod.entrySet()) {
- final DataContainerCodecPrototype<?> childProto = loadChildPrototype(childDataObj.getKey());
- byMethodBuilder.put(childDataObj.getValue(), childProto);
+ 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);
+ tmpMethodToSupplier.put(method, childProto);
byStreamClassBuilder.put(childProto.getBindingClass(), childProto);
byYangBuilder.put(childProto.getYangArg(), childProto);
if (childProto.isChoice()) {
}
}
}
- this.byMethod = ImmutableSortedMap.copyOfSorted(byMethodBuilder);
+
+ // Make sure properties are alpha-sorted
+ final Method[] properties = tmpMethodToSupplier.keySet().toArray(new Method[0]);
+ Arrays.sort(properties, METHOD_BY_ALPHABET);
+ final Builder<Method, NodeContextSupplier> propBuilder = ImmutableMap.builderWithExpectedSize(
+ properties.length);
+ for (Method prop : properties) {
+ propBuilder.put(prop, verifyNotNull(tmpMethodToSupplier.get(prop)));
+ }
+
this.byYang = ImmutableMap.copyOf(byYangBuilder);
this.byStreamClass = ImmutableMap.copyOf(byStreamClassBuilder);
byBindingArgClassBuilder.putAll(byStreamClass);
this.byBindingArgClass = ImmutableMap.copyOf(byBindingArgClassBuilder);
-
- if (Augmentable.class.isAssignableFrom(getBindingClass())) {
+ final CtClass superClass;
+ final MethodType ctorType;
+ if (Augmentable.class.isAssignableFrom(bindingClass)) {
this.possibleAugmentations = factory().getRuntimeContext().getAvailableAugmentationTypes(getSchema());
+ superClass = AUGMENTABLE_SUPERCLASS;
+ ctorType = AUGMENTABLE_CONSTRUCTOR_TYPE;
} else {
this.possibleAugmentations = ImmutableMap.of();
+ superClass = SUPERCLASS;
+ ctorType = CONSTRUCTOR_TYPE;
}
reloadAllAugmentations();
- final Class<?> proxyClass = Proxy.getProxyClass(getBindingClass().getClassLoader(), getBindingClass(),
- AugmentationHolder.class);
+ final Class<?> generatedClass;
try {
- proxyConstructor = MethodHandles.publicLookup().findConstructor(proxyClass, CONSTRUCTOR_TYPE)
- .asType(DATAOBJECT_TYPE);
+ generatedClass = prototype.getFactory().getLoader().generateSubclass(superClass, bindingClass, "codecImpl",
+ new CodecDataObjectCustomizer(propBuilder.build(), keyMethod));
+ } catch (CannotCompileException | IOException | NotFoundException e) {
+ throw new LinkageError("Failed to generated class for " + bindingClass, e);
+ }
+
+ final MethodHandle ctor;
+ try {
+ ctor = MethodHandles.publicLookup().findConstructor(generatedClass, ctorType);
} 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);
+ }
+
+ if (Augmentable.class.isAssignableFrom(bindingClass)) {
+ proxyConstructor = ctor.asType(AUGMENTABLE_DATAOBJECT_TYPE).bindTo(this);
+ } else {
+ proxyConstructor = ctor.asType(DATAOBJECT_TYPE);
}
}
+ // This method could be synchronized, but that would mean that concurrent attempts to load an invalid augmentation
+ // would end up being unnecessarily contended -- blocking real progress and not being able to run concurrently
+ // while producing no effect. We therefore use optimistic read + CAS.
private void reloadAllAugmentations() {
- for (final Entry<AugmentationIdentifier, Type> augment : possibleAugmentations.entrySet()) {
- final DataContainerCodecPrototype<?> augProto = getAugmentationPrototype(augment.getValue());
+ // Load current values
+ Augmentations oldAugmentations = augmentations;
+
+ // FIXME: can we detect when we have both maps fully populated and skip all of this?
+
+ // Scratch space for additions
+ final Map<PathArgument, DataContainerCodecPrototype<?>> addByYang = new HashMap<>();
+ final Map<Class<?>, DataContainerCodecPrototype<?>> addByStream = new HashMap<>();
+
+ // Iterate over all possibilities, checking for modifications.
+ for (final Type augment : possibleAugmentations.values()) {
+ final DataContainerCodecPrototype<?> augProto = getAugmentationPrototype(augment);
if (augProto != null) {
- byYangAugmented.putIfAbsent(augProto.getYangArg(), augProto);
- byStreamAugmented.putIfAbsent(augProto.getBindingClass(), augProto);
+ final PathArgument yangArg = augProto.getYangArg();
+ final Class<?> bindingClass = augProto.getBindingClass();
+ if (!oldAugmentations.byYang.containsKey(yangArg)) {
+ if (addByYang.putIfAbsent(yangArg, augProto) == null) {
+ LOG.trace("Discovered new YANG mapping {} -> {} in {}", yangArg, augProto, this);
+ }
+ }
+ if (!oldAugmentations.byStream.containsKey(bindingClass)) {
+ if (addByStream.putIfAbsent(bindingClass, augProto) == null) {
+ LOG.trace("Discovered new class mapping {} -> {} in {}", bindingClass, augProto, this);
+ }
+ }
+ }
+ }
+
+ while (true) {
+ if (addByYang.isEmpty() && addByStream.isEmpty()) {
+ LOG.trace("No new augmentations discovered in {}", this);
+ return;
+ }
+
+ // We have some additions, propagate them out
+ final Augmentations newAugmentations = new Augmentations(concatMaps(oldAugmentations.byYang, addByYang),
+ concatMaps(oldAugmentations.byStream, addByStream));
+ if (AUGMENTATIONS_UPDATER.compareAndSet(this, oldAugmentations, newAugmentations)) {
+ // Success, we are done
+ return;
+ }
+
+ // We have raced installing new augmentations, read them again, remove everything present in the installed
+ // once and try again. This may mean that we end up not doing anything, but that's fine.
+ oldAugmentations = augmentations;
+
+ // We could use Map.removeAll(oldAugmentations.byYang.keySet()), but that forces the augmentation's keyset
+ // to be materialized, which we otherwise do not need. Hence we do this the other way around, instantiating
+ // our temporary maps' keySets and iterating over them. That's fine as we'll be throwing those maps away.
+ removeMapKeys(addByYang, oldAugmentations.byYang);
+ removeMapKeys(addByStream, oldAugmentations.byStream);
+ }
+ }
+
+ private static <K, V> ImmutableMap<K, V> concatMaps(final ImmutableMap<K, V> old, final Map<K, V> add) {
+ if (add.isEmpty()) {
+ return old;
+ }
+
+ final Builder<K, V> builder = ImmutableMap.builderWithExpectedSize(old.size() + add.size());
+ builder.putAll(old);
+ builder.putAll(add);
+ return builder.build();
+ }
+
+ private static <K, V> void removeMapKeys(final Map<K, V> removeFrom, final ImmutableMap<K, V> map) {
+ final Iterator<K> it = removeFrom.keySet().iterator();
+ while (it.hasNext()) {
+ if (map.containsKey(it.next())) {
+ it.remove();
}
}
}
if (childProto != null) {
return Optional.of((DataContainerCodecContext<C, ?>) childProto.get());
}
- return Optional.absent();
+ return Optional.empty();
}
@Override
if (ctxProto == null && Augmentation.class.isAssignableFrom(argType)) {
ctxProto = augmentationByClass(argType);
}
- final DataContainerCodecContext<?, ?> 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;
- final DataContainerCodecContext<?, ?> caze = choice.getCazeByChildClass(arg.getType());
choice.addYangPathArgument(arg, builder);
+
+ final Optional<? extends Class<? extends DataObject>> caseType = arg.getCaseType();
+ final Class<? extends DataObject> type = arg.getType();
+ final DataContainerCodecContext<?, ?> caze;
+ if (caseType.isPresent()) {
+ // Non-ambiguous addressing this should not pose any problems
+ caze = choice.streamChild(caseType.get());
+ } else {
+ caze = choice.getCaseByChildClass(type);
+ }
+
caze.addYangPathArgument(arg, builder);
return caze.bindingPathArgumentChild(arg, builder);
}
return context;
}
- @SuppressWarnings("unchecked")
@Override
- public NodeCodecContext<D> 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()));
childSupplier = byYang.get(arg);
}
- return (NodeCodecContext<D>) 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);
+ protected final ValueNodeCodecContext getLeafChild(final String name) {
+ final ValueNodeCodecContext value = leafChild.get(name);
return IncorrectNestingException.checkNonNull(value, "Leaf %s is not valid for %s", name, getBindingClass());
}
}
} else {
// We are looking for instantiation via uses in other module
- final QName instantiedName = QName.create(namespace(), origDef.getQName().getLocalName());
+ 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
}
final DataSchemaNode nonNullChild =
childNonNull(childSchema, childClass, "Node %s does not have child named %s", getSchema(), childClass);
- return DataContainerCodecPrototype.from(childClass, nonNullChild, factory());
+ return DataContainerCodecPrototype.from(createBindingArg(childClass, nonNullChild), nonNullChild, factory());
+ }
+
+ @SuppressWarnings("unchecked")
+ Item<?> createBindingArg(final Class<?> childClass, final DataSchemaNode childSchema) {
+ return Item.of((Class<? extends DataObject>) childClass);
}
private DataContainerCodecPrototype<?> yangAugmentationChild(final AugmentationIdentifier arg) {
- final DataContainerCodecPrototype<?> firstTry = byYangAugmented.get(arg);
+ final DataContainerCodecPrototype<?> firstTry = augmentations.byYang.get(arg);
if (firstTry != null) {
return firstTry;
}
if (possibleAugmentations.containsKey(arg)) {
+ // Try to load augmentations, which will potentially update knownAugmentations, hence we re-load that field
+ // again.
reloadAllAugmentations();
- return byYangAugmented.get(arg);
+ return augmentations.byYang.get(arg);
}
return null;
}
- @Nullable
- private DataContainerCodecPrototype<?> augmentationByClass(@Nonnull final Class<?> childClass) {
- final DataContainerCodecPrototype<?> firstTry = augmentationByClassOrEquivalentClass(childClass);
- if (firstTry != null) {
- return firstTry;
+ private @Nullable DataContainerCodecPrototype<?> augmentationByClass(final @NonNull Class<?> childClass) {
+ DataContainerCodecPrototype<?> lookup = augmentationByClassOrEquivalentClass(childClass);
+ if (lookup != null || !isPotentialAugmentation(childClass)) {
+ return lookup;
}
+
+ // Attempt to reload all augmentations using TCCL and lookup again
reloadAllAugmentations();
+ lookup = augmentationByClassOrEquivalentClass(childClass);
+ if (lookup != null) {
+ return lookup;
+ }
+
+ // Still no result, this can be caused by TCCL not being set up properly -- try the class's ClassLoader
+ // if it is present;
+ final ClassLoader loader = childClass.getClassLoader();
+ if (loader == null) {
+ return null;
+ }
+
+ LOG.debug("Class {} not loaded via TCCL, attempting to recover", childClass);
+ ClassLoaderUtils.runWithClassLoader(loader, this::reloadAllAugmentations);
return augmentationByClassOrEquivalentClass(childClass);
}
- @Nullable
- private DataContainerCodecPrototype<?> augmentationByClassOrEquivalentClass(@Nonnull final Class<?> childClass) {
- final DataContainerCodecPrototype<?> childProto = byStreamAugmented.get(childClass);
+ private boolean isPotentialAugmentation(final Class<?> childClass) {
+ final JavaTypeName name = JavaTypeName.create(childClass);
+ for (Type type : possibleAugmentations.values()) {
+ if (name.equals(type.getIdentifier())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private @Nullable DataContainerCodecPrototype<?> augmentationByClassOrEquivalentClass(
+ final @NonNull Class<?> childClass) {
+ // Perform a single load, so we can reuse it if we end up going to the reflection-based slow path
+ final ImmutableMap<Class<?>, DataContainerCodecPrototype<?>> local = augmentations.byStream;
+ final DataContainerCodecPrototype<?> childProto = local.get(childClass);
if (childProto != null) {
return childProto;
}
/*
- * 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 DataContainerCodecPrototype<?> mismatched = mismatchedAugmented.get(childClass);
+ if (mismatched != null) {
+ return mismatched;
+ }
+
@SuppressWarnings("rawtypes")
final Class<?> augTarget = BindingReflections.findAugmentationTarget((Class) childClass);
if (getBindingClass().equals(augTarget)) {
- for (final DataContainerCodecPrototype<?> realChild : byStreamAugmented.values()) {
+ for (final DataContainerCodecPrototype<?> realChild : local.values()) {
if (Augmentation.class.isAssignableFrom(realChild.getBindingClass())
&& BindingReflections.isSubstitutionFor(childClass, realChild.getBindingClass())) {
- return realChild;
+ return cacheMismatched(childClass, realChild);
}
}
}
+ LOG.trace("Failed to resolve {} as a valid augmentation in {}", childClass, this);
return null;
}
+ private synchronized DataContainerCodecPrototype<?> cacheMismatched(final Class<?> childClass,
+ final DataContainerCodecPrototype<?> prototype) {
+ // Original access was unsynchronized, we need to perform additional checking
+ final ImmutableMap<Class<?>, DataContainerCodecPrototype<?>> local = mismatchedAugmented;
+ final DataContainerCodecPrototype<?> existing = local.get(childClass);
+ if (existing != null) {
+ return existing;
+ }
+
+ final Builder<Class<?>, DataContainerCodecPrototype<?>> builder = ImmutableMap.builderWithExpectedSize(
+ local.size() + 1);
+ builder.putAll(local);
+ builder.put(childClass, prototype);
+
+ mismatchedAugmented = builder.build();
+ LOG.trace("Cached mismatched augmentation {} -> {} in {}", childClass, prototype, this);
+ return prototype;
+ }
+
private DataContainerCodecPrototype<?> getAugmentationPrototype(final Type value) {
final ClassLoadingStrategy loader = factory().getRuntimeContext().getStrategy();
@SuppressWarnings("rawtypes")
}
@SuppressWarnings("unchecked")
- final Entry<AugmentationIdentifier, AugmentationSchema> augSchema = factory().getRuntimeContext()
+ final Entry<AugmentationIdentifier, AugmentationSchemaNode> augSchema = factory().getRuntimeContext()
.getResolvedAugmentationSchema(getSchema(), augClass);
return DataContainerCodecPrototype.from(augClass, augSchema.getKey(), augSchema.getValue(), factory());
}
- @SuppressWarnings("rawtypes")
- Object getBindingChildValue(final Method method, final NormalizedNodeContainer domData) {
- final NodeCodecContext<?> childContext = byMethod.get(method).get();
- @SuppressWarnings("unchecked")
- final Optional<NormalizedNode<?, ?>> 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;
- }
- }
-
@SuppressWarnings("checkstyle:illegalCatch")
protected final D createBindingProxy(final NormalizedNodeContainer<?, ?, ?> node) {
try {
- return (D) proxyConstructor.invokeExact((InvocationHandler)new LazyDataObject<>(this, node));
+ return (D) proxyConstructor.invokeExact(node);
} catch (final Throwable e) {
Throwables.throwIfUnchecked(e);
- throw new RuntimeException(e);
+ throw new IllegalStateException(e);
}
}
@SuppressWarnings("unchecked")
- public Map<Class<? extends Augmentation<?>>, Augmentation<?>> getAllAugmentationsFrom(
+ Map<Class<? extends Augmentation<?>>, Augmentation<?>> getAllAugmentationsFrom(
final NormalizedNodeContainer<?, PathArgument, NormalizedNode<?, ?>> data) {
@SuppressWarnings("rawtypes")
}
}
}
- for (final DataContainerCodecPrototype<?> value : byStreamAugmented.values()) {
+ for (final DataContainerCodecPrototype<?> value : augmentations.byStream.values()) {
final Optional<NormalizedNode<?, ?>> augData = data.getChild(value.getYangArg());
if (augData.isPresent()) {
map.put(value.getBindingClass(), value.get().deserializeObject(augData.get()));
return map;
}
- public Collection<Method> getHashCodeAndEqualsMethods() {
- return byMethod.keySet();
- }
-
@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();
}
}
Code Review / mdsal.git / blobdiff