From fc3085b6cb8e80b93842b9742794a11414d11198 Mon Sep 17 00:00:00 2001 From: Jacek Date: Mon, 21 Oct 2019 15:49:34 -0500 Subject: [PATCH] SONAR-12383 Selenide update to 5.2.3 and Guava update to 28.1-jre --- build.gradle | 6 +++--- .../step/ComputeQProfileMeasureStepTest.java | 1 - .../sonar/ce/taskprocessor/CeProcessingSchedulerImpl.java | 5 +++-- .../main/java/org/sonar/application/es/EsConnectorImpl.java | 6 +++--- .../src/main/java/org/sonar/server/es/EsClientProvider.java | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index b0c29473c92..7044700dd73 100644 --- a/build.gradle +++ b/build.gradle @@ -173,14 +173,14 @@ subprojects { dependency 'com.eclipsesource.minimal-json:minimal-json:0.9.5' dependency 'com.github.kevinsawicki:http-request:5.4.1' dependency 'com.github.scribejava:scribejava-core:6.8.1' - dependency 'com.github.scribejava:scribejava-apis:6.8.1' + dependency 'com.github.scribejava:scribejava-apis:6.8.1' dependency 'com.googlecode.java-diff-utils:diffutils:1.2' dependency('com.googlecode.json-simple:json-simple:1.1.1') { exclude 'junit:junit' } dependency 'com.google.code.findbugs:jsr305:3.0.2' dependency 'com.google.code.gson:gson:2.8.5' - dependency 'com.google.guava:guava:18.0' + dependency 'com.google.guava:guava:28.1-jre' dependency "com.google.protobuf:protobuf-java:${protobufVersion}" dependency 'com.h2database:h2:1.3.176' dependencySet(group: 'com.hazelcast', version: '3.12.1') { @@ -283,7 +283,7 @@ subprojects { dependency 'org.sonarsource.update-center:sonar-update-center-common:1.23.0.723' dependency 'org.subethamail:subethasmtp:3.1.7' dependency 'org.yaml:snakeyaml:1.17' - dependency 'xml-apis:xml-apis:1.4.01' + dependency 'xml-apis:xml-apis:1.4.01' // please keep this list alphabetically ordered } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java index 7aa0f353bc2..12bf8075bd1 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java @@ -39,7 +39,6 @@ import org.sonar.server.qualityprofile.QualityProfile; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -import static org.assertj.guava.api.Assertions.assertThat; import static org.sonar.api.measures.CoreMetrics.QUALITY_PROFILES; import static org.sonar.api.measures.CoreMetrics.QUALITY_PROFILES_KEY; import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY; diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImpl.java index f75d8aebe9e..5325dd426c5 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImpl.java @@ -23,6 +23,7 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableScheduledFuture; +import com.google.common.util.concurrent.MoreExecutors; import java.util.Arrays; import java.util.concurrent.TimeUnit; import javax.annotation.CheckForNull; @@ -68,7 +69,7 @@ public class CeProcessingSchedulerImpl implements CeProcessingScheduler { public void startScheduling() { for (ChainingCallback chainingCallback : chainingCallbacks) { ListenableScheduledFuture future = executorService.schedule(chainingCallback.worker, delayBetweenEnabledTasks, timeUnit); - addCallback(future, chainingCallback); + addCallback(future, chainingCallback, MoreExecutors.directExecutor()); } } @@ -200,7 +201,7 @@ public class CeProcessingSchedulerImpl implements CeProcessingScheduler { private void addCallback() { if (workerFuture != null) { - Futures.addCallback(workerFuture, this); + Futures.addCallback(workerFuture, this, MoreExecutors.directExecutor()); } } diff --git a/server/sonar-main/src/main/java/org/sonar/application/es/EsConnectorImpl.java b/server/sonar-main/src/main/java/org/sonar/application/es/EsConnectorImpl.java index 3ab89817001..d03ad986b37 100644 --- a/server/sonar-main/src/main/java/org/sonar/application/es/EsConnectorImpl.java +++ b/server/sonar-main/src/main/java/org/sonar/application/es/EsConnectorImpl.java @@ -105,16 +105,16 @@ public class EsConnectorImpl implements EsConnector { boolean connectedToOneHost = false; for (HostAndPort hostAndPort : hostAndPorts) { try { - addTransportAddress(new TransportAddress(InetAddress.getByName(hostAndPort.getHostText()), hostAndPort.getPortOrDefault(9001))); + addTransportAddress(new TransportAddress(InetAddress.getByName(hostAndPort.getHost()), hostAndPort.getPortOrDefault(9001))); connectedToOneHost = true; } catch (UnknownHostException e) { - LOG.debug("Can not resolve host [" + hostAndPort.getHostText() + "]", e); + LOG.debug("Can not resolve host [" + hostAndPort.getHost() + "]", e); } } if (!connectedToOneHost) { throw new IllegalStateException(format("Can not connect to one node from [%s]", hostAndPorts.stream() - .map(h -> format("%s:%d", h.getHostText(), h.getPortOrDefault(9001))) + .map(h -> format("%s:%d", h.getHost(), h.getPortOrDefault(9001))) .collect(Collectors.joining(",")))); } } diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/es/EsClientProvider.java b/server/sonar-server-common/src/main/java/org/sonar/server/es/EsClientProvider.java index b84ab902146..87d8fdd16e0 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/es/EsClientProvider.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/es/EsClientProvider.java @@ -88,7 +88,7 @@ public class EsClientProvider extends ProviderAdapter { private static void addHostToClient(HostAndPort host, TransportClient client) { try { - client.addTransportAddress(new TransportAddress(InetAddress.getByName(host.getHostText()), host.getPortOrDefault(9001))); + client.addTransportAddress(new TransportAddress(InetAddress.getByName(host.getHost()), host.getPortOrDefault(9001))); } catch (UnknownHostException e) { throw new IllegalStateException("Can not resolve host [" + host + "]", e); } -- 2.39.5