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: Ie80778a3ee4f401764548fd480d9ed99189f9deb
diff --git a/BUILD b/BUILD index bad06dc..b95a85f 100644 --- a/BUILD +++ b/BUILD
@@ -7,7 +7,7 @@ manifest_entries = [ "Gerrit-PluginName: plugin-manager", "Gerrit-HttpModule: com.googlesource.gerrit.plugins.manager.WebModule", - "Gerrit-Module: com.googlesource.gerrit.plugins.manager.Module", + "Gerrit-Module: com.googlesource.gerrit.plugins.manager.PluginModule", "Gerrit-ReloadMode: restart", "Implementation-Title: Plugin manager", "Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/plugin-manager",
diff --git a/src/main/java/com/googlesource/gerrit/plugins/manager/Module.java b/src/main/java/com/googlesource/gerrit/plugins/manager/PluginModule.java similarity index 97% rename from src/main/java/com/googlesource/gerrit/plugins/manager/Module.java rename to src/main/java/com/googlesource/gerrit/plugins/manager/PluginModule.java index 8a6b387..0c4b858 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/manager/Module.java +++ b/src/main/java/com/googlesource/gerrit/plugins/manager/PluginModule.java
@@ -23,7 +23,7 @@ import com.googlesource.gerrit.plugins.manager.repository.JenkinsCiPluginsRepository; import com.googlesource.gerrit.plugins.manager.repository.PluginsRepository; -public class Module extends AbstractModule { +public class PluginModule extends AbstractModule { @Override protected void configure() {
diff --git a/src/test/java/com/google/gerrit/server/restapi/config/PluginManagerTopMenuIT.java b/src/test/java/com/google/gerrit/server/restapi/config/PluginManagerTopMenuIT.java index a5d108d..4b19e4a 100644 --- a/src/test/java/com/google/gerrit/server/restapi/config/PluginManagerTopMenuIT.java +++ b/src/test/java/com/google/gerrit/server/restapi/config/PluginManagerTopMenuIT.java
@@ -32,7 +32,7 @@ @NoHttpd @TestPlugin( name = "plugin-manager", - sysModule = "com.googlesource.gerrit.plugins.manager.Module", + sysModule = "com.googlesource.gerrit.plugins.manager.PluginModule", httpModule = "com.googlesource.gerrit.plugins.manager.WebModule") public class PluginManagerTopMenuIT extends LightweightPluginDaemonTest {