From 839c33ca15090cec6aec3a5115eff49ff94dd95c Mon Sep 17 00:00:00 2001 From: Jared Erickson Date: Thu, 19 Jan 2023 16:16:50 -0800 Subject: [PATCH] Update to Groovy 4 --- pom.xml | 43 +++++++++++++------ src/main/groovy/geoscript/Application.groovy | 4 +- .../geoscript/feature/io/GeoRSSReader.groovy | 2 + .../geoscript/feature/io/GpxReader.groovy | 2 + .../feature/io/XmlSchemaReader.groovy | 1 + .../geoscript/geom/io/GeoRSSReader.groovy | 1 + .../geoscript/geom/io/Gml2Reader.groovy | 1 + .../geoscript/geom/io/Gml3Reader.groovy | 1 + .../groovy/geoscript/geom/io/GpxReader.groovy | 1 + .../layer/io/GdalTmsPyramidReader.groovy | 1 + .../geoscript/layer/io/GeoRSSReader.groovy | 2 +- .../geoscript/layer/io/GpxReader.groovy | 4 +- .../layer/io/XmlPyramidReader.groovy | 1 + .../groovy/geoscript/style/Symbolizer.groovy | 2 + .../geoscript/workspace/Directory.groovy | 1 - .../groovy/geoscript/workspace/Memory.groovy | 2 +- .../groovy/geoscript/workspace/Sqlite.groovy | 2 +- .../geoscript/workspace/Workspace.groovy | 1 - .../feature/io/GeoRSSWriterTest.groovy | 1 + .../geoscript/geom/io/GeoRSSReaderTest.groovy | 3 +- .../geoscript/geom/io/KmlReaderTest.groovy | 5 +-- 21 files changed, 51 insertions(+), 30 deletions(-) diff --git a/pom.xml b/pom.xml index d08a5f2a5..b8715e94f 100755 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ 29-SNAPSHOT 1.19.0 - 3.0.14 + 4.0.7 @@ -254,42 +254,53 @@ ${gt.version} - org.codehaus.groovy + org.apache.groovy groovy ${groovy.version} - org.codehaus.groovy + org.apache.groovy groovy-sql ${groovy.version} - org.codehaus.groovy + org.apache.groovy groovy-xml ${groovy.version} - org.codehaus.groovy + org.apache.groovy groovy-json ${groovy.version} - org.codehaus.groovy + org.apache.groovy groovy-yaml ${groovy.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + 2.13.3 - org.codehaus.groovy + org.apache.groovy groovy-swing ${groovy.version} - org.codehaus.groovy + org.apache.groovy groovy-groovysh ${groovy.version} - org.codehaus.groovy + org.apache.groovy groovy-console ${groovy.version} @@ -348,6 +359,10 @@ false + + groovy-plugins-release + https://groovy.jfrog.io/artifactory/plugins-release + src/main/groovy @@ -361,7 +376,7 @@ org.codehaus.groovy groovy-eclipse-compiler - 3.7.0 + 3.8.0 true @@ -376,12 +391,12 @@ org.codehaus.groovy groovy-eclipse-compiler - 3.7.0 + 3.8.0 org.codehaus.groovy groovy-eclipse-batch - 3.0.8-01 + 4.0.7-02 @@ -440,12 +455,12 @@ - org.codehaus.groovy + org.apache.groovy groovy-ant ${groovy.version} - org.codehaus.groovy + org.apache.groovy groovy-groovydoc ${groovy.version} diff --git a/src/main/groovy/geoscript/Application.groovy b/src/main/groovy/geoscript/Application.groovy index cfad3bf03..f9e9853a3 100644 --- a/src/main/groovy/geoscript/Application.groovy +++ b/src/main/groovy/geoscript/Application.groovy @@ -1,8 +1,8 @@ package geoscript import groovy.ui.GroovyMain as Script -import groovy.ui.Console -import org.codehaus.groovy.tools.shell.Main as Shell +import groovy.console.ui.Console +import org.apache.groovy.groovysh.Main as Shell import org.geotools.util.factory.GeoTools import org.locationtech.jts.JTSVersion diff --git a/src/main/groovy/geoscript/feature/io/GeoRSSReader.groovy b/src/main/groovy/geoscript/feature/io/GeoRSSReader.groovy index a9ed2db5a..6a2d06b05 100644 --- a/src/main/groovy/geoscript/feature/io/GeoRSSReader.groovy +++ b/src/main/groovy/geoscript/feature/io/GeoRSSReader.groovy @@ -4,6 +4,8 @@ import geoscript.feature.Feature import geoscript.feature.Field import geoscript.feature.Schema import geoscript.geom.Point +import groovy.xml.XmlNodePrinter +import groovy.xml.XmlParser /** * Read a Feature from a GeoRSS String diff --git a/src/main/groovy/geoscript/feature/io/GpxReader.groovy b/src/main/groovy/geoscript/feature/io/GpxReader.groovy index 0a23bdf7a..229f340a9 100644 --- a/src/main/groovy/geoscript/feature/io/GpxReader.groovy +++ b/src/main/groovy/geoscript/feature/io/GpxReader.groovy @@ -6,6 +6,8 @@ import geoscript.feature.Schema import geoscript.geom.LineString import geoscript.geom.MultiLineString import geoscript.geom.Point +import groovy.xml.XmlNodePrinter +import groovy.xml.XmlParser /** * Read a Feature from a GPX document diff --git a/src/main/groovy/geoscript/feature/io/XmlSchemaReader.groovy b/src/main/groovy/geoscript/feature/io/XmlSchemaReader.groovy index 7159b5dde..efa5c0f24 100644 --- a/src/main/groovy/geoscript/feature/io/XmlSchemaReader.groovy +++ b/src/main/groovy/geoscript/feature/io/XmlSchemaReader.groovy @@ -2,6 +2,7 @@ package geoscript.feature.io import geoscript.feature.Field import geoscript.feature.Schema +import groovy.xml.XmlSlurper /** * Read a Schema from an XML String. diff --git a/src/main/groovy/geoscript/geom/io/GeoRSSReader.groovy b/src/main/groovy/geoscript/geom/io/GeoRSSReader.groovy index a48d1202f..9b609a04e 100644 --- a/src/main/groovy/geoscript/geom/io/GeoRSSReader.groovy +++ b/src/main/groovy/geoscript/geom/io/GeoRSSReader.groovy @@ -25,6 +25,7 @@ package geoscript.geom.io import geoscript.geom.* +import groovy.xml.XmlParser /** * A GeoRSS Simple Reader. See the GeoRSS spec for more details. diff --git a/src/main/groovy/geoscript/geom/io/Gml2Reader.groovy b/src/main/groovy/geoscript/geom/io/Gml2Reader.groovy index 1069ebdbd..8f1edd5ae 100644 --- a/src/main/groovy/geoscript/geom/io/Gml2Reader.groovy +++ b/src/main/groovy/geoscript/geom/io/Gml2Reader.groovy @@ -1,6 +1,7 @@ package geoscript.geom.io import geoscript.geom.* +import groovy.xml.XmlParser /** * Read a {@link geoscript.geom.Geometry Geometry} from a GML Version 2 String. diff --git a/src/main/groovy/geoscript/geom/io/Gml3Reader.groovy b/src/main/groovy/geoscript/geom/io/Gml3Reader.groovy index 920312cf2..57eb50d4b 100644 --- a/src/main/groovy/geoscript/geom/io/Gml3Reader.groovy +++ b/src/main/groovy/geoscript/geom/io/Gml3Reader.groovy @@ -1,6 +1,7 @@ package geoscript.geom.io import geoscript.geom.* +import groovy.xml.XmlParser /** * Read a {@link geoscript.geom.Geometry Geometry} from a GML Version 3 String. diff --git a/src/main/groovy/geoscript/geom/io/GpxReader.groovy b/src/main/groovy/geoscript/geom/io/GpxReader.groovy index ed364980e..86918c369 100644 --- a/src/main/groovy/geoscript/geom/io/GpxReader.groovy +++ b/src/main/groovy/geoscript/geom/io/GpxReader.groovy @@ -4,6 +4,7 @@ import geoscript.geom.Geometry import geoscript.geom.LineString import geoscript.geom.MultiLineString import geoscript.geom.Point +import groovy.xml.XmlParser /** * Read a Geometry from a GPX String diff --git a/src/main/groovy/geoscript/layer/io/GdalTmsPyramidReader.groovy b/src/main/groovy/geoscript/layer/io/GdalTmsPyramidReader.groovy index 85d880257..7d7bd169e 100644 --- a/src/main/groovy/geoscript/layer/io/GdalTmsPyramidReader.groovy +++ b/src/main/groovy/geoscript/layer/io/GdalTmsPyramidReader.groovy @@ -5,6 +5,7 @@ import geoscript.layer.Grid import geoscript.layer.Pyramid import geoscript.layer.TMS import geoscript.proj.Projection +import groovy.xml.XmlParser /** * Read a Pyramid from a GDAL MiniDriver XML File diff --git a/src/main/groovy/geoscript/layer/io/GeoRSSReader.groovy b/src/main/groovy/geoscript/layer/io/GeoRSSReader.groovy index 6bd98da6c..6ebebcacc 100644 --- a/src/main/groovy/geoscript/layer/io/GeoRSSReader.groovy +++ b/src/main/groovy/geoscript/layer/io/GeoRSSReader.groovy @@ -6,7 +6,7 @@ import geoscript.layer.Layer import geoscript.proj.Projection import geoscript.workspace.Memory import geoscript.workspace.Workspace - +import groovy.xml.XmlParser import java.nio.charset.Charset /** diff --git a/src/main/groovy/geoscript/layer/io/GpxReader.groovy b/src/main/groovy/geoscript/layer/io/GpxReader.groovy index a3564208b..0cd17708a 100644 --- a/src/main/groovy/geoscript/layer/io/GpxReader.groovy +++ b/src/main/groovy/geoscript/layer/io/GpxReader.groovy @@ -3,14 +3,12 @@ package geoscript.layer.io import geoscript.feature.Feature import geoscript.feature.Field import geoscript.feature.Schema -import geoscript.geom.LineString -import geoscript.geom.MultiLineString import geoscript.geom.Point import geoscript.layer.Layer import geoscript.proj.Projection import geoscript.workspace.Memory import geoscript.workspace.Workspace - +import groovy.xml.XmlParser import java.nio.charset.Charset /** diff --git a/src/main/groovy/geoscript/layer/io/XmlPyramidReader.groovy b/src/main/groovy/geoscript/layer/io/XmlPyramidReader.groovy index 4e1842941..3a8f6f472 100644 --- a/src/main/groovy/geoscript/layer/io/XmlPyramidReader.groovy +++ b/src/main/groovy/geoscript/layer/io/XmlPyramidReader.groovy @@ -4,6 +4,7 @@ import geoscript.geom.Bounds import geoscript.layer.Grid import geoscript.layer.Pyramid import geoscript.proj.Projection +import groovy.xml.XmlParser /** * Read a Pyramid from an XML String diff --git a/src/main/groovy/geoscript/style/Symbolizer.groovy b/src/main/groovy/geoscript/style/Symbolizer.groovy index 02aac64a3..c1708c6d4 100644 --- a/src/main/groovy/geoscript/style/Symbolizer.groovy +++ b/src/main/groovy/geoscript/style/Symbolizer.groovy @@ -3,6 +3,7 @@ package geoscript.style import geoscript.feature.Field import geoscript.filter.Filter import geoscript.style.io.SLDWriter +import groovy.transform.AutoClone import org.geotools.styling.Style as GtStyle import org.geotools.styling.Rule import org.geotools.factory.CommonFactoryFinder @@ -28,6 +29,7 @@ import org.geotools.styling.FeatureTypeStyle *

* @author Jared Erickson */ +@AutoClone class Symbolizer implements Style, Cloneable { /** diff --git a/src/main/groovy/geoscript/workspace/Directory.groovy b/src/main/groovy/geoscript/workspace/Directory.groovy index 0940160fe..01a2d15a7 100644 --- a/src/main/groovy/geoscript/workspace/Directory.groovy +++ b/src/main/groovy/geoscript/workspace/Directory.groovy @@ -5,7 +5,6 @@ import geoscript.layer.Layer import geoscript.style.DirectoryStyleRepository import geoscript.style.Style import geoscript.style.StyleRepository -import geoscript.style.io.Readers import org.geotools.data.DataStore import org.geotools.data.directory.DirectoryDataStore import org.geotools.data.shapefile.ShapefileDataStore diff --git a/src/main/groovy/geoscript/workspace/Memory.groovy b/src/main/groovy/geoscript/workspace/Memory.groovy index 65719ecc1..f0c9e539b 100644 --- a/src/main/groovy/geoscript/workspace/Memory.groovy +++ b/src/main/groovy/geoscript/workspace/Memory.groovy @@ -57,7 +57,7 @@ class Memory extends Workspace { @Override Memory create(Map params) { - if (params.type && params.type.equalsIgnoreCase("memory")) { + if (params.type && params.type.toString().equalsIgnoreCase("memory")) { create(new org.geotools.data.memory.MemoryDataStore()) } else { super.create(params) diff --git a/src/main/groovy/geoscript/workspace/Sqlite.groovy b/src/main/groovy/geoscript/workspace/Sqlite.groovy index 6eef9affe..705a42db1 100644 --- a/src/main/groovy/geoscript/workspace/Sqlite.groovy +++ b/src/main/groovy/geoscript/workspace/Sqlite.groovy @@ -195,7 +195,7 @@ class Sqlite extends Database { @Override protected void setupParameters(Map parameters) { - super.setupParameters(parameters); + super.setupParameters(parameters) parameters.remove(HOST.key) parameters.remove(PORT.key) parameters.remove(SCHEMA.key) diff --git a/src/main/groovy/geoscript/workspace/Workspace.groovy b/src/main/groovy/geoscript/workspace/Workspace.groovy index b9ff442e6..6327e591b 100644 --- a/src/main/groovy/geoscript/workspace/Workspace.groovy +++ b/src/main/groovy/geoscript/workspace/Workspace.groovy @@ -101,7 +101,6 @@ class Workspace { new Layer(this, ds.getFeatureSource(name)) } - /** * Another way to get a Layer by name. *

Layer layer = workspace["hospitals"]

diff --git a/src/test/groovy/geoscript/feature/io/GeoRSSWriterTest.groovy b/src/test/groovy/geoscript/feature/io/GeoRSSWriterTest.groovy index 2b31a63e0..47b8f86b8 100644 --- a/src/test/groovy/geoscript/feature/io/GeoRSSWriterTest.groovy +++ b/src/test/groovy/geoscript/feature/io/GeoRSSWriterTest.groovy @@ -7,6 +7,7 @@ import geoscript.feature.Schema import geoscript.geom.Point import org.junit.jupiter.api.Test import static org.junit.jupiter.api.Assertions.* +import groovy.xml.XmlSlurper /** * The GeoRSSWriter Unit Test diff --git a/src/test/groovy/geoscript/geom/io/GeoRSSReaderTest.groovy b/src/test/groovy/geoscript/geom/io/GeoRSSReaderTest.groovy index c691fce7c..0ea949245 100644 --- a/src/test/groovy/geoscript/geom/io/GeoRSSReaderTest.groovy +++ b/src/test/groovy/geoscript/geom/io/GeoRSSReaderTest.groovy @@ -27,8 +27,7 @@ package geoscript.geom.io import org.junit.jupiter.api.Test import static org.junit.jupiter.api.Assertions.* import geoscript.geom.* - -import static org.junit.jupiter.api.Assertions.assertNull +import groovy.xml.XmlParser /** * The GeoRSSReader UnitTest diff --git a/src/test/groovy/geoscript/geom/io/KmlReaderTest.groovy b/src/test/groovy/geoscript/geom/io/KmlReaderTest.groovy index 69e21fb27..a27819901 100644 --- a/src/test/groovy/geoscript/geom/io/KmlReaderTest.groovy +++ b/src/test/groovy/geoscript/geom/io/KmlReaderTest.groovy @@ -3,10 +3,7 @@ package geoscript.geom.io import org.junit.jupiter.api.Test import static org.junit.jupiter.api.Assertions.assertEquals import geoscript.geom.* - -import static org.junit.jupiter.api.Assertions.assertNotNull -import static org.junit.jupiter.api.Assertions.assertTrue - +import groovy.xml.XmlParser /** * The KmlReader UnitTest