updated for geotools 30.x

aodn · Feb 1, 2024 · 44a0d88 · 44a0d88
1 parent 9fcb1d9
commit 44a0d88
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 35 deletions.
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
     <url>http://imos.org.au</url>
 
     <properties>
-        <geoserver.version>2.23.0</geoserver.version>
+        <geoserver.version>2.24.2</geoserver.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.resources.sourceEncoding>${project.build.sourceEncoding}</project.resources.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>

diff --git a/...r/src/main/java/au/org/emii/geoserver/wfs/response/CSVWithMetadataHeaderOutputFormat.java b/...r/src/main/java/au/org/emii/geoserver/wfs/response/CSVWithMetadataHeaderOutputFormat.java
@@ -16,8 +16,8 @@
 import org.geoserver.wfs.request.FeatureCollectionResponse;
 import org.geoserver.wfs.request.GetFeatureRequest;
 import org.geoserver.wfs.request.Query;
-import org.geotools.data.DataAccess;
-import org.geotools.data.Transaction;
+import org.geotools.api.data.DataAccess;
+import org.geotools.api.data.Transaction;
 import org.geotools.data.simple.SimpleFeatureCollection;
 import org.geotools.data.store.DecoratingDataStore;
 import org.geotools.feature.type.DateUtil;

diff --git a/...a-header/src/main/java/au/org/emii/geoserver/wfs/response/CsvFeatureCollectionSource.java b/...a-header/src/main/java/au/org/emii/geoserver/wfs/response/CsvFeatureCollectionSource.java
@@ -2,9 +2,9 @@
 
 import org.geotools.data.simple.SimpleFeatureCollection;
 import org.geotools.feature.FeatureIterator;
-import org.opengis.feature.simple.SimpleFeature;
-import org.opengis.feature.simple.SimpleFeatureType;
-import org.opengis.feature.type.AttributeDescriptor;
+import org.geotools.api.feature.simple.SimpleFeature;
+import org.geotools.api.feature.simple.SimpleFeatureType;
+import org.geotools.api.feature.type.AttributeDescriptor;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...r/src/main/java/au/org/emii/geoserver/wfs/response/CsvPivotedFeatureCollectionSource.java b/...r/src/main/java/au/org/emii/geoserver/wfs/response/CsvPivotedFeatureCollectionSource.java
@@ -6,16 +6,16 @@
 import org.geoserver.catalog.Catalog;
 import org.geoserver.catalog.FeatureTypeInfo;
 import org.geoserver.platform.Operation;
-import org.geotools.data.Transaction;
+import org.geotools.api.data.Transaction;
 import org.geotools.data.simple.SimpleFeatureCollection;
 import org.geotools.data.simple.SimpleFeatureIterator;
 import org.geotools.jdbc.JDBCDataStore;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
-import org.opengis.feature.simple.SimpleFeature;
-import org.opengis.feature.simple.SimpleFeatureType;
-import org.opengis.feature.type.AttributeDescriptor;
+import org.geotools.api.feature.simple.SimpleFeature;
+import org.geotools.api.feature.simple.SimpleFeatureType;
+import org.geotools.api.feature.type.AttributeDescriptor;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.servlet.ServletContext;

diff --git a/...rc/main/java/au/org/emii/geoserver/extensions/filters/layer/data/io/FilterTypeMapper.java b/...rc/main/java/au/org/emii/geoserver/extensions/filters/layer/data/io/FilterTypeMapper.java
@@ -10,7 +10,7 @@
 import org.geoserver.wfs.xml.GML2Profile;
 import org.geoserver.wfs.xml.TypeMappingProfile;
 import org.geoserver.wfs.xml.XSProfile;
-import org.opengis.feature.type.AttributeType;
+import org.geotools.api.feature.type.AttributeType;
 
 /**
  * Hides some ugly type mapping code in to this one class.

diff --git a/...in/java/au/org/emii/geoserver/extensions/filters/layer/data/io/LayerPropertiesReader.java b/...in/java/au/org/emii/geoserver/extensions/filters/layer/data/io/LayerPropertiesReader.java
@@ -9,8 +9,8 @@
 
 import au.org.emii.geoserver.extensions.filters.layer.data.Filter;
 import org.geoserver.catalog.*;
-import org.opengis.feature.type.FeatureType;
-import org.opengis.feature.type.PropertyDescriptor;
+import org.geotools.api.feature.type.FeatureType;
+import org.geotools.api.feature.type.PropertyDescriptor;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...ain/java/au/org/emii/geoserver/extensions/filters/layer/data/io/PossibleValuesReader.java b/...ain/java/au/org/emii/geoserver/extensions/filters/layer/data/io/PossibleValuesReader.java
@@ -9,14 +9,14 @@
 
 import org.geoserver.catalog.DataStoreInfo;
 import org.geoserver.catalog.LayerInfo;
-import org.geotools.data.DataAccess;
-import org.geotools.data.Query;
+import org.geotools.api.data.DataAccess;
+import org.geotools.api.data.Query;
 import org.geotools.data.store.DecoratingDataStore;
 import org.geotools.feature.visitor.UniqueVisitor;
 import org.geotools.jdbc.JDBCDataStore;
 import org.geotools.jdbc.VirtualTable;
 
-import org.opengis.feature.type.FeatureType;
+import org.geotools.api.feature.type.FeatureType;
 
 import org.geoserver.catalog.*;
 
@@ -56,9 +56,9 @@ public Set read(DataStoreInfo dataStoreInfo, LayerInfo layerInfo, String propert
 
         Method storeGetAggregateValueMethod = store.getClass().getDeclaredMethod(
             "getAggregateValue",
-            org.opengis.feature.FeatureVisitor.class,
-            org.opengis.feature.simple.SimpleFeatureType.class,
-            org.geotools.data.Query.class,
+            org.geotools.api.feature.FeatureVisitor.class,
+            org.geotools.api.feature.simple.SimpleFeatureType.class,
+            org.geotools.api.data.Query.class,
             java.sql.Connection.class
         );
         storeGetAggregateValueMethod.setAccessible(true);

diff --git a/...c/main/java/au/org/emii/geoserver/wfs/response/RestrictedColumnCsvOutputFormatHeader.java b/...c/main/java/au/org/emii/geoserver/wfs/response/RestrictedColumnCsvOutputFormatHeader.java
@@ -10,9 +10,9 @@
 import org.eclipse.xsd.XSDElementDeclaration;
 import org.eclipse.xsd.impl.XSDElementDeclarationImpl;
 import org.geotools.feature.FeatureCollection;
-import org.opengis.feature.simple.SimpleFeatureType;
-import org.opengis.feature.type.AttributeDescriptor;
-import org.opengis.feature.type.PropertyDescriptor;
+import org.geotools.api.feature.simple.SimpleFeatureType;
+import org.geotools.api.feature.type.AttributeDescriptor;
+import org.geotools.api.feature.type.PropertyDescriptor;
 
 import java.io.IOException;
 import java.io.Writer;

diff --git a/...rc/main/java/au/org/emii/geoserver/wfs/response/RestrictedColumnCsvOutputFormatLines.java b/...rc/main/java/au/org/emii/geoserver/wfs/response/RestrictedColumnCsvOutputFormatLines.java
@@ -9,10 +9,10 @@
 
 import org.geotools.feature.FeatureCollection;
 import org.geotools.feature.FeatureIterator;
-import org.opengis.feature.Feature;
-import org.opengis.feature.Property;
-import org.opengis.feature.simple.SimpleFeature;
-import org.opengis.feature.type.PropertyDescriptor;
+import org.geotools.api.feature.Feature;
+import org.geotools.api.feature.Property;
+import org.geotools.api.feature.simple.SimpleFeature;
+import org.geotools.api.feature.type.PropertyDescriptor;
 
 import java.io.IOException;
 import java.io.Writer;

diff --git a/.../main/java/au/org/emii/geoserver/wfs/response/RestrictedColumnCsvOutputFormatSection.java b/.../main/java/au/org/emii/geoserver/wfs/response/RestrictedColumnCsvOutputFormatSection.java
@@ -8,7 +8,7 @@
 package au.org.emii.geoserver.wfs.response;
 
 import org.geotools.feature.type.DateUtil;
-import org.opengis.feature.type.PropertyDescriptor;
+import org.geotools.api.feature.type.PropertyDescriptor;
 
 import java.io.IOException;
 import java.io.Writer;

diff --git a/src/extension/ncwms/src/main/java/au/org/emii/geoserver/wms/GeoserverUrlIndex.java b/src/extension/ncwms/src/main/java/au/org/emii/geoserver/wms/GeoserverUrlIndex.java
@@ -1,10 +1,10 @@
 package au.org.emii.geoserver.wms;
 
 import org.geoserver.catalog.Catalog;
-import org.geotools.data.Query;
+import org.geotools.api.data.Query;
 import org.geotools.data.simple.SimpleFeatureCollection;
 import org.geotools.data.simple.SimpleFeatureIterator;
-import org.geotools.data.simple.SimpleFeatureSource;
+import org.geotools.api.data.SimpleFeatureSource;
 import org.geotools.factory.CommonFactoryFinder;
 import org.geotools.filter.text.cql2.CQL;
 import org.geotools.filter.text.cql2.CQLException;
@@ -13,11 +13,11 @@
 import org.joda.time.DateTimeZone;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
-import org.opengis.feature.simple.SimpleFeature;
-import org.opengis.filter.Filter;
-import org.opengis.filter.FilterFactory;
-import org.opengis.filter.sort.SortBy;
-import org.opengis.filter.sort.SortOrder;
+import org.geotools.api.feature.simple.SimpleFeature;
+import org.geotools.api.filter.Filter;
+import org.geotools.api.filter.FilterFactory;
+import org.geotools.api.filter.sort.SortBy;
+import org.geotools.api.filter.sort.SortOrder;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/src/main/pom.xml b/src/main/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.geoserver.web</groupId>
             <artifactId>gs-web-app</artifactId>
-            <version>2.23.0</version>
+            <version>${geoserver.version}</version>
             <scope>runtime</scope>
             <type>war</type>
         </dependency>