SONAR-6818 Split batch/project WS in several simpler WS

7 files changed, 14 insertions, 15 deletions

diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/BatchMediumTester.java b/sonar-batch/src/test/java/org/sonar/batch/mediumtest/BatchMediumTester.java
index ef508dcb553..f488d8bfe65 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/BatchMediumTester.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/mediumtest/BatchMediumTester.java
@@ -33,7 +33,6 @@ import org.apache.commons.lang.mutable.MutableBoolean;
 
 import javax.annotation.Nullable;
 
-import org.sonar.batch.cache.ProjectCacheStatus;
 import org.sonarqube.ws.Rules.ListResponse.Rule;
 import org.sonar.batch.bootstrapper.IssueListener;
 import org.sonar.api.server.rule.RulesDefinition.Repository;
@@ -228,7 +227,10 @@ public class BatchMediumTester {
 
       org.sonarqube.ws.Rules.Rule.Builder builder = org.sonarqube.ws.Rules.Rule.newBuilder();
       builder.setRepo(repositoryKey);
-      builder.setKey(ruleKey);
+      if (internalKey != null) {
+        builder.setInternalKey(internalKey);
+      }
+      builder.setKey(repositoryKey + ":" + ruleKey);
       builder.setName(name);
 
       if (templateRuleKey != null) {
@@ -237,9 +239,6 @@ public class BatchMediumTester {
       if (languag != null) {
         builder.setLang(languag);
       }
-      if (internalKey != null) {
-        builder.setInternalKey(internalKey);
-      }
       if (severity != null) {
         builder.setSeverity(severity);
       }
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/ChecksMediumTest.java b/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/ChecksMediumTest.java
index 488c56ae7bc..29531f3e537 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/ChecksMediumTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/ChecksMediumTest.java
@@ -113,7 +113,7 @@ public class ChecksMediumTest {
     @Nullable String internalKey, @Nullable String languag, String paramKey, String paramValue) {
     org.sonarqube.ws.Rules.Rule.Builder builder = org.sonarqube.ws.Rules.Rule.newBuilder();
     builder.setRepo(repositoryKey);
-    builder.setKey(ruleKey);
+    builder.setKey(repositoryKey + ":" + ruleKey);
     if (templateRuleKey != null) {
       builder.setTemplateKey(templateRuleKey);
     }
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 fb6a18d50c4..00a2e569a96 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
@@ -64,10 +64,10 @@ public class DefaultProjectRepositoriesLoaderTest {
   @Test
   public void passIssuesModeParameter() {
     loader.load(PROJECT_KEY, false, null);
-    verify(wsLoader).loadStream("/batch/project?key=foo%3F");
+    verify(wsLoader).loadStream("/batch/project.protobuf?key=foo%3F");
 
     loader.load(PROJECT_KEY, true, null);
-    verify(wsLoader).loadStream("/batch/project?key=foo%3F&issues=true");
+    verify(wsLoader).loadStream("/batch/project.protobuf?key=foo%3F&issues=true");
   }
 
   @Test
@@ -80,7 +80,7 @@ public class DefaultProjectRepositoriesLoaderTest {
   @Test
   public void passAndEncodeProjectKeyParameter() {
     loader.load(PROJECT_KEY, false, null);
-    verify(wsLoader).loadStream("/batch/project?key=foo%3F");
+    verify(wsLoader).loadStream("/batch/project.protobuf?key=foo%3F");
   }
 
   private InputStream mockData() throws IOException {
diff --git a/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultQualityProfileLoaderTest.java b/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultQualityProfileLoaderTest.java
index 33b053b74a2..6a52a3f1c50 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultQualityProfileLoaderTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultQualityProfileLoaderTest.java
@@ -67,7 +67,7 @@ public class DefaultQualityProfileLoaderTest {
     when(ws.loadStream(anyString())).thenReturn(result);
 
     List<QualityProfile> loaded = qpLoader.load("foo#2", "my-profile#2", null);
-    verify(ws).loadStream("/qualityprofiles/search?projectKey=foo%232&profileName=my-profile%232");
+    verify(ws).loadStream("/api/qualityprofiles/search.protobuf?projectKey=foo%232&profileName=my-profile%232");
     verifyNoMoreInteractions(ws);
     assertThat(loaded).hasSize(1);
   }
@@ -90,7 +90,7 @@ public class DefaultQualityProfileLoaderTest {
     when(ws.loadStream(anyString())).thenReturn(new WSLoaderResult<InputStream>(is, false));
 
     List<QualityProfile> loaded = qpLoader.loadDefault(null);
-    verify(ws).loadStream("/qualityprofiles/search?defaults=true");
+    verify(ws).loadStream("/api/qualityprofiles/search.protobuf?defaults=true");
     verifyNoMoreInteractions(ws);
     assertThat(loaded).hasSize(1);
   }
diff --git a/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultServerIssuesLoaderTest.java b/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultServerIssuesLoaderTest.java
index 1801b62e95f..54b1490082b 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultServerIssuesLoaderTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/repository/DefaultServerIssuesLoaderTest.java
@@ -58,7 +58,7 @@ public class DefaultServerIssuesLoaderTest {
       .writeDelimitedTo(bos);
 
     InputStream is = new ByteArrayInputStream(bos.toByteArray());
-    when(wsLoader.loadStream("/batch/issues?key=foo")).thenReturn(new WSLoaderResult<>(is, true));
+    when(wsLoader.loadStream("/batch/issues.protobuf?key=foo")).thenReturn(new WSLoaderResult<>(is, true));
 
     final List<ServerIssue> result = new ArrayList<>();
     loader.load("foo", new Function<BatchInput.ServerIssue, Void>() {
@@ -77,7 +77,7 @@ public class DefaultServerIssuesLoaderTest {
   public void testError() throws IOException {
     InputStream is = mock(InputStream.class);
     when(is.read()).thenThrow(IOException.class);
-    when(wsLoader.loadStream("/batch/issues?key=foo")).thenReturn(new WSLoaderResult<InputStream>(is, true));
+    when(wsLoader.loadStream("/batch/issues.protobuf?key=foo")).thenReturn(new WSLoaderResult<InputStream>(is, true));
     loader.load("foo", mock(Function.class));
   }
 }
diff --git a/sonar-batch/src/test/java/org/sonar/batch/rule/ActiveRulesProviderTest.java b/sonar-batch/src/test/java/org/sonar/batch/rule/ActiveRulesProviderTest.java
index a4f9b56aa3e..76a5cf1b07d 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/rule/ActiveRulesProviderTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/rule/ActiveRulesProviderTest.java
@@ -89,6 +89,6 @@ public class ActiveRulesProviderTest {
   }
 
   private static Rule mockRule(String name) {
-    return Rule.newBuilder().setName(name).setRepo(name).setKey(name).build();
+    return Rule.newBuilder().setName(name).setRepo(name).setKey(name + ":" + name).build();
   }
 }
diff --git a/sonar-batch/src/test/java/org/sonar/batch/rule/DefaultActiveRulesLoaderTest.java b/sonar-batch/src/test/java/org/sonar/batch/rule/DefaultActiveRulesLoaderTest.java
index d9cd09d2838..766ad91ab81 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/rule/DefaultActiveRulesLoaderTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/rule/DefaultActiveRulesLoaderTest.java
@@ -55,7 +55,7 @@ public class DefaultActiveRulesLoaderTest {
     Collection<Rule> activeRules = loader.load("java-sonar-way-26368", null);
     assertThat(activeRules).hasSize(100);
 
-    verify(ws).loadStream("/api/rules/search?f=repo,name,severity,lang,internalKey,templateKey&qprofile=java-sonar-way-26368");
+    verify(ws).loadStream("/api/rules/search.protobuf?f=repo,name,severity,lang,internalKey,templateKey,params&activation=true&qprofile=java-sonar-way-26368");
     verifyNoMoreInteractions(ws);
 
   }