aboutsummaryrefslogtreecommitdiffstats
path: root/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
parentdeafa95ac4fe407e22e5ad56ecdbbb2e0105e24a (diff)
downloadsonarqube-7945610fd5eb08165568cbcdf74adb45e8b2fd83.tar.gz
sonarqube-7945610fd5eb08165568cbcdf74adb45e8b2fd83.zip
fix varargs and unchecked called warnings
Diffstat (limited to 'server')
-rw-r--r--server/sonar-ce-task/src/test/java/org/sonar/ce/task/container/TaskContainerImplTest.java12
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/platform/ComputeEngineExtensionInstaller.java4
-rw-r--r--server/sonar-db-core/src/test/java/org/sonar/db/DatabaseUtilsTest.java2
-rw-r--r--server/sonar-server-common/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java3
-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
7 files changed, 22 insertions, 10 deletions
diff --git a/server/sonar-ce-task/src/test/java/org/sonar/ce/task/container/TaskContainerImplTest.java b/server/sonar-ce-task/src/test/java/org/sonar/ce/task/container/TaskContainerImplTest.java
index 5360c7a1ac6..e74552bae36 100644
--- a/server/sonar-ce-task/src/test/java/org/sonar/ce/task/container/TaskContainerImplTest.java
+++ b/server/sonar-ce-task/src/test/java/org/sonar/ce/task/container/TaskContainerImplTest.java
@@ -25,16 +25,16 @@ import org.sonar.core.platform.ComponentContainer;
import org.sonar.core.platform.ContainerPopulator;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
public class TaskContainerImplTest {
private ComponentContainer parent = new ComponentContainer();
- private ContainerPopulator populator = mock(ContainerPopulator.class);
+ private ContainerPopulator<TaskContainer> populator = spy(new DummyContainerPopulator());
@Test(expected = NullPointerException.class)
public void constructor_fails_fast_on_null_container() {
- new TaskContainerImpl(null, mock(ContainerPopulator.class));
+ new TaskContainerImpl(null, populator);
}
@Test(expected = NullPointerException.class)
@@ -111,4 +111,10 @@ public class TaskContainerImplTest {
}
+ private static class DummyContainerPopulator implements ContainerPopulator<TaskContainer> {
+ @Override
+ public void populateContainer(TaskContainer container) {
+
+ }
+ }
}
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/platform/ComputeEngineExtensionInstaller.java b/server/sonar-ce/src/main/java/org/sonar/ce/platform/ComputeEngineExtensionInstaller.java
index 796960470e2..48114203aea 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/platform/ComputeEngineExtensionInstaller.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/platform/ComputeEngineExtensionInstaller.java
@@ -24,9 +24,11 @@ import org.sonar.api.ce.ComputeEngineSide;
import org.sonar.core.platform.PluginRepository;
import org.sonar.server.plugins.ServerExtensionInstaller;
+import static java.util.Collections.singleton;
+
public class ComputeEngineExtensionInstaller extends ServerExtensionInstaller {
public ComputeEngineExtensionInstaller(SonarRuntime sonarRuntime, PluginRepository pluginRepository) {
- super(sonarRuntime, pluginRepository, ComputeEngineSide.class);
+ super(sonarRuntime, pluginRepository, singleton(ComputeEngineSide.class));
}
}
diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/DatabaseUtilsTest.java b/server/sonar-db-core/src/test/java/org/sonar/db/DatabaseUtilsTest.java
index b32852e37e6..fef76f8680e 100644
--- a/server/sonar-db-core/src/test/java/org/sonar/db/DatabaseUtilsTest.java
+++ b/server/sonar-db-core/src/test/java/org/sonar/db/DatabaseUtilsTest.java
@@ -141,7 +141,7 @@ public class DatabaseUtilsTest {
public void toUniqueAndSortedList_throws_NPE_if_arg_is_a_set_containing_a_null() {
expectedException.expect(NullPointerException.class);
- toUniqueAndSortedList(new HashSet<Comparable>(asList("A", null, "C")));
+ toUniqueAndSortedList(new HashSet<>(asList("A", (String) null, "C")));
}
@Test
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java b/server/sonar-server-common/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java
index 16bcba75ca9..086b2d22adc 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/plugins/ServerExtensionInstaller.java
@@ -23,6 +23,7 @@ import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ListMultimap;
import java.lang.annotation.Annotation;
+import java.util.Collection;
import java.util.Map;
import java.util.Set;
import org.sonar.api.ExtensionProvider;
@@ -48,7 +49,7 @@ public abstract class ServerExtensionInstaller {
private final Set<Class<? extends Annotation>> supportedAnnotationTypes;
protected ServerExtensionInstaller(SonarRuntime sonarRuntime, PluginRepository pluginRepository,
- Class<? extends Annotation>... supportedAnnotationTypes) {
+ Collection<Class<? extends Annotation>> supportedAnnotationTypes) {
requireNonNull(supportedAnnotationTypes, "At least one supported annotation type must be specified");
this.sonarRuntime = sonarRuntime;
this.pluginRepository = pluginRepository;
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;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-13 16:29:27 +0000