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

fix: orphan target warning

Browse source
This commit is contained in:
zaaarf 2023-03-25 21:04:29 +01:00
parent b793bddaa0
commit c688b55fc3
No known key found for this signature in database
GPG key ID: AD8563472FD43386
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,8 +11,6 @@ import ftbsc.lll.processor.annotations.Target;
import ftbsc.lll.processor.tools.containers.ClassContainer; import ftbsc.lll.processor.tools.containers.ClassContainer;
import ftbsc.lll.processor.tools.obfuscation.ObfuscationMapper; import ftbsc.lll.processor.tools.obfuscation.ObfuscationMapper;
import ftbsc.lll.proxies.ProxyType; import ftbsc.lll.proxies.ProxyType;
import ftbsc.lll.proxies.impl.FieldProxy;
import ftbsc.lll.proxies.impl.MethodProxy;
import ftbsc.lll.proxies.impl.TypeProxy; import ftbsc.lll.proxies.impl.TypeProxy;
import javax.annotation.processing.*; import javax.annotation.processing.*;
@ -223,9 +221,6 @@ public class LilleroProcessor extends AbstractProcessor {
appendMemberFinderDefinition(targetClass, proxyVar, null, constructorBuilder, this.processingEnv, this.mapper); appendMemberFinderDefinition(targetClass, proxyVar, null, constructorBuilder, this.processingEnv, this.mapper);
} }
//targets that have matched at least once are put in here
Set<ExecutableElement> matchedTargets = new HashSet<>();
//this will contain the classes to generate: the key is the class name //this will contain the classes to generate: the key is the class name
HashMap<String, InjectorInfo> toGenerate = new HashMap<>(); HashMap<String, InjectorInfo> toGenerate = new HashMap<>();
@ -270,9 +265,8 @@ public class LilleroProcessor extends AbstractProcessor {
String.format("Target specified user %s, but name was used by both a finder and injector.", targetAnn.of()) String.format("Target specified user %s, but name was used by both a finder and injector.", targetAnn.of())
); );
else if(finderCandidates.size() == 0 && injectorCandidates.size() == 0) else if(finderCandidates.size() == 0 && injectorCandidates.size() == 0)
throw new AmbiguousDefinitionException( processingEnv.getMessager().printMessage(Diagnostic.Kind.WARNING,
String.format("Could not find any candidate mathcing target %s", tg.getSimpleName().toString()) String.format("Found orphan @Target annotation on method %s, it will be ignored!", tg.getSimpleName().toString()));
);
else if(finderCandidates.size() == 0 && injectorCandidates.size() != 1) else if(finderCandidates.size() == 0 && injectorCandidates.size() != 1)
throw new AmbiguousDefinitionException( throw new AmbiguousDefinitionException(
String.format("Found multiple candidate injectors for target %s::%s!", cl.getSimpleName(), tg.getSimpleName()) String.format("Found multiple candidate injectors for target %s::%s!", cl.getSimpleName(), tg.getSimpleName())
@ -282,7 +276,6 @@ public class LilleroProcessor extends AbstractProcessor {
String.format("Found multiple candidate finders for target %s::%s!", cl.getSimpleName(), tg.getSimpleName()) String.format("Found multiple candidate finders for target %s::%s!", cl.getSimpleName(), tg.getSimpleName())
); );
else { else {
matchedTargets.add(tg);
if(injectorCandidates.size() == 1) { if(injectorCandidates.size() == 1) {
//matched an injector! //matched an injector!
toGenerate.put( toGenerate.put(
@ -305,10 +298,6 @@ public class LilleroProcessor extends AbstractProcessor {
} }
} }
//find orphan targets and warn
Set<ExecutableElement> orphanTargets = targets.stream().filter(t -> !matchedTargets.contains(t)).collect(Collectors.toSet());
//TODO!
//iterate over the map and generate the classes //iterate over the map and generate the classes
for(String injName : toGenerate.keySet()) { for(String injName : toGenerate.keySet()) {
String targetMethodDescriptor = descriptorFromExecutableElement(toGenerate.get(injName).target); String targetMethodDescriptor = descriptorFromExecutableElement(toGenerate.get(injName).target);