simplifications in TypeUtils

Author: gavinking

Diff for: tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaAttribute.java

@@ -84,7 +84,7 @@ public String getAttributeNameDeclarationString(){
 
 	@Override
 	public String getPropertyName() {
-		return propertyName(parent, element);
+		return propertyName(element);
 	}
 
 	@Override

Diff for: tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java

@@ -17,6 +17,7 @@
 import org.hibernate.processor.model.Metamodel;
 import org.hibernate.processor.util.AccessTypeInformation;
 import org.hibernate.processor.util.Constants;
+import org.hibernate.processor.util.TypeUtils;
 import org.hibernate.processor.validation.ProcessorSessionFactory;
 import org.hibernate.processor.validation.Validation;
 import org.hibernate.query.criteria.JpaEntityJoin;
@@ -469,15 +470,15 @@ private void addIdClassIfNeeded(List<? extends Element> fields, List<? extends E
 		final List<MetaAttribute> components = new ArrayList<>();
 		for ( Element field : fields ) {
 			if ( hasAnnotation( field, ID ) && isPersistent( field, AccessType.FIELD ) ) {
-				final String propertyName = propertyName( this, field );
+				final String propertyName = propertyName( field );
 				if ( members.containsKey( propertyName ) ) {
 					components.add( members.get( propertyName ) );
 				}
 			}
 		}
 		for ( Element method : methods ) {
 			if ( hasAnnotation( method, ID ) && isPersistent( method, AccessType.PROPERTY ) ) {
-				final String propertyName = propertyName( this, method );
+				final String propertyName = propertyName( method );
 				if ( members.containsKey( propertyName ) ) {
 					components.add( members.get( propertyName ) );
 				}
@@ -1037,7 +1038,7 @@ private void validateBidirectionalMapping(
 				return;
 			}
 			for ( Element member : context.getAllMembers( assocTypeElement ) ) {
-				if ( propertyName( this, member ).contentEquals( mappedBy )
+				if ( propertyName( member ).contentEquals( mappedBy )
 						&& compatibleAccess( assocTypeElement, member ) ) {
 					validateBackRef( memberOfClass, annotation, assocTypeElement, member, annotationVal );
 					return;
@@ -2965,7 +2966,7 @@ private List<String> parameterNames(ExecutableElement method, TypeElement entity
 				// account for special @By("#id") hack in Jakarta Data
 				entity.getEnclosedElements().stream()
 						.filter(member -> hasAnnotation(member, ID))
-						.map(member -> propertyName(this, member))
+						.map(TypeUtils::propertyName)
 						.findFirst()
 						.orElse("id");
 		return method.getParameters().stream()

Diff for: tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/DataAnnotationMetaAttribute.java

@@ -99,7 +99,7 @@ private String fieldName() {
 
 	@Override
 	public String getPropertyName() {
-		final String propertyName = propertyName(parent, element);
+		final String propertyName = propertyName(element);
 		return path == null ? propertyName : path + '.' + propertyName;
 	}
 

Diff for: tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/TypeUtils.java

@@ -8,7 +8,6 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.processor.Context;
 import org.hibernate.processor.MetaModelGenerationException;
-import org.hibernate.processor.annotation.AnnotationMetaEntity;
 import org.hibernate.processor.model.Metamodel;
 
 import javax.lang.model.element.AnnotationMirror;
@@ -28,7 +27,6 @@
 import javax.lang.model.type.TypeVariable;
 import javax.lang.model.type.WildcardType;
 import javax.lang.model.util.ElementFilter;
-import javax.lang.model.util.Elements;
 import javax.lang.model.util.SimpleTypeVisitor8;
 import javax.tools.Diagnostic;
 import java.util.HashMap;
@@ -582,23 +580,23 @@ else if ( isAnnotationMirrorOfType( mirror, "org.hibernate.annotations.Target")
 		return null;
 	}
 
-	public static String propertyName(AnnotationMetaEntity parent, Element element) {
-		final Elements elementsUtil = parent.getContext().getElementUtils();
-		if ( element.getKind() == ElementKind.FIELD ) {
-			return element.getSimpleName().toString();
-		}
-		else if ( element.getKind() == ElementKind.METHOD ) {
-			final String name = element.getSimpleName().toString();
-			if ( name.startsWith( "get" ) ) {
-				return elementsUtil.getName(decapitalize(name.substring(3))).toString();
-			}
-			else if ( name.startsWith( "is" ) ) {
-				return elementsUtil.getName(decapitalize(name.substring(2))).toString();
-			}
-			return elementsUtil.getName(decapitalize(name)).toString();
-		}
-		else {
-			return elementsUtil.getName(element.getSimpleName() + "/* " + element.getKind() + " */").toString();
+	public static String propertyName(Element element) {
+		switch ( element.getKind() ) {
+			case FIELD:
+				return element.getSimpleName().toString();
+			case METHOD:
+				final Name name = element.getSimpleName();
+				if ( name.length() > 3 && name.subSequence( 0, 3 ).equals( "get" ) ) {
+					return decapitalize( name.subSequence( 3, name.length() ).toString() );
+				}
+				else if ( name.length() > 2 && name.subSequence( 0, 2 ).equals( "is" ) ) {
+					return decapitalize( name.subSequence( 2, name.length() ).toString() );
+				}
+				else {
+					return decapitalize( name.toString() );
+				}
+			default:
+				return element.getSimpleName() + "/* " + element.getKind() + " */";
 		}
 	}
 
@@ -678,17 +676,29 @@ public static boolean isMemberType(Element element) {
 	public static String getGeneratedClassFullyQualifiedName(TypeElement typeElement, boolean jakartaDataStyle) {
 		final String simpleName = typeElement.getSimpleName().toString();
 		final Element enclosingElement = typeElement.getEnclosingElement();
-		return (enclosingElement instanceof TypeElement
-				? getGeneratedClassFullyQualifiedName( (TypeElement) enclosingElement, jakartaDataStyle )
-				: ((PackageElement) enclosingElement).getQualifiedName().toString())
-			+ "." + (jakartaDataStyle ? '_' + simpleName : simpleName + '_');
+		return qualifiedName( enclosingElement, jakartaDataStyle )
+				+ "." + (jakartaDataStyle ? '_' + simpleName : simpleName + '_');
+	}
+
+	private static String qualifiedName(Element enclosingElement, boolean jakartaDataStyle) {
+		if ( enclosingElement instanceof TypeElement typeElement ) {
+			return getGeneratedClassFullyQualifiedName( typeElement, jakartaDataStyle );
+		}
+		else if ( enclosingElement instanceof PackageElement packageElement ) {
+			return packageElement.getQualifiedName().toString();
+		}
+		else {
+			throw new MetaModelGenerationException( "Unexpected enclosing element: " + enclosingElement );
+		}
 	}
 
 
 	public static String getGeneratedClassFullyQualifiedName(TypeElement element, String packageName, boolean jakartaDataStyle) {
 		final StringBuilder builder = new StringBuilder( packageName );
-		for ( String s : split( ".", element.getQualifiedName().toString().substring( builder.length() ) ) ) {
-			final String part = removeDollar( s );
+		final Name qualifiedName = element.getQualifiedName();
+		final String tail = qualifiedName.subSequence( builder.length(), qualifiedName.length() ).toString();
+		for ( String bit : split( ".", tail ) ) {
+			final String part = removeDollar( bit );
 			if ( !builder.isEmpty() ) {
 				builder.append( "." );
 			}