Skip to content

add support for single GemDefinition annotation #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filiphr merged 1 commit into from
May 31, 2026
+39 −19
Merged

add support for single GemDefinition annotation #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions processor/src/main/java/org/mapstruct/tools/gem/processor/GemProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
/**
* @author sjaakd
*/
@SupportedAnnotationTypes( "org.mapstruct.tools.gem.GemDefinitions" )
@SupportedAnnotationTypes( {"org.mapstruct.tools.gem.GemDefinitions", "org.mapstruct.tools.gem.GemDefinition"} )
public class GemProcessor extends AbstractProcessor {

private Util util;
Expand All @@ -55,24 +55,28 @@ public boolean process(Set<? extends TypeElement> annotationTypes, RoundEnvironm
try {
util = new Util( processingEnv.getTypeUtils(), processingEnv.getElementUtils() );
for ( TypeElement annotationType : annotationTypes ) {

String annotationName = annotationType.getQualifiedName().toString();
for ( Element definingElement : roundEnv.getElementsAnnotatedWith( annotationType ) ) {

// get an annotation mirror on @GemDefinitions
AnnotationMirror gemDefinitionsMirror = definingElement
.getAnnotationMirrors()
.stream()
.filter( t -> util.isSame( t.getAnnotationType(), "org.mapstruct.tools.gem.GemDefinitions" ) )
.filter( t -> util.isSame( t.getAnnotationType(), annotationName ) )
.findFirst()
.orElseThrow( IllegalStateException::new );

// get annotation mirrors on each @GemDefinitions#value
List<AnnotationMirror> gemDefinitionMirrors = util.getAnnotationValue(
gemDefinitionsMirror,
"value",
List.class
);
gemDefinitionMirrors.forEach( m -> addGemInfo( m, definingElement ) );
if ( annotationName.endsWith( "s" ) ) {
// get annotation mirrors on each @GemDefinitions#value
List<AnnotationMirror> gemDefinitionMirrors = util.getAnnotationValue(
gemDefinitionsMirror,
"value",
List.class
);
gemDefinitionMirrors.forEach( m -> addGemInfo( m, definingElement ) );
}
else {
addGemInfo( gemDefinitionsMirror, definingElement );
}
}
}
postProcessGemInfo();
Expand Down
32 changes: 24 additions & 8 deletions processor/src/test/java/org/mapstruct/tools/gem/processor/ProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,31 @@ void example() throws IOException {
"org.mapstruct.annotations.processor.GemGenerator",
getSource()
);
compile( new GemProcessor(), src );
File generatedDir = compile( new GemProcessor(), src );
assertGeneratedFileContent( "BuilderGem", generatedDir );
assertGeneratedFileContent( "SomeAnnotationGem", generatedDir );
assertGeneratedFileContent( "SomeAnnotationsGem", generatedDir );
assertGeneratedFileContent( "SomeArrayAnnotationGem", generatedDir );
}

@Test
void singleAnnotation() throws IOException {
StringJavaFileObject src = new StringJavaFileObject(
"org.mapstruct.annotations.processor.GemGenerator",
"package org.mapstruct.tools.gem.processor;\n" +
"\n" +
"import org.mapstruct.tools.gem.GemDefinition;\n" +
"import org.mapstruct.tools.gem.test.Builder;\n" +
"\n" +
"@GemDefinition(value = Builder.class)\n" +
"public class GemGenerator {\n" +
"}"
);
File generatedDir = compile( new GemProcessor(), src );
assertGeneratedFileContent( "BuilderGem", generatedDir );
}

private void compile(Processor processor, JavaFileObject... compilationUnits) throws IOException {
private File compile(Processor processor, JavaFileObject... compilationUnits) throws IOException {
JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();

DiagnosticCollector<JavaFileObject> diagnostics = new DiagnosticCollector<JavaFileObject>();
Expand Down Expand Up @@ -71,12 +92,7 @@ private void compile(Processor processor, JavaFileObject... compilationUnits) th
System.err.println( diagnostic );
}
assertThat( success ).isTrue();


assertGeneratedFileContent( "BuilderGem", generatedDir );
assertGeneratedFileContent( "SomeAnnotationGem", generatedDir );
assertGeneratedFileContent( "SomeAnnotationsGem", generatedDir );
assertGeneratedFileContent( "SomeArrayAnnotationGem", generatedDir );
return generatedDir;
}

protected void assertGeneratedFileContent(String gemName, File generatedDir) {
Expand Down