import static com.google.common.base.Verify.verify;
import static com.google.common.base.Verify.verifyNotNull;
import static java.util.Objects.requireNonNull;
-import static org.opendaylight.mdsal.binding.dom.codec.impl.ByteBuddyUtils.THIS;
+import static net.bytebuddy.implementation.bytecode.member.MethodVariableAccess.loadThis;
import static org.opendaylight.mdsal.binding.dom.codec.impl.ByteBuddyUtils.getField;
import static org.opendaylight.mdsal.binding.dom.codec.impl.ByteBuddyUtils.invokeMethod;
import static org.opendaylight.mdsal.binding.dom.codec.impl.ByteBuddyUtils.putField;
import org.eclipse.jdt.annotation.Nullable;
import org.opendaylight.mdsal.binding.dom.codec.impl.ClassGeneratorBridge.LocalNameProvider;
import org.opendaylight.mdsal.binding.dom.codec.impl.ClassGeneratorBridge.NodeContextSupplierProvider;
-import org.opendaylight.mdsal.binding.dom.codec.loader.CodecClassLoader;
-import org.opendaylight.mdsal.binding.dom.codec.loader.CodecClassLoader.ClassGenerator;
-import org.opendaylight.mdsal.binding.dom.codec.loader.CodecClassLoader.GeneratorResult;
+import org.opendaylight.mdsal.binding.loader.BindingClassLoader;
+import org.opendaylight.mdsal.binding.loader.BindingClassLoader.ClassGenerator;
+import org.opendaylight.mdsal.binding.loader.BindingClassLoader.GeneratorResult;
import org.opendaylight.mdsal.binding.spec.naming.BindingMapping;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.slf4j.Logger;
* private static final VarHandle getBar$$$V;
* private volatile Object getBar;
*
- * public Foo$$$codecImpl(NormalizedNodeContainer data) {
+ * public Foo$$$codecImpl(DistinctNodeContainer data) {
* super(data);
* }
*
*
* <p>
* We take a different approach here, which takes advantage of the fact we are in control of both code generation (here)
- * and class loading (in {@link CodecClassLoader}). The process is performed in four steps:
+ * and class loading (in {@link BindingClassLoader}). The process is performed in four steps:
* <ul>
* <li>During code generation, the context fields are pointed towards
* {@link ClassGeneratorBridge#resolveNodeContextSupplier(String)} and
*/
abstract class CodecDataObjectGenerator<T extends CodecDataObject<?>> implements ClassGenerator<T> {
// Not reusable definition: we can inline NodeContextSuppliers without a problem
- // FIXME: 6.0.0: wire this implementation, which requires that BindingRuntimeTypes provides information about types
- // being generated from within a grouping
+ // FIXME: MDSAL-443: wire this implementation, which requires that BindingRuntimeTypes provides information about
+ // types being generated from within a grouping
private static final class Fixed<T extends CodecDataObject<?>> extends CodecDataObjectGenerator<T>
implements NodeContextSupplierProvider<T> {
private final ImmutableMap<Method, NodeContextSupplier> properties;
for (Method method : properties.keySet()) {
LOG.trace("Generating for fixed method {}", method);
final String methodName = method.getName();
- final TypeDescription retType = TypeDescription.ForLoadedType.of(method.getReturnType());
+ final TypeDescription retType = ForLoadedType.of(method.getReturnType());
tmp = tmp.defineMethod(methodName, retType, PUB_FINAL).intercept(
new SupplierGetterMethodImplementation(methodName, retType));
}
final Optional<Entry<Method, NodeContextSupplier>> found = properties.entrySet().stream()
.filter(entry -> methodName.equals(entry.getKey().getName())).findAny();
verify(found.isPresent(), "Failed to find property for %s in %s", methodName, this);
- return verifyNotNull(found.get().getValue());
+ return verifyNotNull(found.orElseThrow().getValue());
}
}
private static final class Reusable<T extends CodecDataObject<?>> extends CodecDataObjectGenerator<T>
implements LocalNameProvider<T> {
private final ImmutableMap<Method, ValueNodeCodecContext> simpleProperties;
- private final Map<Method, Class<?>> daoProperties;
+ private final Map<Class<?>, PropertyInfo> daoProperties;
Reusable(final TypeDescription superClass, final ImmutableMap<Method, ValueNodeCodecContext> simpleProperties,
- final Map<Method, Class<?>> daoProperties, final @Nullable Method keyMethod) {
+ final Map<Class<?>, PropertyInfo> daoProperties, final @Nullable Method keyMethod) {
super(superClass, keyMethod);
this.simpleProperties = requireNonNull(simpleProperties);
this.daoProperties = requireNonNull(daoProperties);
for (Method method : simpleProperties.keySet()) {
LOG.trace("Generating for simple method {}", method);
final String methodName = method.getName();
- final TypeDescription retType = TypeDescription.ForLoadedType.of(method.getReturnType());
+ final TypeDescription retType = ForLoadedType.of(method.getReturnType());
tmp = tmp.defineMethod(methodName, retType, PUB_FINAL).intercept(
new SimpleGetterMethodImplementation(methodName, retType));
}
- for (Entry<Method, Class<?>> entry : daoProperties.entrySet()) {
- final Method method = entry.getKey();
+ for (Entry<Class<?>, PropertyInfo> entry : daoProperties.entrySet()) {
+ final PropertyInfo info = entry.getValue();
+ final Method method = info.getterMethod();
LOG.trace("Generating for structured method {}", method);
final String methodName = method.getName();
- final TypeDescription retType = TypeDescription.ForLoadedType.of(method.getReturnType());
+ final TypeDescription retType = ForLoadedType.of(method.getReturnType());
tmp = tmp.defineMethod(methodName, retType, PUB_FINAL).intercept(
- new StructuredGetterMethodImplementation(methodName, retType, entry.getValue()));
+ new StructuredGetterMethodImplementation(methodName, retType, entry.getKey()));
+
+ if (info instanceof PropertyInfo.GetterAndNonnull orEmpty) {
+ final String nonnullName = orEmpty.nonnullMethod().getName();
+ tmp = tmp.defineMethod(nonnullName, retType, PUB_FINAL).intercept(
+ new NonnullMethodImplementation(nonnullName, retType, entry.getKey(), method));
+ }
}
return tmp;
final Optional<Entry<Method, ValueNodeCodecContext>> found = simpleProperties.entrySet().stream()
.filter(entry -> methodName.equals(entry.getKey().getName())).findAny();
verify(found.isPresent(), "Failed to find property for %s in %s", methodName, this);
- return found.get().getValue().getSchema().getQName().getLocalName();
+ return found.orElseThrow().getValue().getSchema().getQName().getLocalName();
}
}
this.keyMethod = keyMethod;
}
- static <D extends DataObject, T extends CodecDataObject<T>> Class<T> generate(final CodecClassLoader loader,
+ static <D extends DataObject, T extends CodecDataObject<T>> Class<T> generate(final BindingClassLoader loader,
final Class<D> bindingInterface, final ImmutableMap<Method, ValueNodeCodecContext> simpleProperties,
- final Map<Method, Class<?>> daoProperties, final Method keyMethod) {
- return loader.generateClass(bindingInterface, "codecImpl",
+ final Map<Class<?>, PropertyInfo> daoProperties, final Method keyMethod) {
+ return CodecPackage.CODEC.generateClass(loader, bindingInterface,
new Reusable<>(BB_CDO, simpleProperties, daoProperties, keyMethod));
}
static <D extends DataObject, T extends CodecDataObject<T>> Class<T> generateAugmentable(
- final CodecClassLoader loader, final Class<D> bindingInterface,
+ final BindingClassLoader loader, final Class<D> bindingInterface,
final ImmutableMap<Method, ValueNodeCodecContext> simpleProperties,
- final Map<Method, Class<?>> daoProperties, final Method keyMethod) {
- return loader.generateClass(bindingInterface, "codecImpl",
+ final Map<Class<?>, PropertyInfo> daoProperties, final Method keyMethod) {
+ return CodecPackage.CODEC.generateClass(loader, bindingInterface,
new Reusable<>(BB_ACDO, simpleProperties, daoProperties, keyMethod));
}
@Override
- public final GeneratorResult<T> generateClass(final CodecClassLoader loeader, final String fqcn,
+ public final GeneratorResult<T> generateClass(final BindingClassLoader loader, final String fqcn,
final Class<?> bindingInterface) {
LOG.trace("Generating class {}", fqcn);
final Generic bindingDef = TypeDefinition.Sort.describe(bindingInterface);
@SuppressWarnings("unchecked")
Builder<T> builder = (Builder<T>) BB.subclass(Generic.Builder.parameterizedType(superClass, bindingDef).build())
- .visit(ByteBuddyUtils.computeFrames()).name(fqcn).implement(bindingDef);
+ .name(fqcn).implement(bindingDef);
builder = generateGetters(builder);
if (keyMethod != null) {
LOG.trace("Generating for key {}", keyMethod);
final String methodName = keyMethod.getName();
- final TypeDescription retType = TypeDescription.ForLoadedType.of(keyMethod.getReturnType());
+ final TypeDescription retType = ForLoadedType.of(keyMethod.getReturnType());
builder = builder.defineMethod(methodName, retType, PUB_FINAL).intercept(
new KeyMethodImplementation(methodName, retType));
}
private static Implementation codecHashCode(final Class<?> bindingInterface) {
return new Implementation.Simple(
// return Foo.bindingHashCode(this);
- THIS,
+ loadThis(),
invokeMethod(bindingInterface, BindingMapping.BINDING_HASHCODE_NAME, bindingInterface),
MethodReturn.INTEGER);
}
private static Implementation codecEquals(final Class<?> bindingInterface) {
return new Implementation.Simple(
// return Foo.bindingEquals(this, obj);
- THIS,
+ loadThis(),
FIRST_ARG_REF,
invokeMethod(bindingInterface, BindingMapping.BINDING_EQUALS_NAME, bindingInterface, Object.class),
MethodReturn.INTEGER);
private static Implementation toString(final Class<?> bindingInterface) {
return new Implementation.Simple(
// return Foo.bindingToString(this);
- THIS,
+ loadThis(),
invokeMethod(bindingInterface, BindingMapping.BINDING_TO_STRING_NAME, bindingInterface),
MethodReturn.REFERENCE);
}
private abstract static class AbstractMethodImplementation implements Implementation {
+ final TypeDescription retType;
+ // getFoo, usually
+ final String methodName;
+
+ AbstractMethodImplementation(final String methodName, final TypeDescription retType) {
+ this.methodName = requireNonNull(methodName);
+ this.retType = requireNonNull(retType);
+ }
+ }
+
+ private abstract static class AbstractCachedMethodImplementation extends AbstractMethodImplementation {
private static final Generic BB_HANDLE = TypeDefinition.Sort.describe(VarHandle.class);
private static final Generic BB_OBJECT = TypeDefinition.Sort.describe(Object.class);
- private static final StackManipulation OBJECT_CLASS = ClassConstant.of(TypeDescription.OBJECT);
+ private static final StackManipulation OBJECT_CLASS = ClassConstant.of(ForLoadedType.of(Object.class));
private static final StackManipulation LOOKUP = invokeMethod(MethodHandles.class, "lookup");
private static final StackManipulation FIND_VAR_HANDLE = invokeMethod(Lookup.class,
"findVarHandle", Class.class, String.class, Class.class);
| Opcodes.ACC_SYNTHETIC;
private static final int PRIV_VOLATILE = Opcodes.ACC_PRIVATE | Opcodes.ACC_VOLATILE | Opcodes.ACC_SYNTHETIC;
- final TypeDescription retType;
- // getFoo
- final String methodName;
// getFoo$$$V
final String handleName;
- AbstractMethodImplementation(final String methodName, final TypeDescription retType) {
- this.methodName = requireNonNull(methodName);
- this.retType = requireNonNull(retType);
- this.handleName = methodName + "$$$V";
+ AbstractCachedMethodImplementation(final String methodName, final TypeDescription retType) {
+ super(methodName, retType);
+ handleName = methodName + "$$$V";
}
@Override
}
}
- private static final class KeyMethodImplementation extends AbstractMethodImplementation {
+ private static final class KeyMethodImplementation extends AbstractCachedMethodImplementation {
private static final StackManipulation CODEC_KEY = invokeMethod(CodecDataObject.class,
"codecKey", VarHandle.class);
public ByteCodeAppender appender(final Target implementationTarget) {
return new ByteCodeAppender.Simple(
// return (FooType) codecKey(getFoo$$$V);
- THIS,
+ loadThis(),
getField(implementationTarget.getInstrumentedType(), handleName),
CODEC_KEY,
TypeCasting.to(retType),
}
}
+ private static final class NonnullMethodImplementation extends AbstractMethodImplementation {
+ private static final StackManipulation NONNULL_MEMBER = invokeMethod(CodecDataObject.class,
+ "codecMemberOrEmpty", Object.class, Class.class);
+
+ private final Class<?> bindingClass;
+ private final Method getterMethod;
+
+ NonnullMethodImplementation(final String methodName, final TypeDescription retType,
+ final Class<?> bindingClass, final Method getterMethod) {
+ super(methodName, retType);
+ this.bindingClass = requireNonNull(bindingClass);
+ this.getterMethod = requireNonNull(getterMethod);
+ }
+
+ @Override
+ public ByteCodeAppender appender(final Target implementationTarget) {
+ return new ByteCodeAppender.Simple(
+ // return (FooType) codecMemberOrEmpty(getFoo(), FooType.class)
+ loadThis(),
+ loadThis(),
+ invokeMethod(getterMethod),
+ ClassConstant.of(TypeDefinition.Sort.describe(bindingClass).asErasure()),
+ NONNULL_MEMBER,
+ TypeCasting.to(retType),
+ MethodReturn.REFERENCE);
+ }
+
+ @Override
+ public InstrumentedType prepare(final InstrumentedType instrumentedType) {
+ // No-op
+ return instrumentedType;
+ }
+ }
+
/*
* A simple leaf method, which looks up child by a String constant. This is slightly more complicated because we
* want to make sure we are using the same String instance as the one stored in associated DataObjectCodecContext,
* as minimizing footprint. Since that string is not guaranteed to be interned in the String Pool, we cannot rely
* on the constant pool entry to resolve to the same object.
*/
- private static final class SimpleGetterMethodImplementation extends AbstractMethodImplementation {
+ private static final class SimpleGetterMethodImplementation extends AbstractCachedMethodImplementation {
private static final StackManipulation CODEC_MEMBER = invokeMethod(CodecDataObject.class,
"codecMember", VarHandle.class, String.class);
private static final StackManipulation BRIDGE_RESOLVE = invokeMethod(ClassGeneratorBridge.class,
SimpleGetterMethodImplementation(final String methodName, final TypeDescription retType) {
super(methodName, retType);
- this.stringName = methodName + "$$$S";
+ stringName = methodName + "$$$S";
}
@Override
final TypeDescription instrumentedType = implementationTarget.getInstrumentedType();
return new ByteCodeAppender.Simple(
// return (FooType) codecMember(getFoo$$$V, getFoo$$$S);
- THIS,
+ loadThis(),
getField(instrumentedType, handleName),
getField(instrumentedType, stringName),
CODEC_MEMBER,
}
}
- private static final class StructuredGetterMethodImplementation extends AbstractMethodImplementation {
+ private static final class StructuredGetterMethodImplementation extends AbstractCachedMethodImplementation {
private static final StackManipulation CODEC_MEMBER = invokeMethod(CodecDataObject.class,
"codecMember", VarHandle.class, Class.class);
public ByteCodeAppender appender(final Target implementationTarget) {
return new ByteCodeAppender.Simple(
// return (FooType) codecMember(getFoo$$$V, FooType.class);
- THIS,
+ loadThis(),
getField(implementationTarget.getInstrumentedType(), handleName),
ClassConstant.of(TypeDefinition.Sort.describe(bindingClass).asErasure()),
CODEC_MEMBER,
}
}
- private static final class SupplierGetterMethodImplementation extends AbstractMethodImplementation {
+ private static final class SupplierGetterMethodImplementation extends AbstractCachedMethodImplementation {
private static final StackManipulation CODEC_MEMBER = invokeMethod(CodecDataObject.class,
"codecMember", VarHandle.class, NodeContextSupplier.class);
private static final StackManipulation BRIDGE_RESOLVE = invokeMethod(ClassGeneratorBridge.class,
final TypeDescription instrumentedType = implementationTarget.getInstrumentedType();
return new ByteCodeAppender.Simple(
// return (FooType) codecMember(getFoo$$$V, getFoo$$$C);
- THIS,
+ loadThis(),
getField(instrumentedType, handleName),
getField(instrumentedType, contextName),
CODEC_MEMBER,
Code Review / mdsal.git / blobdiff