Use Square Moshi instead of jackson for DependencyLockReader

nebula-plugins · Nov 21, 2018 · ced99cf · ced99cf
1 parent 4fadec7
commit ced99cf
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 46 deletions.
diff --git a/build.gradle b/build.gradle
@@ -37,7 +37,7 @@ contacts {
 }
 
 dependencies {
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.9.4'
+    compile 'com.squareup.moshi:moshi:1.8.0'
     compile 'joda-time:joda-time:2.10'
     compile 'com.netflix.nebula:nebula-gradle-interop:latest.release'
     compile 'com.netflix.nebula:gradle-scm-plugin:latest.release'

diff --git a/dependencies.lock b/dependencies.lock
@@ -1,9 +1,5 @@
 {
     "apiDependenciesMetadata": {
-        "com.fasterxml.jackson.core:jackson-databind": {
-            "locked": "2.9.4",
-            "requested": "2.9.4"
-        },
         "com.netflix.nebula:gradle-metrics-plugin": {
             "locked": "5.3.0",
             "requested": "5.+"
@@ -16,6 +12,10 @@
             "locked": "1.0.2",
             "requested": "latest.release"
         },
+        "com.squareup.moshi:moshi": {
+            "locked": "1.8.0",
+            "requested": "1.8.0"
+        },
         "joda-time:joda-time": {
             "locked": "2.10",
             "requested": "2.10"
@@ -30,10 +30,6 @@
         }
     },
     "compile": {
-        "com.fasterxml.jackson.core:jackson-databind": {
-            "locked": "2.9.4",
-            "requested": "2.9.4"
-        },
         "com.netflix.nebula:gradle-metrics-plugin": {
             "locked": "5.3.0",
             "requested": "5.+"
@@ -46,6 +42,10 @@
             "locked": "1.0.2",
             "requested": "latest.release"
         },
+        "com.squareup.moshi:moshi": {
+            "locked": "1.8.0",
+            "requested": "1.8.0"
+        },
         "joda-time:joda-time": {
             "locked": "2.10",
             "requested": "2.10"
@@ -60,10 +60,6 @@
         }
     },
     "compileClasspath": {
-        "com.fasterxml.jackson.core:jackson-databind": {
-            "locked": "2.9.4",
-            "requested": "2.9.4"
-        },
         "com.netflix.nebula:gradle-metrics-plugin": {
             "locked": "5.3.0",
             "requested": "5.+"
@@ -76,6 +72,10 @@
             "locked": "1.0.2",
             "requested": "latest.release"
         },
+        "com.squareup.moshi:moshi": {
+            "locked": "1.8.0",
+            "requested": "1.8.0"
+        },
         "joda-time:joda-time": {
             "locked": "2.10",
             "requested": "2.10"
@@ -90,10 +90,6 @@
         }
     },
     "default": {
-        "com.fasterxml.jackson.core:jackson-databind": {
-            "locked": "2.9.4",
-            "requested": "2.9.4"
-        },
         "com.netflix.nebula:gradle-metrics-plugin": {
             "locked": "5.3.0",
             "requested": "5.+"
@@ -106,6 +102,10 @@
             "locked": "1.0.2",
             "requested": "latest.release"
         },
+        "com.squareup.moshi:moshi": {
+            "locked": "1.8.0",
+            "requested": "1.8.0"
+        },
         "joda-time:joda-time": {
             "locked": "2.10",
             "requested": "2.10"
@@ -121,8 +121,8 @@
     },
     "integTestCompile": {
         "com.fasterxml.jackson.core:jackson-databind": {
-            "locked": "2.9.4",
-            "requested": "2.9.4"
+            "locked": "2.8.11.2",
+            "requested": "2.8.+"
         },
         "com.netflix.nebula:gradle-git-scm-plugin": {
             "locked": "4.1.1",
@@ -144,6 +144,10 @@
             "locked": "7.1.0",
             "requested": "7.+"
         },
+        "com.squareup.moshi:moshi": {
+            "locked": "1.8.0",
+            "requested": "1.8.0"
+        },
         "joda-time:joda-time": {
             "locked": "2.10",
             "requested": "2.10"
@@ -163,8 +167,8 @@
     },
     "integTestCompileClasspath": {
         "com.fasterxml.jackson.core:jackson-databind": {
-            "locked": "2.9.4",
-            "requested": "2.9.4"
+            "locked": "2.8.11.2",
+            "requested": "2.8.+"
         },
         "com.netflix.nebula:gradle-git-scm-plugin": {
             "locked": "4.1.1",
@@ -186,6 +190,10 @@
             "locked": "7.1.0",
             "requested": "7.+"
         },
+        "com.squareup.moshi:moshi": {
+            "locked": "1.8.0",
+            "requested": "1.8.0"
+        },
         "joda-time:joda-time": {
             "locked": "2.10",
             "requested": "2.10"
@@ -205,8 +213,8 @@
     },
     "integTestRuntime": {
         "com.fasterxml.jackson.core:jackson-databind": {
-            "locked": "2.9.4",
-            "requested": "2.9.4"
+            "locked": "2.8.11.2",
+            "requested": "2.8.+"
         },
         "com.netflix.nebula:gradle-git-scm-plugin": {
             "locked": "4.1.1",
@@ -228,6 +236,10 @@
             "locked": "7.1.0",
             "requested": "7.+"
         },
+        "com.squareup.moshi:moshi": {
+            "locked": "1.8.0",
+            "requested": "1.8.0"
+        },
         "joda-time:joda-time": {
             "locked": "2.10",
             "requested": "2.10"
@@ -247,8 +259,8 @@
     },
     "integTestRuntimeClasspath": {
         "com.fasterxml.jackson.core:jackson-databind": {
-            "locked": "2.9.4",
-            "requested": "2.9.4"
+            "locked": "2.8.11.2",
+            "requested": "2.8.+"
         },
         "com.netflix.nebula:gradle-git-scm-plugin": {
             "locked": "4.1.1",
@@ -270,6 +282,10 @@
             "locked": "7.1.0",
             "requested": "7.+"
         },
+        "com.squareup.moshi:moshi": {
+            "locked": "1.8.0",
+            "requested": "1.8.0"
+        },
         "joda-time:joda-time": {
             "locked": "2.10",
             "requested": "2.10"
@@ -309,10 +325,6 @@
         }
     },
     "runtime": {
-        "com.fasterxml.jackson.core:jackson-databind": {
-            "locked": "2.9.4",
-            "requested": "2.9.4"
-        },
         "com.netflix.nebula:gradle-metrics-plugin": {
             "locked": "5.3.0",
             "requested": "5.+"
@@ -325,6 +337,10 @@
             "locked": "1.0.2",
             "requested": "latest.release"
         },
+        "com.squareup.moshi:moshi": {
+            "locked": "1.8.0",
+            "requested": "1.8.0"
+        },
         "joda-time:joda-time": {
             "locked": "2.10",
             "requested": "2.10"
@@ -339,10 +355,6 @@
         }
     },
     "runtimeClasspath": {
-        "com.fasterxml.jackson.core:jackson-databind": {
-            "locked": "2.9.4",
-            "requested": "2.9.4"
-        },
         "com.netflix.nebula:gradle-metrics-plugin": {
             "locked": "5.3.0",
             "requested": "5.+"
@@ -355,6 +367,10 @@
             "locked": "1.0.2",
             "requested": "latest.release"
         },
+        "com.squareup.moshi:moshi": {
+            "locked": "1.8.0",
+            "requested": "1.8.0"
+        },
         "joda-time:joda-time": {
             "locked": "2.10",
             "requested": "2.10"
@@ -370,8 +386,8 @@
     },
     "testCompile": {
         "com.fasterxml.jackson.core:jackson-databind": {
-            "locked": "2.9.4",
-            "requested": "2.9.4"
+            "locked": "2.8.11.2",
+            "requested": "2.8.+"
         },
         "com.netflix.nebula:gradle-git-scm-plugin": {
             "locked": "4.1.1",
@@ -393,6 +409,10 @@
             "locked": "7.1.0",
             "requested": "7.+"
         },
+        "com.squareup.moshi:moshi": {
+            "locked": "1.8.0",
+            "requested": "1.8.0"
+        },
         "joda-time:joda-time": {
             "locked": "2.10",
             "requested": "2.10"
@@ -412,8 +432,8 @@
     },
     "testCompileClasspath": {
         "com.fasterxml.jackson.core:jackson-databind": {
-            "locked": "2.9.4",
-            "requested": "2.9.4"
+            "locked": "2.8.11.2",
+            "requested": "2.8.+"
         },
         "com.netflix.nebula:gradle-git-scm-plugin": {
             "locked": "4.1.1",
@@ -435,6 +455,10 @@
             "locked": "7.1.0",
             "requested": "7.+"
         },
+        "com.squareup.moshi:moshi": {
+            "locked": "1.8.0",
+            "requested": "1.8.0"
+        },
         "joda-time:joda-time": {
             "locked": "2.10",
             "requested": "2.10"
@@ -454,8 +478,8 @@
     },
     "testRuntime": {
         "com.fasterxml.jackson.core:jackson-databind": {
-            "locked": "2.9.4",
-            "requested": "2.9.4"
+            "locked": "2.8.11.2",
+            "requested": "2.8.+"
         },
         "com.netflix.nebula:gradle-git-scm-plugin": {
             "locked": "4.1.1",
@@ -477,6 +501,10 @@
             "locked": "7.1.0",
             "requested": "7.+"
         },
+        "com.squareup.moshi:moshi": {
+            "locked": "1.8.0",
+            "requested": "1.8.0"
+        },
         "joda-time:joda-time": {
             "locked": "2.10",
             "requested": "2.10"
@@ -496,8 +524,8 @@
     },
     "testRuntimeClasspath": {
         "com.fasterxml.jackson.core:jackson-databind": {
-            "locked": "2.9.4",
-            "requested": "2.9.4"
+            "locked": "2.8.11.2",
+            "requested": "2.8.+"
         },
         "com.netflix.nebula:gradle-git-scm-plugin": {
             "locked": "4.1.1",
@@ -519,6 +547,10 @@
             "locked": "7.1.0",
             "requested": "7.+"
         },
+        "com.squareup.moshi:moshi": {
+            "locked": "1.8.0",
+            "requested": "1.8.0"
+        },
         "joda-time:joda-time": {
             "locked": "2.10",
             "requested": "2.10"

diff --git a/src/main/groovy/nebula/plugin/dependencylock/DependencyLockReader.groovy b/src/main/groovy/nebula/plugin/dependencylock/DependencyLockReader.groovy
@@ -1,7 +1,7 @@
 package nebula.plugin.dependencylock
 
-import com.fasterxml.jackson.databind.ObjectMapper
-import groovy.json.JsonSlurper
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.Moshi
 import groovy.transform.TupleConstructor
 import org.gradle.api.GradleException
 import org.gradle.api.Project
@@ -14,8 +14,8 @@ import static DependencyLockTaskConfigurer.GLOBAL_LOCK_CONFIG
 @TupleConstructor
 class DependencyLockReader {
     private static final Logger logger = Logging.getLogger(DependencyLockReader)
-    private static final ObjectMapper mapper = new ObjectMapper()
-
+    private static final Moshi moshi = new Moshi.Builder().build()
+    private static final JsonAdapter<Map> jsonAdapter = moshi.adapter(Map)
     Project project
 
     DependencyLockReader(Project project) {
@@ -84,7 +84,7 @@ class DependencyLockReader {
 
     private static Map parseLockFile(File lock) {
         try {
-            return mapper.readValue(lock.text, HashMap)
+            return jsonAdapter.fromJson(lock.text)
         } catch (ex) {
             logger.debug('Unreadable json file: ' + lock.text)
             logger.error('JSON unreadable')