Switch from groovy-yaml to snakeyaml due to jackson version conflicts

jericks · jericks · commit 03f09ba787a4 · 2023-07-18T16:15:53.000-07:00
diff --git a/pom.xml b/pom.xml
@@ -273,22 +273,6 @@
             <artifactId>groovy-json</artifactId>
             <version>${groovy.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.groovy</groupId>
-            <artifactId>groovy-yaml</artifactId>
-            <version>${groovy.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.dataformat</groupId>
-                    <artifactId>jackson-dataformat-yaml</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.13.3</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-swing</artifactId>
@@ -314,6 +298,11 @@
             <artifactId>batik-codec</artifactId>
             <version>1.13</version>
         </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.33</version>
+        </dependency>
         <dependency>
             <groupId>com.lowagie</groupId>
             <artifactId>itext</artifactId>
diff --git a/src/main/groovy/geoscript/feature/io/YamlReader.groovy b/src/main/groovy/geoscript/feature/io/YamlReader.groovy
@@ -3,7 +3,7 @@ package geoscript.feature.io
 import geoscript.geom.Geometry
 import geoscript.geom.io.YamlReader as GeometryYamlReader
 import geoscript.feature.Feature
-import groovy.yaml.YamlSlurper
+import org.yaml.snakeyaml.Yaml
 
 /**
  * Read a Feature from a GeoYaml String
@@ -15,8 +15,8 @@ class YamlReader implements Reader {
 
     @Override
     Feature read(String str) {
-        YamlSlurper yamlSlurper = new YamlSlurper()
-        def obj = yamlSlurper.parseText(str)
+        Yaml yaml = new Yaml()
+        def obj = yaml.load(str)
         readFeature(obj)
     }
 
diff --git a/src/main/groovy/geoscript/feature/io/YamlWriter.groovy b/src/main/groovy/geoscript/feature/io/YamlWriter.groovy
@@ -1,8 +1,9 @@
 package geoscript.feature.io
 
 import geoscript.feature.Feature
-import groovy.yaml.YamlBuilder
 import geoscript.geom.io.YamlWriter as GeometryYamlWriter
+import org.yaml.snakeyaml.DumperOptions
+import org.yaml.snakeyaml.Yaml
 
 /**
  * Write a Feature to a GeoYaml String
@@ -14,11 +15,15 @@ class YamlWriter implements Writer {
 
     @Override
     String write(Feature feature) {
-        YamlBuilder builder = new YamlBuilder()
-        Map yaml = [type: "Feature"]
-        yaml.putAll(build(feature))
-        builder(yaml)
-        builder.toString()
+        DumperOptions options = new DumperOptions()
+        options.indent = 2
+        options.prettyFlow = true
+        options.defaultFlowStyle = DumperOptions.FlowStyle.BLOCK
+        options.explicitStart = true
+        Yaml yaml = new Yaml(options)
+        Map data = [type: "Feature"]
+        data.putAll(build(feature))
+        yaml.dump(data)
     }
 
     Map build(Feature feature) {
diff --git a/src/main/groovy/geoscript/geom/io/YamlReader.groovy b/src/main/groovy/geoscript/geom/io/YamlReader.groovy
@@ -8,7 +8,7 @@ import geoscript.geom.MultiPoint
 import geoscript.geom.MultiPolygon
 import geoscript.geom.Point
 import geoscript.geom.Polygon
-import groovy.yaml.YamlSlurper
+import org.yaml.snakeyaml.Yaml
 
 /**
  * Read a Geometry from a GeoYaml String
@@ -18,8 +18,8 @@ class YamlReader implements Reader {
 
     @Override
     Geometry read(String str) {
-        YamlSlurper yamlSlurper = new YamlSlurper()
-        def obj = yamlSlurper.parseText(str)
+        Yaml yaml = new Yaml()
+        def obj = yaml.load(str)
         readGeometry(obj?.geometry)
     }
 
diff --git a/src/main/groovy/geoscript/geom/io/YamlWriter.groovy b/src/main/groovy/geoscript/geom/io/YamlWriter.groovy
@@ -8,7 +8,8 @@ import geoscript.geom.MultiPoint
 import geoscript.geom.MultiPolygon
 import geoscript.geom.Point
 import geoscript.geom.Polygon
-import groovy.yaml.YamlBuilder
+import org.yaml.snakeyaml.DumperOptions
+import org.yaml.snakeyaml.Yaml
 
 /**
  * Write a Geometry to a GeoYaml String.
@@ -18,12 +19,16 @@ class YamlWriter implements Writer {
 
     @Override
     String write(Geometry g) {
-        YamlBuilder builder = new YamlBuilder()
-        Map yaml = [
+        DumperOptions options = new DumperOptions()
+        options.indent = 2
+        options.prettyFlow = true
+        options.defaultFlowStyle = DumperOptions.FlowStyle.BLOCK
+        options.explicitStart = true
+        Yaml yaml = new Yaml(options)
+        Map data = [
             geometry: build(g)
         ]
-        builder(yaml)
-        builder.toString()
+        yaml.dump(data)
     }
 
     Map build(Geometry g) {
diff --git a/src/main/groovy/geoscript/layer/io/YamlReader.groovy b/src/main/groovy/geoscript/layer/io/YamlReader.groovy
@@ -5,7 +5,7 @@ import geoscript.feature.Field
 import geoscript.feature.Schema
 import geoscript.layer.Layer
 import geoscript.feature.io.YamlReader as FeatureYamlReader
-import groovy.yaml.YamlSlurper
+import org.yaml.snakeyaml.Yaml
 
 /**
  * Read a Layer from a GeoYaml String, File, or InputStream
@@ -17,8 +17,8 @@ class YamlReader implements Reader {
 
     @Override
     Layer read(InputStream input) {
-        YamlSlurper yamlSlurper = new YamlSlurper()
-        readLayer(yamlSlurper.parse(input))
+        Yaml yaml = new Yaml()
+        readLayer(yaml.load(input))
     }
 
     @Override
@@ -32,8 +32,8 @@ class YamlReader implements Reader {
 
     @Override
     Layer read(String str) {
-        YamlSlurper yamlSlurper = new YamlSlurper()
-        readLayer(yamlSlurper.parseText(str))
+        Yaml yaml = new Yaml()
+        readLayer(yaml.load(str))
     }
 
     private Layer readLayer(def obj) {
diff --git a/src/main/groovy/geoscript/layer/io/YamlWriter.groovy b/src/main/groovy/geoscript/layer/io/YamlWriter.groovy
@@ -3,7 +3,8 @@ package geoscript.layer.io
 import geoscript.feature.Feature
 import geoscript.layer.Layer
 import geoscript.feature.io.YamlWriter as FeatureYamlWriter
-import groovy.yaml.YamlBuilder
+import org.yaml.snakeyaml.DumperOptions
+import org.yaml.snakeyaml.Yaml
 
 /**
  * Write a Layer to a GeoYaml String, File, or OutputStream
@@ -27,15 +28,19 @@ class YamlWriter implements Writer {
 
     @Override
     String write(Layer layer) {
-        YamlBuilder builder = new YamlBuilder()
-        Map yaml = [
+        DumperOptions options = new DumperOptions()
+        options.indent = 2
+        options.prettyFlow = true
+        options.defaultFlowStyle = DumperOptions.FlowStyle.BLOCK
+        options.explicitStart = true
+        Yaml yaml = new Yaml(options)
+        Map data = [
                 type: "FeatureCollection",
                 features: layer.collectFromFeature { Feature feature ->
                     featureYamlWriter.build(feature)
                 }
         ]
-        builder(yaml)
-        builder.toString()
+        yaml.dump(data)
     }
 
 }
diff --git a/src/test/groovy/geoscript/feature/FeatureTest.groovy b/src/test/groovy/geoscript/feature/FeatureTest.groovy
@@ -324,12 +324,12 @@ class FeatureTest {
         Schema s1 = new Schema("houses", [new Field("geom","Point"), new Field("name","string"), new Field("price","float")])
         Feature f1 = new Feature([new Point(111,-47), "House", 12.5], "house1", s1)
         assertEquals("""---
-type: "Feature"
+type: Feature
 properties:
-  name: "House"
+  name: House
   price: 12.5
 geometry:
-  type: "Point"
+  type: Point
   coordinates:
   - 111.0
   - -47.0
diff --git a/src/test/groovy/geoscript/feature/io/YamlWriterTest.groovy b/src/test/groovy/geoscript/feature/io/YamlWriterTest.groovy
@@ -15,12 +15,12 @@ class YamlWriterTest {
         Feature feature = new Feature([new Point(111,-47), "House", 12.5], "house1", schema)
         YamlWriter writer = new YamlWriter()
         String expected = """---
-type: "Feature"
+type: Feature
 properties:
-  name: "House"
+  name: House
   price: 12.5
 geometry:
-  type: "Point"
+  type: Point
   coordinates:
   - 111.0
   - -47.0
diff --git a/src/test/groovy/geoscript/geom/GeometryTest.groovy b/src/test/groovy/geoscript/geom/GeometryTest.groovy
@@ -291,7 +291,7 @@ class GeometryTest {
         Geometry g = Geometry.fromWKT("POINT (111 -47)")
         assertEquals """---
 geometry:
-  type: "Point"
+  type: Point
   coordinates:
   - 111.0
   - -47.0
diff --git a/src/test/groovy/geoscript/geom/io/YamlWriterTest.groovy b/src/test/groovy/geoscript/geom/io/YamlWriterTest.groovy
@@ -18,7 +18,7 @@ class YamlWriterTest {
         Point p = new Point(-122.23, 45.67)
         assertEquals("""---
 geometry:
-  type: "Point"
+  type: Point
   coordinates:
   - -122.23
   - 45.67
@@ -30,7 +30,7 @@ geometry:
         LineString l = new LineString([[111.0, -47], [123.0, -48], [110.0, -47]])
         assertEquals """---
 geometry:
-  type: "LineString"
+  type: LineString
   coordinates:
   - - 111.0
     - -47.0
@@ -51,7 +51,7 @@ geometry:
         )
         String expected = """---
 geometry:
-  type: "Polygon"
+  type: Polygon
   coordinates:
   - - - 1.0
       - 1.0
@@ -93,7 +93,7 @@ geometry:
         MultiPoint p = new MultiPoint([111, -47],[110, -46.5])
         String expected = """---
 geometry:
-  type: "MultiPoint"
+  type: MultiPoint
   coordinates:
   - - 111.0
     - -47.0
@@ -109,7 +109,7 @@ geometry:
         MultiLineString m = new MultiLineString(new LineString([1, 2],[3, 4]), new LineString([5, 6],[7, 8]))
         String expected = """---
 geometry:
-  type: "MultiLineString"
+  type: MultiLineString
   coordinates:
   - - - 1.0
       - 2.0
@@ -129,7 +129,7 @@ geometry:
         MultiPolygon mp = new MultiPolygon([[[[1, 2], [3, 4], [5, 6], [1, 2]]], [[[7, 8], [9, 10], [11, 12], [7, 8]]]])
         String expected = """---
 geometry:
-  type: "MultiPolygon"
+  type: MultiPolygon
   coordinates:
   - - - - 1.0
         - 2.0
@@ -157,13 +157,13 @@ geometry:
         GeometryCollection gc = new GeometryCollection(new Point(100.0, 0.0), new LineString([101.0, 0.0], [102.0, 1.0]))
         String expected = """---
 geometry:
-  type: "GeometryCollection"
+  type: GeometryCollection
   geometries:
-  - type: "Point"
+  - type: Point
     coordinates:
     - 100.0
     - 0.0
-  - type: "LineString"
+  - type: LineString
     coordinates:
     - - 101.0
       - 0.0
diff --git a/src/test/groovy/geoscript/layer/LayerTest.groovy b/src/test/groovy/geoscript/layer/LayerTest.groovy
@@ -427,13 +427,13 @@ class LayerTest {
         layer1.add(new Feature([new Point(-122.444,47.2528), "House", 12.5], "house1", s1))
 
         String expected = """---
-type: "FeatureCollection"
+type: FeatureCollection
 features:
 - properties:
-    name: "House"
+    name: House
     price: 12.5
   geometry:
-    type: "Point"
+    type: Point
     coordinates:
     - -122.444
     - 47.2528
diff --git a/src/test/groovy/geoscript/layer/io/YamlWriterTest.groovy b/src/test/groovy/geoscript/layer/io/YamlWriterTest.groovy
@@ -28,21 +28,21 @@ class YamlWriterTest {
         layer.add(new Feature([new Point(121,-45), "School", 22.7], "house2", schema))
 
         String expected = """---
-type: "FeatureCollection"
+type: FeatureCollection
 features:
 - properties:
-    name: "House"
+    name: House
     price: 12.5
   geometry:
-    type: "Point"
+    type: Point
     coordinates:
     - 111.0
     - -47.0
 - properties:
-    name: "School"
+    name: School
     price: 22.7
   geometry:
-    type: "Point"
+    type: Point
     coordinates:
     - 121.0
     - -45.0
