Skip to content

Refactor MappingProcessor#getMappers #4136

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

Open
mlntdrv wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −25
Open

Refactor MappingProcessor#getMappers #4136

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a8eb92
refactor: extract method #mapperTypeElements
mtodorov-dl Sep 27, 2026
afb8037
refactor: replace nested control structures with pipeline
mlntdrv Sep 27, 2026
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
44 changes: 19 additions & 25 deletions processor/src/main/java/org/mapstruct/ap/MappingProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.ServiceLoader;
import java.util.Set;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -254,33 +255,26 @@ private Set<TypeElement> getAndResetDeferredMappers() {

private Set<TypeElement> getMappers(final Set<? extends TypeElement> annotations,
final RoundEnvironment roundEnvironment) {
Set<TypeElement> mapperTypes = new HashSet<>();

for ( TypeElement annotation : annotations ) {
//Indicates that the annotation's type isn't on the class path of the compiled
//project. Let the compiler deal with that and print an appropriate error.
if ( annotation.getKind() != ElementKind.ANNOTATION_TYPE ) {
continue;
}
return annotations.stream()
.filter( a -> a.getKind().equals( ElementKind.ANNOTATION_TYPE ) )
.map( a -> mapperTypeElements( roundEnvironment, a ) )
.flatMap( Set::stream )
.collect( Collectors.toSet() );
}

try {
Set<? extends Element> annotatedMappers = roundEnvironment.getElementsAnnotatedWith( annotation );
for ( Element mapperElement : annotatedMappers ) {
TypeElement mapperTypeElement = asTypeElement( mapperElement );

// on some JDKs, RoundEnvironment.getElementsAnnotatedWith( ... ) returns types with
// annotations unknown to the compiler, even though they are not declared Mappers
if ( mapperTypeElement != null && MapperGem.instanceOn( mapperTypeElement ) != null ) {
mapperTypes.add( mapperTypeElement );
}
}
}
catch ( Throwable t ) { // whenever that may happen, but just to stay on the save side
handleUncaughtError( annotation, t );
continue;
}
private Set<TypeElement> mapperTypeElements(final RoundEnvironment roundEnvironment, final TypeElement annotation) {
try {
return roundEnvironment.getElementsAnnotatedWith( annotation )
.stream()
.map( this::asTypeElement )
.filter( Objects::nonNull )
.filter( mapper -> Objects.nonNull( MapperGem.instanceOn( mapper ) ) )
.collect( Collectors.toSet() );
}
catch ( Throwable t ) { // whenever that may happen, but just to stay on the save side
handleUncaughtError( annotation, t );
return new HashSet<>();
}
return mapperTypes;
}

private void processMapperElements(Set<TypeElement> mapperElements, RoundContext roundContext) {
Expand Down