Fix warnings from use of older code style

gocd-contrib · Apr 14, 2024 · fc21140 · fc21140
1 parent 1501176
commit fc21140
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 23 deletions.
diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ plugins {
 
 apply from: 'plugin-helpers.gradle'
 
-project.ext.pluginVersion = '1.7.3'
+project.ext.pluginVersion = '1.8.0'
 project.ext.fullVersion = project.git.distVersion() ? "${project.pluginVersion}-${project.git.distVersion()}" : project.pluginVersion
 
 project.ext.pluginDesc = [

diff --git a/common/src/test/java/com/tw/go/plugin/provider/DefaultProviderTest.java b/common/src/test/java/com/tw/go/plugin/provider/DefaultProviderTest.java
@@ -21,6 +21,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -45,7 +46,7 @@ public String pluginId() {
 
         @Override
         public List<String> pollerPluginIds() {
-            return null;
+            return Collections.emptyList();
         }
 
         @Override

diff --git a/gerrit-cs-status/src/main/java/com/tw/go/plugin/provider/GerritProvider.java b/gerrit-cs-status/src/main/java/com/tw/go/plugin/provider/GerritProvider.java
@@ -31,7 +31,6 @@
 
 import static com.tw.go.plugin.setting.DefaultPluginConfigurationView.*;
 import static com.tw.go.plugin.util.ValidationUtils.getValidationError;
-import static java.util.Collections.singletonList;
 
 public class GerritProvider extends DefaultProvider {
 
@@ -61,7 +60,7 @@ public String pluginId() {
 
     @Override
     public List<String> pollerPluginIds() {
-        return singletonList(GERRIT_CS_POLLER_PLUGIN_ID);
+        return List.of(GERRIT_CS_POLLER_PLUGIN_ID);
     }
 
     @Override

diff --git a/gerrit-cs-status/src/test/java/com/tw/go/plugin/GerritBuildStatusNotifierPluginTest.java b/gerrit-cs-status/src/test/java/com/tw/go/plugin/GerritBuildStatusNotifierPluginTest.java
@@ -36,7 +36,6 @@
 import java.util.Map;
 
 import static com.tw.go.plugin.BuildStatusNotifierPlugin.PLUGIN_SETTINGS_GET_CONFIGURATION;
-import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.openMocks;
@@ -61,7 +60,7 @@ public void setUp() {
         pluginSettingsResponse.setResponseBody(JSONUtils.toJSON(new HashMap<String, String>()));
         when(goApplicationAccessor.submit(any(GoApiRequest.class))).thenReturn(pluginSettingsResponse);
         when(provider.pluginId()).thenReturn(PLUGIN_ID);
-        when(provider.pollerPluginIds()).thenReturn(singletonList(POLLER_PLUGIN_ID));
+        when(provider.pollerPluginIds()).thenReturn(List.of(POLLER_PLUGIN_ID));
 
         plugin.initializeGoApplicationAccessor(goApplicationAccessor);
         plugin.setProvider(provider);

diff --git a/github-pr-status/src/main/java/com/tw/go/plugin/provider/GitHubProvider.java b/github-pr-status/src/main/java/com/tw/go/plugin/provider/GitHubProvider.java
@@ -28,8 +28,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static java.util.Collections.singletonList;
-
 public class GitHubProvider extends DefaultProvider {
     private static final Logger LOGGER = Logger.getLoggerFor(GitHubProvider.class);
     public static final String PLUGIN_ID = "github.pr.status";
@@ -46,7 +44,7 @@ public String pluginId() {
 
     @Override
     public List<String> pollerPluginIds() {
-        return singletonList(GITHUB_PR_POLLER_PLUGIN_ID);
+        return List.of(GITHUB_PR_POLLER_PLUGIN_ID);
     }
 
     @Override

diff --git a/github-pr-status/src/test/java/com/tw/go/plugin/GitHubBuildStatusNotifierPluginTest.java b/github-pr-status/src/test/java/com/tw/go/plugin/GitHubBuildStatusNotifierPluginTest.java
@@ -36,7 +36,6 @@
 import java.util.Map;
 
 import static com.tw.go.plugin.BuildStatusNotifierPlugin.PLUGIN_SETTINGS_GET_CONFIGURATION;
-import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.openMocks;
@@ -61,7 +60,7 @@ public void setUp() {
         pluginSettingsResponse.setResponseBody(JSONUtils.toJSON(new HashMap<String, String>()));
         when(goApplicationAccessor.submit(any(GoApiRequest.class))).thenReturn(pluginSettingsResponse);
         when(provider.pluginId()).thenReturn(PLUGIN_ID);
-        when(provider.pollerPluginIds()).thenReturn(singletonList(POLLER_PLUGIN_ID));
+        when(provider.pollerPluginIds()).thenReturn(List.of(POLLER_PLUGIN_ID));
 
         plugin.initializeGoApplicationAccessor(goApplicationAccessor);
         plugin.setProvider(provider);

diff --git a/gitlab-mr-status/src/main/java/com/tw/go/plugin/provider/GitLabProvider.java b/gitlab-mr-status/src/main/java/com/tw/go/plugin/provider/GitLabProvider.java
@@ -16,18 +16,13 @@
 
 import static com.tw.go.plugin.setting.DefaultPluginConfigurationView.*;
 import static com.tw.go.plugin.util.ValidationUtils.getValidationError;
-import static java.util.Collections.unmodifiableList;
 
 public class GitLabProvider extends DefaultProvider {
-    private static Logger LOGGER = Logger.getLoggerFor(GitLabProvider.class);
+    private static final Logger LOGGER = Logger.getLoggerFor(GitLabProvider.class);
 
     private static final String PLUGIN_ID = "gitlab.mr.status";
     private static final String GITLAB_FB_POLLER_PLUGIN_ID = "git.fb";
     private static final String GITLAB_POLLER_PLUGIN_ID = "gitlab.pr";
-    private static final List<String> POLLER_PLUGINS = unmodifiableList(new ArrayList<String>() {{
-        add(GITLAB_FB_POLLER_PLUGIN_ID);
-        add(GITLAB_POLLER_PLUGIN_ID);
-    }});
 
     public GitLabProvider() {
         super(new GitlLabConfigurationView());
@@ -40,7 +35,7 @@ public String pluginId() {
 
     @Override
     public List<String> pollerPluginIds() {
-        return POLLER_PLUGINS;
+        return List.of(GITLAB_FB_POLLER_PLUGIN_ID, GITLAB_POLLER_PLUGIN_ID);
     }
 
     @Override

diff --git a/stash-pr-status/src/main/java/com/tw/go/plugin/provider/StashProvider.java b/stash-pr-status/src/main/java/com/tw/go/plugin/provider/StashProvider.java
@@ -28,8 +28,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static java.util.Collections.singletonList;
-
 public class StashProvider extends DefaultProvider {
     public static final String PLUGIN_ID = "stash.pr.status";
     public static final String STASH_PR_POLLER_PLUGIN_ID = "stash.pr";
@@ -57,7 +55,7 @@ public String pluginId() {
 
     @Override
     public List<String> pollerPluginIds() {
-        return singletonList(STASH_PR_POLLER_PLUGIN_ID);
+        return List.of(STASH_PR_POLLER_PLUGIN_ID);
     }
 
     @Override

diff --git a/stash-pr-status/src/test/java/com/tw/go/plugin/StashBuildStatusNotifierPluginTest.java b/stash-pr-status/src/test/java/com/tw/go/plugin/StashBuildStatusNotifierPluginTest.java
@@ -37,7 +37,6 @@
 import java.util.Map;
 
 import static com.tw.go.plugin.BuildStatusNotifierPlugin.PLUGIN_SETTINGS_GET_CONFIGURATION;
-import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.openMocks;
@@ -62,7 +61,7 @@ public void setUp() {
         pluginSettingsResponse.setResponseBody(JSONUtils.toJSON(new HashMap<String, String>()));
         when(goApplicationAccessor.submit(any(GoApiRequest.class))).thenReturn(pluginSettingsResponse);
         when(provider.pluginId()).thenReturn(PLUGIN_ID);
-        when(provider.pollerPluginIds()).thenReturn(singletonList(POLLER_PLUGIN_ID));
+        when(provider.pollerPluginIds()).thenReturn(List.of(POLLER_PLUGIN_ID));
 
         plugin.initializeGoApplicationAccessor(goApplicationAccessor);
         plugin.setProvider(provider);