HHH-19629 Hibernate Processor may fail when repository method parameter has more than one annotation (e.g. multiple constraints) / HHH-19630 Hibernate Processor may fail if the return type is a single entity and annotatated with multiple annotations

[marko-bekhta]

https://hibernate.atlassian.net/browse/HHH-19629
https://hibernate.atlassian.net/browse/HHH-19630

cc: @cigaly

---

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.

---

[cigaly]

It is working, with that comment that parameter will be annotated with two Nonnull annotations, but this will not cause any error. And if some purist have problems with that, (s)he can fix it.

[cigaly]

And if you really want some nitpicking, maybe you can (in typeAsString) move

result = type.toString();

into else branch (when type is DeclaredType result this is redundant call).
Also, you may consider to use collect( Collectors.joining( ",", "<", ">" ) ) instead of concatenating prefix and suffix in separate statements.
Of course, neither of those changes will make big difference.

[gavinking]

I've been avoiding the use of toString() for this, since the Javadoc doesn't clearly say it's the qualified name, and there are more things than javac.

[gavinking]

What I mean is, I would prefer to see TypeElement.getQualifiedName() here.

It's obnoxious that there is no DeclaredType.getQualifiedName() method, and that DeclaredType.getElement() doesn't return a TypeElement.

[cigaly]

Maybe will be better to use StringBuilder. I guess that this will reduce amount of job for garbage collector.

Suggested change

	if ( type instanceof DeclaredType dt && dt.asElement() instanceof TypeElement te ) {
	// get the "fqcn" without any type arguments
	String result = te.getQualifiedName().toString();
	// add the < ? ,? ....> as necessary:
	if ( !dt.getTypeArguments().isEmpty() ) {
	result += dt.getTypeArguments().stream()
	.map( arg -> typeAsString( arg, true ) )
	.collect( Collectors.joining( ", ", "<", ">" ) );
	}
	if ( includeAnnotations ) {
	for ( AnnotationMirror annotation : type.getAnnotationMirrors() ) {
	result = annotation.toString() + ' ' + result;
	}
	}
	return result;
	}
	if ( type instanceof DeclaredType dt && dt.asElement() instanceof TypeElement te ) {
	final StringBuilder sb = new StringBuilder();
	if ( includeAnnotations ) {
	for ( AnnotationMirror annotation : type.getAnnotationMirrors() ) {
	sb.append( annotation.toString() ).append( ' ' );
	}
	}
	// get the "fqcn" without any type arguments
	sb.append( te.getQualifiedName().toString() );
	// add the < ? ,? ....> as necessary:
	if ( !dt.getTypeArguments().isEmpty() ) {
	sb.append( '<' );
	dt.getTypeArguments()
	.forEach( arg -> sb.append( typeAsString( arg, true ) ) );
	sb.append( '>' );
	}
	return sb.toString();
	}

[gavinking]

I agree.

[gavinking]

@marko-bekhta there are three places in AnnotationMetaEntity where this constructor is called. I believe this change should be replicated to all three invocations, do you agree?