HHH-16572 Incorrect enhancement for PROPERTY attributes with mismatched field and method names

[scottmarlow]

https://hibernate.atlassian.net/browse/HHH-16572

[scottmarlow]

One of the test failures in https://github.com/hibernate/hibernate-orm/blob/19e495d8da7610503afd50083b003de631d25564/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/internal/bytebuddy/DirtyCheckingWithEmbeddedOnGetterTest.java seems to because the CardGame entity has an @id on the property getter getId() which as per this pull request will not be enhanced which I am guessing breaks the the test code attempt to do things like:

assertThat( entity )
				.extracting( NEXT_FIELD_NAME ).isNull();

[scottmarlow]

@raphw Does this use of getDeclaredMethods look correct to you?

I'm trying to check the passed application class to see if it has any methods that have @jakarta.persistence.Id or @jakarta.persistence.Access (with a certain value) which seems to work with some testing but I'm seeing some Hibernate test failures that I do not yet understand. This is to avoid rewriting classes that have those annotations to avoid the https://hibernate.atlassian.net/browse/HHH-16572 problem.

Thank you for your advice!

Scott

[raphw]

Are you only interested in the declared methods of a class, or also in the ones that are inherited from super classes. For the former, this is correct..For the latter, you'd need to use a MethodGraph.Compiler and resolve the hierarchy.

[scottmarlow]

@raphw I'm interested in the declared methods of a class and also the ones that are inherited from super classes. I'm also interested in examining the declared fields (methodDescription.getDeclaringType().getDeclaredFields()) of each methodDescription.getDeclaringType().

Is it correct for me to depend on methodDescription.getDeclaringType().getDeclaredFields() to access each class's set of fields in the hierarchy?

MethodGraph.Linked methodGraph = MethodGraph.Compiler.Default.forJavaHierarchy().compile(managedCtClass);
for (MethodGraph.Node node : methodGraph.listNodes()) {
	MethodDescription methodDescription = node.getRepresentative();
	ArrayList<AnnotatedFieldDescription> fieldList = new ArrayList<>();
	for (FieldDescription ctField : methodDescription.getDeclaringType().getDeclaredFields()) {
			AnnotatedFieldDescription annotatedField = new AnnotatedFieldDescription(enhancementContext, ctField);
			if (enhancementContext.isPersistentField(annotatedField)) {
				fieldList.add(annotatedField);
			}
		}
	}
	...  validate each declared method name against the fields in methodDescription.getDeclaringType()

[scottmarlow]

As far as I can tell ^ code is fine except I should instead be looping through each class fields and validate those against the class declared methods.

[scottmarlow]

Or would it be better to use net.bytebuddy.dynamic.scaffold.FieldLocator to walk through all of the fields of each class in the hierarchy?

[raphw]

A FieldLocator would resolve a field by its name as the Java language would do it, so this sounds like the right approach to me.

[scottmarlow]

I removed the unneeded checks that duplicated checks done in other code and stuck with the MethodGraph.Compiler as that covers the needs for the added check done by this change.

[hibernate-github-bot]

Thanks for your pull request!

This pull request appears to follow the contribution rules.

› This message was automatically generated.

[scottmarlow]

Change is merged as faebabd