upgrade groovy + gson

Author: ervandew

ant/build.gant

@@ -16,9 +16,10 @@
  */
 import javax.xml.XMLConstants
 
-import groovy.json.JsonSlurper
 import groovy.util.XmlSlurper
 
+import com.google.gson.JsonParser
+
 import org.apache.tools.ant.BuildException
 import org.apache.tools.ant.taskdefs.condition.Os
 
@@ -254,11 +255,11 @@ target(name: 'deploy.eclipse'){
     instances = new File(binding.getVariable('user.home') + '/.eclim/.eclimd_instances')
     if (instances.exists()){
       eclipse = binding.getVariable('eclipse')
-      parser = new JsonSlurper()
       instances.eachLine { line ->
-        json = parser.parseText(line)
-        port = json.port
-        echo("#  shutdown: ${json.workspace}:${json.port}")
+        json = JsonParser.parseString(line)
+        port = json.get('port').getAsInt()
+        workspace = json.get('workspace').getAsString()
+        echo("#  shutdown: ${workspace}:${port}")
         eclim('-command shutdown',
           port=port, failonerror=false, dir=existing.toString() + '/bin')
       }

ant/lib/gant-1.9.11.jar renamed to ant/lib/gant/gant-1.9.11.jar

@@ -126,7 +126,7 @@
 
     <taskdef name="gant" classname="org.codehaus.gant.ant.Gant">
       <classpath>
-        <fileset dir="ant/lib" includes="*.jar"/>
+        <fileset dir="ant/lib" includes="**/*.jar"/>
         <fileset dir="org.eclim" includes="lib/*.jar"/>
       </classpath>
     </taskdef>

ant/lib/gant/groovy-3.0.6.jar

@@ -1,4 +1,4 @@
-.. Copyright (C) 2005 - 2012  Eric Van Dewoestine
+.. Copyright (C) 2005 - 2020  Eric Van Dewoestine
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -55,7 +55,7 @@ Configuration
 
 .. _org.eclim.java.import.exclude:
 
-- **org.eclim.java.import.exclude** (Default: ["^com\.sun\..*", "^sunw\?\..*"]) -
+- **org.eclim.java.import.exclude** (Default: ["^com\.sun\..*", "^sunw?\..*"]) -
   List of patterns to exclude from import results.
 
 .. _org.eclim.java.import.package_separation_level:

ant/lib/gant/groovy-ant-3.0.6.jar

@@ -19,6 +19,10 @@
 import java.io.File;
 import java.io.FileReader;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -47,7 +51,7 @@
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.google.gson.JsonStreamParser;
+import com.google.gson.JsonParser;
 
 /**
  * Command to update a project.
@@ -102,13 +106,15 @@ private List<Error> updateSettings(IProject project, String settings)
     throws Exception
   {
     FileReader in = null;
-    File file = new File(settings);
+    Path file = Paths.get(settings);
     ArrayList<Error> errors = new ArrayList<Error>();
     try{
-      in = new FileReader(file);
-      JsonStreamParser parser = new JsonStreamParser(in);
-      JsonObject obj = (JsonObject)parser.next();
+      String content = Files.readString(file);
+      // somewhere between gson 1.7.1 and 2.8.6 it became stupidily strict on
+      // back slashes in values.
+      content = content.replace("\\", "\\\\");
 
+      JsonObject obj = (JsonObject)JsonParser.parseString(content);
       Preferences preferences = getPreferences();
       for (Map.Entry<String, JsonElement> entry : obj.entrySet()){
         String name = entry.getKey();
@@ -122,7 +128,7 @@ private List<Error> updateSettings(IProject project, String settings)
     }finally{
       IOUtils.closeQuietly(in);
       try{
-        file.delete();
+        file.toFile().delete();
       }catch(Exception e){
         logger.warn("Error deleting project settings temp file: " + file, e);
       }

ant/lib/gant/groovy-json-3.0.6.jar

@@ -40,6 +40,7 @@
 import org.osgi.service.prefs.BackingStoreException;
 
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 
 import com.google.gson.reflect.TypeToken;
 
@@ -67,6 +68,8 @@ public class Preferences
   private static final String NODE_NAME = "org.eclim";
   private static final String GLOBAL = "_global_";
 
+  private static Gson gson = new GsonBuilder().setLenient().create();
+
   private static Preferences instance = new Preferences();
   private static Map<String, OptionHandler> optionHandlers =
     new HashMap<String, OptionHandler>();
@@ -328,7 +331,10 @@ public String[] getArrayValue(IProject project, String name)
   {
     String value = getValues(project).get(name);
     if (value != null && value.trim().length() != 0){
-      return new Gson().fromJson(value, String[].class);
+      // somewhere between gson 1.7.1 and 2.8.6 it became stupidily strict on
+      // back slashes in values.
+      value = value.replace("\\", "\\\\");
+      return gson.fromJson(value, String[].class);
     }
     return ArrayUtils.EMPTY_STRING_ARRAY;
   }
@@ -356,7 +362,9 @@ public Set<String> getSetValue(IProject project, String name)
   {
     String value = getValues(project).get(name);
     if (value != null && value.trim().length() != 0){
-      return (Set<String>)new Gson().fromJson(
+      // more gson being overly strict on back slashes
+      value = value.replace("\\", "\\\\");
+      return (Set<String>)gson.fromJson(
           value, new TypeToken<Set<String>>(){}.getType());
     }
     return new HashSet<String>();
@@ -385,7 +393,9 @@ public Map<String, String> getMapValue(IProject project, String name)
   {
     String value = getValues(project).get(name);
     if (value != null && value.trim().length() != 0){
-      return (Map<String, String>)new Gson().fromJson(
+      // more gson being overly strict on back slashes
+      value = value.replace("\\", "\\\\");
+      return (Map<String, String>)gson.fromJson(
           value, new TypeToken<Map<String, String>>(){}.getType());
     }
     return new HashMap<String, String>();

ant/lib/gant/groovy-xml-3.0.6.jar

@@ -25,8 +25,6 @@
 
 import org.apache.commons.lang.StringUtils;
 
-import org.apache.tools.ant.taskdefs.condition.Os;
-
 import org.eclim.util.CommandExecutor;
 import org.eclim.util.IOUtils;
 
@@ -52,8 +50,6 @@ public class Eclim
   private static final String PRETTY = "-pretty";
   private static final String COMMAND = "-command";
 
-  private static final JsonParser JSON_PARSER = new JsonParser();
-
   private static String workspace;
 
   /**
@@ -157,7 +153,7 @@ public static Object execute(String[] args, long timeout, boolean failOnError)
       result = "\"\"";
     }
     try{
-      return toType(JSON_PARSER.parse(result));
+      return toType(JsonParser.parseString(result));
     }catch(JsonSyntaxException jse){
       if(!failOnError){
         return result;

ant/lib/groovy-all-2.2.0.jar

@@ -91,7 +91,7 @@ public void initialize(String name)
       "JDT org.eclim.java.logging.template logger.gst\n" +
       "JDT org.eclim.java.import.package_separation_level 1 (-1|\\d+)\n" +
       "JDT org.eclim.java.import.exclude " +
-        "[\"^com\\.sun\\..*\",\"^sunw\\?\\..*\"] JSON[]\n" +
+        "[\"^com\\.sun\\..*\",\"^sunw?\\..*\"] JSON[]\n" +
       "JDT org.eclim.java.format.strip_trialing_whitespace true (true|false)\n" +
       "JDT org.eclim.java.checkstyle.config\n" +
       "JDT org.eclim.java.checkstyle.properties\n" +
@@ -111,7 +111,7 @@ public void initialize(String name)
     );
     // Indentation settings found in DefaultCodeFormatterConstants
     PreferenceFactory.addOptions(NATURE,
-      "JDT org.eclipse.jdt.core.compiler.source ^(1\\.[3-8]|9|10)$\n" +
+      "JDT org.eclipse.jdt.core.compiler.source ^(1\\.[3-8]|9|1[0-5])$\n" +
       "JDT org.eclipse.jdt.ui.importorder [a-zA-Z0-9_.#;]+\n" +
       "JDT/Javadoc " + JavaUI.ID_PLUGIN + ".project_javadoc_location\n" +
       "JDT/CodeComplete " +

build.xml

@@ -1,4 +1,4 @@
-import groovy.json.JsonSlurper
+import com.google.gson.Gson
 
 feature_pydev = 'org.python.pydev.feature'
 
@@ -8,9 +8,8 @@ target(name: 'org.eclim.pydev.test'){
   port = getEclimdPort()
   cmd = "${cmd} --nailgun-port ${port} -command"
 
-  parser = new JsonSlurper()
-  interpreters = parser.parseText(
-    "${cmd} python_list_interpreters".execute().text)
+  result = "${cmd} python_list_interpreters".execute().text
+  interpreters = new Gson().fromJson(result, List<Map<String, String>>.class)
 
   if (!interpreters){
     python = 'which python'.execute().text