From f0a65f13aa42aa86c51157e119c2fb11720aa4bb Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Sat, 18 Jan 2014 09:58:56 +0100
Subject: [PATCH] Replace json-simple by gson in sonar-batch

---
 sonar-batch/pom.xml                                   |  5 -----
 .../java/org/sonar/batch/bootstrap/BatchSettings.java | 11 +++++++----
 .../java/org/sonar/batch/scan/ModuleSettings.java     |  7 ++++---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/sonar-batch/pom.xml b/sonar-batch/pom.xml
index 238af5901ab..84b5dac0dcd 100644
--- a/sonar-batch/pom.xml
+++ b/sonar-batch/pom.xml
@@ -76,11 +76,6 @@
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.googlecode.json-simple</groupId>
-      <artifactId>json-simple</artifactId>
-    </dependency>
-
     <dependency>
       <!-- local database -->
       <groupId>com.h2database</groupId>
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchSettings.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchSettings.java
index 29d9474c394..2b36425b15d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchSettings.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchSettings.java
@@ -19,9 +19,10 @@
  */
 package org.sonar.batch.bootstrap;
 
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.lang.StringUtils;
-import org.json.simple.JSONValue;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
@@ -30,7 +31,6 @@ import org.sonar.api.config.Settings;
 import org.sonar.api.utils.SonarException;
 
 import javax.annotation.Nullable;
-
 import java.util.List;
 import java.util.Map;
 
@@ -45,7 +45,7 @@ public class BatchSettings extends Settings {
   private Map<String, String> savedProperties;
 
   public BatchSettings(BootstrapSettings bootstrapSettings, PropertyDefinitions propertyDefinitions,
-    ServerClient client, Configuration deprecatedConfiguration, AnalysisMode mode) {
+                       ServerClient client, Configuration deprecatedConfiguration, AnalysisMode mode) {
 
     super(propertyDefinitions);
     this.mode = mode;
@@ -96,7 +96,10 @@ public class BatchSettings extends Settings {
       url = BATCH_BOOTSTRAP_PROPERTIES_URL + "?dryRun=" + preview;
     }
     String jsonText = client.request(url);
-    List<Map<String, String>> json = (List<Map<String, String>>) JSONValue.parse(jsonText);
+
+    List<Map<String, String>> json = new Gson().fromJson(jsonText, new TypeToken<List<Map<String, String>>>() {
+    }.getType());
+
     for (Map<String, String> jsonProperty : json) {
       String key = jsonProperty.get("k");
       String value = jsonProperty.get("v");
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleSettings.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleSettings.java
index 996fb1e60a7..6f9b01f8387 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleSettings.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleSettings.java
@@ -20,9 +20,10 @@
 package org.sonar.batch.scan;
 
 import com.google.common.collect.Lists;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.lang.StringUtils;
-import org.json.simple.JSONValue;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
@@ -33,7 +34,6 @@ import org.sonar.batch.bootstrap.BatchSettings;
 import org.sonar.batch.bootstrap.ServerClient;
 
 import javax.annotation.Nullable;
-
 import java.util.List;
 import java.util.Map;
 
@@ -80,7 +80,8 @@ public class ModuleSettings extends Settings {
   private void downloadSettings(String moduleKey) {
     String url = BATCH_BOOTSTRAP_PROPERTIES_URL + "?project=" + moduleKey + "&dryRun=" + analysisMode.isPreview();
     String jsonText = client.request(url);
-    List<Map<String, String>> json = (List<Map<String, String>>) JSONValue.parse(jsonText);
+    List<Map<String, String>> json = new Gson().fromJson(jsonText, new TypeToken<List<Map<String, String>>>() {
+    }.getType());
     for (Map<String, String> jsonProperty : json) {
       String key = jsonProperty.get("k");
       String value = jsonProperty.get("v");
-- 
2.39.5