import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Set;
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.mdsal.binding.spec.naming.BindingMapping;
import org.opendaylight.yangtools.concepts.AbstractIllegalArgumentCodec;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.IdentifiableItem;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
-import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.stmt.KeyEffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.ListEffectiveStatement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Codec support for extracting the {@link Identifiable#key()} method return from a MapEntryNode.
private final MethodHandle ctor;
private final QName keyName;
- SingleKey(final ListSchemaNode schema, final Class<? extends Identifier<?>> keyClass,
+ SingleKey(final ListEffectiveStatement schema, final Class<? extends Identifier<?>> keyClass,
final Class<?> identifiable, final QName keyName, final ValueContext keyContext) {
super(schema, keyClass, identifiable);
this.keyContext = requireNonNull(keyContext);
this.keyName = requireNonNull(keyName);
- ctor = getConstructor(keyClass).asType(CTOR_TYPE);
+ ctor = getConstructor(keyClass, 1).asType(CTOR_TYPE);
}
@Override
private final ImmutableList<QName> keysInBindingOrder;
private final MethodHandle ctor;
- MultiKey(final ListSchemaNode schema, final Class<? extends Identifier<?>> keyClass,
+ MultiKey(final ListEffectiveStatement schema, final Class<? extends Identifier<?>> keyClass,
final Class<?> identifiable, final Map<QName, ValueContext> keyValueContexts) {
super(schema, keyClass, identifiable);
- final MethodHandle tmpCtor = getConstructor(keyClass);
+ final MethodHandle tmpCtor = getConstructor(keyClass, keyValueContexts.size());
final MethodHandle inv = MethodHandles.spreadInvoker(tmpCtor.type(), 0);
- this.ctor = inv.asType(inv.type().changeReturnType(Identifier.class)).bindTo(tmpCtor);
+ ctor = inv.asType(inv.type().changeReturnType(Identifier.class)).bindTo(tmpCtor);
/*
* We need to re-index to make sure we instantiate nodes in the order in which they are defined. We will
* also need to instantiate values in the same order.
*/
- final List<QName> keyDef = schema.getKeyDefinition();
+ final Set<QName> keyDef = schema.findFirstEffectiveSubstatementArgument(KeyEffectiveStatement.class)
+ .orElseThrow();
predicateTemplate = ImmutableOffsetMapTemplate.ordered(keyDef);
this.keyValueContexts = predicateTemplate.instantiateTransformed(keyValueContexts, (key, value) -> value);
final List<QName> tmp = new ArrayList<>(keyDef);
// This is not terribly efficient but gets the job done
tmp.sort(Comparator.comparing(qname -> BindingMapping.getPropertyName(qname.getLocalName())));
- this.keysInBindingOrder = ImmutableList.copyOf(tmp.equals(keyDef) ? keyDef : tmp);
+ keysInBindingOrder = ImmutableList.copyOf(tmp.equals(List.copyOf(keyDef)) ? keyDef : tmp);
}
@Override
}
}
+ private static final Logger LOG = LoggerFactory.getLogger(IdentifiableItemCodec.class);
+
private final Class<?> identifiable;
private final QName qname;
- IdentifiableItemCodec(final ListSchemaNode schema, final Class<? extends Identifier<?>> keyClass,
+ IdentifiableItemCodec(final ListEffectiveStatement schema, final Class<? extends Identifier<?>> keyClass,
final Class<?> identifiable) {
this.identifiable = requireNonNull(identifiable);
- this.qname = schema.getQName();
+ qname = schema.argument();
}
- static IdentifiableItemCodec of(final ListSchemaNode schema,
+ static IdentifiableItemCodec of(final ListEffectiveStatement schema,
final Class<? extends Identifier<?>> keyClass, final Class<?> identifiable,
final Map<QName, ValueContext> keyValueContexts) {
switch (keyValueContexts.size()) {
abstract @NonNull NodeIdentifierWithPredicates serializeIdentifier(QName qname, Identifier<?> key);
- static MethodHandle getConstructor(final Class<? extends Identifier<?>> clazz) {
- for (@SuppressWarnings("rawtypes") final Constructor constr : clazz.getConstructors()) {
- final Class<?>[] parameters = constr.getParameterTypes();
- if (!clazz.equals(parameters[0])) {
- // It is not copy constructor...
- try {
- return MethodHandles.publicLookup().unreflectConstructor(constr);
- } catch (IllegalAccessException e) {
- throw new IllegalStateException("Cannot access constructor " + constr + " in class " + clazz, e);
- }
+ static MethodHandle getConstructor(final Class<? extends Identifier<?>> clazz, final int nrArgs) {
+ for (final Constructor<?> ctor : clazz.getConstructors()) {
+ // Check argument count
+ if (ctor.getParameterCount() != nrArgs) {
+ LOG.debug("Skipping {} due to argument count mismatch", ctor);
+ continue;
+ }
+
+ // Do not consider deprecated constructors
+ if (isDeprecated(ctor)) {
+ LOG.debug("Skipping deprecated constructor {}", ctor);
+ continue;
+ }
+
+ // Do not consider copy constructors
+ if (clazz.equals(ctor.getParameterTypes()[0])) {
+ LOG.debug("Skipping copy constructor {}", ctor);
+ continue;
+ }
+
+ try {
+ return MethodHandles.publicLookup().unreflectConstructor(ctor);
+ } catch (IllegalAccessException e) {
+ throw new IllegalStateException("Cannot access constructor " + ctor + " in class " + clazz, e);
}
}
- throw new IllegalArgumentException("Supplied class " + clazz + "does not have required constructor.");
+ throw new IllegalArgumentException("Supplied class " + clazz + " does not have required constructor.");
+ }
+
+ // This could be inlined, but then it throws off Eclipse analysis, which thinks the return is always non-null
+ private static boolean isDeprecated(final Constructor<?> ctor) {
+ return ctor.getAnnotation(Deprecated.class) != null;
}
}