commit 3239ce3a471f5aa9edd8f6f702bee655ea81f77d
author Edwin Kempin <ekempin@google.com> Tue Oct 19 15:29:05 2021 +0200
committer Edwin Kempin <ekempin@google.com> Tue Oct 19 16:19:40 2021 +0200
tree 1903b139dbc77f175447701bb7feb53a290f1473
parent 09623b9432d360060f88ae48fb3386e374ca29c0

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: Ia8019f9e8b99a45ba1d9bca8f123e1336b3d7f59

BUILD

diff --git a/BUILD b/BUILD
index ce625bb..f9ec196 100644
--- a/BUILD
+++ b/BUILD
@@ -6,7 +6,7 @@
     srcs = glob(["src/main/java/**/*.java"]),
     manifest_entries = [
         "Gerrit-PluginName: singleusergroup",
-        "Gerrit-Module: com.googlesource.gerrit.plugins.singleusergroup.SingleUserGroup$Module",
+        "Gerrit-Module: com.googlesource.gerrit.plugins.singleusergroup.SingleUserGroup$PluginModule",
     ],
     resources = glob(["src/main/resources/**/*"]),
 )

src/main/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroup.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroup.java b/src/main/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroup.java
index 4e2f7ef..2e08c11 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroup.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroup.java
@@ -64,7 +64,7 @@
   private static final String ACCOUNT_ID_PATTERN = "[1-9][0-9]*";
   private static final int MAX = 10;
 
-  public static class Module extends AbstractModule {
+  public static class PluginModule extends AbstractModule {
     @Override
     protected void configure() {
       DynamicSet.bind(binder(), GroupBackend.class).to(SingleUserGroup.class);

src/test/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroupTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroupTest.java b/src/test/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroupTest.java
index 8b2c257..c1b75ab 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroupTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/singleusergroup/SingleUserGroupTest.java
@@ -32,7 +32,7 @@
 @NoHttpd
 @TestPlugin(
     name = "singleusergroup",
-    sysModule = "com.googlesource.gerrit.plugins.singleusergroup.SingleUserGroup$Module")
+    sysModule = "com.googlesource.gerrit.plugins.singleusergroup.SingleUserGroup$PluginModule")
 public class SingleUserGroupTest extends LightweightPluginDaemonTest {
   @Inject private RequestScopeOperations requestScopeOperations;