#835 Remove all injector classes from AuthMe, update installer tasks
This commit is contained in:
@@ -1,16 +1,17 @@
|
||||
package tools.dependencygraph;
|
||||
|
||||
import ch.jalu.injector.handlers.instantiation.DependencyDescription;
|
||||
import ch.jalu.injector.handlers.instantiation.Instantiation;
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.Multimap;
|
||||
import fr.xephi.authme.command.ExecutableCommand;
|
||||
import fr.xephi.authme.converter.Converter;
|
||||
import fr.xephi.authme.initialization.Injection;
|
||||
import fr.xephi.authme.initialization.InjectionHelper;
|
||||
import fr.xephi.authme.process.AsynchronousProcess;
|
||||
import fr.xephi.authme.process.SynchronousProcess;
|
||||
import fr.xephi.authme.security.crypts.EncryptionMethod;
|
||||
import org.bukkit.event.Listener;
|
||||
import tools.utils.InjectorUtils;
|
||||
import tools.utils.ToolTask;
|
||||
import tools.utils.ToolsConstants;
|
||||
|
||||
@@ -143,8 +144,8 @@ public class DrawDependency implements ToolTask {
|
||||
}
|
||||
|
||||
private List<String> getDependencies(Class<?> clazz) {
|
||||
Injection<?> injection = InjectionHelper.getInjection(clazz);
|
||||
return injection == null ? null : formatInjectionDependencies(injection);
|
||||
Instantiation<?> instantiation = InjectorUtils.getInstantiationMethod(clazz);
|
||||
return instantiation == null ? null : formatInjectionDependencies(instantiation);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -155,9 +156,15 @@ public class DrawDependency implements ToolTask {
|
||||
* @param injection the injection whose dependencies should be formatted
|
||||
* @return list of dependencies in a friendly format
|
||||
*/
|
||||
private List<String> formatInjectionDependencies(Injection<?> injection) {
|
||||
Class<?>[] dependencies = injection.getDependencies();
|
||||
Class<?>[] annotations = injection.getDependencyAnnotations();
|
||||
private List<String> formatInjectionDependencies(Instantiation<?> injection) {
|
||||
List<? extends DependencyDescription> descriptions = injection.getDependencies();
|
||||
final int totalDependencies = descriptions.size();
|
||||
Class<?>[] dependencies = new Class<?>[totalDependencies];
|
||||
Class<?>[] annotations = new Class<?>[totalDependencies];
|
||||
for (int i = 0; i < descriptions.size(); ++i) {
|
||||
dependencies[i] = descriptions.get(i).getType();
|
||||
annotations[i] = null; // FIXME #835 descriptions.get(i).getAnnotations();
|
||||
}
|
||||
|
||||
List<String> result = new ArrayList<>(dependencies.length);
|
||||
for (int i = 0; i < dependencies.length; ++i) {
|
||||
|
||||
Reference in New Issue
Block a user