Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-18917 Follow all of the JavaBeans rules in enhance/internal/bytebuddy/EnhancerImpl when checking if a class can be enhanced 

Signed-off-by: Scott Marlow <smarlow@redhat.com>
This commit is contained in:
Scott Marlow 2024-12-05 15:54:45 -05:00 committed by Marco Belladelli
parent 4ebbf5b36d
commit 8af90ca921
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java
View File

@ -459,8 +459,8 @@ public class EnhancerImpl implements Enhancer {
continue; continue;
} }
boolean propertyNameMatchesFieldName = false; boolean propertyNameMatchesFieldName = false;
// convert field letter to lower case // extract the property name from method name
methodFieldName = methodFieldName.substring(0, 1).toLowerCase() + methodFieldName.substring(1); methodFieldName = getJavaBeansFieldName(methodFieldName);
TypeList typeList = methodDescription.getDeclaredAnnotations().asTypeList(); TypeList typeList = methodDescription.getDeclaredAnnotations().asTypeList();
if (typeList.stream().anyMatch(typeDefinitions -> if (typeList.stream().anyMatch(typeDefinitions ->
(typeDefinitions.getName().equals("jakarta.persistence.Transient")))) { (typeDefinitions.getName().equals("jakarta.persistence.Transient")))) {
@ -474,7 +474,6 @@ public class EnhancerImpl implements Enhancer {
for (FieldDescription ctField : methodDescription.getDeclaringType().getDeclaredFields()) { for (FieldDescription ctField : methodDescription.getDeclaringType().getDeclaredFields()) {
if (!Modifier.isStatic(ctField.getModifiers())) { if (!Modifier.isStatic(ctField.getModifiers())) {
AnnotatedFieldDescription annotatedField = new AnnotatedFieldDescription(enhancementContext, ctField); AnnotatedFieldDescription annotatedField = new AnnotatedFieldDescription(enhancementContext, ctField);
boolean containsPropertyAccessorMethods = false;
if (enhancementContext.isPersistentField(annotatedField)) { if (enhancementContext.isPersistentField(annotatedField)) {
if (methodFieldName.equals(ctField.getActualName())) { if (methodFieldName.equals(ctField.getActualName())) {
propertyNameMatchesFieldName = true; propertyNameMatchesFieldName = true;
@ -505,6 +504,22 @@ public class EnhancerImpl implements Enhancer {
return false; return false;
} }
/**
* If the first two characters are upper case, assume all characters are upper case to be returned as is.
* Otherwise, return the name with the first character converted to lower case and the remaining part returned as is.
* @param fieldName is the property accessor name to be updated following Persistence property name rules.
* @return name that follows JavaBeans rules.
*/
private static String getJavaBeansFieldName(String fieldName) {
if (fieldName.length() == 0 ||
(fieldName.length() > 1 && Character.isUpperCase(fieldName.charAt(0)) && Character.isUpperCase(fieldName.charAt(1)))
) {
return fieldName;
}
return Character.toLowerCase(fieldName.charAt(0)) + fieldName.substring(1);
}
private static void verifyVersions(TypeDescription managedCtClass, ByteBuddyEnhancementContext enhancementContext) { private static void verifyVersions(TypeDescription managedCtClass, ByteBuddyEnhancementContext enhancementContext) {
final AnnotationDescription.Loadable<EnhancementInfo> existingInfo = managedCtClass final AnnotationDescription.Loadable<EnhancementInfo> existingInfo = managedCtClass
.getDeclaredAnnotations() .getDeclaredAnnotations()