From 0316e0b883129594466be5b1088a8ee9b1d06461 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Fri, 22 Jun 2018 17:01:46 +0200 Subject: [PATCH] move some classes (including webhooks) to server-common --- server/sonar-server-common/build.gradle | 5 +++- .../sonar/server/async/AsyncExecution.java | 0 .../async/AsyncExecutionExecutorService.java | 0 .../AsyncExecutionExecutorServiceImpl.java | 0 .../server/async/AsyncExecutionImpl.java | 0 .../server/async/AsyncExecutionMBean.java | 0 .../server/async/AsyncExecutionMBeanImpl.java | 0 .../server/async/AsyncExecutionModule.java | 0 .../async/AsyncExecutionMonitoring.java | 0 .../org/sonar/server/async/package-info.java | 0 .../org/sonar/server/project/Project.java | 0 .../sonar/server/project/package-info.java | 23 +++++++++++++++++++ .../sonar/server/qualitygate/Condition.java | 0 .../qualitygate/EvaluatedCondition.java | 0 .../qualitygate/EvaluatedQualityGate.java | 0 .../sonar/server/qualitygate/QualityGate.java | 0 .../server/qualitygate/package-info.java | 23 +++++++++++++++++++ .../server/util/OkHttpClientProvider.java | 0 .../org/sonar/server/webhook/Analysis.java | 0 .../java/org/sonar/server/webhook/Branch.java | 0 .../java/org/sonar/server/webhook/CeTask.java | 0 .../sonar/server/webhook/ProjectAnalysis.java | 0 .../org/sonar/server/webhook/WebHooks.java | 0 .../sonar/server/webhook/WebHooksImpl.java | 14 ++++++++++- .../org/sonar/server/webhook/Webhook.java | 0 .../sonar/server/webhook/WebhookCaller.java | 0 .../server/webhook/WebhookCallerImpl.java | 2 ++ .../sonar/server/webhook/WebhookDelivery.java | 0 .../webhook/WebhookDeliveryStorage.java | 2 ++ .../sonar/server/webhook/WebhookModule.java | 0 .../sonar/server/webhook/WebhookPayload.java | 0 .../server/webhook/WebhookPayloadFactory.java | 0 .../webhook/WebhookPayloadFactoryImpl.java | 2 ++ .../sonar/server/webhook/package-info.java | 0 ...AsyncExecutionExecutorServiceImplTest.java | 0 .../server/async/AsyncExecutionImplTest.java | 0 .../async/AsyncExecutionMBeanImplTest.java | 0 .../org/sonar/server/project/ProjectTest.java | 0 .../server/qualitygate/ConditionTest.java | 0 .../qualitygate/EvaluatedConditionTest.java | 0 .../qualitygate/EvaluatedQualityGateTest.java | 0 .../server/qualitygate/QualityGateTest.java | 0 .../server/util/OkHttpClientProviderTest.java | 0 .../sonar/server/webhook/AnalysisTest.java | 0 .../webhook/AsynchronousWebHooksImplTest.java | 0 .../org/sonar/server/webhook/BranchTest.java | 0 .../org/sonar/server/webhook/CeTaskTest.java | 0 .../server/webhook/ProjectAnalysisTest.java | 0 .../webhook/SynchronousWebHooksImplTest.java | 0 .../server/webhook/TestWebhookCaller.java | 0 .../server/webhook/WebhookCallerImplTest.java | 0 .../webhook/WebhookDeliveryStorageTest.java | 1 - .../server/webhook/WebhookDeliveryTest.java | 3 --- .../server/webhook/WebhookModuleTest.java | 1 + .../WebhookPayloadFactoryImplTest.java | 0 .../org/sonar/server/webhook/WebhookTest.java | 0 .../platformlevel/PlatformLevel4.java | 2 +- 57 files changed, 71 insertions(+), 7 deletions(-) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/async/AsyncExecution.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/async/AsyncExecutionExecutorService.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/async/AsyncExecutionExecutorServiceImpl.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/async/AsyncExecutionImpl.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/async/AsyncExecutionMBean.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/async/AsyncExecutionMBeanImpl.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/async/AsyncExecutionModule.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/async/AsyncExecutionMonitoring.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/async/package-info.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/project/Project.java (100%) create mode 100644 server/sonar-server-common/src/main/java/org/sonar/server/project/package-info.java rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/qualitygate/Condition.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/qualitygate/EvaluatedCondition.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/qualitygate/EvaluatedQualityGate.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/qualitygate/QualityGate.java (100%) create mode 100644 server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/package-info.java rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/util/OkHttpClientProvider.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/webhook/Analysis.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/webhook/Branch.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/webhook/CeTask.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/webhook/ProjectAnalysis.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/webhook/WebHooks.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/webhook/WebHooksImpl.java (91%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/webhook/Webhook.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/webhook/WebhookCaller.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/webhook/WebhookCallerImpl.java (99%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/webhook/WebhookDelivery.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/webhook/WebhookDeliveryStorage.java (98%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/webhook/WebhookModule.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/webhook/WebhookPayload.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/webhook/WebhookPayloadFactory.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/webhook/WebhookPayloadFactoryImpl.java (99%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/webhook/package-info.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/async/AsyncExecutionExecutorServiceImplTest.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/async/AsyncExecutionImplTest.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/async/AsyncExecutionMBeanImplTest.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/project/ProjectTest.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/qualitygate/ConditionTest.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/qualitygate/EvaluatedConditionTest.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/qualitygate/EvaluatedQualityGateTest.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/qualitygate/QualityGateTest.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/webhook/AnalysisTest.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/webhook/AsynchronousWebHooksImplTest.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/webhook/BranchTest.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/webhook/CeTaskTest.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/webhook/ProjectAnalysisTest.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/webhook/SynchronousWebHooksImplTest.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/webhook/TestWebhookCaller.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/webhook/WebhookDeliveryStorageTest.java (98%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/webhook/WebhookDeliveryTest.java (94%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/webhook/WebhookModuleTest.java (97%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/webhook/WebhookPayloadFactoryImplTest.java (100%) rename server/{sonar-server => sonar-server-common}/src/test/java/org/sonar/server/webhook/WebhookTest.java (100%) diff --git a/server/sonar-server-common/build.gradle b/server/sonar-server-common/build.gradle index 6e189c3febf..3b2443c6f2a 100644 --- a/server/sonar-server-common/build.gradle +++ b/server/sonar-server-common/build.gradle @@ -15,8 +15,10 @@ dependencies { compile 'com.google.guava:guava' compile 'org.slf4j:slf4j-api' - compile project(':sonar-core') + compile 'com.squareup.okhttp3:okhttp' compile project(':server:sonar-db-dao') + compile project(':sonar-core') + compile project(':sonar-ws') compileOnly project(path: ':sonar-plugin-api') compileOnly project(path: ':server:sonar-process') @@ -25,6 +27,7 @@ dependencies { testCompile 'com.google.code.findbugs:jsr305' testCompile 'com.h2database:h2' + testCompile 'com.squareup.okhttp3:mockwebserver' testCompile 'com.tngtech.java:junit-dataprovider' testCompile 'junit:junit' testCompile 'org.assertj:assertj-core' diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecution.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecution.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecution.java rename to server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecution.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionExecutorService.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionExecutorService.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionExecutorService.java rename to server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionExecutorService.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionExecutorServiceImpl.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionExecutorServiceImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionExecutorServiceImpl.java rename to server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionExecutorServiceImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionImpl.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionImpl.java rename to server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionMBean.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionMBean.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionMBean.java rename to server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionMBean.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionMBeanImpl.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionMBeanImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionMBeanImpl.java rename to server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionMBeanImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionModule.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionModule.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionModule.java rename to server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionModule.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionMonitoring.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionMonitoring.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionMonitoring.java rename to server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionMonitoring.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/package-info.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/async/package-info.java rename to server/sonar-server-common/src/main/java/org/sonar/server/async/package-info.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/Project.java b/server/sonar-server-common/src/main/java/org/sonar/server/project/Project.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/project/Project.java rename to server/sonar-server-common/src/main/java/org/sonar/server/project/Project.java diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/project/package-info.java b/server/sonar-server-common/src/main/java/org/sonar/server/project/package-info.java new file mode 100644 index 00000000000..7771f38cbe9 --- /dev/null +++ b/server/sonar-server-common/src/main/java/org/sonar/server/project/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.project; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/Condition.java b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/Condition.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/Condition.java rename to server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/Condition.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/EvaluatedCondition.java b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/EvaluatedCondition.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/EvaluatedCondition.java rename to server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/EvaluatedCondition.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/EvaluatedQualityGate.java b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/EvaluatedQualityGate.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/EvaluatedQualityGate.java rename to server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/EvaluatedQualityGate.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGate.java b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/QualityGate.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGate.java rename to server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/QualityGate.java diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/package-info.java b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/package-info.java new file mode 100644 index 00000000000..c378d26367b --- /dev/null +++ b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.qualitygate; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/OkHttpClientProvider.java b/server/sonar-server-common/src/main/java/org/sonar/server/util/OkHttpClientProvider.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/util/OkHttpClientProvider.java rename to server/sonar-server-common/src/main/java/org/sonar/server/util/OkHttpClientProvider.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/Analysis.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/Analysis.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/Analysis.java rename to server/sonar-server-common/src/main/java/org/sonar/server/webhook/Analysis.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/Branch.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/Branch.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/Branch.java rename to server/sonar-server-common/src/main/java/org/sonar/server/webhook/Branch.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/CeTask.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/CeTask.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/CeTask.java rename to server/sonar-server-common/src/main/java/org/sonar/server/webhook/CeTask.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ProjectAnalysis.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/ProjectAnalysis.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/ProjectAnalysis.java rename to server/sonar-server-common/src/main/java/org/sonar/server/webhook/ProjectAnalysis.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebHooks.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebHooks.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/WebHooks.java rename to server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebHooks.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebHooksImpl.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebHooksImpl.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/WebHooksImpl.java rename to server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebHooksImpl.java index 5036e81a92c..26c432656f6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebHooksImpl.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebHooksImpl.java @@ -23,6 +23,8 @@ import java.util.List; import java.util.Optional; import java.util.function.Supplier; import java.util.stream.Stream; +import org.sonar.api.ce.ComputeEngineSide; +import org.sonar.api.server.ServerSide; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.core.util.stream.MoreCollectors; @@ -33,9 +35,11 @@ import org.sonar.db.webhook.WebhookDao; import org.sonar.db.webhook.WebhookDto; import org.sonar.server.async.AsyncExecution; +import static java.lang.String.format; import static java.util.Optional.ofNullable; -import static org.sonar.server.ws.WsUtils.checkStateWithOptional; +@ServerSide +@ComputeEngineSide public class WebHooksImpl implements WebHooks { private static final Logger LOGGER = Loggers.get(WebHooksImpl.class); @@ -77,6 +81,14 @@ public class WebHooksImpl implements WebHooks { } } + private static T checkStateWithOptional(java.util.Optional value, String message, Object... messageArguments) { + if (!value.isPresent()) { + throw new IllegalStateException(format(message, messageArguments)); + } + + return value.get(); + } + @Override public void sendProjectAnalysisUpdate(Analysis analysis, Supplier payloadSupplier) { List webhooks = readWebHooksFrom(analysis.getProjectUuid()) diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/Webhook.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/Webhook.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/Webhook.java rename to server/sonar-server-common/src/main/java/org/sonar/server/webhook/Webhook.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookCaller.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookCaller.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookCaller.java rename to server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookCaller.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookCallerImpl.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookCallerImpl.java similarity index 99% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookCallerImpl.java rename to server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookCallerImpl.java index e9e70ca09c1..4f0624b6117 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookCallerImpl.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookCallerImpl.java @@ -28,6 +28,7 @@ import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; import org.sonar.api.ce.ComputeEngineSide; +import org.sonar.api.server.ServerSide; import org.sonar.api.utils.System2; import static java.lang.String.format; @@ -38,6 +39,7 @@ import static okhttp3.internal.http.StatusLine.HTTP_PERM_REDIRECT; import static okhttp3.internal.http.StatusLine.HTTP_TEMP_REDIRECT; import static org.apache.commons.lang.StringUtils.isNotEmpty; +@ServerSide @ComputeEngineSide public class WebhookCallerImpl implements WebhookCaller { diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookDelivery.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookDelivery.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookDelivery.java rename to server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookDelivery.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookDeliveryStorage.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookDeliveryStorage.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookDeliveryStorage.java rename to server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookDeliveryStorage.java index 0ba9bb95c75..7bf13c484a2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookDeliveryStorage.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookDeliveryStorage.java @@ -21,6 +21,7 @@ package org.sonar.server.webhook; import com.google.common.base.Throwables; import org.sonar.api.ce.ComputeEngineSide; +import org.sonar.api.server.ServerSide; import org.sonar.api.utils.System2; import org.sonar.core.util.UuidFactory; import org.sonar.db.DbClient; @@ -31,6 +32,7 @@ import org.sonar.db.webhook.WebhookDeliveryDto; /** * Persist and purge {@link WebhookDelivery} into database */ +@ServerSide @ComputeEngineSide public class WebhookDeliveryStorage { diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookModule.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookModule.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookModule.java rename to server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookModule.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookPayload.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookPayload.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookPayload.java rename to server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookPayload.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookPayloadFactory.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookPayloadFactory.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookPayloadFactory.java rename to server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookPayloadFactory.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookPayloadFactoryImpl.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookPayloadFactoryImpl.java similarity index 99% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookPayloadFactoryImpl.java rename to server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookPayloadFactoryImpl.java index 32440c4b2cb..d6b9b298ec6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookPayloadFactoryImpl.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookPayloadFactoryImpl.java @@ -28,6 +28,7 @@ import java.util.Map; import java.util.Optional; import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.platform.Server; +import org.sonar.api.server.ServerSide; import org.sonar.api.utils.System2; import org.sonar.api.utils.text.JsonWriter; import org.sonar.server.project.Project; @@ -38,6 +39,7 @@ import org.sonar.server.qualitygate.EvaluatedQualityGate; import static java.lang.String.format; import static org.sonar.core.config.CorePropertyDefinitions.SONAR_ANALYSIS; +@ServerSide @ComputeEngineSide public class WebhookPayloadFactoryImpl implements WebhookPayloadFactory { diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/package-info.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/package-info.java rename to server/sonar-server-common/src/main/java/org/sonar/server/webhook/package-info.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/async/AsyncExecutionExecutorServiceImplTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/async/AsyncExecutionExecutorServiceImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/async/AsyncExecutionExecutorServiceImplTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/async/AsyncExecutionExecutorServiceImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/async/AsyncExecutionImplTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/async/AsyncExecutionImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/async/AsyncExecutionImplTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/async/AsyncExecutionImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/async/AsyncExecutionMBeanImplTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/async/AsyncExecutionMBeanImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/async/AsyncExecutionMBeanImplTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/async/AsyncExecutionMBeanImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ProjectTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/project/ProjectTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/project/ProjectTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/project/ProjectTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ConditionTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/ConditionTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualitygate/ConditionTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/ConditionTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/EvaluatedConditionTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/EvaluatedConditionTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualitygate/EvaluatedConditionTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/EvaluatedConditionTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/EvaluatedQualityGateTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/EvaluatedQualityGateTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualitygate/EvaluatedQualityGateTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/EvaluatedQualityGateTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/QualityGateTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/QualityGateTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/AnalysisTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/AnalysisTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/webhook/AnalysisTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/webhook/AnalysisTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/AsynchronousWebHooksImplTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/AsynchronousWebHooksImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/webhook/AsynchronousWebHooksImplTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/webhook/AsynchronousWebHooksImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/BranchTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/BranchTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/webhook/BranchTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/webhook/BranchTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/CeTaskTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/CeTaskTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/webhook/CeTaskTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/webhook/CeTaskTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/ProjectAnalysisTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/ProjectAnalysisTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/webhook/ProjectAnalysisTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/webhook/ProjectAnalysisTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/SynchronousWebHooksImplTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/SynchronousWebHooksImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/webhook/SynchronousWebHooksImplTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/webhook/SynchronousWebHooksImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/TestWebhookCaller.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/TestWebhookCaller.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/webhook/TestWebhookCaller.java rename to server/sonar-server-common/src/test/java/org/sonar/server/webhook/TestWebhookCaller.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookDeliveryStorageTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookDeliveryStorageTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookDeliveryStorageTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookDeliveryStorageTest.java index 1fac932cbc9..7273b947c86 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookDeliveryStorageTest.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookDeliveryStorageTest.java @@ -34,7 +34,6 @@ import org.sonar.db.webhook.WebhookDeliveryDto; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.sonar.db.webhook.WebhookDbTesting.newDto; import static org.sonar.db.webhook.WebhookDbTesting.selectAllDeliveryUuids; public class WebhookDeliveryStorageTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookDeliveryTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookDeliveryTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookDeliveryTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookDeliveryTest.java index 534702838c3..1e627f560e3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookDeliveryTest.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookDeliveryTest.java @@ -21,9 +21,6 @@ package org.sonar.server.webhook; import java.io.IOException; import org.junit.Test; -import org.sonar.server.webhook.Webhook; -import org.sonar.server.webhook.WebhookDelivery; -import org.sonar.server.webhook.WebhookPayload; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookModuleTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookModuleTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookModuleTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookModuleTest.java index 2615c87ade7..58b17bf35ee 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookModuleTest.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookModuleTest.java @@ -23,6 +23,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.core.platform.ComponentContainer; +import org.sonar.server.webhook.WebhookModule; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER; diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookPayloadFactoryImplTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookPayloadFactoryImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookPayloadFactoryImplTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookPayloadFactoryImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookTest.java rename to server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookTest.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java index 0b1e7bcfbab..cf5e8b244cc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java @@ -28,7 +28,6 @@ import org.sonar.api.resources.ResourceTypes; import org.sonar.api.rules.AnnotationRuleParser; import org.sonar.api.rules.XMLRuleParser; import org.sonar.api.server.rule.RulesDefinitionXmlLoader; -import org.sonar.server.ce.CeModule; import org.sonar.ce.notification.ReportAnalysisFailureNotificationModule; import org.sonar.core.component.DefaultResourceTypes; import org.sonar.core.extension.CoreExtensionsInstaller; @@ -42,6 +41,7 @@ import org.sonar.server.batch.BatchWsModule; import org.sonar.server.branch.BranchFeatureProxyImpl; import org.sonar.server.branch.pr.ws.PullRequestWsModule; import org.sonar.server.branch.ws.BranchWsModule; +import org.sonar.server.ce.CeModule; import org.sonar.server.ce.ws.CeWsModule; import org.sonar.server.component.ComponentCleanerService; import org.sonar.server.component.ComponentFinder; -- 2.39.5