Skip to content

Commit e685425

Browse files
gavinkingbeikov
authored andcommitted
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)
1 parent 103b2f8 commit e685425

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMeta.java

+10-8
Original file line numberDiff line numberDiff line change
@@ -155,15 +155,17 @@ private void addAuxiliaryMembersForAnnotation(String annotationName, String pref
155155
}
156156

157157
private void addAuxiliaryMembersForMirror(AnnotationMirror mirror, String prefix) {
158-
mirror.getElementValues().forEach((key, value) -> {
159-
if ( key.getSimpleName().contentEquals("name") ) {
160-
final String name = value.getValue().toString();
161-
if ( !name.isEmpty() ) {
162-
putMember( prefix + name,
163-
new NameMetaAttribute( this, name, prefix ) );
158+
if ( !isJakartaDataStyle() ) {
159+
mirror.getElementValues().forEach((key, value) -> {
160+
if ( key.getSimpleName().contentEquals( "name" ) ) {
161+
final String name = value.getValue().toString();
162+
if ( !name.isEmpty() ) {
163+
putMember( prefix + name,
164+
new NameMetaAttribute( this, name, prefix ) );
165+
}
164166
}
165-
}
166-
});
167+
});
168+
}
167169
}
168170

169171
protected String getSessionVariableName() {

tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/NameMetaAttribute.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ public String getAttributeDeclarationString() {
4242

4343
@Override
4444
public String getAttributeNameDeclarationString() {
45-
return new StringBuilder()
46-
.append("public static final ")
45+
final StringBuilder declaration = new StringBuilder();
46+
if ( !annotationMetaEntity.isJakartaDataStyle() ) {
47+
declaration.append( "public static final " );
48+
}
49+
return declaration
4750
.append(annotationMetaEntity.importType(String.class.getName()))
4851
.append(" ")
4952
.append(prefix)

0 commit comments

Comments
 (0)