From c980b1b86b4589538642a9535ea2fec807c3eb3b Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Wed, 14 Aug 2019 08:43:40 +0200 Subject: [PATCH] remove all other dependencies onto sonar-server was causing funky dependency tree for tests (almost loop) dependency was sometimes added for transitive dependencies module was super large yet hardly a couple classes were used --- .../build.gradle | 1 - server/sonar-server/build.gradle | 13 ----------- .../sonar/server/platform/ClusterFeature.java | 0 .../sonar/server/telemetry/LicenseReader.java | 0 .../sonar/server/telemetry/package-info.java | 23 +++++++++++++++++++ .../sonar/server/util/GlobalLockManager.java | 0 .../util/BooleanTypeValidationTest.java | 0 .../server/util/FloatTypeValidationTest.java | 0 .../server/util/GlobalLockManagerTest.java | 0 .../util/IntegerTypeValidationTest.java | 0 .../server/util/LongTypeValidationTest.java | 0 .../util/StringListTypeValidationTest.java | 0 .../server/util/StringTypeValidationTest.java | 0 .../server/util/TextTypeValidationTest.java | 0 .../server/util/TypeValidationModuleTest.java | 0 .../server/util/TypeValidationsTest.java | 0 .../server/util/TypeValidationsTesting.java | 0 server/sonar-webserver-webapi/build.gradle | 2 -- sonar-plugin-api-impl/build.gradle | 6 ++--- .../api/impl/utils/DefaultTempFolderTest.java | 5 ++-- 20 files changed, 28 insertions(+), 22 deletions(-) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/platform/ClusterFeature.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/telemetry/LicenseReader.java (100%) create mode 100644 server/sonar-webserver-common/src/main/java/org/sonar/server/telemetry/package-info.java rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/util/GlobalLockManager.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/util/GlobalLockManagerTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/util/LongTypeValidationTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/util/StringTypeValidationTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/util/TextTypeValidationTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/util/TypeValidationsTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/util/TypeValidationsTesting.java (100%) diff --git a/server/sonar-ce-task-projectanalysis/build.gradle b/server/sonar-ce-task-projectanalysis/build.gradle index 626c72a9ad3..7362ffc3ad6 100644 --- a/server/sonar-ce-task-projectanalysis/build.gradle +++ b/server/sonar-ce-task-projectanalysis/build.gradle @@ -63,7 +63,6 @@ dependencies { testCompile project(':server:sonar-db-testing') testCompile project(':sonar-testing-harness') testCompile project(path: ":server:sonar-ce-task", configuration: "tests") - testCompile project(path: ":server:sonar-server", configuration: "tests") testCompile project(path: ":server:sonar-server-common", configuration: "tests") } diff --git a/server/sonar-server/build.gradle b/server/sonar-server/build.gradle index 13ff9a20c67..063ee7dcfcb 100644 --- a/server/sonar-server/build.gradle +++ b/server/sonar-server/build.gradle @@ -80,16 +80,3 @@ dependencies { runtime 'io.jsonwebtoken:jjwt-jackson' } - -task testJar(type: Jar) { - classifier = 'tests' - from sourceSets.test.output -} - -configurations { - tests -} - -artifacts { - tests testJar -} diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ClusterFeature.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/ClusterFeature.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/platform/ClusterFeature.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/platform/ClusterFeature.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/telemetry/LicenseReader.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/telemetry/LicenseReader.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/telemetry/LicenseReader.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/telemetry/LicenseReader.java diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/telemetry/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/telemetry/package-info.java new file mode 100644 index 00000000000..ce3724b93a5 --- /dev/null +++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/telemetry/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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.telemetry; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/GlobalLockManager.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/GlobalLockManager.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/util/GlobalLockManager.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/util/GlobalLockManager.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/GlobalLockManagerTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/GlobalLockManagerTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/util/GlobalLockManagerTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/util/GlobalLockManagerTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/LongTypeValidationTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/LongTypeValidationTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/util/LongTypeValidationTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/util/LongTypeValidationTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/StringTypeValidationTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/StringTypeValidationTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/util/StringTypeValidationTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/util/StringTypeValidationTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/TextTypeValidationTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TextTypeValidationTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/util/TextTypeValidationTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/util/TextTypeValidationTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationsTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationsTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTesting.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationsTesting.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTesting.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationsTesting.java diff --git a/server/sonar-webserver-webapi/build.gradle b/server/sonar-webserver-webapi/build.gradle index b5d66accd1c..eaec81fa3ba 100644 --- a/server/sonar-webserver-webapi/build.gradle +++ b/server/sonar-webserver-webapi/build.gradle @@ -18,7 +18,6 @@ dependencies { compile project(':server:sonar-ce-task') compile project(':server:sonar-db-dao') compile project(':server:sonar-process') - compile project(':server:sonar-server') compile project(':server:sonar-webserver-auth') compile project(':server:sonar-webserver-es') compile project(':server:sonar-webserver-ws') @@ -37,7 +36,6 @@ dependencies { testCompile 'javax.servlet:javax.servlet-api' testCompile 'org.mockito:mockito-core' testCompile project(':server:sonar-db-testing') - testCompile project(path: ":server:sonar-server", configuration: "tests") testCompile project(path: ":server:sonar-server-common", configuration: "tests") testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests") testCompile project(path: ":server:sonar-webserver-common", configuration: "tests") diff --git a/sonar-plugin-api-impl/build.gradle b/sonar-plugin-api-impl/build.gradle index 274ca7ea96c..ee9930a295d 100644 --- a/sonar-plugin-api-impl/build.gradle +++ b/sonar-plugin-api-impl/build.gradle @@ -17,13 +17,13 @@ dependencies { compileOnly 'com.google.code.findbugs:jsr305' compileOnly 'junit:junit' - testCompile 'junit:junit' - testCompile 'com.google.code.findbugs:jsr305' + testCompileOnly 'com.google.code.findbugs:jsr305' + testCompile 'com.google.guava:guava' testCompile 'com.tngtech.java:junit-dataprovider' + testCompile 'junit:junit' testCompile 'org.assertj:assertj-core' testCompile 'org.mockito:mockito-core' - testCompile project(':server:sonar-server') } artifactoryPublish.skip = false diff --git a/sonar-plugin-api-impl/src/test/java/org/sonar/api/impl/utils/DefaultTempFolderTest.java b/sonar-plugin-api-impl/src/test/java/org/sonar/api/impl/utils/DefaultTempFolderTest.java index b21d2077ebb..eadf5e8a272 100644 --- a/sonar-plugin-api-impl/src/test/java/org/sonar/api/impl/utils/DefaultTempFolderTest.java +++ b/sonar-plugin-api-impl/src/test/java/org/sonar/api/impl/utils/DefaultTempFolderTest.java @@ -27,7 +27,6 @@ import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; -import org.sonar.server.util.TempFolderCleaner; import static org.assertj.core.api.Assertions.assertThat; @@ -51,7 +50,7 @@ public class DefaultTempFolderTest { File file = underTest.newFile(); assertThat(file).exists().isFile(); - new TempFolderCleaner(underTest).stop(); + underTest.clean(); assertThat(rootTempFolder).doesNotExist(); } @@ -63,7 +62,7 @@ public class DefaultTempFolderTest { assertThat(dir).exists().isDirectory(); assertThat(new File(rootTempFolder, "sample")).isEqualTo(dir); - new TempFolderCleaner(underTest).stop(); + underTest.clean(); assertThat(rootTempFolder).doesNotExist(); } -- 2.39.5