From 6abad1970c71aa80dde864f6e3c2f31ddc479ba5 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Fri, 20 May 2016 14:58:41 +0200 Subject: [PATCH] Revert "Cleanup" This reverts commit 95b65ae20a855d8d89aa42432553fc6f051b5c46. --- .../command/executable/authme/PurgeCommand.java | 8 ++++++++ .../xephi/authme/initialization/FieldInjection.java | 1 - .../initialization/samples/InvalidPostConstruct.java | 11 +++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java index db91aad6..a0811cfe 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeCommand.java @@ -4,7 +4,9 @@ import fr.xephi.authme.AuthMe; import fr.xephi.authme.command.CommandService; import fr.xephi.authme.command.ExecutableCommand; import fr.xephi.authme.datasource.DataSource; +import fr.xephi.authme.hooks.PluginHooks; import fr.xephi.authme.task.PurgeTask; +import fr.xephi.authme.util.BukkitService; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; @@ -24,6 +26,12 @@ public class PurgeCommand implements ExecutableCommand { @Inject private DataSource dataSource; + @Inject + private PluginHooks pluginHooks; + + @Inject + private BukkitService bukkitService; + @Inject private AuthMe plugin; diff --git a/src/main/java/fr/xephi/authme/initialization/FieldInjection.java b/src/main/java/fr/xephi/authme/initialization/FieldInjection.java index 096c5f52..b8112b87 100644 --- a/src/main/java/fr/xephi/authme/initialization/FieldInjection.java +++ b/src/main/java/fr/xephi/authme/initialization/FieldInjection.java @@ -114,7 +114,6 @@ class FieldInjection implements Injection { return null; } - @SuppressWarnings("unchecked") private static Constructor getDefaultConstructor(Class clazz) { try { Constructor defaultConstructor = clazz.getDeclaredConstructor(); diff --git a/src/test/java/fr/xephi/authme/initialization/samples/InvalidPostConstruct.java b/src/test/java/fr/xephi/authme/initialization/samples/InvalidPostConstruct.java index e6d6e3a6..80b6c83e 100644 --- a/src/test/java/fr/xephi/authme/initialization/samples/InvalidPostConstruct.java +++ b/src/test/java/fr/xephi/authme/initialization/samples/InvalidPostConstruct.java @@ -9,6 +9,11 @@ import javax.inject.Inject; public abstract class InvalidPostConstruct { public static final class WithParams { + @Inject + private AlphaService alphaService; + @Inject + private ProvidedClass providedClass; + WithParams() { } @PostConstruct @@ -36,6 +41,9 @@ public abstract class InvalidPostConstruct { } public static final class NotVoidReturnType { + @Inject + private ProvidedClass providedClass; + @PostConstruct public int returnsInt() { return 42; @@ -43,6 +51,9 @@ public abstract class InvalidPostConstruct { } public static final class MultiplePostConstructs { + @Inject + private ProvidedClass providedClass; + @PostConstruct public void postConstruct1() { // --