don't generate "auxiliary" members for Jakarta Data static metamodel

since it doesn't seem like these are very useful with the repository programming model (backport of cf626df from main)
hibernate · Dec 18, 2024 · e685425 · e685425
1 parent 103b2f8
commit e685425
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/.../metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMeta.java b/.../metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMeta.java
@@ -155,15 +155,17 @@ private void addAuxiliaryMembersForAnnotation(String annotationName, String pref
 	}
 
 	private void addAuxiliaryMembersForMirror(AnnotationMirror mirror, String prefix) {
-		mirror.getElementValues().forEach((key, value) -> {
-			if ( key.getSimpleName().contentEquals("name") ) {
-				final String name = value.getValue().toString();
-				if ( !name.isEmpty() ) {
-					putMember( prefix + name,
-							new NameMetaAttribute( this, name, prefix ) );
+		if ( !isJakartaDataStyle() ) {
+			mirror.getElementValues().forEach((key, value) -> {
+				if ( key.getSimpleName().contentEquals( "name" ) ) {
+					final String name = value.getValue().toString();
+					if ( !name.isEmpty() ) {
+						putMember( prefix + name,
+								new NameMetaAttribute( this, name, prefix ) );
+					}
 				}
-			}
-		});
+			});
+		}
 	}
 
 	protected String getSessionVariableName() {

diff --git a/...tamodel-generator/src/main/java/org/hibernate/processor/annotation/NameMetaAttribute.java b/...tamodel-generator/src/main/java/org/hibernate/processor/annotation/NameMetaAttribute.java
@@ -42,8 +42,11 @@ public String getAttributeDeclarationString() {
 
 	@Override
 	public String getAttributeNameDeclarationString() {
-		return new StringBuilder()
-				.append("public static final ")
+		final StringBuilder declaration = new StringBuilder();
+		if ( !annotationMetaEntity.isJakartaDataStyle() ) {
+			declaration.append( "public static final " );
+		}
+		return declaration
 				.append(annotationMetaEntity.importType(String.class.getName()))
 				.append(" ")
 				.append(prefix)