SONAR-5417 Handle permision error for project referential loader

4 files changed, 12 insertions, 17 deletions

diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalReferentials.java b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalReferentials.java
index 4a15c7042d2..4fa32d5d68b 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalReferentials.java
+++ b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalReferentials.java
@@ -21,7 +21,6 @@ package org.sonar.batch.protocol.input;
 
 import com.google.gson.Gson;
 
-import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -41,7 +40,7 @@ public class GlobalReferentials {
     return globalSettings;
   }
 
-  public GlobalReferentials addGlobalSetting(String key, String value){
+  public GlobalReferentials addGlobalSetting(String key, String value) {
     globalSettings.put(key, value);
     return this;
   }
@@ -50,7 +49,7 @@ public class GlobalReferentials {
     return metrics;
   }
 
-  public GlobalReferentials addMetric(Metric metric){
+  public GlobalReferentials addMetric(Metric metric) {
     metrics.add(metric);
     return this;
   }
@@ -67,8 +66,8 @@ public class GlobalReferentials {
     return new Gson().toJson(this);
   }
 
-  public static GlobalReferentials fromJson(Reader input) {
-    return new Gson().fromJson(input, GlobalReferentials.class);
+  public static GlobalReferentials fromJson(String json) {
+    return new Gson().fromJson(json, GlobalReferentials.class);
   }
 
 }
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectReferentials.java b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectReferentials.java
index 06109d82b11..6a8d5c8691e 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectReferentials.java
+++ b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectReferentials.java
@@ -21,7 +21,6 @@ package org.sonar.batch.protocol.input;
 
 import com.google.gson.Gson;
 
-import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -83,8 +82,8 @@ public class ProjectReferentials {
     return new Gson().toJson(this);
   }
 
-  public static ProjectReferentials fromJson(Reader input) {
-    return new Gson().fromJson(input, ProjectReferentials.class);
+  public static ProjectReferentials fromJson(String json) {
+    return new Gson().fromJson(json, ProjectReferentials.class);
   }
 
 }
diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalReferentialsTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalReferentialsTest.java
index 6ea2a3bf218..36c6dc2677f 100644
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalReferentialsTest.java
+++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalReferentialsTest.java
@@ -24,8 +24,6 @@ import org.json.JSONException;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 
-import java.io.StringReader;
-
 import static org.fest.assertions.Assertions.assertThat;
 
 public class GlobalReferentialsTest {
@@ -48,10 +46,10 @@ public class GlobalReferentialsTest {
   @Test
   public void from_json() throws JSONException {
     GlobalReferentials ref = GlobalReferentials
-      .fromJson(new StringReader(
-        "{timestamp:1,"
-          + "metrics:[{id:1,key:ncloc,valueType:DATA,description:Description,direction:-1,name:NCLOC,qualitative:true,userManaged:false,worstValue:2.0,bestValue:1.0,optimizedBestValue:true}],"
-          + "globalSettings:{prop:value}}"));
+      .fromJson(
+      "{timestamp:1,"
+        + "metrics:[{id:1,key:ncloc,valueType:DATA,description:Description,direction:-1,name:NCLOC,qualitative:true,userManaged:false,worstValue:2.0,bestValue:1.0,optimizedBestValue:true}],"
+        + "globalSettings:{prop:value}}");
 
     assertThat(ref.timestamp()).isEqualTo(1);
     Metric metric = ref.metrics().iterator().next();
diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectReferentialsTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectReferentialsTest.java
index 328939ca23d..fbcb0c9f216 100644
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectReferentialsTest.java
+++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectReferentialsTest.java
@@ -24,7 +24,6 @@ import org.json.JSONException;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 
-import java.io.StringReader;
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
 
@@ -53,10 +52,10 @@ public class ProjectReferentialsTest {
 
   @Test
   public void testFromJson() throws JSONException {
-    ProjectReferentials ref = ProjectReferentials.fromJson(new StringReader("{timestamp:1,"
+    ProjectReferentials ref = ProjectReferentials.fromJson("{timestamp:1,"
       + "qprofilesByLanguage:{java:{key:\"squid-java\",name:Java,language:java,rulesUpdatedAt:\"Mar 14, 1984 12:00:00 AM\"}},"
       + "activeRules:[{repositoryKey:repo,ruleKey:rule,severity:MAJOR,internalKey:rule,language:java,params:{}}],"
-      + "settingsByModule:{foo:{prop:value}}}"));
+      + "settingsByModule:{foo:{prop:value}}}");
 
     assertThat(ref.timestamp()).isEqualTo(1);