Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ public final class JsonbProcessor extends AbstractProcessor {

private SimpleComponentWriter componentWriter;
private boolean readModuleInfo;
private boolean generateComponent;
private int rounds;

@Override
public SourceVersion getSupportedSourceVersion() {
Expand Down Expand Up @@ -112,9 +114,10 @@ private void readModule() {

@Override
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment round) {
if (round.errorRaised()) {
if (generateComponent || round.errorRaised()) {
return false;
}
generateComponent = rounds++ > 0;
APContext.setProjectModuleElement(annotations, round);
readModule();
getElements(round, ValuePrism.PRISM_TYPE).ifPresent(this::writeValueAdapters);
Expand All @@ -127,13 +130,19 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment

metaData.fullName(false);
cascadeTypes();
writeComponent(round.processingOver());
writeComponent(generateComponent);
return false;
}

// Optional because annotations are not guaranteed to exist
private Optional<? extends Set<? extends Element>> getElements(RoundEnvironment round, String name) {
return Optional.ofNullable(typeElement(name)).map(round::getElementsAnnotatedWith);
var op =
Optional.ofNullable(typeElement(name))
.map(round::getElementsAnnotatedWith)
.filter(n -> !n.isEmpty());
// skip generateComponent if anything needs processing in this round
generateComponent = generateComponent && op.isEmpty();
return op;
}

private void registerCustomAdapters(Set<? extends Element> elements) {
Expand Down Expand Up @@ -245,6 +254,8 @@ private void cascadeTypesInner() {
}
for (final String type : extraTypes) {
if (!ignoreType(type)) {
// skip generateComponent for this round due to cascade
generateComponent = false;
final TypeElement element = typeElement(type);
if (element != null
&& element.getKind() != ElementKind.ENUM
Expand Down