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: I363665f9d55542fae60ad45f3aeec457b290cf0d
diff --git a/BUILD b/BUILD index 08741ba..5ee6f0d 100644 --- a/BUILD +++ b/BUILD
@@ -7,7 +7,7 @@ srcs = glob(["src/main/java/**/*.java"]), manifest_entries = [ "Gerrit-PluginName: gitiles", - "Gerrit-Module: com.googlesource.gerrit.plugins.gitiles.Module", + "Gerrit-Module: com.googlesource.gerrit.plugins.gitiles.PluginModule", "Gerrit-HttpModule: com.googlesource.gerrit.plugins.gitiles.HttpModule", # Gitiles uses /repo to access a repo, so the default plugin layout would # disallow repos named "static" or "Documentation". Paths starting with +
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitiles/Module.java b/src/main/java/com/googlesource/gerrit/plugins/gitiles/PluginModule.java similarity index 97% rename from src/main/java/com/googlesource/gerrit/plugins/gitiles/Module.java rename to src/main/java/com/googlesource/gerrit/plugins/gitiles/PluginModule.java index 02f7eb7..5aab4cd 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/gitiles/Module.java +++ b/src/main/java/com/googlesource/gerrit/plugins/gitiles/PluginModule.java
@@ -47,11 +47,11 @@ import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.transport.resolver.RepositoryResolver; -class Module extends LifecycleModule { +class PluginModule extends LifecycleModule { private final boolean noWebLinks; @Inject - Module(PluginConfigFactory configFactory) { + PluginModule(PluginConfigFactory configFactory) { Config config = configFactory.getGlobalPluginConfig("gitiles"); this.noWebLinks = config.getBoolean("gerrit", null, "noWebLinks", false); }
diff --git a/src/test/java/com/googlesource/gerrit/plugins/gitiles/ListProjectsAccessTest.java b/src/test/java/com/googlesource/gerrit/plugins/gitiles/ListProjectsAccessTest.java index 839bd26..d8dee32 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/gitiles/ListProjectsAccessTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/gitiles/ListProjectsAccessTest.java
@@ -34,7 +34,7 @@ import org.junit.After; import org.junit.Test; -@TestPlugin(name = "gitiles", sysModule = "com.googlesource.gerrit.plugins.gitiles.Module") +@TestPlugin(name = "gitiles", sysModule = "com.googlesource.gerrit.plugins.gitiles.PluginModule") public class ListProjectsAccessTest extends LightweightPluginDaemonTest { @ConfigSuite.Default public static Config defaultConfig() {
diff --git a/src/test/java/com/googlesource/gerrit/plugins/gitiles/RepositoryResolverAccessTest.java b/src/test/java/com/googlesource/gerrit/plugins/gitiles/RepositoryResolverAccessTest.java index dc0e89d..110837f 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/gitiles/RepositoryResolverAccessTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/gitiles/RepositoryResolverAccessTest.java
@@ -35,7 +35,7 @@ import org.junit.After; import org.junit.Test; -@TestPlugin(name = "gitiles", sysModule = "com.googlesource.gerrit.plugins.gitiles.Module") +@TestPlugin(name = "gitiles", sysModule = "com.googlesource.gerrit.plugins.gitiles.PluginModule") public class RepositoryResolverAccessTest extends LightweightPluginDaemonTest { @ConfigSuite.Default public static Config defaultConfig() {