Revert "SONAR-6864 Rename WS batch/* to scanner/*"

This reverts commit a515be7cbe641e21805d9fa945bf13afc66c810c.
author: Teryk Bellahsene <teryk.bellahsene@sonarsource.com> 2015-09-28 14:14:35 +0200
committer: Duarte Meneses <duarte.meneses@sonarsource.com> 2015-09-30 16:28:08 +0200
commit: a23a7ec4f48244c193b48aec84127701618a31cc (patch)
tree: 60c76cbb7f6fc709c9ff98375f6f2c8c2d27928f
parent: 80b9f52b80c5ae3fcc81b8b8cc3209000a886b7f (diff)
download: sonarqube-a23a7ec4f48244c193b48aec84127701618a31cc.tar.gz
sonarqube-a23a7ec4f48244c193b48aec84127701618a31cc.zip
32 files changed, 347 insertions, 370 deletions
diff --git a/it/it-tests/src/test/java/server/suite/ServerTest.java b/it/it-tests/src/test/java/server/suite/ServerTest.java
index 7e6a4ae7049..57ab6c3b33f 100644
--- a/it/it-tests/src/test/java/server/suite/ServerTest.java
+++ b/it/it-tests/src/test/java/server/suite/ServerTest.java
@@ -72,7 +72,7 @@ public class ServerTest {
       orchestrator.getServer().getAdminWsClient().update(new PropertyUpdateQuery("sonar.forceAuthentication", "true"));
 
       // /batch/index should never need authentication
-      String batchIndex = orchestrator.getServer().wsClient().get("/scanner/index");
+      String batchIndex = orchestrator.getServer().wsClient().get("/batch/index");
       assertThat(batchIndex).isNotEmpty();
 
       String jar = batchIndex.split("\\|")[0];
@@ -80,13 +80,13 @@ public class ServerTest {
       // /batch/file should never need authentication
       HttpClient httpclient = new DefaultHttpClient();
       try {
-        HttpGet get = new HttpGet(orchestrator.getServer().getUrl() + "/scanner/file?name=" + jar);
+        HttpGet get = new HttpGet(orchestrator.getServer().getUrl() + "/batch/file?name=" + jar);
         HttpResponse response = httpclient.execute(get);
         assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
         EntityUtils.consume(response.getEntity());
 
         // As Sonar runner is still using /batch/key, we have to also verify it
-        get = new HttpGet(orchestrator.getServer().getUrl() + "/scanner/" + jar);
+        get = new HttpGet(orchestrator.getServer().getUrl() + "/batch/" + jar);
         response = httpclient.execute(get);
         assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
         EntityUtils.consume(response.getEntity());
diff --git a/server/sonar-server/src/main/java/org/sonar/server/scanner/ScannerIndex.java b/server/sonar-server/src/main/java/org/sonar/server/batch/BatchIndex.java
index d9f82d207b9..77ab8034969 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/scanner/ScannerIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/BatchIndex.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.FileFilterUtils;
@@ -38,13 +38,13 @@ import java.util.Collection;
  * JAR files to be downloaded by sonar-runner.
  */
 @ServerSide
-public class ScannerIndex implements Startable {
+public class BatchIndex implements Startable {
 
   private final Server server;
   private String index;
   private File batchDir;
 
-  public ScannerIndex(Server server) {
+  public BatchIndex(Server server) {
     this.server = server;
   }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/scanner/ScannerWs.java b/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWs.java
index b8d4c4c2898..df6a4bccbb8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/scanner/ScannerWs.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWs.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -28,15 +28,15 @@ import org.sonar.api.server.ws.WebService;
 
 import java.io.IOException;
 
-public class ScannerWs implements WebService {
+public class BatchWs implements WebService {
 
-  public static final String API_ENDPOINT = "scanner";
+  public static final String API_ENDPOINT = "batch";
 
-  private final ScannerIndex scannerIndex;
-  private final ScannerWsAction[] actions;
+  private final BatchIndex batchIndex;
+  private final BatchWsAction[] actions;
 
-  public ScannerWs(ScannerIndex scannerIndex, ScannerWsAction... actions) {
-    this.scannerIndex = scannerIndex;
+  public BatchWs(BatchIndex batchIndex, BatchWsAction... actions) {
+    this.batchIndex = batchIndex;
     this.actions = actions;
   }
 
@@ -48,7 +48,7 @@ public class ScannerWs implements WebService {
 
     defineIndexAction(controller);
     defineFileAction(controller);
-    for (ScannerWsAction action : actions) {
+    for (BatchWsAction action : actions) {
       action.define(controller);
     }
 
@@ -64,7 +64,7 @@ public class ScannerWs implements WebService {
         public void handle(Request request, Response response) {
           try {
             response.stream().setMediaType("text/plain");
-            IOUtils.write(scannerIndex.getIndex(), response.stream().output());
+            IOUtils.write(batchIndex.getIndex(), response.stream().output());
           } catch (IOException e) {
             throw new IllegalStateException(e);
           }
@@ -83,7 +83,7 @@ public class ScannerWs implements WebService {
           String filename = request.mandatoryParam("name");
           try {
             response.stream().setMediaType("application/java-archive");
-            FileUtils.copyFile(scannerIndex.getFile(filename), response.stream().output());
+            FileUtils.copyFile(batchIndex.getFile(filename), response.stream().output());
           } catch (IOException e) {
             throw new IllegalStateException(e);
           }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/scanner/ScannerWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsAction.java
index 2df2a0f773a..66f279a690b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/scanner/ScannerWsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsAction.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import org.sonar.server.ws.WsAction;
 
-public interface ScannerWsAction extends WsAction {
+public interface BatchWsAction extends WsAction {
   // Marker interface
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/scanner/ScannerWsModule.java b/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsModule.java
index cc2b3be7175..3ea7bbab019 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/scanner/ScannerWsModule.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsModule.java
@@ -17,20 +17,20 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import org.sonar.core.platform.Module;
 
-public class ScannerWsModule extends Module {
+public class BatchWsModule extends Module {
   @Override
   protected void configureModule() {
     add(
-      ScannerIndex.class,
+      BatchIndex.class,
       GlobalAction.class,
       ProjectAction.class,
       ProjectDataLoader.class,
       IssuesAction.class,
       UsersAction.class,
-      ScannerWs.class);
+      BatchWs.class);
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/scanner/GlobalAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java
index fc9706e67e2..f528f93ac44 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/scanner/GlobalAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import org.apache.commons.io.IOUtils;
 import org.sonar.api.server.ws.Request;
@@ -36,7 +36,7 @@ import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.plugins.MimeTypes;
 import org.sonar.server.user.UserSession;
 
-public class GlobalAction implements ScannerWsAction {
+public class GlobalAction implements BatchWsAction {
 
   private final DbClient dbClient;
   private final PropertiesDao propertiesDao;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/scanner/IssuesAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java
index 445ec7cef15..6e3042a4d93 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/scanner/IssuesAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -43,7 +43,7 @@ import org.sonar.server.user.UserSession;
 
 import static com.google.common.collect.Maps.newHashMap;
 
-public class IssuesAction implements ScannerWsAction {
+public class IssuesAction implements BatchWsAction {
 
   private static final String PARAM_KEY = "key";
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/scanner/Messages.java b/server/sonar-server/src/main/java/org/sonar/server/batch/Messages.java
index da223a3354f..71c877da110 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/scanner/Messages.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/Messages.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 public class Messages {
   private Messages() {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/scanner/ProjectAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectAction.java
index 28777593040..36d20e4afc0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/scanner/ProjectAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectAction.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -28,11 +28,11 @@ import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.batch.protocol.input.FileData;
 import org.sonar.batch.protocol.input.ProjectRepositories;
-import org.sonarqube.ws.WsScanner.WsProjectResponse;
+import org.sonarqube.ws.WsBatch.WsProjectResponse;
 
 import static org.sonar.server.ws.WsUtils.writeProtobuf;
 
-public class ProjectAction implements ScannerWsAction {
+public class ProjectAction implements BatchWsAction {
 
   private static final String PARAM_KEY = "key";
   private static final String PARAM_PROFILE = "profile";
diff --git a/server/sonar-server/src/main/java/org/sonar/server/scanner/ProjectDataLoader.java b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java
index 06ba815719e..5b990a5f06d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/scanner/ProjectDataLoader.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Maps;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/scanner/ProjectDataQuery.java b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataQuery.java
index de13aefd43e..fa3e8246d6f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/scanner/ProjectDataQuery.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataQuery.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/scanner/UsersAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/UsersAction.java
index b738bf26486..a4ecc638736 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/scanner/UsersAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/UsersAction.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -34,7 +34,7 @@ import org.sonar.server.user.UserSession;
 import org.sonar.server.user.index.UserDoc;
 import org.sonar.server.user.index.UserIndex;
 
-public class UsersAction implements ScannerWsAction {
+public class UsersAction implements BatchWsAction {
 
   private static final String PARAM_LOGINS = "logins";
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/scanner/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/batch/package-info.java
index 81945a8168e..9fc58425b89 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/scanner/package-info.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/package-info.java
@@ -19,6 +19,6 @@
  */
 
 @ParametersAreNonnullByDefault
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import javax.annotation.ParametersAreNonnullByDefault;
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 aee4aebb5ae..1af4c400a59 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
@@ -49,7 +49,7 @@ import org.sonar.server.activity.index.ActivityIndexer;
 import org.sonar.server.activity.ws.ActivitiesWs;
 import org.sonar.server.activity.ws.ActivityMapping;
 import org.sonar.server.authentication.ws.AuthenticationWs;
-import org.sonar.server.scanner.ScannerWsModule;
+import org.sonar.server.batch.BatchWsModule;
 import org.sonar.server.charts.ChartFactory;
 import org.sonar.server.charts.DistributionAreaChart;
 import org.sonar.server.charts.DistributionBarChart;
@@ -343,7 +343,7 @@ public class PlatformLevel4 extends PlatformLevel {
       ActivityIndex.class,
 
       // batch
-      ScannerWsModule.class,
+      BatchWsModule.class,
 
       // Dashboard
       DashboardsWs.class,
diff --git a/server/sonar-server/src/test/java/org/sonar/server/scanner/ScannerIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/BatchIndexTest.java
index 239a3402df6..884524cc9ca 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/scanner/ScannerIndexTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/batch/BatchIndexTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.CharUtils;
@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class ScannerIndexTest {
+public class BatchIndexTest {
 
   @Rule
   public TemporaryFolder temp = new TemporaryFolder();
@@ -60,21 +60,21 @@ public class ScannerIndexTest {
 
   @Test
   public void get_index() {
-    ScannerIndex scannerIndex = new ScannerIndex(server);
-    scannerIndex.start();
+    BatchIndex batchIndex = new BatchIndex(server);
+    batchIndex.start();
 
-    String index = scannerIndex.getIndex();
+    String index = batchIndex.getIndex();
     assertThat(index).isEqualTo("sonar-batch.jar|acbd18db4cc2f85cedef654fccc4a4d8" + CharUtils.LF);
 
-    scannerIndex.stop();
+    batchIndex.stop();
   }
 
   @Test
   public void get_file() {
-    ScannerIndex scannerIndex = new ScannerIndex(server);
-    scannerIndex.start();
+    BatchIndex batchIndex = new BatchIndex(server);
+    batchIndex.start();
 
-    File file = scannerIndex.getFile("sonar-batch.jar");
+    File file = batchIndex.getFile("sonar-batch.jar");
     assertThat(file).isEqualTo(jar);
   }
 
@@ -87,10 +87,10 @@ public class ScannerIndexTest {
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage("Bad filename: ../sonar-batch.jar");
 
-    ScannerIndex scannerIndex = new ScannerIndex(server);
-    scannerIndex.start();
+    BatchIndex batchIndex = new BatchIndex(server);
+    batchIndex.start();
 
-    scannerIndex.getFile("../sonar-batch.jar");
+    batchIndex.getFile("../sonar-batch.jar");
   }
 
   @Test
@@ -98,9 +98,9 @@ public class ScannerIndexTest {
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage("Bad filename: other.jar");
 
-    ScannerIndex scannerIndex = new ScannerIndex(server);
-    scannerIndex.start();
+    BatchIndex batchIndex = new BatchIndex(server);
+    batchIndex.start();
 
-    scannerIndex.getFile("other.jar");
+    batchIndex.getFile("other.jar");
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/scanner/ScannerWsModuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/BatchWsModuleTest.java
index 6b81f52a87e..997ac69ffec 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/scanner/ScannerWsModuleTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/batch/BatchWsModuleTest.java
@@ -17,18 +17,18 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import org.junit.Test;
 import org.sonar.core.platform.ComponentContainer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ScannerWsModuleTest {
+public class BatchWsModuleTest {
   @Test
   public void verify_count_of_added_components() {
     ComponentContainer container = new ComponentContainer();
-    new ScannerWsModule().configure(container);
+    new BatchWsModule().configure(container);
     assertThat(container.size()).isEqualTo(9);
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/scanner/ScannerWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/BatchWsTest.java
index e672e132cb8..c1f20842324 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/scanner/ScannerWsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/batch/BatchWsTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import java.io.File;
 import org.apache.commons.io.FileUtils;
@@ -41,7 +41,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
-public class ScannerWsTest {
+public class BatchWsTest {
   @Rule
   public UserSessionRule userSessionRule = UserSessionRule.standalone();
 
@@ -52,13 +52,13 @@ public class ScannerWsTest {
   public ExpectedException thrown = ExpectedException.none();
 
   @Mock
-  ScannerIndex scannerIndex;
+  BatchIndex batchIndex;
 
   WsTester tester;
 
   @Before
   public void before() {
-    tester = new WsTester(new ScannerWs(scannerIndex,
+    tester = new WsTester(new BatchWs(batchIndex,
       new GlobalAction(mock(DbClient.class), mock(PropertiesDao.class), userSessionRule),
       new ProjectAction(mock(ProjectDataLoader.class)),
       new IssuesAction(mock(DbClient.class), mock(IssueIndex.class), userSessionRule, mock(ComponentFinder.class))));
@@ -66,9 +66,9 @@ public class ScannerWsTest {
 
   @Test
   public void download_index() throws Exception {
-    when(scannerIndex.getIndex()).thenReturn("sonar-batch.jar|acbd18db4cc2f85cedef654fccc4a4d8");
+    when(batchIndex.getIndex()).thenReturn("sonar-batch.jar|acbd18db4cc2f85cedef654fccc4a4d8");
 
-    String index = tester.newGetRequest("scanner", "index").execute().outputAsString();
+    String index = tester.newGetRequest("batch", "index").execute().outputAsString();
     assertThat(index).isEqualTo("sonar-batch.jar|acbd18db4cc2f85cedef654fccc4a4d8");
   }
 
@@ -78,9 +78,9 @@ public class ScannerWsTest {
 
     File file = temp.newFile(filename);
     FileUtils.writeStringToFile(file, "foo");
-    when(scannerIndex.getFile(filename)).thenReturn(file);
+    when(batchIndex.getFile(filename)).thenReturn(file);
 
-    String jar = tester.newGetRequest("scanner", "file").setParam("name", filename).execute().outputAsString();
+    String jar = tester.newGetRequest("batch", "file").setParam("name", filename).execute().outputAsString();
     assertThat(jar).isEqualTo("foo");
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/scanner/GlobalActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalActionTest.java
index 69e19dfc12c..31ebee42edf 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/scanner/GlobalActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalActionTest.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -66,7 +66,7 @@ public class GlobalActionTest {
     when(dbClient.openSession(false)).thenReturn(session);
     when(dbClient.metricDao()).thenReturn(metricDao);
 
-    tester = new WsTester(new ScannerWs(mock(ScannerIndex.class), new GlobalAction(dbClient, propertiesDao, userSessionRule)));
+    tester = new WsTester(new BatchWs(mock(BatchIndex.class), new GlobalAction(dbClient, propertiesDao, userSessionRule)));
   }
 
   @Test
@@ -78,7 +78,7 @@ public class GlobalActionTest {
         .setWorstValue(0d).setBestValue(100d).setOptimizedBestValue(false).setDirection(1).setEnabled(true)
       ));
 
-    WsTester.TestRequest request = tester.newGetRequest("scanner", "global");
+    WsTester.TestRequest request = tester.newGetRequest("batch", "global");
     request.execute().assertJson(getClass(), "return_global_referentials.json");
   }
 
@@ -92,7 +92,7 @@ public class GlobalActionTest {
       new PropertyDto().setKey("foo.license.secured").setValue("5678")
       ));
 
-    WsTester.TestRequest request = tester.newGetRequest("scanner", "global");
+    WsTester.TestRequest request = tester.newGetRequest("batch", "global");
     request.execute().assertJson(getClass(), "return_global_settings.json");
   }
 
@@ -106,7 +106,7 @@ public class GlobalActionTest {
       new PropertyDto().setKey("foo.license.secured").setValue("5678")
       ));
 
-    WsTester.TestRequest request = tester.newGetRequest("scanner", "global");
+    WsTester.TestRequest request = tester.newGetRequest("batch", "global");
     request.execute().assertJson(getClass(), "return_only_license_settings_without_scan_but_with_preview_permission.json");
   }
 
@@ -122,6 +122,6 @@ public class GlobalActionTest {
 
     thrown.expect(ForbiddenException.class);
 
-    tester.newGetRequest("scanner", "global").execute();
+    tester.newGetRequest("batch", "global").execute();
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/scanner/IssuesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java
index ba9762e904d..67950cbb5d0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/scanner/IssuesActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import java.io.ByteArrayInputStream;
 import java.util.Arrays;
@@ -90,7 +90,7 @@ public class IssuesActionTest {
     issueAuthorizationIndexer = new IssueAuthorizationIndexer(null, es.client());
     issuesAction = new IssuesAction(db.getDbClient(), issueIndex, userSessionRule, new ComponentFinder(db.getDbClient()));
 
-    tester = new WsTester(new ScannerWs(new ScannerIndex(mock(Server.class)), issuesAction));
+    tester = new WsTester(new BatchWs(new BatchIndex(mock(Server.class)), issuesAction));
   }
 
   @Test
@@ -114,7 +114,7 @@ public class IssuesActionTest {
 
     userSessionRule.login("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION);
 
-    WsTester.TestRequest request = tester.newGetRequest("scanner", "issues").setParam("key", PROJECT_KEY);
+    WsTester.TestRequest request = tester.newGetRequest("batch", "issues").setParam("key", PROJECT_KEY);
 
     ServerIssue serverIssue = ServerIssue.parseDelimitedFrom(new ByteArrayInputStream(request.execute().output()));
     assertThat(serverIssue.getKey()).isEqualTo("EFGH");
@@ -153,7 +153,7 @@ public class IssuesActionTest {
 
     userSessionRule.login("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION);
 
-    WsTester.TestRequest request = tester.newGetRequest("scanner", "issues").setParam("key", PROJECT_KEY);
+    WsTester.TestRequest request = tester.newGetRequest("batch", "issues").setParam("key", PROJECT_KEY);
 
     ServerIssue serverIssue = ServerIssue.parseDelimitedFrom(new ByteArrayInputStream(request.execute().output()));
     assertThat(serverIssue.getKey()).isEqualTo("EFGH");
@@ -192,7 +192,7 @@ public class IssuesActionTest {
 
     userSessionRule.login("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION);
 
-    WsTester.TestRequest request = tester.newGetRequest("scanner", "issues").setParam("key", MODULE_KEY);
+    WsTester.TestRequest request = tester.newGetRequest("batch", "issues").setParam("key", MODULE_KEY);
     ServerIssue serverIssue = ServerIssue.parseDelimitedFrom(new ByteArrayInputStream(request.execute().output()));
     assertThat(serverIssue.getKey()).isEqualTo("EFGH");
     assertThat(serverIssue.getModuleKey()).isEqualTo(MODULE_KEY);
@@ -230,7 +230,7 @@ public class IssuesActionTest {
 
     userSessionRule.login("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION);
 
-    WsTester.TestRequest request = tester.newGetRequest("scanner", "issues").setParam("key", FILE_KEY);
+    WsTester.TestRequest request = tester.newGetRequest("batch", "issues").setParam("key", FILE_KEY);
     ServerIssue serverIssue = ServerIssue.parseDelimitedFrom(new ByteArrayInputStream(request.execute().output()));
     assertThat(serverIssue.getKey()).isEqualTo("EFGH");
     assertThat(serverIssue.getModuleKey()).isEqualTo(MODULE_KEY);
@@ -267,7 +267,7 @@ public class IssuesActionTest {
 
     userSessionRule.login("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION);
 
-    WsTester.TestRequest request = tester.newGetRequest("scanner", "issues").setParam("key", MODULE_KEY);
+    WsTester.TestRequest request = tester.newGetRequest("batch", "issues").setParam("key", MODULE_KEY);
     ServerIssue previousIssue = ServerIssue.parseDelimitedFrom(new ByteArrayInputStream(request.execute().output()));
     assertThat(previousIssue.getKey()).isEqualTo("EFGH");
     assertThat(previousIssue.getModuleKey()).isEqualTo(MODULE_KEY);
@@ -306,7 +306,7 @@ public class IssuesActionTest {
 
     userSessionRule.login("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION);
 
-    WsTester.TestRequest request = tester.newGetRequest("scanner", "issues").setParam("key", PROJECT_KEY);
+    WsTester.TestRequest request = tester.newGetRequest("batch", "issues").setParam("key", PROJECT_KEY);
     ServerIssue serverIssue = ServerIssue.parseDelimitedFrom(new ByteArrayInputStream(request.execute().output()));
     assertThat(serverIssue.getKey()).isEqualTo("EFGH");
     // Module key of removed file should be returned
@@ -317,7 +317,7 @@ public class IssuesActionTest {
   public void fail_without_preview_permission() throws Exception {
     userSessionRule.login("henry").setGlobalPermissions(GlobalPermissions.PROVISIONING);
 
-    WsTester.TestRequest request = tester.newGetRequest("scanner", "issues").setParam("key", PROJECT_KEY);
+    WsTester.TestRequest request = tester.newGetRequest("batch", "issues").setParam("key", PROJECT_KEY);
     request.execute();
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/scanner/ProjectActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java
index 29ac51b7c6f..372118eba96 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/scanner/ProjectActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -38,7 +38,7 @@ public class ProjectActionTest {
 
   @Before
   public void setUp() {
-    tester = new WsTester(new ScannerWs(mock(ScannerIndex.class), new ProjectAction(projectDataLoader)));
+    tester = new WsTester(new BatchWs(mock(BatchIndex.class), new ProjectAction(projectDataLoader)));
   }
 
   @Test
@@ -51,7 +51,7 @@ public class ProjectActionTest {
     ArgumentCaptor<ProjectDataQuery> queryArgumentCaptor = ArgumentCaptor.forClass(ProjectDataQuery.class);
     when(projectDataLoader.load(queryArgumentCaptor.capture())).thenReturn(projectReferentials);
 
-    WsTester.TestRequest request = tester.newGetRequest("scanner", "project")
+    WsTester.TestRequest request = tester.newGetRequest("batch", "project")
       .setParam("key", projectKey)
       .setParam("profile", "Default")
       .setParam("preview", "false");
diff --git a/server/sonar-server/src/test/java/org/sonar/server/scanner/ProjectDataLoaderMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java
index c4cf868bb81..8498f3fc3db 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/scanner/ProjectDataLoaderMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectDataLoaderMediumTest.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Date;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/scanner/UsersActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/UsersActionTest.java
index 450a70d0691..43c000cafae 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/scanner/UsersActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/batch/UsersActionTest.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.server.scanner;
+package org.sonar.server.batch;
 
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -60,7 +60,7 @@ public class UsersActionTest {
     userIndex = new UserIndex(es.client());
     usersAction = new UsersAction(userIndex, userSessionRule);
 
-    tester = new WsTester(new ScannerWs(new ScannerIndex(mock(Server.class)), usersAction));
+    tester = new WsTester(new BatchWs(new BatchIndex(mock(Server.class)), usersAction));
   }
 
   @Test
@@ -71,7 +71,7 @@ public class UsersActionTest {
 
     userSessionRule.login("sonarqtech").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION);
 
-    WsTester.TestRequest request = tester.newGetRequest("scanner", "users").setParam("logins", "ada.lovelace,grace.hopper");
+    WsTester.TestRequest request = tester.newGetRequest("batch", "users").setParam("logins", "ada.lovelace,grace.hopper");
 
     ByteArrayInputStream input = new ByteArrayInputStream(request.execute().output());
 
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/scanner/GlobalActionTest/return_global_referentials.json b/server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalActionTest/return_global_referentials.json
index 2e558edbbf6..2e558edbbf6 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/scanner/GlobalActionTest/return_global_referentials.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalActionTest/return_global_referentials.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/scanner/GlobalActionTest/return_global_settings.json b/server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalActionTest/return_global_settings.json
index d6faa69622a..d6faa69622a 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/scanner/GlobalActionTest/return_global_settings.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalActionTest/return_global_settings.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/scanner/GlobalActionTest/return_only_license_settings_without_scan_but_with_preview_permission.json b/server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalActionTest/return_only_license_settings_without_scan_but_with_preview_permission.json
index b0af2f8ca33..b0af2f8ca33 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/scanner/GlobalActionTest/return_only_license_settings_without_scan_but_with_preview_permission.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalActionTest/return_only_license_settings_without_scan_but_with_preview_permission.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/scanner/ProjectActionTest/project_referentials.json b/server/sonar-server/src/test/resources/org/sonar/server/batch/ProjectActionTest/project_referentials.json
index ff04061219e..ff04061219e 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/scanner/ProjectActionTest/project_referentials.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/batch/ProjectActionTest/project_referentials.json
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/config/routes.rb b/server/sonar-web/src/main/webapp/WEB-INF/config/routes.rb
index 1ccfc4e2216..098d8cccf9a 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/config/routes.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/config/routes.rb
@@ -9,8 +9,8 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'api', :controller => 'api/java_ws', :action => 'redirect_to_ws_listing'
 
   # deprecated, sonar-runner should use batch/index and batch/file?name=xxx
-  map.connect 'batch_bootstrap/index', :controller => 'api/java_ws', :action => 'index', :wspath => 'scanner', :wsaction => 'index'
-  map.connect 'scanner/:name', :controller => 'api/java_ws', :action => 'index', :wspath => 'scanner', :wsaction => 'file', :requirements => { :name => /.*/ }
+  map.connect 'batch_bootstrap/index', :controller => 'api/java_ws', :action => 'index', :wspath => 'batch', :wsaction => 'index'
+  map.connect 'batch/:name', :controller => 'api/java_ws', :action => 'index', :wspath => 'batch', :wsaction => 'file', :requirements => { :name => /.*/ }
 
   map.connect 'api/server/:action', :controller => 'api/server'
   map.connect 'api/resoures', :controller => 'api/resources', :action => 'index'
diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoader.java b/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoader.java
index 990a6c903f0..1634de89847 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoader.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoader.java
@@ -19,26 +19,23 @@
  */
 package org.sonar.batch.repository;
 
-import org.apache.commons.io.IOUtils;
-
-import org.sonar.batch.util.BatchUtils;
-import org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath;
-import org.sonarqube.ws.WsScanner.WsProjectResponse.Settings;
-import org.sonarqube.ws.WsScanner.WsProjectResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.google.common.collect.Table;
 import com.google.common.collect.HashBasedTable;
-import org.sonar.batch.cache.WSLoaderResult;
-import org.sonar.batch.cache.WSLoader;
-import org.apache.commons.lang.mutable.MutableBoolean;
-
-import javax.annotation.Nullable;
-
+import com.google.common.collect.Table;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Date;
 import java.util.Map;
+import javax.annotation.Nullable;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.mutable.MutableBoolean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.sonar.batch.cache.WSLoader;
+import org.sonar.batch.cache.WSLoaderResult;
+import org.sonar.batch.util.BatchUtils;
+import org.sonarqube.ws.WsBatch.WsProjectResponse;
+import org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath;
+import org.sonarqube.ws.WsBatch.WsProjectResponse.Settings;
 
 public class DefaultProjectRepositoriesLoader implements ProjectRepositoriesLoader {
   private static final Logger LOG = LoggerFactory.getLogger(DefaultProjectRepositoriesLoader.class);
@@ -90,7 +87,7 @@ public class DefaultProjectRepositoriesLoader implements ProjectRepositoriesLoad
 
       Map<String, FileDataByPath> fileDataByModuleAndPath = response.getFileDataByModuleAndPath();
       for (Map.Entry<String, FileDataByPath> e1 : fileDataByModuleAndPath.entrySet()) {
-        for (Map.Entry<String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData> e2 : e1.getValue().getFileDataByPath().entrySet()) {
+        for (Map.Entry<String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData> e2 : e1.getValue().getFileDataByPath().entrySet()) {
           FileData fd = new FileData(e2.getValue().getHash(), e2.getValue().getRevision());
           fileDataTable.put(e1.getKey(), e2.getKey(), fd);
         }
diff --git a/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoaderTest.java b/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoaderTest.java
index 3a0a4b892f9..fb6a18d50c4 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoaderTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoaderTest.java
@@ -19,21 +19,20 @@
  */
 package org.sonar.batch.repository;
 
-import org.sonarqube.ws.WsScanner.WsProjectResponse;
-import org.sonar.batch.cache.WSLoaderResult;
-import org.sonar.batch.cache.WSLoader;
-import org.apache.commons.lang.mutable.MutableBoolean;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import org.apache.commons.lang.mutable.MutableBoolean;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.sonar.batch.cache.WSLoader;
+import org.sonar.batch.cache.WSLoaderResult;
+import org.sonarqube.ws.WsBatch.WsProjectResponse;
+
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/sonar-ws/src/main/gen-java/org/sonarqube/ws/WsScanner.java b/sonar-ws/src/main/gen-java/org/sonarqube/ws/WsBatch.java
index e10798d639d..73a996bda27 100644
--- a/sonar-ws/src/main/gen-java/org/sonarqube/ws/WsScanner.java
+++ b/sonar-ws/src/main/gen-java/org/sonarqube/ws/WsBatch.java
@@ -1,10 +1,10 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: ws-scanner.proto
+// source: ws-batch.proto
 
 package org.sonarqube.ws;
 
-public final class WsScanner {
-  private WsScanner() {}
+public final class WsBatch {
+  private WsBatch() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
   }
@@ -24,13 +24,13 @@ public final class WsScanner {
     /**
      * <code>map&lt;string, .sonarqube.ws.batch.WsProjectResponse.Settings&gt; settingsByModule = 2;</code>
      */
-    java.util.Map<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings>
+    java.util.Map<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings>
     getSettingsByModule();
 
     /**
      * <code>map&lt;string, .sonarqube.ws.batch.WsProjectResponse.FileDataByPath&gt; fileDataByModuleAndPath = 3;</code>
      */
-    java.util.Map<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath>
+    java.util.Map<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath>
     getFileDataByModuleAndPath();
 
     /**
@@ -46,7 +46,7 @@ public final class WsScanner {
    * Protobuf type {@code sonarqube.ws.batch.WsProjectResponse}
    *
    * <pre>
-   * WS api/scanner/project
+   * WS api/batch/project
    * </pre>
    */
   public  static final class WsProjectResponse extends
@@ -100,7 +100,7 @@ public final class WsScanner {
                     SettingsByModuleDefaultEntryHolder.defaultEntry);
                 mutable_bitField0_ |= 0x00000002;
               }
-              com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings>
+              com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings>
               settingsByModule = input.readMessage(
                   SettingsByModuleDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
               settingsByModule_.getMutableMap().put(settingsByModule.getKey(), settingsByModule.getValue());
@@ -112,7 +112,7 @@ public final class WsScanner {
                     FileDataByModuleAndPathDefaultEntryHolder.defaultEntry);
                 mutable_bitField0_ |= 0x00000004;
               }
-              com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath>
+              com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath>
               fileDataByModuleAndPath = input.readMessage(
                   FileDataByModuleAndPathDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
               fileDataByModuleAndPath_.getMutableMap().put(fileDataByModuleAndPath.getKey(), fileDataByModuleAndPath.getValue());
@@ -138,7 +138,7 @@ public final class WsScanner {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_descriptor;
+      return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_descriptor;
     }
 
     @SuppressWarnings({"rawtypes"})
@@ -156,9 +156,9 @@ public final class WsScanner {
     }
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_fieldAccessorTable
+      return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.sonarqube.ws.WsScanner.WsProjectResponse.class, org.sonarqube.ws.WsScanner.WsProjectResponse.Builder.class);
+              org.sonarqube.ws.WsBatch.WsProjectResponse.class, org.sonarqube.ws.WsBatch.WsProjectResponse.Builder.class);
     }
 
     public interface SettingsOrBuilder extends
@@ -239,7 +239,7 @@ public final class WsScanner {
       }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_Settings_descriptor;
+        return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_Settings_descriptor;
       }
 
       @SuppressWarnings({"rawtypes"})
@@ -255,9 +255,9 @@ public final class WsScanner {
       }
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_Settings_fieldAccessorTable
+        return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_Settings_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.sonarqube.ws.WsScanner.WsProjectResponse.Settings.class, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings.Builder.class);
+                org.sonarqube.ws.WsBatch.WsProjectResponse.Settings.class, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings.Builder.class);
       }
 
       public static final int SETTINGS_FIELD_NUMBER = 1;
@@ -266,7 +266,7 @@ public final class WsScanner {
             java.lang.String, java.lang.String> defaultEntry =
                 com.google.protobuf.MapEntry
                 .<java.lang.String, java.lang.String>newDefaultInstance(
-                    org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_Settings_SettingsEntry_descriptor, 
+                    org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_Settings_SettingsEntry_descriptor, 
                     com.google.protobuf.WireFormat.FieldType.STRING,
                     "",
                     com.google.protobuf.WireFormat.FieldType.STRING,
@@ -336,53 +336,53 @@ public final class WsScanner {
       }
 
       private static final long serialVersionUID = 0L;
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.Settings parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.Settings parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.Settings parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.Settings parseFrom(
           com.google.protobuf.ByteString data,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.Settings parseFrom(byte[] data)
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.Settings parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.Settings parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.Settings parseFrom(
           byte[] data,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.Settings parseFrom(java.io.InputStream input)
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.Settings parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.Settings parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.Settings parseFrom(
           java.io.InputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseFrom(input, extensionRegistry);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.Settings parseDelimitedFrom(java.io.InputStream input)
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.Settings parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.Settings parseDelimitedFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.Settings parseDelimitedFrom(
           java.io.InputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input, extensionRegistry);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.Settings parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.Settings parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.Settings parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.Settings parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -393,7 +393,7 @@ public final class WsScanner {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(org.sonarqube.ws.WsScanner.WsProjectResponse.Settings prototype) {
+      public static Builder newBuilder(org.sonarqube.ws.WsBatch.WsProjectResponse.Settings prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() {
@@ -413,10 +413,10 @@ public final class WsScanner {
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.Builder<Builder> implements
           // @@protoc_insertion_point(builder_implements:sonarqube.ws.batch.WsProjectResponse.Settings)
-          org.sonarqube.ws.WsScanner.WsProjectResponse.SettingsOrBuilder {
+          org.sonarqube.ws.WsBatch.WsProjectResponse.SettingsOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_Settings_descriptor;
+          return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_Settings_descriptor;
         }
 
         @SuppressWarnings({"rawtypes"})
@@ -443,12 +443,12 @@ public final class WsScanner {
         }
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_Settings_fieldAccessorTable
+          return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_Settings_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  org.sonarqube.ws.WsScanner.WsProjectResponse.Settings.class, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings.Builder.class);
+                  org.sonarqube.ws.WsBatch.WsProjectResponse.Settings.class, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings.Builder.class);
         }
 
-        // Construct using org.sonarqube.ws.WsScanner.WsProjectResponse.Settings.newBuilder()
+        // Construct using org.sonarqube.ws.WsBatch.WsProjectResponse.Settings.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -470,23 +470,23 @@ public final class WsScanner {
 
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_Settings_descriptor;
+          return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_Settings_descriptor;
         }
 
-        public org.sonarqube.ws.WsScanner.WsProjectResponse.Settings getDefaultInstanceForType() {
-          return org.sonarqube.ws.WsScanner.WsProjectResponse.Settings.getDefaultInstance();
+        public org.sonarqube.ws.WsBatch.WsProjectResponse.Settings getDefaultInstanceForType() {
+          return org.sonarqube.ws.WsBatch.WsProjectResponse.Settings.getDefaultInstance();
         }
 
-        public org.sonarqube.ws.WsScanner.WsProjectResponse.Settings build() {
-          org.sonarqube.ws.WsScanner.WsProjectResponse.Settings result = buildPartial();
+        public org.sonarqube.ws.WsBatch.WsProjectResponse.Settings build() {
+          org.sonarqube.ws.WsBatch.WsProjectResponse.Settings result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.sonarqube.ws.WsScanner.WsProjectResponse.Settings buildPartial() {
-          org.sonarqube.ws.WsScanner.WsProjectResponse.Settings result = new org.sonarqube.ws.WsScanner.WsProjectResponse.Settings(this);
+        public org.sonarqube.ws.WsBatch.WsProjectResponse.Settings buildPartial() {
+          org.sonarqube.ws.WsBatch.WsProjectResponse.Settings result = new org.sonarqube.ws.WsBatch.WsProjectResponse.Settings(this);
           int from_bitField0_ = bitField0_;
           result.settings_ = internalGetSettings();
           result.settings_.makeImmutable();
@@ -495,16 +495,16 @@ public final class WsScanner {
         }
 
         public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof org.sonarqube.ws.WsScanner.WsProjectResponse.Settings) {
-            return mergeFrom((org.sonarqube.ws.WsScanner.WsProjectResponse.Settings)other);
+          if (other instanceof org.sonarqube.ws.WsBatch.WsProjectResponse.Settings) {
+            return mergeFrom((org.sonarqube.ws.WsBatch.WsProjectResponse.Settings)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(org.sonarqube.ws.WsScanner.WsProjectResponse.Settings other) {
-          if (other == org.sonarqube.ws.WsScanner.WsProjectResponse.Settings.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.sonarqube.ws.WsBatch.WsProjectResponse.Settings other) {
+          if (other == org.sonarqube.ws.WsBatch.WsProjectResponse.Settings.getDefaultInstance()) return this;
           internalGetMutableSettings().mergeFrom(
               other.internalGetSettings());
           this.mergeUnknownFields(other.unknownFields);
@@ -520,11 +520,11 @@ public final class WsScanner {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.sonarqube.ws.WsScanner.WsProjectResponse.Settings parsedMessage = null;
+          org.sonarqube.ws.WsBatch.WsProjectResponse.Settings parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.sonarqube.ws.WsScanner.WsProjectResponse.Settings) e.getUnfinishedMessage();
+            parsedMessage = (org.sonarqube.ws.WsBatch.WsProjectResponse.Settings) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -575,12 +575,12 @@ public final class WsScanner {
       }
 
       // @@protoc_insertion_point(class_scope:sonarqube.ws.batch.WsProjectResponse.Settings)
-      private static final org.sonarqube.ws.WsScanner.WsProjectResponse.Settings DEFAULT_INSTANCE;
+      private static final org.sonarqube.ws.WsBatch.WsProjectResponse.Settings DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new org.sonarqube.ws.WsScanner.WsProjectResponse.Settings();
+        DEFAULT_INSTANCE = new org.sonarqube.ws.WsBatch.WsProjectResponse.Settings();
       }
 
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.Settings getDefaultInstance() {
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.Settings getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
@@ -608,7 +608,7 @@ public final class WsScanner {
         return PARSER;
       }
 
-      public org.sonarqube.ws.WsScanner.WsProjectResponse.Settings getDefaultInstanceForType() {
+      public org.sonarqube.ws.WsBatch.WsProjectResponse.Settings getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -621,7 +621,7 @@ public final class WsScanner {
       /**
        * <code>map&lt;string, .sonarqube.ws.batch.WsProjectResponse.FileData&gt; FileDataByPath = 1;</code>
        */
-      java.util.Map<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData>
+      java.util.Map<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData>
       getFileDataByPath();
     }
     /**
@@ -671,7 +671,7 @@ public final class WsScanner {
                       FileDataByPathDefaultEntryHolder.defaultEntry);
                   mutable_bitField0_ |= 0x00000001;
                 }
-                com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData>
+                com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData>
                 fileDataByPath = input.readMessage(
                     FileDataByPathDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
                 fileDataByPath_.getMutableMap().put(fileDataByPath.getKey(), fileDataByPath.getValue());
@@ -692,7 +692,7 @@ public final class WsScanner {
       }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_FileDataByPath_descriptor;
+        return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_FileDataByPath_descriptor;
       }
 
       @SuppressWarnings({"rawtypes"})
@@ -708,26 +708,26 @@ public final class WsScanner {
       }
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_FileDataByPath_fieldAccessorTable
+        return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_FileDataByPath_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath.class, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath.Builder.class);
+                org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath.class, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath.Builder.class);
       }
 
       public static final int FILEDATABYPATH_FIELD_NUMBER = 1;
       private static final class FileDataByPathDefaultEntryHolder {
         static final com.google.protobuf.MapEntry<
-            java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData> defaultEntry =
+            java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData> defaultEntry =
                 com.google.protobuf.MapEntry
-                .<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData>newDefaultInstance(
-                    org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_FileDataByPath_FileDataByPathEntry_descriptor, 
+                .<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData>newDefaultInstance(
+                    org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_FileDataByPath_FileDataByPathEntry_descriptor, 
                     com.google.protobuf.WireFormat.FieldType.STRING,
                     "",
                     com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                    org.sonarqube.ws.WsScanner.WsProjectResponse.FileData.getDefaultInstance());
+                    org.sonarqube.ws.WsBatch.WsProjectResponse.FileData.getDefaultInstance());
       }
       private com.google.protobuf.MapField<
-          java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData> fileDataByPath_;
-      private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData>
+          java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData> fileDataByPath_;
+      private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData>
       internalGetFileDataByPath() {
         if (fileDataByPath_ == null) {
           return com.google.protobuf.MapField.emptyMapField(
@@ -739,7 +739,7 @@ public final class WsScanner {
        * <code>map&lt;string, .sonarqube.ws.batch.WsProjectResponse.FileData&gt; FileDataByPath = 1;</code>
        */
 
-      public java.util.Map<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData> getFileDataByPath() {
+      public java.util.Map<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData> getFileDataByPath() {
         return internalGetFileDataByPath().getMap();
       }
 
@@ -755,9 +755,9 @@ public final class WsScanner {
 
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
-        for (java.util.Map.Entry<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData> entry
+        for (java.util.Map.Entry<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData> entry
              : internalGetFileDataByPath().getMap().entrySet()) {
-          com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData>
+          com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData>
           fileDataByPath = FileDataByPathDefaultEntryHolder.defaultEntry.newBuilderForType()
               .setKey(entry.getKey())
               .setValue(entry.getValue())
@@ -773,9 +773,9 @@ public final class WsScanner {
         if (size != -1) return size;
 
         size = 0;
-        for (java.util.Map.Entry<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData> entry
+        for (java.util.Map.Entry<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData> entry
              : internalGetFileDataByPath().getMap().entrySet()) {
-          com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData>
+          com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData>
           fileDataByPath = FileDataByPathDefaultEntryHolder.defaultEntry.newBuilderForType()
               .setKey(entry.getKey())
               .setValue(entry.getValue())
@@ -789,53 +789,53 @@ public final class WsScanner {
       }
 
       private static final long serialVersionUID = 0L;
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath parseFrom(
           com.google.protobuf.ByteString data,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath parseFrom(byte[] data)
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath parseFrom(
           byte[] data,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath parseFrom(java.io.InputStream input)
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath parseFrom(
           java.io.InputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseFrom(input, extensionRegistry);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath parseDelimitedFrom(java.io.InputStream input)
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath parseDelimitedFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath parseDelimitedFrom(
           java.io.InputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input, extensionRegistry);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -846,7 +846,7 @@ public final class WsScanner {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath prototype) {
+      public static Builder newBuilder(org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() {
@@ -866,10 +866,10 @@ public final class WsScanner {
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.Builder<Builder> implements
           // @@protoc_insertion_point(builder_implements:sonarqube.ws.batch.WsProjectResponse.FileDataByPath)
-          org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPathOrBuilder {
+          org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPathOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_FileDataByPath_descriptor;
+          return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_FileDataByPath_descriptor;
         }
 
         @SuppressWarnings({"rawtypes"})
@@ -896,12 +896,12 @@ public final class WsScanner {
         }
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_FileDataByPath_fieldAccessorTable
+          return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_FileDataByPath_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath.class, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath.Builder.class);
+                  org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath.class, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath.Builder.class);
         }
 
-        // Construct using org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath.newBuilder()
+        // Construct using org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -923,23 +923,23 @@ public final class WsScanner {
 
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_FileDataByPath_descriptor;
+          return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_FileDataByPath_descriptor;
         }
 
-        public org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath getDefaultInstanceForType() {
-          return org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath.getDefaultInstance();
+        public org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath getDefaultInstanceForType() {
+          return org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath.getDefaultInstance();
         }
 
-        public org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath build() {
-          org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath result = buildPartial();
+        public org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath build() {
+          org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath buildPartial() {
-          org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath result = new org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath(this);
+        public org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath buildPartial() {
+          org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath result = new org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath(this);
           int from_bitField0_ = bitField0_;
           result.fileDataByPath_ = internalGetFileDataByPath();
           result.fileDataByPath_.makeImmutable();
@@ -948,16 +948,16 @@ public final class WsScanner {
         }
 
         public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath) {
-            return mergeFrom((org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath)other);
+          if (other instanceof org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath) {
+            return mergeFrom((org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath other) {
-          if (other == org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath other) {
+          if (other == org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath.getDefaultInstance()) return this;
           internalGetMutableFileDataByPath().mergeFrom(
               other.internalGetFileDataByPath());
           this.mergeUnknownFields(other.unknownFields);
@@ -973,11 +973,11 @@ public final class WsScanner {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath parsedMessage = null;
+          org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath) e.getUnfinishedMessage();
+            parsedMessage = (org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -989,8 +989,8 @@ public final class WsScanner {
         private int bitField0_;
 
         private com.google.protobuf.MapField<
-            java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData> fileDataByPath_;
-        private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData>
+            java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData> fileDataByPath_;
+        private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData>
         internalGetFileDataByPath() {
           if (fileDataByPath_ == null) {
             return com.google.protobuf.MapField.emptyMapField(
@@ -998,7 +998,7 @@ public final class WsScanner {
          }
           return fileDataByPath_;
         }
-        private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData>
+        private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData>
         internalGetMutableFileDataByPath() {
           onChanged();;
           if (fileDataByPath_ == null) {
@@ -1013,13 +1013,13 @@ public final class WsScanner {
         /**
          * <code>map&lt;string, .sonarqube.ws.batch.WsProjectResponse.FileData&gt; FileDataByPath = 1;</code>
          */
-        public java.util.Map<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData> getFileDataByPath() {
+        public java.util.Map<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData> getFileDataByPath() {
           return internalGetFileDataByPath().getMap();
         }
         /**
          * <code>map&lt;string, .sonarqube.ws.batch.WsProjectResponse.FileData&gt; FileDataByPath = 1;</code>
          */
-        public java.util.Map<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData>
+        public java.util.Map<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData>
         getMutableFileDataByPath() {
           return internalGetMutableFileDataByPath().getMutableMap();
         }
@@ -1028,12 +1028,12 @@ public final class WsScanner {
       }
 
       // @@protoc_insertion_point(class_scope:sonarqube.ws.batch.WsProjectResponse.FileDataByPath)
-      private static final org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath DEFAULT_INSTANCE;
+      private static final org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath();
+        DEFAULT_INSTANCE = new org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath();
       }
 
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath getDefaultInstance() {
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
@@ -1061,7 +1061,7 @@ public final class WsScanner {
         return PARSER;
       }
 
-      public org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath getDefaultInstanceForType() {
+      public org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -1169,14 +1169,14 @@ public final class WsScanner {
       }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_FileData_descriptor;
+        return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_FileData_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_FileData_fieldAccessorTable
+        return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_FileData_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.sonarqube.ws.WsScanner.WsProjectResponse.FileData.class, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData.Builder.class);
+                org.sonarqube.ws.WsBatch.WsProjectResponse.FileData.class, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData.Builder.class);
       }
 
       private int bitField0_;
@@ -1305,53 +1305,53 @@ public final class WsScanner {
       }
 
       private static final long serialVersionUID = 0L;
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileData parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileData parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileData parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileData parseFrom(
           com.google.protobuf.ByteString data,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileData parseFrom(byte[] data)
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileData parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileData parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileData parseFrom(
           byte[] data,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileData parseFrom(java.io.InputStream input)
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileData parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileData parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileData parseFrom(
           java.io.InputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseFrom(input, extensionRegistry);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileData parseDelimitedFrom(java.io.InputStream input)
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileData parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileData parseDelimitedFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileData parseDelimitedFrom(
           java.io.InputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input, extensionRegistry);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileData parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileData parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileData parseFrom(
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileData parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -1362,7 +1362,7 @@ public final class WsScanner {
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-      public static Builder newBuilder(org.sonarqube.ws.WsScanner.WsProjectResponse.FileData prototype) {
+      public static Builder newBuilder(org.sonarqube.ws.WsBatch.WsProjectResponse.FileData prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() {
@@ -1382,20 +1382,20 @@ public final class WsScanner {
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.Builder<Builder> implements
           // @@protoc_insertion_point(builder_implements:sonarqube.ws.batch.WsProjectResponse.FileData)
-          org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataOrBuilder {
+          org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_FileData_descriptor;
+          return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_FileData_descriptor;
         }
 
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_FileData_fieldAccessorTable
+          return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_FileData_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  org.sonarqube.ws.WsScanner.WsProjectResponse.FileData.class, org.sonarqube.ws.WsScanner.WsProjectResponse.FileData.Builder.class);
+                  org.sonarqube.ws.WsBatch.WsProjectResponse.FileData.class, org.sonarqube.ws.WsBatch.WsProjectResponse.FileData.Builder.class);
         }
 
-        // Construct using org.sonarqube.ws.WsScanner.WsProjectResponse.FileData.newBuilder()
+        // Construct using org.sonarqube.ws.WsBatch.WsProjectResponse.FileData.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -1420,23 +1420,23 @@ public final class WsScanner {
 
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_FileData_descriptor;
+          return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_FileData_descriptor;
         }
 
-        public org.sonarqube.ws.WsScanner.WsProjectResponse.FileData getDefaultInstanceForType() {
-          return org.sonarqube.ws.WsScanner.WsProjectResponse.FileData.getDefaultInstance();
+        public org.sonarqube.ws.WsBatch.WsProjectResponse.FileData getDefaultInstanceForType() {
+          return org.sonarqube.ws.WsBatch.WsProjectResponse.FileData.getDefaultInstance();
         }
 
-        public org.sonarqube.ws.WsScanner.WsProjectResponse.FileData build() {
-          org.sonarqube.ws.WsScanner.WsProjectResponse.FileData result = buildPartial();
+        public org.sonarqube.ws.WsBatch.WsProjectResponse.FileData build() {
+          org.sonarqube.ws.WsBatch.WsProjectResponse.FileData result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.sonarqube.ws.WsScanner.WsProjectResponse.FileData buildPartial() {
-          org.sonarqube.ws.WsScanner.WsProjectResponse.FileData result = new org.sonarqube.ws.WsScanner.WsProjectResponse.FileData(this);
+        public org.sonarqube.ws.WsBatch.WsProjectResponse.FileData buildPartial() {
+          org.sonarqube.ws.WsBatch.WsProjectResponse.FileData result = new org.sonarqube.ws.WsBatch.WsProjectResponse.FileData(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1453,16 +1453,16 @@ public final class WsScanner {
         }
 
         public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof org.sonarqube.ws.WsScanner.WsProjectResponse.FileData) {
-            return mergeFrom((org.sonarqube.ws.WsScanner.WsProjectResponse.FileData)other);
+          if (other instanceof org.sonarqube.ws.WsBatch.WsProjectResponse.FileData) {
+            return mergeFrom((org.sonarqube.ws.WsBatch.WsProjectResponse.FileData)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(org.sonarqube.ws.WsScanner.WsProjectResponse.FileData other) {
-          if (other == org.sonarqube.ws.WsScanner.WsProjectResponse.FileData.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.sonarqube.ws.WsBatch.WsProjectResponse.FileData other) {
+          if (other == org.sonarqube.ws.WsBatch.WsProjectResponse.FileData.getDefaultInstance()) return this;
           if (other.hasHash()) {
             bitField0_ |= 0x00000001;
             hash_ = other.hash_;
@@ -1486,11 +1486,11 @@ public final class WsScanner {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.sonarqube.ws.WsScanner.WsProjectResponse.FileData parsedMessage = null;
+          org.sonarqube.ws.WsBatch.WsProjectResponse.FileData parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.sonarqube.ws.WsScanner.WsProjectResponse.FileData) e.getUnfinishedMessage();
+            parsedMessage = (org.sonarqube.ws.WsBatch.WsProjectResponse.FileData) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -1657,12 +1657,12 @@ public final class WsScanner {
       }
 
       // @@protoc_insertion_point(class_scope:sonarqube.ws.batch.WsProjectResponse.FileData)
-      private static final org.sonarqube.ws.WsScanner.WsProjectResponse.FileData DEFAULT_INSTANCE;
+      private static final org.sonarqube.ws.WsBatch.WsProjectResponse.FileData DEFAULT_INSTANCE;
       static {
-        DEFAULT_INSTANCE = new org.sonarqube.ws.WsScanner.WsProjectResponse.FileData();
+        DEFAULT_INSTANCE = new org.sonarqube.ws.WsBatch.WsProjectResponse.FileData();
       }
 
-      public static org.sonarqube.ws.WsScanner.WsProjectResponse.FileData getDefaultInstance() {
+      public static org.sonarqube.ws.WsBatch.WsProjectResponse.FileData getDefaultInstance() {
         return DEFAULT_INSTANCE;
       }
 
@@ -1690,7 +1690,7 @@ public final class WsScanner {
         return PARSER;
       }
 
-      public org.sonarqube.ws.WsScanner.WsProjectResponse.FileData getDefaultInstanceForType() {
+      public org.sonarqube.ws.WsBatch.WsProjectResponse.FileData getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
 
@@ -1715,18 +1715,18 @@ public final class WsScanner {
     public static final int SETTINGSBYMODULE_FIELD_NUMBER = 2;
     private static final class SettingsByModuleDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
-          java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings> defaultEntry =
+          java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings> defaultEntry =
               com.google.protobuf.MapEntry
-              .<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings>newDefaultInstance(
-                  org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_SettingsByModuleEntry_descriptor, 
+              .<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings>newDefaultInstance(
+                  org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_SettingsByModuleEntry_descriptor, 
                   com.google.protobuf.WireFormat.FieldType.STRING,
                   "",
                   com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                  org.sonarqube.ws.WsScanner.WsProjectResponse.Settings.getDefaultInstance());
+                  org.sonarqube.ws.WsBatch.WsProjectResponse.Settings.getDefaultInstance());
     }
     private com.google.protobuf.MapField<
-        java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings> settingsByModule_;
-    private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings>
+        java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings> settingsByModule_;
+    private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings>
     internalGetSettingsByModule() {
       if (settingsByModule_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
@@ -1738,25 +1738,25 @@ public final class WsScanner {
      * <code>map&lt;string, .sonarqube.ws.batch.WsProjectResponse.Settings&gt; settingsByModule = 2;</code>
      */
 
-    public java.util.Map<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings> getSettingsByModule() {
+    public java.util.Map<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings> getSettingsByModule() {
       return internalGetSettingsByModule().getMap();
     }
 
     public static final int FILEDATABYMODULEANDPATH_FIELD_NUMBER = 3;
     private static final class FileDataByModuleAndPathDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
-          java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath> defaultEntry =
+          java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath> defaultEntry =
               com.google.protobuf.MapEntry
-              .<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath>newDefaultInstance(
-                  org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_FileDataByModuleAndPathEntry_descriptor, 
+              .<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath>newDefaultInstance(
+                  org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_FileDataByModuleAndPathEntry_descriptor, 
                   com.google.protobuf.WireFormat.FieldType.STRING,
                   "",
                   com.google.protobuf.WireFormat.FieldType.MESSAGE,
-                  org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath.getDefaultInstance());
+                  org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath.getDefaultInstance());
     }
     private com.google.protobuf.MapField<
-        java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath> fileDataByModuleAndPath_;
-    private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath>
+        java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath> fileDataByModuleAndPath_;
+    private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath>
     internalGetFileDataByModuleAndPath() {
       if (fileDataByModuleAndPath_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
@@ -1768,7 +1768,7 @@ public final class WsScanner {
      * <code>map&lt;string, .sonarqube.ws.batch.WsProjectResponse.FileDataByPath&gt; fileDataByModuleAndPath = 3;</code>
      */
 
-    public java.util.Map<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath> getFileDataByModuleAndPath() {
+    public java.util.Map<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath> getFileDataByModuleAndPath() {
       return internalGetFileDataByModuleAndPath().getMap();
     }
 
@@ -1802,18 +1802,18 @@ public final class WsScanner {
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt64(1, timestamp_);
       }
-      for (java.util.Map.Entry<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings> entry
+      for (java.util.Map.Entry<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings> entry
            : internalGetSettingsByModule().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings>
+        com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings>
         settingsByModule = SettingsByModuleDefaultEntryHolder.defaultEntry.newBuilderForType()
             .setKey(entry.getKey())
             .setValue(entry.getValue())
             .build();
         output.writeMessage(2, settingsByModule);
       }
-      for (java.util.Map.Entry<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath> entry
+      for (java.util.Map.Entry<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath> entry
            : internalGetFileDataByModuleAndPath().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath>
+        com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath>
         fileDataByModuleAndPath = FileDataByModuleAndPathDefaultEntryHolder.defaultEntry.newBuilderForType()
             .setKey(entry.getKey())
             .setValue(entry.getValue())
@@ -1836,9 +1836,9 @@ public final class WsScanner {
         size += com.google.protobuf.CodedOutputStream
           .computeInt64Size(1, timestamp_);
       }
-      for (java.util.Map.Entry<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings> entry
+      for (java.util.Map.Entry<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings> entry
            : internalGetSettingsByModule().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings>
+        com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings>
         settingsByModule = SettingsByModuleDefaultEntryHolder.defaultEntry.newBuilderForType()
             .setKey(entry.getKey())
             .setValue(entry.getValue())
@@ -1846,9 +1846,9 @@ public final class WsScanner {
         size += com.google.protobuf.CodedOutputStream
             .computeMessageSize(2, settingsByModule);
       }
-      for (java.util.Map.Entry<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath> entry
+      for (java.util.Map.Entry<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath> entry
            : internalGetFileDataByModuleAndPath().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath>
+        com.google.protobuf.MapEntry<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath>
         fileDataByModuleAndPath = FileDataByModuleAndPathDefaultEntryHolder.defaultEntry.newBuilderForType()
             .setKey(entry.getKey())
             .setValue(entry.getValue())
@@ -1866,53 +1866,53 @@ public final class WsScanner {
     }
 
     private static final long serialVersionUID = 0L;
-    public static org.sonarqube.ws.WsScanner.WsProjectResponse parseFrom(
+    public static org.sonarqube.ws.WsBatch.WsProjectResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.sonarqube.ws.WsScanner.WsProjectResponse parseFrom(
+    public static org.sonarqube.ws.WsBatch.WsProjectResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.sonarqube.ws.WsScanner.WsProjectResponse parseFrom(byte[] data)
+    public static org.sonarqube.ws.WsBatch.WsProjectResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.sonarqube.ws.WsScanner.WsProjectResponse parseFrom(
+    public static org.sonarqube.ws.WsBatch.WsProjectResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.sonarqube.ws.WsScanner.WsProjectResponse parseFrom(java.io.InputStream input)
+    public static org.sonarqube.ws.WsBatch.WsProjectResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.sonarqube.ws.WsScanner.WsProjectResponse parseFrom(
+    public static org.sonarqube.ws.WsBatch.WsProjectResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.sonarqube.ws.WsScanner.WsProjectResponse parseDelimitedFrom(java.io.InputStream input)
+    public static org.sonarqube.ws.WsBatch.WsProjectResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.sonarqube.ws.WsScanner.WsProjectResponse parseDelimitedFrom(
+    public static org.sonarqube.ws.WsBatch.WsProjectResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.sonarqube.ws.WsScanner.WsProjectResponse parseFrom(
+    public static org.sonarqube.ws.WsBatch.WsProjectResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.sonarqube.ws.WsScanner.WsProjectResponse parseFrom(
+    public static org.sonarqube.ws.WsBatch.WsProjectResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1923,7 +1923,7 @@ public final class WsScanner {
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(org.sonarqube.ws.WsScanner.WsProjectResponse prototype) {
+    public static Builder newBuilder(org.sonarqube.ws.WsBatch.WsProjectResponse prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() {
@@ -1941,16 +1941,16 @@ public final class WsScanner {
      * Protobuf type {@code sonarqube.ws.batch.WsProjectResponse}
      *
      * <pre>
-     * WS api/scanner/project
+     * WS api/batch/project
      * </pre>
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:sonarqube.ws.batch.WsProjectResponse)
-        org.sonarqube.ws.WsScanner.WsProjectResponseOrBuilder {
+        org.sonarqube.ws.WsBatch.WsProjectResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_descriptor;
+        return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_descriptor;
       }
 
       @SuppressWarnings({"rawtypes"})
@@ -1981,12 +1981,12 @@ public final class WsScanner {
       }
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_fieldAccessorTable
+        return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.sonarqube.ws.WsScanner.WsProjectResponse.class, org.sonarqube.ws.WsScanner.WsProjectResponse.Builder.class);
+                org.sonarqube.ws.WsBatch.WsProjectResponse.class, org.sonarqube.ws.WsBatch.WsProjectResponse.Builder.class);
       }
 
-      // Construct using org.sonarqube.ws.WsScanner.WsProjectResponse.newBuilder()
+      // Construct using org.sonarqube.ws.WsBatch.WsProjectResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2013,23 +2013,23 @@ public final class WsScanner {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.sonarqube.ws.WsScanner.internal_static_sonarqube_ws_batch_WsProjectResponse_descriptor;
+        return org.sonarqube.ws.WsBatch.internal_static_sonarqube_ws_batch_WsProjectResponse_descriptor;
       }
 
-      public org.sonarqube.ws.WsScanner.WsProjectResponse getDefaultInstanceForType() {
-        return org.sonarqube.ws.WsScanner.WsProjectResponse.getDefaultInstance();
+      public org.sonarqube.ws.WsBatch.WsProjectResponse getDefaultInstanceForType() {
+        return org.sonarqube.ws.WsBatch.WsProjectResponse.getDefaultInstance();
       }
 
-      public org.sonarqube.ws.WsScanner.WsProjectResponse build() {
-        org.sonarqube.ws.WsScanner.WsProjectResponse result = buildPartial();
+      public org.sonarqube.ws.WsBatch.WsProjectResponse build() {
+        org.sonarqube.ws.WsBatch.WsProjectResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.sonarqube.ws.WsScanner.WsProjectResponse buildPartial() {
-        org.sonarqube.ws.WsScanner.WsProjectResponse result = new org.sonarqube.ws.WsScanner.WsProjectResponse(this);
+      public org.sonarqube.ws.WsBatch.WsProjectResponse buildPartial() {
+        org.sonarqube.ws.WsBatch.WsProjectResponse result = new org.sonarqube.ws.WsBatch.WsProjectResponse(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2050,16 +2050,16 @@ public final class WsScanner {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.sonarqube.ws.WsScanner.WsProjectResponse) {
-          return mergeFrom((org.sonarqube.ws.WsScanner.WsProjectResponse)other);
+        if (other instanceof org.sonarqube.ws.WsBatch.WsProjectResponse) {
+          return mergeFrom((org.sonarqube.ws.WsBatch.WsProjectResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.sonarqube.ws.WsScanner.WsProjectResponse other) {
-        if (other == org.sonarqube.ws.WsScanner.WsProjectResponse.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.sonarqube.ws.WsBatch.WsProjectResponse other) {
+        if (other == org.sonarqube.ws.WsBatch.WsProjectResponse.getDefaultInstance()) return this;
         if (other.hasTimestamp()) {
           setTimestamp(other.getTimestamp());
         }
@@ -2083,11 +2083,11 @@ public final class WsScanner {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.sonarqube.ws.WsScanner.WsProjectResponse parsedMessage = null;
+        org.sonarqube.ws.WsBatch.WsProjectResponse parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.sonarqube.ws.WsScanner.WsProjectResponse) e.getUnfinishedMessage();
+          parsedMessage = (org.sonarqube.ws.WsBatch.WsProjectResponse) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -2131,8 +2131,8 @@ public final class WsScanner {
       }
 
       private com.google.protobuf.MapField<
-          java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings> settingsByModule_;
-      private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings>
+          java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings> settingsByModule_;
+      private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings>
       internalGetSettingsByModule() {
         if (settingsByModule_ == null) {
           return com.google.protobuf.MapField.emptyMapField(
@@ -2140,7 +2140,7 @@ public final class WsScanner {
        }
         return settingsByModule_;
       }
-      private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings>
+      private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings>
       internalGetMutableSettingsByModule() {
         onChanged();;
         if (settingsByModule_ == null) {
@@ -2155,20 +2155,20 @@ public final class WsScanner {
       /**
        * <code>map&lt;string, .sonarqube.ws.batch.WsProjectResponse.Settings&gt; settingsByModule = 2;</code>
        */
-      public java.util.Map<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings> getSettingsByModule() {
+      public java.util.Map<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings> getSettingsByModule() {
         return internalGetSettingsByModule().getMap();
       }
       /**
        * <code>map&lt;string, .sonarqube.ws.batch.WsProjectResponse.Settings&gt; settingsByModule = 2;</code>
        */
-      public java.util.Map<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.Settings>
+      public java.util.Map<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.Settings>
       getMutableSettingsByModule() {
         return internalGetMutableSettingsByModule().getMutableMap();
       }
 
       private com.google.protobuf.MapField<
-          java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath> fileDataByModuleAndPath_;
-      private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath>
+          java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath> fileDataByModuleAndPath_;
+      private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath>
       internalGetFileDataByModuleAndPath() {
         if (fileDataByModuleAndPath_ == null) {
           return com.google.protobuf.MapField.emptyMapField(
@@ -2176,7 +2176,7 @@ public final class WsScanner {
        }
         return fileDataByModuleAndPath_;
       }
-      private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath>
+      private com.google.protobuf.MapField<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath>
       internalGetMutableFileDataByModuleAndPath() {
         onChanged();;
         if (fileDataByModuleAndPath_ == null) {
@@ -2191,13 +2191,13 @@ public final class WsScanner {
       /**
        * <code>map&lt;string, .sonarqube.ws.batch.WsProjectResponse.FileDataByPath&gt; fileDataByModuleAndPath = 3;</code>
        */
-      public java.util.Map<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath> getFileDataByModuleAndPath() {
+      public java.util.Map<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath> getFileDataByModuleAndPath() {
         return internalGetFileDataByModuleAndPath().getMap();
       }
       /**
        * <code>map&lt;string, .sonarqube.ws.batch.WsProjectResponse.FileDataByPath&gt; fileDataByModuleAndPath = 3;</code>
        */
-      public java.util.Map<java.lang.String, org.sonarqube.ws.WsScanner.WsProjectResponse.FileDataByPath>
+      public java.util.Map<java.lang.String, org.sonarqube.ws.WsBatch.WsProjectResponse.FileDataByPath>
       getMutableFileDataByModuleAndPath() {
         return internalGetMutableFileDataByModuleAndPath().getMutableMap();
       }
@@ -2238,12 +2238,12 @@ public final class WsScanner {
     }
 
     // @@protoc_insertion_point(class_scope:sonarqube.ws.batch.WsProjectResponse)
-    private static final org.sonarqube.ws.WsScanner.WsProjectResponse DEFAULT_INSTANCE;
+    private static final org.sonarqube.ws.WsBatch.WsProjectResponse DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new org.sonarqube.ws.WsScanner.WsProjectResponse();
+      DEFAULT_INSTANCE = new org.sonarqube.ws.WsBatch.WsProjectResponse();
     }
 
-    public static org.sonarqube.ws.WsScanner.WsProjectResponse getDefaultInstance() {
+    public static org.sonarqube.ws.WsBatch.WsProjectResponse getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2271,7 +2271,7 @@ public final class WsScanner {
       return PARSER;
     }
 
-    public org.sonarqube.ws.WsScanner.WsProjectResponse getDefaultInstanceForType() {
+    public org.sonarqube.ws.WsBatch.WsProjectResponse getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2326,30 +2326,30 @@ public final class WsScanner {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\020ws-scanner.proto\022\022sonarqube.ws.batch\"\361" +
-      "\006\n\021WsProjectResponse\022\021\n\ttimestamp\030\001 \001(\003\022" +
-      "U\n\020settingsByModule\030\002 \003(\0132;.sonarqube.ws" +
-      ".batch.WsProjectResponse.SettingsByModul" +
-      "eEntry\022c\n\027fileDataByModuleAndPath\030\003 \003(\0132" +
-      "B.sonarqube.ws.batch.WsProjectResponse.F" +
-      "ileDataByModuleAndPathEntry\022\030\n\020lastAnaly" +
-      "sisDate\030\004 \001(\003\032g\n\025SettingsByModuleEntry\022\013" +
-      "\n\003key\030\001 \001(\t\022=\n\005value\030\002 \001(\0132..sonarqube.w" +
-      "s.batch.WsProjectResponse.Settings:\0028\001\032t",
-      "\n\034FileDataByModuleAndPathEntry\022\013\n\003key\030\001 " +
-      "\001(\t\022C\n\005value\030\002 \001(\01324.sonarqube.ws.batch." +
-      "WsProjectResponse.FileDataByPath:\0028\001\032\213\001\n" +
-      "\010Settings\022N\n\010settings\030\001 \003(\0132<.sonarqube." +
-      "ws.batch.WsProjectResponse.Settings.Sett" +
-      "ingsEntry\032/\n\rSettingsEntry\022\013\n\003key\030\001 \001(\t\022" +
-      "\r\n\005value\030\002 \001(\t:\0028\001\032\331\001\n\016FileDataByPath\022`\n" +
-      "\016FileDataByPath\030\001 \003(\0132H.sonarqube.ws.bat" +
-      "ch.WsProjectResponse.FileDataByPath.File" +
-      "DataByPathEntry\032e\n\023FileDataByPathEntry\022\013",
-      "\n\003key\030\001 \001(\t\022=\n\005value\030\002 \001(\0132..sonarqube.w" +
-      "s.batch.WsProjectResponse.FileData:\0028\001\032*" +
-      "\n\010FileData\022\014\n\004hash\030\001 \001(\t\022\020\n\010revision\030\002 \001" +
-      "(\tB\037\n\020org.sonarqube.wsB\tWsScannerH\001"
+      "\n\016ws-batch.proto\022\022sonarqube.ws.batch\"\361\006\n" +
+      "\021WsProjectResponse\022\021\n\ttimestamp\030\001 \001(\003\022U\n" +
+      "\020settingsByModule\030\002 \003(\0132;.sonarqube.ws.b" +
+      "atch.WsProjectResponse.SettingsByModuleE" +
+      "ntry\022c\n\027fileDataByModuleAndPath\030\003 \003(\0132B." +
+      "sonarqube.ws.batch.WsProjectResponse.Fil" +
+      "eDataByModuleAndPathEntry\022\030\n\020lastAnalysi" +
+      "sDate\030\004 \001(\003\032g\n\025SettingsByModuleEntry\022\013\n\003" +
+      "key\030\001 \001(\t\022=\n\005value\030\002 \001(\0132..sonarqube.ws." +
+      "batch.WsProjectResponse.Settings:\0028\001\032t\n\034",
+      "FileDataByModuleAndPathEntry\022\013\n\003key\030\001 \001(" +
+      "\t\022C\n\005value\030\002 \001(\01324.sonarqube.ws.batch.Ws" +
+      "ProjectResponse.FileDataByPath:\0028\001\032\213\001\n\010S" +
+      "ettings\022N\n\010settings\030\001 \003(\0132<.sonarqube.ws" +
+      ".batch.WsProjectResponse.Settings.Settin" +
+      "gsEntry\032/\n\rSettingsEntry\022\013\n\003key\030\001 \001(\t\022\r\n" +
+      "\005value\030\002 \001(\t:\0028\001\032\331\001\n\016FileDataByPath\022`\n\016F" +
+      "ileDataByPath\030\001 \003(\0132H.sonarqube.ws.batch" +
+      ".WsProjectResponse.FileDataByPath.FileDa" +
+      "taByPathEntry\032e\n\023FileDataByPathEntry\022\013\n\003",
+      "key\030\001 \001(\t\022=\n\005value\030\002 \001(\0132..sonarqube.ws." +
+      "batch.WsProjectResponse.FileData:\0028\001\032*\n\010" +
+      "FileData\022\014\n\004hash\030\001 \001(\t\022\020\n\010revision\030\002 \001(\t" +
+      "B\035\n\020org.sonarqube.wsB\007WsBatchH\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
diff --git a/sonar-ws/src/main/gen-java/org/sonarqube/ws/WsCe.java b/sonar-ws/src/main/gen-java/org/sonarqube/ws/WsCe.java
index 630ac930185..201805b6698 100644
--- a/sonar-ws/src/main/gen-java/org/sonarqube/ws/WsCe.java
+++ b/sonar-ws/src/main/gen-java/org/sonarqube/ws/WsCe.java
@@ -3824,23 +3824,20 @@ public final class WsCe {
      * <code>optional string executedAt = 10;</code>
      */
     boolean hasExecutedAt();
-    
     /**
      * <code>optional string executedAt = 10;</code>
      */
     java.lang.String getExecutedAt();
-    
     /**
      * <code>optional string executedAt = 10;</code>
      */
     com.google.protobuf.ByteString
- getExecutedAtBytes();
+        getExecutedAtBytes();
 
     /**
      * <code>optional bool isLastExecuted = 11;</code>
      */
     boolean hasIsLastExecuted();
-    
     /**
      * <code>optional bool isLastExecuted = 11;</code>
      */
@@ -4378,14 +4375,12 @@ public final class WsCe {
 
     public static final int EXECUTEDAT_FIELD_NUMBER = 10;
     private volatile java.lang.Object executedAt_;
-    
     /**
      * <code>optional string executedAt = 10;</code>
      */
     public boolean hasExecutedAt() {
       return ((bitField0_ & 0x00000200) == 0x00000200);
     }
-    
     /**
      * <code>optional string executedAt = 10;</code>
      */
@@ -4403,12 +4398,11 @@ public final class WsCe {
         return s;
       }
     }
-    
     /**
      * <code>optional string executedAt = 10;</code>
      */
     public com.google.protobuf.ByteString
- getExecutedAtBytes() {
+        getExecutedAtBytes() {
       java.lang.Object ref = executedAt_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
@@ -4423,14 +4417,12 @@ public final class WsCe {
 
     public static final int ISLASTEXECUTED_FIELD_NUMBER = 11;
     private boolean isLastExecuted_;
-    
     /**
      * <code>optional bool isLastExecuted = 11;</code>
      */
     public boolean hasIsLastExecuted() {
       return ((bitField0_ & 0x00000400) == 0x00000400);
     }
-    
     /**
      * <code>optional bool isLastExecuted = 11;</code>
      */
@@ -5540,14 +5532,12 @@ public final class WsCe {
       }
 
       private java.lang.Object executedAt_ = "";
-      
       /**
        * <code>optional string executedAt = 10;</code>
        */
       public boolean hasExecutedAt() {
         return ((bitField0_ & 0x00000200) == 0x00000200);
       }
-      
       /**
        * <code>optional string executedAt = 10;</code>
        */
@@ -5565,12 +5555,11 @@ public final class WsCe {
           return (java.lang.String) ref;
         }
       }
-      
       /**
        * <code>optional string executedAt = 10;</code>
        */
       public com.google.protobuf.ByteString
- getExecutedAtBytes() {
+          getExecutedAtBytes() {
         java.lang.Object ref = executedAt_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
@@ -5582,7 +5571,6 @@ public final class WsCe {
           return (com.google.protobuf.ByteString) ref;
         }
       }
-      
       /**
        * <code>optional string executedAt = 10;</code>
        */
@@ -5596,7 +5584,6 @@ public final class WsCe {
         onChanged();
         return this;
       }
-      
       /**
        * <code>optional string executedAt = 10;</code>
        */
@@ -5606,7 +5593,6 @@ public final class WsCe {
         onChanged();
         return this;
       }
-      
       /**
        * <code>optional string executedAt = 10;</code>
        */
@@ -5621,22 +5607,19 @@ public final class WsCe {
         return this;
       }
 
-      private boolean isLastExecuted_;
-      
+      private boolean isLastExecuted_ ;
       /**
        * <code>optional bool isLastExecuted = 11;</code>
        */
       public boolean hasIsLastExecuted() {
         return ((bitField0_ & 0x00000400) == 0x00000400);
       }
-      
       /**
        * <code>optional bool isLastExecuted = 11;</code>
        */
       public boolean getIsLastExecuted() {
         return isLastExecuted_;
       }
-      
       /**
        * <code>optional bool isLastExecuted = 11;</code>
        */
@@ -5646,7 +5629,6 @@ public final class WsCe {
         onChanged();
         return this;
       }
-      
       /**
        * <code>optional bool isLastExecuted = 11;</code>
        */
@@ -5689,7 +5671,7 @@ public final class WsCe {
         return this;
       }
 
-      private boolean logs_;
+      private boolean logs_ ;
       /**
        * <code>optional bool logs = 13;</code>
        */
@@ -5818,11 +5800,11 @@ public final class WsCe {
       "ey\030\004 \001(\t\022\025\n\rcomponentName\030\005 \001(\t\022+\n\006statu" +
       "s\030\006 \001(\0162\033.sonarqube.ws.ce.TaskStatus\022\023\n\013" +
       "submittedAt\030\007 \001(\t\022\026\n\016submitterLogin\030\010 \001(" +
-        "\t\022\021\n\tstartedAt\030\t \001(\t\022\022\n\nexecutedAt\030\n \001(\t" +
-        "\022\026\n\016isLastExecuted\030\013 \001(\010\022\027\n\017executionTim" +
-        "eMs\030\014 \001(\003\022\014\n\004logs\030\r \001(\010*Q\n\nTaskStatus\022\013\n" +
-        "\007PENDING\020\000\022\017\n\013IN_PROGRESS\020\001\022\013\n\007SUCCESS\020\002" +
-        "\022\n\n\006FAILED\020\003\022\014\n\010CANCELED\020\004B\032\n\020org.sonarq",
+      "\t\022\021\n\tstartedAt\030\t \001(\t\022\022\n\nexecutedAt\030\n \001(\t" +
+      "\022\026\n\016isLastExecuted\030\013 \001(\010\022\027\n\017executionTim" +
+      "eMs\030\014 \001(\003\022\014\n\004logs\030\r \001(\010*Q\n\nTaskStatus\022\013\n" +
+      "\007PENDING\020\000\022\017\n\013IN_PROGRESS\020\001\022\013\n\007SUCCESS\020\002" +
+      "\022\n\n\006FAILED\020\003\022\014\n\010CANCELED\020\004B\032\n\020org.sonarq",
       "ube.wsB\004WsCeH\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
@@ -5873,8 +5855,7 @@ public final class WsCe {
     internal_static_sonarqube_ws_ce_Task_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessage.FieldAccessorTable(
         internal_static_sonarqube_ws_ce_Task_descriptor,
-      new java.lang.String[] {"Id", "Type", "ComponentId", "ComponentKey", "ComponentName", "Status", "SubmittedAt", "SubmitterLogin", "StartedAt", "ExecutedAt", "IsLastExecuted",
-        "ExecutionTimeMs", "Logs",});
+        new java.lang.String[] { "Id", "Type", "ComponentId", "ComponentKey", "ComponentName", "Status", "SubmittedAt", "SubmitterLogin", "StartedAt", "ExecutedAt", "IsLastExecuted", "ExecutionTimeMs", "Logs", });
     org.sonarqube.ws.Common.getDescriptor();
   }
 
diff --git a/sonar-ws/src/main/protobuf/ws-scanner.proto b/sonar-ws/src/main/protobuf/ws-batch.proto
index 46679d0173f..d6d050668a0 100644
--- a/sonar-ws/src/main/protobuf/ws-scanner.proto
+++ b/sonar-ws/src/main/protobuf/ws-batch.proto
@@ -21,11 +21,11 @@ syntax = "proto2";
 package sonarqube.ws.batch;
 
 option java_package = "org.sonarqube.ws";
-option java_outer_classname = "WsScanner";
+option java_outer_classname = "WsBatch";
 
 option optimize_for = SPEED;
 
-// WS api/scanner/project
+// WS api/batch/project
 message WsProjectResponse {
   optional int64 timestamp = 1;
   map<string, Settings> settingsByModule = 2;
author	Teryk Bellahsene <teryk.bellahsene@sonarsource.com>	2015-09-28 14:14:35 +0200
committer	Duarte Meneses <duarte.meneses@sonarsource.com>	2015-09-30 16:28:08 +0200
commit	a23a7ec4f48244c193b48aec84127701618a31cc (patch)
tree	60c76cbb7f6fc709c9ff98375f6f2c8c2d27928f
parent	80b9f52b80c5ae3fcc81b8b8cc3209000a886b7f (diff)
download	sonarqube-a23a7ec4f48244c193b48aec84127701618a31cc.tar.gz sonarqube-a23a7ec4f48244c193b48aec84127701618a31cc.zip