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

chore: replaced string concats with String.format, fixed logic in main loop

Browse source
This commit is contained in:
zaaarf 2023-03-15 15:32:56 +01:00
parent 309415056e
commit f54854a42f
No known key found for this signature in database
GPG key ID: 82240E075E31FA4C
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -140,7 +140,7 @@ public class LilleroProcessor extends AbstractProcessor {
})) return true; })) return true;
else { else {
processingEnv.getMessager().printMessage(Diagnostic.Kind.WARNING, processingEnv.getMessager().printMessage(Diagnostic.Kind.WARNING,
"Missing valid @Injector method in @Patch class " + elem + ", skipping."); String.format("Missing valid @Injector method in @Patch class %s, skipping.", elem));
return false; return false;
} }
} }
@ -256,7 +256,7 @@ public class LilleroProcessor extends AbstractProcessor {
private ExecutableElement findMethod(String fullyQualifiedNameParent, String name, String descr, boolean strict) { private ExecutableElement findMethod(String fullyQualifiedNameParent, String name, String descr, boolean strict) {
TypeElement parent = processingEnv.getElementUtils().getTypeElement(fullyQualifiedNameParent); TypeElement parent = processingEnv.getElementUtils().getTypeElement(fullyQualifiedNameParent);
if(parent == null) if(parent == null)
throw new AmbiguousDefinitionException("Could not find parent class " + fullyQualifiedNameParent + "!"); throw new AmbiguousDefinitionException(String.format("Could not find parent class %s!", fullyQualifiedNameParent));
//try to find by name //try to find by name
List<ExecutableElement> candidates = parent.getEnclosedElements() List<ExecutableElement> candidates = parent.getEnclosedElements()
@ -266,14 +266,12 @@ public class LilleroProcessor extends AbstractProcessor {
.filter(e -> e.getSimpleName().contentEquals(name)) .filter(e -> e.getSimpleName().contentEquals(name))
.collect(Collectors.toList()); .collect(Collectors.toList());
if(candidates.size() == 0) if(candidates.size() == 0)
throw new TargetNotFoundException(name + " " + descr); throw new TargetNotFoundException(String.format("%s %s", name, descr));
if(candidates.size() == 1 && !strict) if(candidates.size() == 1 && !strict)
return candidates.get(0); return candidates.get(0);
if(descr == null) { if(descr == null) {
throw new AmbiguousDefinitionException( throw new AmbiguousDefinitionException(
"Found " + candidates.size() String.format("Found %d methods named %s in class %s!", candidates.size(), name, fullyQualifiedNameParent)
+ " methods named " + name
+ " in class " + fullyQualifiedNameParent + "!"
); );
} else { } else {
candidates = candidates.stream() candidates = candidates.stream()
@ -282,12 +280,10 @@ public class LilleroProcessor extends AbstractProcessor {
: c -> descr.split("\\)")[0].equalsIgnoreCase(descriptorFromExecutableElement(c).split("\\)")[0]) : c -> descr.split("\\)")[0].equalsIgnoreCase(descriptorFromExecutableElement(c).split("\\)")[0])
).collect(Collectors.toList()); ).collect(Collectors.toList());
if(candidates.size() == 0) if(candidates.size() == 0)
throw new TargetNotFoundException(name + " " + descr); throw new TargetNotFoundException(String.format("%s %s", name, descr));
if(candidates.size() > 1) if(candidates.size() > 1)
throw new AmbiguousDefinitionException( throw new AmbiguousDefinitionException(
"Found " + candidates.size() String.format("Found %d methods named %s in class %s!", candidates.size(), name, fullyQualifiedNameParent)
+ " methods named " + name
+ " in class " + fullyQualifiedNameParent + "!"
); );
return candidates.get(0); return candidates.get(0);
} }
@ -393,6 +389,7 @@ public class LilleroProcessor extends AbstractProcessor {
.collect(Collectors.toList()); .collect(Collectors.toList());
} else if(targets.size() == 1) { } else if(targets.size() == 1) {
//case 2: there is only one target //case 2: there is only one target
injectionCandidates = new ArrayList<>();
injectionCandidates.add(targets.get(0)); injectionCandidates.add(targets.get(0));
} else { } else {
//case 3: try to match by injectTargetName //case 3: try to match by injectTargetName
@ -410,6 +407,7 @@ public class LilleroProcessor extends AbstractProcessor {
if(injectionCandidates.size() == 1) if(injectionCandidates.size() == 1)
injectionTarget = injectionCandidates.get(0); injectionTarget = injectionCandidates.get(0);
else { else {
List<TypeMirror> params = classArrayFromAnnotation(injectorAnn, Injector::params, processingEnv.getElementUtils()); List<TypeMirror> params = classArrayFromAnnotation(injectorAnn, Injector::params, processingEnv.getElementUtils());
@ -434,9 +432,9 @@ public class LilleroProcessor extends AbstractProcessor {
//if we haven't found it yet, it's an ambiguity //if we haven't found it yet, it's an ambiguity
if(injectionTarget == null) if(injectionTarget == null)
throw new AmbiguousDefinitionException("Unclear target for injector " + inj.getSimpleName().toString() + "!"); throw new AmbiguousDefinitionException(String.format("Unclear target for injector %s::%s!", cl.getSimpleName(), inj.getSimpleName()));
else toGenerate.put( else toGenerate.put(
cl.getSimpleName().toString() + "Injector" + iterationNumber, String.format("%sInjector%d", cl.getSimpleName(), iterationNumber),
new InjectorInfo(inj, findRealMethod(injectionTarget, mapper)) new InjectorInfo(inj, findRealMethod(injectionTarget, mapper))
); );
iterationNumber++; iterationNumber++;
@ -461,7 +459,7 @@ public class LilleroProcessor extends AbstractProcessor {
TypeName.get(processingEnv TypeName.get(processingEnv
.getElementUtils() .getElementUtils()
.getTypeElement("org.objectweb.asm.tree.MethodNode").asType()), "main").build()) .getTypeElement("org.objectweb.asm.tree.MethodNode").asType()), "main").build())
.addStatement("super." + toGenerate.get(injName).injector.getSimpleName() + "(clazz, main)", TypeName.get(cl.asType())) .addStatement(String.format("super.%s(clazz, main)", toGenerate.get(injName).injector.getSimpleName()), TypeName.get(cl.asType()))
.build(); .build();
TypeSpec injectorClass = TypeSpec.classBuilder(injName) TypeSpec injectorClass = TypeSpec.classBuilder(injName)
@ -479,7 +477,7 @@ public class LilleroProcessor extends AbstractProcessor {
.build(); .build();
JavaFile javaFile = JavaFile.builder(packageName, injectorClass).build(); JavaFile javaFile = JavaFile.builder(packageName, injectorClass).build();
String injectorClassName = packageName + "." + injName; String injectorClassName = String.format("%s.%s", packageName, injName);
try { try {
JavaFileObject injectorFile = processingEnv.getFiler().createSourceFile(injectorClassName); JavaFileObject injectorFile = processingEnv.getFiler().createSourceFile(injectorClassName);