aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-server
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2018-07-05 18:26:06 +0200
committersonartech <sonartech@sonarsource.com>2018-07-09 10:39:33 +0200
commit7945610fd5eb08165568cbcdf74adb45e8b2fd83 (patch)
tree6cc0e832d4bce6e1fc76ec3b1018c7b2e2f27879 /server/sonar-server
parentdeafa95ac4fe407e22e5ad56ecdbbb2e0105e24a (diff)
downloadsonarqube-7945610fd5eb08165568cbcdf74adb45e8b2fd83.tar.gz
sonarqube-7945610fd5eb08165568cbcdf74adb45e8b2fd83.zip
fix varargs and unchecked called warnings
Diffstat (limited to 'server/sonar-server')
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityAction.java5
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java4
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java2
3 files changed, 7 insertions, 4 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityAction.java b/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityAction.java
index 164ca9fd7c5..35ecc68b825 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ce/ws/ActivityAction.java
@@ -52,6 +52,7 @@ import org.sonarqube.ws.Ce.ActivityResponse;
import static java.lang.Boolean.parseBoolean;
import static java.lang.Integer.parseInt;
import static java.lang.String.format;
+import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
import static org.apache.commons.lang.StringUtils.defaultString;
import static org.sonar.api.utils.DateUtils.parseEndingDateOrDateTime;
@@ -128,8 +129,8 @@ public class ActivityAction implements CeWsAction {
action.createParam(PARAM_STATUS)
.setDescription("Comma separated list of task statuses")
.setPossibleValues(ImmutableList.builder()
- .add(CeActivityDto.Status.values())
- .add(CeQueueDto.Status.values()).build())
+ .addAll(asList(CeActivityDto.Status.values()))
+ .addAll(asList(CeQueueDto.Status.values())).build())
.setExampleValue(Joiner.on(",").join(CeQueueDto.Status.IN_PROGRESS, CeActivityDto.Status.SUCCESS))
// activity statuses by default to be backward compatible
// queued tasks have been added in 5.5
diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java
index a192f057287..21a0dc0f02f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java
@@ -23,9 +23,11 @@ import org.sonar.api.SonarRuntime;
import org.sonar.api.server.ServerSide;
import org.sonar.core.platform.PluginRepository;
+import static java.util.Collections.singleton;
+
@ServerSide
public class WebServerExtensionInstaller extends ServerExtensionInstaller {
public WebServerExtensionInstaller(SonarRuntime sonarRuntime, PluginRepository pluginRepository) {
- super(sonarRuntime, pluginRepository, ServerSide.class);
+ super(sonarRuntime, pluginRepository, singleton(ServerSide.class));
}
}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java
index 40e26606a8e..7dd63c8be6f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java
@@ -236,7 +236,7 @@ public class QualityGateConditionsUpdater {
@SuppressWarnings("unchecked")
private static boolean check(boolean expression, List<String> errors, String message, String... args) {
if (!expression) {
- errors.add(format(message, args));
+ errors.add(format(message, (Object[]) args));
}
return expression;
}