Fix ErrorProne issues for JavaLangClash bug pattern This requires renaming Module classes that clash with java.lang.Module. Signed-off-by: Edwin Kempin <ekempin@google.com> Change-Id: Ib92b26248c5b84a6cc0af5d6b4dcaf0253b569bb
diff --git a/BUILD b/BUILD index 35312a7..c6c0af4 100644 --- a/BUILD +++ b/BUILD
@@ -6,7 +6,7 @@ srcs = glob(["src/main/java/**/*.java"]), manifest_entries = [ "Gerrit-PluginName: hooks", - "Gerrit-Module: com.googlesource.gerrit.plugins.hooks.Module", + "Gerrit-Module: com.googlesource.gerrit.plugins.hooks.PluginModule", ], resources = glob(["src/main/resources/**/*"]), )
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/Module.java b/src/main/java/com/googlesource/gerrit/plugins/hooks/PluginModule.java similarity index 98% rename from src/main/java/com/googlesource/gerrit/plugins/hooks/Module.java rename to src/main/java/com/googlesource/gerrit/plugins/hooks/PluginModule.java index fac480b..b6e171f 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/hooks/Module.java +++ b/src/main/java/com/googlesource/gerrit/plugins/hooks/PluginModule.java
@@ -36,7 +36,7 @@ import com.google.inject.Scopes; import com.google.inject.internal.UniqueAnnotations; -class Module extends FactoryModule { +class PluginModule extends FactoryModule { @Override protected void configure() { bind(HookQueue.class).in(Scopes.SINGLETON);
diff --git a/src/test/java/com/googlesource/gerrit/plugins/hooks/HooksIT.java b/src/test/java/com/googlesource/gerrit/plugins/hooks/HooksIT.java index bcf2d20..2d5b177 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/hooks/HooksIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/hooks/HooksIT.java
@@ -20,7 +20,7 @@ import org.junit.Test; @NoHttpd -@TestPlugin(name = "hooks", sysModule = "com.googlesource.gerrit.plugins.hooks.Module") +@TestPlugin(name = "hooks", sysModule = "com.googlesource.gerrit.plugins.hooks.PluginModule") public class HooksIT extends LightweightPluginDaemonTest { @Test