zaaarf/lillero-processor
1
0
Fork 0
mirror of https://github.com/zaaarf/lillero-processor.git synced 2024-11-13 00:59:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: attempting to write the service provider multiple times

Browse source
This commit is contained in:
zaaarf 2023-04-13 11:09:02 +02:00
parent fe9a6c8d4a
commit f1c413eb2d
No known key found for this signature in database
GPG key ID: 82240E075E31FA4C
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/ftbsc/lll/processor/LilleroProcessor.java
View file

@ -44,7 +44,7 @@ public class LilleroProcessor extends AbstractProcessor {
* A {@link Set} of {@link String}s that will contain the fully qualified names * A {@link Set} of {@link String}s that will contain the fully qualified names
* of the generated injector files. * of the generated injector files.
*/ */
private final Set<String> generatedInjectors = new HashSet<>(); private final Set<String> injectors = new HashSet<>();
/** /**
* The {@link ObfuscationMapper} used to convert classes and variables * The {@link ObfuscationMapper} used to convert classes and variables
@ -136,19 +136,16 @@ public class LilleroProcessor extends AbstractProcessor {
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) { public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
for(TypeElement annotation : annotations) { for(TypeElement annotation : annotations) {
if(annotation.getQualifiedName().contentEquals(Patch.class.getName())) { if(annotation.getQualifiedName().contentEquals(Patch.class.getName())) {
Set<TypeElement> validInjectors = roundEnv.getElementsAnnotatedWith(annotation)
roundEnv.getElementsAnnotatedWith(annotation) .stream()
.stream() .map(e -> (TypeElement) e)
.map(e -> (TypeElement) e) .filter(this::isValidInjector)
.filter(this::isValidInjector) .forEach(this::generateClasses);
.collect(Collectors.toSet());
if(!validInjectors.isEmpty())
validInjectors.forEach(this::generateClasses);
} else if(annotation.getQualifiedName().contentEquals(RegisterBareInjector.class.getName())) { } else if(annotation.getQualifiedName().contentEquals(RegisterBareInjector.class.getName())) {
TypeMirror injectorType = this.processingEnv.getElementUtils().getTypeElement("ftbsc.lll.IInjector").asType(); TypeMirror injectorType = this.processingEnv.getElementUtils().getTypeElement("ftbsc.lll.IInjector").asType();
for(Element e : roundEnv.getElementsAnnotatedWith(annotation)) { for(Element e : roundEnv.getElementsAnnotatedWith(annotation)) {
if(this.processingEnv.getTypeUtils().isAssignable(e.asType(), injectorType)) if(this.processingEnv.getTypeUtils().isAssignable(e.asType(), injectorType))
this.generatedInjectors.add(((TypeElement) e).getQualifiedName().toString()); this.injectors.add(((TypeElement) e).getQualifiedName().toString());
else this.processingEnv.getMessager().printMessage(Diagnostic.Kind.WARNING, String.format( else this.processingEnv.getMessager().printMessage(Diagnostic.Kind.WARNING, String.format(
"Class %s annotated with @RegisterBareInjector is not an instance of IInjector, skipping...", "Class %s annotated with @RegisterBareInjector is not an instance of IInjector, skipping...",
((TypeElement) e).getQualifiedName().toString() ((TypeElement) e).getQualifiedName().toString()
@ -156,7 +153,7 @@ public class LilleroProcessor extends AbstractProcessor {
} }
} }
} }
if (!this.generatedInjectors.isEmpty()) { if (!this.injectors.isEmpty()) {
generateServiceProvider(); generateServiceProvider();
return true; return true;
} else return false; } else return false;
@ -372,7 +369,7 @@ public class LilleroProcessor extends AbstractProcessor {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
this.generatedInjectors.add(injectorClassName); this.injectors.add(injectorClassName);
} }
} }
@ -386,7 +383,8 @@ public class LilleroProcessor extends AbstractProcessor {
StandardLocation.CLASS_OUTPUT, "", "META-INF/services/ftbsc.lll.IInjector" StandardLocation.CLASS_OUTPUT, "", "META-INF/services/ftbsc.lll.IInjector"
); );
PrintWriter out = new PrintWriter(serviceProvider.openWriter()); PrintWriter out = new PrintWriter(serviceProvider.openWriter());
this.generatedInjectors.forEach(out::println); this.injectors.forEach(out::println);
this.injectors.clear();
out.close(); out.close();
} catch(IOException e) { } catch(IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);