clean up sonar-webserver content belonging to sonar-webserver-core

server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java → server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java

@@ -30,7 +30,6 @@ import org.sonar.server.rule.index.RuleQuery;
 
 /**
  * Operations related to activation and deactivation of rules on user profiles.
- * Use {@link BuiltInQProfileUpdate} for built-in profiles.
  */
 @ServerSide
 public interface QProfileRules {

server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/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.qualityprofile;
+
+import javax.annotation.ParametersAreNonnullByDefault;

server/sonar-webserver-core/build.gradle

@@ -1,3 +1,5 @@
+description = 'SonarQube WebServer-only code'
+
 sonarqube {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Web Server :: Core"
@@ -73,6 +75,7 @@ dependencies {
   testCompile project(':server:sonar-db-testing')
   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")
   testCompile project(path: ":server:sonar-webserver-es", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-ws", configuration: "tests")
   testCompile project(':sonar-testing-harness')

server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/CeModule.java → server/sonar-webserver-core/src/main/java/org/sonar/server/ce/CeModule.java

@@ -23,8 +23,6 @@ import org.sonar.ce.queue.CeQueueImpl;
 import org.sonar.ce.task.log.CeTaskLogging;
 import org.sonar.core.platform.Module;
 import org.sonar.server.ce.http.CeHttpClientImpl;
-import org.sonar.server.ce.queue.BranchSupport;
-import org.sonar.server.ce.queue.ReportSubmitter;
 
 public class CeModule extends Module {
   @Override
@@ -33,8 +31,6 @@ public class CeModule extends Module {
       CeHttpClientImpl.class,
 
       // Queue
-      CeQueueImpl.class,
-      BranchSupport.class,
-      ReportSubmitter.class);
+      CeQueueImpl.class);
   }
 }

server/sonar-webserver/src/main/java/org/sonar/server/rule/package-info.java → server/sonar-webserver-core/src/main/java/org/sonar/server/ce/http/package-info.java

@@ -18,6 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.server.rule;
+package org.sonar.server.ce.http;
 
 import javax.annotation.ParametersAreNonnullByDefault;

server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/CeModuleTest.java → server/sonar-webserver-core/src/test/java/org/sonar/server/ce/CeModuleTest.java

@@ -31,7 +31,7 @@ public class CeModuleTest {
   public void verify_count_of_added_components() {
     ComponentContainer container = new ComponentContainer();
     new CeModule().configure(container);
-    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 5);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 3);
   }
 
 

server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/http/CeHttpClientTest.java → server/sonar-webserver-core/src/test/java/org/sonar/server/ce/http/CeHttpClientImplTest.java

@@ -41,7 +41,7 @@ import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.test.ExceptionCauseMatcher.hasType;
 
-public class CeHttpClientTest {
+public class CeHttpClientImplTest {
   @Rule
   public TemporaryFolder temp = new TemporaryFolder();
   @Rule

server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/CeWsModule.java

@@ -20,11 +20,16 @@
 package org.sonar.server.ce.ws;
 
 import org.sonar.core.platform.Module;
+import org.sonar.server.ce.queue.BranchSupport;
+import org.sonar.server.ce.queue.ReportSubmitter;
 
 public class CeWsModule extends Module {
   @Override
   protected void configureModule() {
     add(
+      BranchSupport.class,
+      ReportSubmitter.class,
+
       CeWs.class,
       ActivityAction.class,
       ActivityStatusAction.class,

server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/ws/CeWsModuleTest.java

@@ -31,6 +31,6 @@ public class CeWsModuleTest {
   public void verify_count_of_added_components() {
     ComponentContainer container = new ComponentContainer();
     new CeWsModule().configure(container);
-    assertThat(container.size()).isEqualTo(16 + COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER);
+    assertThat(container.size()).isEqualTo(18 + COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER);
   }
 }

server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ChangeLogLevelActionTest.java

@@ -24,7 +24,6 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.utils.log.LoggerLevel;
 import org.sonar.server.ce.http.CeHttpClient;
-import org.sonar.server.ce.http.CeHttpClientImpl;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.log.ServerLogging;
 import org.sonar.server.tester.UserSessionRule;
@@ -41,7 +40,7 @@ public class ChangeLogLevelActionTest {
   public ExpectedException expectedException = ExpectedException.none();
 
   private ServerLogging serverLogging = mock(ServerLogging.class);
-  private CeHttpClient ceHttpClient = mock(CeHttpClientImpl.class);
+  private CeHttpClient ceHttpClient = mock(CeHttpClient.class);
   private ChangeLogLevelAction underTest = new ChangeLogLevelAction(userSession, new ChangeLogLevelStandaloneService(serverLogging, ceHttpClient));
   private WsActionTester actionTester = new WsActionTester(underTest);
 

server/sonar-webserver/build.gradle

@@ -1,4 +1,4 @@
-description = 'SonarQube WebServer'
+description = 'SonarQube WebServer executable and Tomcat directly related code'
 
 sonarqube {
   properties {