Skip to content

Commit 9e4cd70

Browse files
committed
Fix ErrorProne issues for JavaLangClash bug pattern
This requires renaming Module classes that clash with java.lang.Module. Signed-off-by: Edwin Kempin <[email protected]> Change-Id: Ic094fd30aea87433ff8063afc44427350309ff85
1 parent 73f9dc7 commit 9e4cd70

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ gerrit_plugin(
1111
srcs = glob(["src/main/java/**/*.java"]),
1212
manifest_entries = [
1313
"Gerrit-PluginName: webhooks",
14-
"Gerrit-Module: com.googlesource.gerrit.plugins.webhooks.Module",
14+
"Gerrit-Module: com.googlesource.gerrit.plugins.webhooks.PluginModule",
1515
"Implementation-Title: webhooks plugin",
1616
"Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/webhooks",
1717
"Implementation-Vendor: Gerrit Code Review",

src/main/java/com/googlesource/gerrit/plugins/webhooks/Module.java renamed to src/main/java/com/googlesource/gerrit/plugins/webhooks/PluginModule.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
import java.util.concurrent.ScheduledExecutorService;
3030
import org.apache.http.impl.client.CloseableHttpClient;
3131

32-
public class Module extends FactoryModule {
32+
public class PluginModule extends FactoryModule {
3333
private final ProcessorModule processors;
3434

3535
@Inject
36-
public Module(ProcessorModule processors) {
36+
public PluginModule(ProcessorModule processors) {
3737
this.processors = processors;
3838
}
3939

src/test/java/com/googlesource/gerrit/plugins/webhooks/rest/GetRemoteIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.eclipse.jgit.transport.RefSpec;
3535
import org.junit.Test;
3636

37-
@TestPlugin(name = "webhooks", sysModule = "com.googlesource.gerrit.plugins.webhooks.Module")
37+
@TestPlugin(name = "webhooks", sysModule = "com.googlesource.gerrit.plugins.webhooks.PluginModule")
3838
public class GetRemoteIT extends LightweightPluginDaemonTest {
3939

4040
@Test

src/test/java/com/googlesource/gerrit/plugins/webhooks/rest/UpdateRemoteIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.junit.Before;
3333
import org.junit.Test;
3434

35-
@TestPlugin(name = "webhooks", sysModule = "com.googlesource.gerrit.plugins.webhooks.Module")
35+
@TestPlugin(name = "webhooks", sysModule = "com.googlesource.gerrit.plugins.webhooks.PluginModule")
3636
public class UpdateRemoteIT extends LightweightPluginDaemonTest {
3737

3838
private String fooEndpoint;

0 commit comments

Comments
 (0)