diff --git a/.gitmodules b/.gitmodules index b3395907a..219ca6c86 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,5 +5,5 @@ [submodule "geoserver"] path = geoserver_submodule/geoserver url = https://github.com/camptocamp/geoserver.git - branch = gscloud/2.23.x/integration + branch = gscloud/2.24.x/integration shallow = true diff --git a/geoserver_submodule/geoserver b/geoserver_submodule/geoserver index f5bba95b4..46844cf27 160000 --- a/geoserver_submodule/geoserver +++ b/geoserver_submodule/geoserver @@ -1 +1 @@ -Subproject commit f5bba95b4c4b509bfc3753223079d289bdb3dd88 +Subproject commit 46844cf27f800d070b539ec21c4f93ffc5cce4d1 diff --git a/src/catalog/backends/catalog-service/src/main/java/org/geoserver/cloud/config/catalog/backend/catalogservice/CatalogClientGeoServerLoader.java b/src/catalog/backends/catalog-service/src/main/java/org/geoserver/cloud/config/catalog/backend/catalogservice/CatalogClientGeoServerLoader.java index b180b7c9e..f08969ea0 100644 --- a/src/catalog/backends/catalog-service/src/main/java/org/geoserver/cloud/config/catalog/backend/catalogservice/CatalogClientGeoServerLoader.java +++ b/src/catalog/backends/catalog-service/src/main/java/org/geoserver/cloud/config/catalog/backend/catalogservice/CatalogClientGeoServerLoader.java @@ -13,7 +13,7 @@ import org.geoserver.config.GeoServerLoader; import org.geoserver.config.util.XStreamPersister; import org.geoserver.platform.GeoServerResourceLoader; -import org.opengis.filter.Filter; +import org.geotools.api.filter.Filter; import java.io.IOException; diff --git a/src/catalog/backends/datadir/src/main/java/org/geoserver/cloud/config/catalog/backend/datadirectory/ParallelDataDirectoryGeoServerLoader.java b/src/catalog/backends/datadir/src/main/java/org/geoserver/cloud/config/catalog/backend/datadirectory/ParallelDataDirectoryGeoServerLoader.java index d5077a021..0f58da40a 100644 --- a/src/catalog/backends/datadir/src/main/java/org/geoserver/cloud/config/catalog/backend/datadirectory/ParallelDataDirectoryGeoServerLoader.java +++ b/src/catalog/backends/datadir/src/main/java/org/geoserver/cloud/config/catalog/backend/datadirectory/ParallelDataDirectoryGeoServerLoader.java @@ -27,7 +27,7 @@ import org.geoserver.platform.GeoServerResourceLoader; import org.geoserver.platform.config.UpdateSequence; import org.geoserver.security.GeoServerSecurityManager; -import org.opengis.referencing.FactoryException; +import org.geotools.api.referencing.FactoryException; import org.vfny.geoserver.util.DataStoreUtils; import java.io.IOException; diff --git a/src/catalog/backends/jdbcconfig/src/main/java/org/geoserver/cloud/config/catalog/backend/jdbcconfig/CloudJdbcGeoserverFacade.java b/src/catalog/backends/jdbcconfig/src/main/java/org/geoserver/cloud/config/catalog/backend/jdbcconfig/CloudJdbcGeoserverFacade.java index 472fd53ba..04ebd97cc 100644 --- a/src/catalog/backends/jdbcconfig/src/main/java/org/geoserver/cloud/config/catalog/backend/jdbcconfig/CloudJdbcGeoserverFacade.java +++ b/src/catalog/backends/jdbcconfig/src/main/java/org/geoserver/cloud/config/catalog/backend/jdbcconfig/CloudJdbcGeoserverFacade.java @@ -23,8 +23,8 @@ import org.geoserver.jdbcconfig.config.JDBCGeoServerFacade; import org.geoserver.jdbcconfig.internal.ConfigDatabase; import org.geoserver.ows.util.OwsUtils; +import org.geotools.api.filter.Filter; import org.geotools.util.logging.Logging; -import org.opengis.filter.Filter; import java.lang.reflect.Proxy; import java.rmi.server.UID; diff --git a/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlCatalogFilterSplitter.java b/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlCatalogFilterSplitter.java index 2693d0ef6..9eb205069 100644 --- a/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlCatalogFilterSplitter.java +++ b/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlCatalogFilterSplitter.java @@ -4,9 +4,9 @@ */ package org.geoserver.cloud.backend.pgsql.catalog.filter; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.expression.PropertyName; import org.geotools.filter.visitor.PostPreProcessFilterSplittingVisitor; -import org.opengis.filter.Filter; -import org.opengis.filter.expression.PropertyName; import java.util.Set; diff --git a/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlFilterCapabilities.java b/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlFilterCapabilities.java index 6f522b2ea..d90206af2 100644 --- a/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlFilterCapabilities.java +++ b/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlFilterCapabilities.java @@ -4,6 +4,18 @@ */ package org.geoserver.cloud.backend.pgsql.catalog.filter; +import org.geotools.api.filter.ExcludeFilter; +import org.geotools.api.filter.Id; +import org.geotools.api.filter.IncludeFilter; +import org.geotools.api.filter.PropertyIsBetween; +import org.geotools.api.filter.PropertyIsLike; +import org.geotools.api.filter.PropertyIsNull; +import org.geotools.api.filter.expression.Add; +import org.geotools.api.filter.expression.Divide; +import org.geotools.api.filter.expression.Literal; +import org.geotools.api.filter.expression.Multiply; +import org.geotools.api.filter.expression.PropertyName; +import org.geotools.api.filter.expression.Subtract; import org.geotools.filter.FilterCapabilities; import org.geotools.filter.LengthFunction; import org.geotools.filter.function.DateDifferenceFunction; @@ -29,18 +41,6 @@ import org.geotools.filter.function.math.FilterFunction_abs_4; import org.geotools.filter.function.math.FilterFunction_ceil; import org.geotools.filter.function.math.FilterFunction_floor; -import org.opengis.filter.ExcludeFilter; -import org.opengis.filter.Id; -import org.opengis.filter.IncludeFilter; -import org.opengis.filter.PropertyIsBetween; -import org.opengis.filter.PropertyIsLike; -import org.opengis.filter.PropertyIsNull; -import org.opengis.filter.expression.Add; -import org.opengis.filter.expression.Divide; -import org.opengis.filter.expression.Literal; -import org.opengis.filter.expression.Multiply; -import org.opengis.filter.expression.PropertyName; -import org.opengis.filter.expression.Subtract; /** * @since 1.4 diff --git a/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlFilterToSQL.java b/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlFilterToSQL.java index e1815612d..8619195e5 100644 --- a/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlFilterToSQL.java +++ b/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlFilterToSQL.java @@ -6,6 +6,10 @@ import lombok.Value; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.PropertyIsLike; +import org.geotools.api.filter.expression.Expression; +import org.geotools.api.filter.expression.Function; import org.geotools.filter.LengthFunction; import org.geotools.filter.LikeFilterImpl; import org.geotools.filter.function.FilterFunction_strConcat; @@ -24,10 +28,6 @@ import org.geotools.filter.function.math.FilterFunction_abs_3; import org.geotools.filter.function.math.FilterFunction_abs_4; import org.geotools.jdbc.PreparedFilterToSQL; -import org.opengis.filter.Filter; -import org.opengis.filter.PropertyIsLike; -import org.opengis.filter.expression.Expression; -import org.opengis.filter.expression.Function; import java.io.IOException; import java.io.StringWriter; diff --git a/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlQueryBuilder.java b/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlQueryBuilder.java index 32ef6beb3..bc6fb1b96 100644 --- a/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlQueryBuilder.java +++ b/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlQueryBuilder.java @@ -8,8 +8,8 @@ import lombok.RequiredArgsConstructor; import org.geoserver.cloud.backend.pgsql.catalog.filter.PgsqlFilterToSQL.Result; +import org.geotools.api.filter.Filter; import org.geotools.filter.visitor.SimplifyingFilterVisitor; -import org.opengis.filter.Filter; import java.util.List; import java.util.Set; diff --git a/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/ToPgsqlCompatibleFilterDuplicator.java b/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/ToPgsqlCompatibleFilterDuplicator.java index 16de6124f..bb273a63a 100644 --- a/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/ToPgsqlCompatibleFilterDuplicator.java +++ b/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/ToPgsqlCompatibleFilterDuplicator.java @@ -4,21 +4,21 @@ */ package org.geoserver.cloud.backend.pgsql.catalog.filter; +import org.geotools.api.filter.BinaryComparisonOperator; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.MultiValuedFilter.MatchAction; +import org.geotools.api.filter.PropertyIsBetween; +import org.geotools.api.filter.PropertyIsEqualTo; +import org.geotools.api.filter.PropertyIsGreaterThan; +import org.geotools.api.filter.PropertyIsGreaterThanOrEqualTo; +import org.geotools.api.filter.PropertyIsLessThan; +import org.geotools.api.filter.PropertyIsLessThanOrEqualTo; +import org.geotools.api.filter.PropertyIsLike; +import org.geotools.api.filter.PropertyIsNotEqualTo; +import org.geotools.api.filter.expression.Expression; +import org.geotools.api.filter.expression.Literal; +import org.geotools.api.filter.expression.PropertyName; import org.geotools.filter.visitor.DuplicatingFilterVisitor; -import org.opengis.filter.BinaryComparisonOperator; -import org.opengis.filter.Filter; -import org.opengis.filter.MultiValuedFilter.MatchAction; -import org.opengis.filter.PropertyIsBetween; -import org.opengis.filter.PropertyIsEqualTo; -import org.opengis.filter.PropertyIsGreaterThan; -import org.opengis.filter.PropertyIsGreaterThanOrEqualTo; -import org.opengis.filter.PropertyIsLessThan; -import org.opengis.filter.PropertyIsLessThanOrEqualTo; -import org.opengis.filter.PropertyIsLike; -import org.opengis.filter.PropertyIsNotEqualTo; -import org.opengis.filter.expression.Expression; -import org.opengis.filter.expression.Literal; -import org.opengis.filter.expression.PropertyName; import java.util.ArrayList; import java.util.Collection; diff --git a/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/repository/PgsqlCatalogInfoRepository.java b/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/repository/PgsqlCatalogInfoRepository.java index a86639e42..ce42b3949 100644 --- a/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/repository/PgsqlCatalogInfoRepository.java +++ b/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/repository/PgsqlCatalogInfoRepository.java @@ -16,11 +16,11 @@ import org.geoserver.catalog.plugin.Patch; import org.geoserver.catalog.plugin.Query; import org.geoserver.cloud.backend.pgsql.catalog.filter.PgsqlQueryBuilder; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.sort.SortBy; +import org.geotools.api.filter.sort.SortOrder; import org.geotools.filter.visitor.SimplifyingFilterVisitor; import org.geotools.jackson.databind.util.ObjectMapperUtil; -import org.opengis.filter.Filter; -import org.opengis.filter.sort.SortBy; -import org.opengis.filter.sort.SortOrder; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/src/catalog/catalog-server/client/src/main/java/org/geoserver/cloud/catalog/client/reactivefeign/ReactiveCatalogClient.java b/src/catalog/catalog-server/client/src/main/java/org/geoserver/cloud/catalog/client/reactivefeign/ReactiveCatalogClient.java index 29669eb99..6ccf28a17 100644 --- a/src/catalog/catalog-server/client/src/main/java/org/geoserver/cloud/catalog/client/reactivefeign/ReactiveCatalogClient.java +++ b/src/catalog/catalog-server/client/src/main/java/org/geoserver/cloud/catalog/client/reactivefeign/ReactiveCatalogClient.java @@ -16,7 +16,7 @@ import org.geoserver.catalog.impl.ClassMappings; import org.geoserver.catalog.plugin.Patch; import org.geoserver.catalog.plugin.Query; -import org.opengis.filter.capability.FunctionName; +import org.geotools.api.filter.capability.FunctionName; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; diff --git a/src/catalog/catalog-server/client/src/main/java/org/geoserver/cloud/catalog/client/repository/CatalogClientFilterSupport.java b/src/catalog/catalog-server/client/src/main/java/org/geoserver/cloud/catalog/client/repository/CatalogClientFilterSupport.java index 9a8ceace1..7e2f47f74 100644 --- a/src/catalog/catalog-server/client/src/main/java/org/geoserver/cloud/catalog/client/repository/CatalogClientFilterSupport.java +++ b/src/catalog/catalog-server/client/src/main/java/org/geoserver/cloud/catalog/client/repository/CatalogClientFilterSupport.java @@ -9,45 +9,45 @@ import lombok.Value; import lombok.experimental.Accessors; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.Id; +import org.geotools.api.filter.PropertyIsBetween; +import org.geotools.api.filter.PropertyIsLike; +import org.geotools.api.filter.PropertyIsNil; +import org.geotools.api.filter.PropertyIsNull; +import org.geotools.api.filter.capability.FilterCapabilities; +import org.geotools.api.filter.capability.FunctionName; +import org.geotools.api.filter.expression.Add; +import org.geotools.api.filter.expression.Divide; +import org.geotools.api.filter.expression.Multiply; +import org.geotools.api.filter.expression.Subtract; +import org.geotools.api.filter.spatial.BBOX; +import org.geotools.api.filter.spatial.Beyond; +import org.geotools.api.filter.spatial.Contains; +import org.geotools.api.filter.spatial.Crosses; +import org.geotools.api.filter.spatial.DWithin; +import org.geotools.api.filter.spatial.Disjoint; +import org.geotools.api.filter.spatial.Equals; +import org.geotools.api.filter.spatial.Intersects; +import org.geotools.api.filter.spatial.Overlaps; +import org.geotools.api.filter.spatial.Touches; +import org.geotools.api.filter.spatial.Within; +import org.geotools.api.filter.temporal.After; +import org.geotools.api.filter.temporal.AnyInteracts; +import org.geotools.api.filter.temporal.Before; +import org.geotools.api.filter.temporal.Begins; +import org.geotools.api.filter.temporal.BegunBy; +import org.geotools.api.filter.temporal.During; +import org.geotools.api.filter.temporal.EndedBy; +import org.geotools.api.filter.temporal.Ends; +import org.geotools.api.filter.temporal.Meets; +import org.geotools.api.filter.temporal.MetBy; +import org.geotools.api.filter.temporal.OverlappedBy; +import org.geotools.api.filter.temporal.TContains; +import org.geotools.api.filter.temporal.TEquals; +import org.geotools.api.filter.temporal.TOverlaps; import org.geotools.filter.Capabilities; import org.geotools.filter.visitor.CapabilitiesFilterSplitter; -import org.opengis.filter.Filter; -import org.opengis.filter.Id; -import org.opengis.filter.PropertyIsBetween; -import org.opengis.filter.PropertyIsLike; -import org.opengis.filter.PropertyIsNil; -import org.opengis.filter.PropertyIsNull; -import org.opengis.filter.capability.FilterCapabilities; -import org.opengis.filter.capability.FunctionName; -import org.opengis.filter.expression.Add; -import org.opengis.filter.expression.Divide; -import org.opengis.filter.expression.Multiply; -import org.opengis.filter.expression.Subtract; -import org.opengis.filter.spatial.BBOX; -import org.opengis.filter.spatial.Beyond; -import org.opengis.filter.spatial.Contains; -import org.opengis.filter.spatial.Crosses; -import org.opengis.filter.spatial.DWithin; -import org.opengis.filter.spatial.Disjoint; -import org.opengis.filter.spatial.Equals; -import org.opengis.filter.spatial.Intersects; -import org.opengis.filter.spatial.Overlaps; -import org.opengis.filter.spatial.Touches; -import org.opengis.filter.spatial.Within; -import org.opengis.filter.temporal.After; -import org.opengis.filter.temporal.AnyInteracts; -import org.opengis.filter.temporal.Before; -import org.opengis.filter.temporal.Begins; -import org.opengis.filter.temporal.BegunBy; -import org.opengis.filter.temporal.During; -import org.opengis.filter.temporal.EndedBy; -import org.opengis.filter.temporal.Ends; -import org.opengis.filter.temporal.Meets; -import org.opengis.filter.temporal.MetBy; -import org.opengis.filter.temporal.OverlappedBy; -import org.opengis.filter.temporal.TContains; -import org.opengis.filter.temporal.TEquals; -import org.opengis.filter.temporal.TOverlaps; import java.util.List; diff --git a/src/catalog/catalog-server/client/src/main/java/org/geoserver/cloud/catalog/client/repository/CatalogClientRepository.java b/src/catalog/catalog-server/client/src/main/java/org/geoserver/cloud/catalog/client/repository/CatalogClientRepository.java index 836289d30..9319f7eb2 100644 --- a/src/catalog/catalog-server/client/src/main/java/org/geoserver/cloud/catalog/client/repository/CatalogClientRepository.java +++ b/src/catalog/catalog-server/client/src/main/java/org/geoserver/cloud/catalog/client/repository/CatalogClientRepository.java @@ -19,8 +19,8 @@ import org.geoserver.catalog.plugin.Query; import org.geoserver.cloud.catalog.client.reactivefeign.ReactiveCatalogClient; import org.geoserver.cloud.catalog.client.repository.CatalogClientFilterSupport.PrePostFilterTuple; -import org.opengis.filter.Filter; -import org.opengis.filter.capability.FunctionName; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.capability.FunctionName; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.lang.Nullable; diff --git a/src/catalog/catalog-server/client/src/main/java/org/geoserver/cloud/catalog/client/repository/CatalogClientResourceRepository.java b/src/catalog/catalog-server/client/src/main/java/org/geoserver/cloud/catalog/client/repository/CatalogClientResourceRepository.java index 39654bb93..b68347ee1 100644 --- a/src/catalog/catalog-server/client/src/main/java/org/geoserver/cloud/catalog/client/repository/CatalogClientResourceRepository.java +++ b/src/catalog/catalog-server/client/src/main/java/org/geoserver/cloud/catalog/client/repository/CatalogClientResourceRepository.java @@ -13,9 +13,9 @@ import org.geoserver.catalog.impl.ClassMappings; import org.geoserver.catalog.plugin.CatalogInfoRepository.ResourceRepository; import org.geoserver.catalog.plugin.Query; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.FilterFactory; import org.geotools.factory.CommonFactoryFinder; -import org.opengis.filter.Filter; -import org.opengis.filter.FilterFactory2; import org.springframework.lang.Nullable; import java.util.Optional; @@ -27,7 +27,7 @@ public class CatalogClientResourceRepository extends CatalogClientRepository contentType = ResourceInfo.class; // REVISIT: used to build filters on methods that miss a counterpart on ReactiveCatalogClient - private final FilterFactory2 ff = CommonFactoryFinder.getFilterFactory2(); + private final FilterFactory ff = CommonFactoryFinder.getFilterFactory(); public @Override Stream findAllByType(@Nullable Class clazz) { return toStream(client().findAll(endpoint(), typeEnum(clazz)).map(clazz::cast)); diff --git a/src/catalog/catalog-server/client/src/test/java/org/geoserver/cloud/catalog/client/repository/CatalogClientRepositoryTest.java b/src/catalog/catalog-server/client/src/test/java/org/geoserver/cloud/catalog/client/repository/CatalogClientRepositoryTest.java index b592f2d1e..fa6e4fd2b 100644 --- a/src/catalog/catalog-server/client/src/test/java/org/geoserver/cloud/catalog/client/repository/CatalogClientRepositoryTest.java +++ b/src/catalog/catalog-server/client/src/test/java/org/geoserver/cloud/catalog/client/repository/CatalogClientRepositoryTest.java @@ -43,6 +43,8 @@ import org.geoserver.cloud.catalog.client.reactivefeign.ReactiveCatalogClient; import org.geoserver.function.IsInstanceOf; import org.geoserver.ows.util.OwsUtils; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.capability.FunctionName; import org.geotools.filter.function.FilterFunction_toWKT; import org.geotools.filter.function.math.FilterFunction_abs; import org.geotools.filter.function.math.FilterFunction_acos; @@ -51,8 +53,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opengis.filter.Filter; -import org.opengis.filter.capability.FunctionName; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; diff --git a/src/catalog/catalog-server/server/src/main/java/org/geoserver/cloud/catalog/server/api/v1/ReactiveCatalogController.java b/src/catalog/catalog-server/server/src/main/java/org/geoserver/cloud/catalog/server/api/v1/ReactiveCatalogController.java index 8279dd040..f46654d04 100644 --- a/src/catalog/catalog-server/server/src/main/java/org/geoserver/cloud/catalog/server/api/v1/ReactiveCatalogController.java +++ b/src/catalog/catalog-server/server/src/main/java/org/geoserver/cloud/catalog/server/api/v1/ReactiveCatalogController.java @@ -25,7 +25,7 @@ import org.geoserver.catalog.plugin.Query; import org.geoserver.cloud.catalog.server.service.ProxyResolver; import org.geoserver.cloud.catalog.server.service.ReactiveCatalog; -import org.opengis.filter.capability.FunctionName; +import org.geotools.api.filter.capability.FunctionName; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/catalog/catalog-server/server/src/main/java/org/geoserver/cloud/catalog/server/service/BlockingCatalog.java b/src/catalog/catalog-server/server/src/main/java/org/geoserver/cloud/catalog/server/service/BlockingCatalog.java index 8ce24cd50..455697234 100644 --- a/src/catalog/catalog-server/server/src/main/java/org/geoserver/cloud/catalog/server/service/BlockingCatalog.java +++ b/src/catalog/catalog-server/server/src/main/java/org/geoserver/cloud/catalog/server/service/BlockingCatalog.java @@ -26,8 +26,8 @@ import org.geoserver.catalog.plugin.Query; import org.geoserver.catalog.plugin.forwarding.ForwardingCatalogFacade; import org.geoserver.catalog.util.CloseableIterator; -import org.opengis.filter.Filter; -import org.opengis.filter.sort.SortBy; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.sort.SortBy; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; diff --git a/src/catalog/catalog-server/server/src/main/java/org/geoserver/cloud/catalog/server/service/ReactiveCatalog.java b/src/catalog/catalog-server/server/src/main/java/org/geoserver/cloud/catalog/server/service/ReactiveCatalog.java index 5163f916d..8f2a4dbbc 100644 --- a/src/catalog/catalog-server/server/src/main/java/org/geoserver/cloud/catalog/server/service/ReactiveCatalog.java +++ b/src/catalog/catalog-server/server/src/main/java/org/geoserver/cloud/catalog/server/service/ReactiveCatalog.java @@ -17,8 +17,8 @@ import org.geoserver.catalog.WorkspaceInfo; import org.geoserver.catalog.plugin.Patch; import org.geoserver.catalog.plugin.Query; -import org.opengis.filter.Filter; -import org.opengis.filter.capability.FunctionName; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.capability.FunctionName; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/src/catalog/catalog-server/server/src/main/java/org/geoserver/cloud/catalog/server/service/ReactiveCatalogImpl.java b/src/catalog/catalog-server/server/src/main/java/org/geoserver/cloud/catalog/server/service/ReactiveCatalogImpl.java index 6740312b6..9d6aa3a8e 100644 --- a/src/catalog/catalog-server/server/src/main/java/org/geoserver/cloud/catalog/server/service/ReactiveCatalogImpl.java +++ b/src/catalog/catalog-server/server/src/main/java/org/geoserver/cloud/catalog/server/service/ReactiveCatalogImpl.java @@ -20,13 +20,13 @@ import org.geoserver.catalog.plugin.Patch; import org.geoserver.catalog.plugin.Query; import org.geoserver.function.IsInstanceOf; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.capability.FunctionName; +import org.geotools.api.parameter.Parameter; +import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import org.geotools.filter.FunctionFinder; import org.geotools.geometry.jts.ReferencedEnvelope; import org.locationtech.jts.geom.Geometry; -import org.opengis.filter.Filter; -import org.opengis.filter.capability.FunctionName; -import org.opengis.parameter.Parameter; -import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --git a/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/AbstractReactiveCatalogControllerTest.java b/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/AbstractReactiveCatalogControllerTest.java index cd9063f37..2abedecf6 100644 --- a/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/AbstractReactiveCatalogControllerTest.java +++ b/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/AbstractReactiveCatalogControllerTest.java @@ -22,13 +22,13 @@ import org.geoserver.cloud.catalog.server.test.WebTestClientSupport; import org.geoserver.cloud.catalog.server.test.WebTestClientSupportConfiguration; import org.geoserver.config.GeoServer; +import org.geotools.api.filter.Filter; import org.geotools.filter.text.cql2.CQLException; import org.geotools.filter.text.ecql.ECQL; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opengis.filter.Filter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.context.SpringBootTest; diff --git a/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/LayerGroupControllerTest.java b/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/LayerGroupControllerTest.java index fa55c85aa..591088f4a 100644 --- a/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/LayerGroupControllerTest.java +++ b/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/LayerGroupControllerTest.java @@ -11,8 +11,8 @@ import org.geoserver.catalog.LayerGroupInfo; import org.geoserver.catalog.StyleInfo; import org.geoserver.catalog.WorkspaceInfo; +import org.geotools.api.filter.Filter; import org.junit.jupiter.api.Test; -import org.opengis.filter.Filter; import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; @AutoConfigureWebTestClient(timeout = "360000") diff --git a/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/ResourceInfoControllerTest.java b/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/ResourceInfoControllerTest.java index 4021a9571..49e4f4e4f 100644 --- a/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/ResourceInfoControllerTest.java +++ b/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/ResourceInfoControllerTest.java @@ -17,9 +17,9 @@ import org.geoserver.catalog.impl.WMSLayerInfoImpl; import org.geoserver.cloud.catalog.server.test.CatalogTestClient; import org.geoserver.ows.util.OwsUtils; +import org.geotools.api.filter.Filter; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.opengis.filter.Filter; import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.http.MediaType; diff --git a/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/StoreControllerTest.java b/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/StoreControllerTest.java index 273a5aa4c..57adfb9ce 100644 --- a/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/StoreControllerTest.java +++ b/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/StoreControllerTest.java @@ -17,8 +17,8 @@ import org.geoserver.catalog.WorkspaceInfo; import org.geoserver.catalog.impl.ClassMappings; import org.geoserver.cloud.catalog.server.test.CatalogTestClient; +import org.geotools.api.filter.Filter; import org.junit.jupiter.api.Test; -import org.opengis.filter.Filter; import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.http.MediaType; import org.springframework.lang.Nullable; diff --git a/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/StyleControllerTest.java b/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/StyleControllerTest.java index c8ac71f99..d5aaa4967 100644 --- a/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/StyleControllerTest.java +++ b/src/catalog/catalog-server/server/src/test/java/org/geoserver/cloud/catalog/server/api/v1/StyleControllerTest.java @@ -12,8 +12,8 @@ import org.geoserver.catalog.WorkspaceInfo; import org.geoserver.catalog.impl.LegendInfoImpl; import org.geoserver.catalog.impl.StyleInfoImpl; +import org.geotools.api.filter.Filter; import org.junit.jupiter.api.Test; -import org.opengis.filter.Filter; import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.http.MediaType; diff --git a/src/catalog/event-bus/src/main/java/org/geoserver/cloud/autoconfigure/event/bus/RemoteGeoServerEventsAutoConfiguration.java b/src/catalog/event-bus/src/main/java/org/geoserver/cloud/autoconfigure/event/bus/RemoteGeoServerEventsAutoConfiguration.java index 3d1f3d174..3e097b15d 100644 --- a/src/catalog/event-bus/src/main/java/org/geoserver/cloud/autoconfigure/event/bus/RemoteGeoServerEventsAutoConfiguration.java +++ b/src/catalog/event-bus/src/main/java/org/geoserver/cloud/autoconfigure/event/bus/RemoteGeoServerEventsAutoConfiguration.java @@ -19,10 +19,10 @@ import org.geoserver.config.GeoServer; import org.geoserver.jackson.databind.catalog.GeoServerCatalogModule; import org.geoserver.jackson.databind.config.GeoServerConfigModule; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.expression.Expression; +import org.geotools.api.filter.expression.Literal; import org.geotools.jackson.databind.filter.GeoToolsFilterModule; -import org.opengis.filter.Filter; -import org.opengis.filter.expression.Expression; -import org.opengis.filter.expression.Literal; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/src/catalog/event-bus/src/test/java/org/geoserver/cloud/event/bus/CatalogRemoteApplicationEventsIT.java b/src/catalog/event-bus/src/test/java/org/geoserver/cloud/event/bus/CatalogRemoteApplicationEventsIT.java index 8ecb6809a..d18d1a022 100644 --- a/src/catalog/event-bus/src/test/java/org/geoserver/cloud/event/bus/CatalogRemoteApplicationEventsIT.java +++ b/src/catalog/event-bus/src/test/java/org/geoserver/cloud/event/bus/CatalogRemoteApplicationEventsIT.java @@ -39,13 +39,13 @@ import org.geoserver.cloud.event.info.InfoModified; import org.geoserver.cog.CogSettings.RangeReaderType; import org.geoserver.cog.CogSettingsStore; +import org.geotools.api.feature.simple.SimpleFeatureType; import org.geotools.data.DataUtilities; import org.geotools.feature.SchemaException; import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.referencing.CRS; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.opengis.feature.simple.SimpleFeatureType; import java.util.List; import java.util.Locale; diff --git a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/GeoServerCatalogModule.java b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/GeoServerCatalogModule.java index e7042dfa6..ba517daa5 100644 --- a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/GeoServerCatalogModule.java +++ b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/GeoServerCatalogModule.java @@ -46,6 +46,9 @@ import org.geoserver.jackson.databind.config.dto.NameDto; import org.geoserver.jackson.databind.mapper.PatchMapper; import org.geoserver.jackson.databind.mapper.SharedMappers; +import org.geotools.api.coverage.grid.GridGeometry; +import org.geotools.api.referencing.crs.CoordinateReferenceSystem; +import org.geotools.api.util.InternationalString; import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.jackson.databind.filter.GeoToolsFilterModule; import org.geotools.jackson.databind.geojson.GeoToolsGeoJsonModule; @@ -55,9 +58,6 @@ import org.geotools.measure.Measure; import org.geotools.util.NumberRange; import org.mapstruct.factory.Mappers; -import org.opengis.coverage.grid.GridGeometry; -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.opengis.util.InternationalString; import java.util.Arrays; import java.util.Locale; @@ -262,7 +262,7 @@ private void registerSharedMappers() { KeywordInfo.class, SHARED_MAPPER::keyword, Keyword.class, SHARED_MAPPER::keyword); addMapperSerializer( - org.opengis.feature.type.Name.class, + org.geotools.api.feature.type.Name.class, SHARED_MAPPER::map, NameDto.class, SHARED_MAPPER::map); diff --git a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/QueryDto.java b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/QueryDto.java index 65aa3ed80..97f906908 100644 --- a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/QueryDto.java +++ b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/QueryDto.java @@ -11,8 +11,8 @@ import lombok.RequiredArgsConstructor; import org.geoserver.catalog.plugin.Query; -import org.opengis.filter.Filter; -import org.opengis.filter.sort.SortBy; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.sort.SortBy; import java.util.ArrayList; import java.util.List; diff --git a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/mapper/ValueMappers.java b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/mapper/ValueMappers.java index 232ace928..57479ecb1 100644 --- a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/mapper/ValueMappers.java +++ b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/mapper/ValueMappers.java @@ -34,6 +34,12 @@ import org.geoserver.jackson.databind.catalog.dto.QueryDto; import org.geoserver.jackson.databind.catalog.dto.VirtualTableDto; import org.geoserver.jackson.databind.mapper.SharedMappers; +import org.geotools.api.coverage.SampleDimensionType; +import org.geotools.api.coverage.grid.GridEnvelope; +import org.geotools.api.coverage.grid.GridGeometry; +import org.geotools.api.referencing.crs.CoordinateReferenceSystem; +import org.geotools.api.referencing.operation.MathTransform; +import org.geotools.api.util.InternationalString; import org.geotools.coverage.grid.GeneralGridEnvelope; import org.geotools.coverage.grid.GridGeometry2D; import org.geotools.data.util.MeasureConverterFactory; @@ -48,12 +54,6 @@ import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; -import org.opengis.coverage.SampleDimensionType; -import org.opengis.coverage.grid.GridEnvelope; -import org.opengis.coverage.grid.GridGeometry; -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.opengis.referencing.operation.MathTransform; -import org.opengis.util.InternationalString; import org.slf4j.LoggerFactory; import java.awt.geom.AffineTransform; diff --git a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/GeoServer.java b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/GeoServer.java index 210033f6f..6ea16dd81 100644 --- a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/GeoServer.java +++ b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/GeoServer.java @@ -46,4 +46,9 @@ public static enum WebUIMode { private WebUIMode webUIMode; private Boolean allowStoredQueriesPerWorkspace; private ResourceErrorHandling resourceErrorHandling; + + /** + * @since geoserver 2.24.0 + */ + private boolean trailingSlashMatch; } diff --git a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/NameDto.java b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/NameDto.java index c8c8ca347..1d280915e 100644 --- a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/NameDto.java +++ b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/NameDto.java @@ -7,7 +7,7 @@ import lombok.Data; import lombok.Generated; -/** DTO for {@link org.opengis.feature.type.Name} */ +/** DTO for {@link org.geotools.api.feature.type.Name} */ public @Data @Generated class NameDto { private String namespaceURI; private String localPart; diff --git a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Service.java b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Service.java index 57e050142..cc5041c6d 100644 --- a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Service.java +++ b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Service.java @@ -136,6 +136,11 @@ * @since geoserver 2.22.0 */ private boolean autoEscapeTemplateValues; + + /** + * @since geoserver 2.24.0 + */ + private boolean transformFeatureInfoDisabled; } @EqualsAndHashCode(callSuper = true) @@ -162,6 +167,11 @@ * @since geoserver 2.22.0 */ private Set getFeatureOutputTypes = new HashSet<>(); + + /** + * @since geoserver 2.24.0 + */ + private String csvDateFormat; } @EqualsAndHashCode(callSuper = true) diff --git a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/mapper/SharedMappers.java b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/mapper/SharedMappers.java index 62ccaa880..0d1ab0ec9 100644 --- a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/mapper/SharedMappers.java +++ b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/mapper/SharedMappers.java @@ -18,6 +18,9 @@ import org.geoserver.jackson.databind.catalog.dto.VersionDto; import org.geoserver.jackson.databind.config.dto.NameDto; import org.geoserver.wfs.GMLInfo; +import org.geotools.api.feature.type.Name; +import org.geotools.api.referencing.FactoryException; +import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import org.geotools.feature.NameImpl; import org.geotools.geometry.jts.ReferencedEnvelope; import org.geotools.referencing.CRS.AxisOrder; @@ -27,9 +30,6 @@ import org.mapstruct.ObjectFactory; import org.mapstruct.ReportingPolicy; import org.mapstruct.factory.Mappers; -import org.opengis.feature.type.Name; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.crs.CoordinateReferenceSystem; import java.util.Optional; @@ -93,7 +93,7 @@ public Optional stringToOpt(String value) { return Optional.ofNullable(value); } - public abstract NameDto map(org.opengis.feature.type.Name name); + public abstract NameDto map(org.geotools.api.feature.type.Name name); public Name map(NameDto dto) { return new NameImpl(dto.getNamespaceURI(), dto.getLocalPart()); diff --git a/src/catalog/jackson-bindings/geoserver/src/test/java/org/geoserver/jackson/databind/catalog/GeoServerCatalogModuleTest.java b/src/catalog/jackson-bindings/geoserver/src/test/java/org/geoserver/jackson/databind/catalog/GeoServerCatalogModuleTest.java index 7ba929401..43f0c864e 100644 --- a/src/catalog/jackson-bindings/geoserver/src/test/java/org/geoserver/jackson/databind/catalog/GeoServerCatalogModuleTest.java +++ b/src/catalog/jackson-bindings/geoserver/src/test/java/org/geoserver/jackson/databind/catalog/GeoServerCatalogModuleTest.java @@ -58,6 +58,16 @@ import org.geoserver.config.impl.ContactInfoImpl; import org.geoserver.config.plugin.GeoServerImpl; import org.geoserver.platform.GeoServerExtensionsHelper; +import org.geotools.api.coverage.grid.GridEnvelope; +import org.geotools.api.coverage.grid.GridGeometry; +import org.geotools.api.feature.simple.SimpleFeatureType; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.FilterFactory; +import org.geotools.api.filter.PropertyIsEqualTo; +import org.geotools.api.filter.expression.Expression; +import org.geotools.api.filter.expression.Literal; +import org.geotools.api.filter.sort.SortOrder; +import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import org.geotools.coverage.grid.GeneralGridEnvelope; import org.geotools.coverage.grid.GridGeometry2D; import org.geotools.data.DataUtilities; @@ -73,16 +83,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opengis.coverage.grid.GridEnvelope; -import org.opengis.coverage.grid.GridGeometry; -import org.opengis.feature.simple.SimpleFeatureType; -import org.opengis.filter.Filter; -import org.opengis.filter.FilterFactory2; -import org.opengis.filter.PropertyIsEqualTo; -import org.opengis.filter.expression.Expression; -import org.opengis.filter.expression.Literal; -import org.opengis.filter.sort.SortOrder; -import org.opengis.referencing.crs.CoordinateReferenceSystem; import si.uom.SI; @@ -102,7 +102,7 @@ @Slf4j public abstract class GeoServerCatalogModuleTest { - private FilterFactory2 ff = CommonFactoryFinder.getFilterFactory2(); + private FilterFactory ff = CommonFactoryFinder.getFilterFactory(); protected void print(String logmsg, Object... args) { boolean debug = Boolean.getBoolean("debug"); diff --git a/src/catalog/jackson-bindings/geoserver/src/test/java/org/geoserver/jackson/databind/catalog/PatchSerializationTest.java b/src/catalog/jackson-bindings/geoserver/src/test/java/org/geoserver/jackson/databind/catalog/PatchSerializationTest.java index 29c28e729..f5b9f6f69 100644 --- a/src/catalog/jackson-bindings/geoserver/src/test/java/org/geoserver/jackson/databind/catalog/PatchSerializationTest.java +++ b/src/catalog/jackson-bindings/geoserver/src/test/java/org/geoserver/jackson/databind/catalog/PatchSerializationTest.java @@ -66,6 +66,10 @@ import org.geoserver.platform.GeoServerExtensionsHelper; import org.geoserver.wfs.WFSInfo; import org.geoserver.wms.WMSInfo; +import org.geotools.api.coverage.grid.GridEnvelope; +import org.geotools.api.feature.simple.SimpleFeatureType; +import org.geotools.api.referencing.crs.CoordinateReferenceSystem; +import org.geotools.api.util.InternationalString; import org.geotools.coverage.grid.GeneralGridEnvelope; import org.geotools.coverage.grid.GridGeometry2D; import org.geotools.data.DataUtilities; @@ -82,10 +86,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opengis.coverage.grid.GridEnvelope; -import org.opengis.feature.simple.SimpleFeatureType; -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.opengis.util.InternationalString; import si.uom.SI; @@ -339,12 +339,12 @@ private List createTestAttributes(FeatureTypeInfo info) } public @Test void name() throws Exception { - org.opengis.feature.type.Name name = new NameImpl("localname"); + org.geotools.api.feature.type.Name name = new NameImpl("localname"); testPatch("name", name); } public @Test void name_with_ns() throws Exception { - org.opengis.feature.type.Name name = new NameImpl("http://name.space", "localname"); + org.geotools.api.feature.type.Name name = new NameImpl("http://name.space", "localname"); testPatch("name", name); } diff --git a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/GeoToolsFilterModule.java b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/GeoToolsFilterModule.java index 1de847793..2e3454382 100644 --- a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/GeoToolsFilterModule.java +++ b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/GeoToolsFilterModule.java @@ -10,6 +10,10 @@ import lombok.extern.slf4j.Slf4j; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.capability.FunctionName; +import org.geotools.api.filter.expression.Expression; +import org.geotools.api.filter.sort.SortBy; import org.geotools.jackson.databind.filter.dto.Literal; import org.geotools.jackson.databind.filter.dto.LiteralDeserializer; import org.geotools.jackson.databind.filter.dto.LiteralSerializer; @@ -21,10 +25,6 @@ import org.geotools.jackson.databind.util.MapperSerializer; import org.locationtech.jts.geom.Geometry; import org.mapstruct.factory.Mappers; -import org.opengis.filter.Filter; -import org.opengis.filter.capability.FunctionName; -import org.opengis.filter.expression.Expression; -import org.opengis.filter.sort.SortBy; import java.util.function.Function; @@ -74,7 +74,7 @@ public GeoToolsFilterModule() { addSerializer( Expression.class, new MapperSerializer<>( - org.opengis.filter.expression.Expression.class, EXPRESSIONS::map)); + org.geotools.api.filter.expression.Expression.class, EXPRESSIONS::map)); addSerializer(Literal.class, new LiteralSerializer()); addDeserializer( Expression.class, diff --git a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/dto/SortBy.java b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/dto/SortBy.java index aeb1f6d77..404c54906 100644 --- a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/dto/SortBy.java +++ b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/dto/SortBy.java @@ -9,7 +9,7 @@ import lombok.Generated; import lombok.NoArgsConstructor; -/** DTO for {@link org.opengis.filter.sort.SortBy} */ +/** DTO for {@link org.geotools.api.filter.sort.SortBy} */ @NoArgsConstructor @AllArgsConstructor public @Data @Generated class SortBy { diff --git a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/DtoToFilterMapper.java b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/DtoToFilterMapper.java index fcf108d64..a2b04ada6 100644 --- a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/DtoToFilterMapper.java +++ b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/DtoToFilterMapper.java @@ -4,6 +4,52 @@ */ package org.geotools.jackson.databind.filter.mapper; +import org.geotools.api.filter.And; +import org.geotools.api.filter.ExcludeFilter; +import org.geotools.api.filter.FilterFactory; +import org.geotools.api.filter.Id; +import org.geotools.api.filter.IncludeFilter; +import org.geotools.api.filter.MultiValuedFilter.MatchAction; +import org.geotools.api.filter.NativeFilter; +import org.geotools.api.filter.Not; +import org.geotools.api.filter.Or; +import org.geotools.api.filter.PropertyIsBetween; +import org.geotools.api.filter.PropertyIsEqualTo; +import org.geotools.api.filter.PropertyIsGreaterThan; +import org.geotools.api.filter.PropertyIsGreaterThanOrEqualTo; +import org.geotools.api.filter.PropertyIsLessThan; +import org.geotools.api.filter.PropertyIsLessThanOrEqualTo; +import org.geotools.api.filter.PropertyIsLike; +import org.geotools.api.filter.PropertyIsNil; +import org.geotools.api.filter.PropertyIsNotEqualTo; +import org.geotools.api.filter.PropertyIsNull; +import org.geotools.api.filter.expression.Expression; +import org.geotools.api.filter.identity.Identifier; +import org.geotools.api.filter.spatial.BBOX; +import org.geotools.api.filter.spatial.Beyond; +import org.geotools.api.filter.spatial.Contains; +import org.geotools.api.filter.spatial.Crosses; +import org.geotools.api.filter.spatial.DWithin; +import org.geotools.api.filter.spatial.Disjoint; +import org.geotools.api.filter.spatial.Equals; +import org.geotools.api.filter.spatial.Intersects; +import org.geotools.api.filter.spatial.Overlaps; +import org.geotools.api.filter.spatial.Touches; +import org.geotools.api.filter.spatial.Within; +import org.geotools.api.filter.temporal.After; +import org.geotools.api.filter.temporal.AnyInteracts; +import org.geotools.api.filter.temporal.Before; +import org.geotools.api.filter.temporal.Begins; +import org.geotools.api.filter.temporal.BegunBy; +import org.geotools.api.filter.temporal.During; +import org.geotools.api.filter.temporal.EndedBy; +import org.geotools.api.filter.temporal.Ends; +import org.geotools.api.filter.temporal.Meets; +import org.geotools.api.filter.temporal.MetBy; +import org.geotools.api.filter.temporal.OverlappedBy; +import org.geotools.api.filter.temporal.TContains; +import org.geotools.api.filter.temporal.TEquals; +import org.geotools.api.filter.temporal.TOverlaps; import org.geotools.factory.CommonFactoryFinder; import org.geotools.filter.IsEqualsToImpl; import org.geotools.filter.IsGreaterThanImpl; @@ -41,52 +87,6 @@ import org.mapstruct.IterableMapping; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import org.opengis.filter.And; -import org.opengis.filter.ExcludeFilter; -import org.opengis.filter.FilterFactory2; -import org.opengis.filter.Id; -import org.opengis.filter.IncludeFilter; -import org.opengis.filter.MultiValuedFilter.MatchAction; -import org.opengis.filter.NativeFilter; -import org.opengis.filter.Not; -import org.opengis.filter.Or; -import org.opengis.filter.PropertyIsBetween; -import org.opengis.filter.PropertyIsEqualTo; -import org.opengis.filter.PropertyIsGreaterThan; -import org.opengis.filter.PropertyIsGreaterThanOrEqualTo; -import org.opengis.filter.PropertyIsLessThan; -import org.opengis.filter.PropertyIsLessThanOrEqualTo; -import org.opengis.filter.PropertyIsLike; -import org.opengis.filter.PropertyIsNil; -import org.opengis.filter.PropertyIsNotEqualTo; -import org.opengis.filter.PropertyIsNull; -import org.opengis.filter.expression.Expression; -import org.opengis.filter.identity.Identifier; -import org.opengis.filter.spatial.BBOX; -import org.opengis.filter.spatial.Beyond; -import org.opengis.filter.spatial.Contains; -import org.opengis.filter.spatial.Crosses; -import org.opengis.filter.spatial.DWithin; -import org.opengis.filter.spatial.Disjoint; -import org.opengis.filter.spatial.Equals; -import org.opengis.filter.spatial.Intersects; -import org.opengis.filter.spatial.Overlaps; -import org.opengis.filter.spatial.Touches; -import org.opengis.filter.spatial.Within; -import org.opengis.filter.temporal.After; -import org.opengis.filter.temporal.AnyInteracts; -import org.opengis.filter.temporal.Before; -import org.opengis.filter.temporal.Begins; -import org.opengis.filter.temporal.BegunBy; -import org.opengis.filter.temporal.During; -import org.opengis.filter.temporal.EndedBy; -import org.opengis.filter.temporal.Ends; -import org.opengis.filter.temporal.Meets; -import org.opengis.filter.temporal.MetBy; -import org.opengis.filter.temporal.OverlappedBy; -import org.opengis.filter.temporal.TContains; -import org.opengis.filter.temporal.TEquals; -import org.opengis.filter.temporal.TOverlaps; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -98,7 +98,7 @@ @Mapper(config = FilterMapperConfig.class) abstract class DtoToFilterMapper { - private FilterFactory2 ff = CommonFactoryFinder.getFilterFactory2(); + private FilterFactory ff = CommonFactoryFinder.getFilterFactory(); private ExpressionMapper expm = Mappers.getMapper(ExpressionMapper.class); private final ValueMappers valueMappers = Mappers.getMapper(ValueMappers.class); @@ -106,7 +106,7 @@ private Expression exp(org.geotools.jackson.databind.filter.dto.Expression e) { return expm.map(e); } - public org.opengis.filter.Filter map(org.geotools.jackson.databind.filter.dto.Filter dto) { + public org.geotools.api.filter.Filter map(org.geotools.jackson.databind.filter.dto.Filter dto) { if (dto == null) return null; final Class dtoFilterType = dto.getClass(); Method mapperMethod; @@ -115,9 +115,9 @@ public org.opengis.filter.Filter map(org.geotools.jackson.databind.filter.dto.Fi } catch (NoSuchMethodException | SecurityException e) { throw new RuntimeException(e); } - org.opengis.filter.Filter filter; + org.geotools.api.filter.Filter filter; try { - filter = (org.opengis.filter.Filter) mapperMethod.invoke(this, dto); + filter = (org.geotools.api.filter.Filter) mapperMethod.invoke(this, dto); } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { throw new RuntimeException(e); } @@ -160,8 +160,8 @@ public PropertyIsBetween toFilter(Filter.PropertyIsBetween dto) { return ff.between(expression, lower, upper, matchAction); } - @IterableMapping(elementTargetType = org.opengis.filter.Filter.class) - protected abstract List list(List dtos); + @IterableMapping(elementTargetType = org.geotools.api.filter.Filter.class) + protected abstract List list(List dtos); public And toFilter(Filter.BinaryLogicOperator.And dto) { return ff.and(list(dto.getChildren())); @@ -213,7 +213,7 @@ Identifier toIdentifier(Filter.Id.FeatureId dto) { R apply(A a, B b, C c, D d); } - private T toBinaryOperator( + private T toBinaryOperator( Filter.BinaryOperator dto, TriFunction factory) { @@ -223,9 +223,10 @@ private T toBinaryOperator( return factory.apply(e1, e2, matchAction); } - private T toBinaryComparisonOperator( - Filter.BinaryComparisonOperator dto, - QuadFunction factory) { + private + T toBinaryComparisonOperator( + Filter.BinaryComparisonOperator dto, + QuadFunction factory) { Expression e1 = exp(dto.getExpression1()); Expression e2 = exp(dto.getExpression2()); diff --git a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/ExpressionFactory.java b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/ExpressionFactory.java index fdcc80c66..0dfae9d82 100644 --- a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/ExpressionFactory.java +++ b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/ExpressionFactory.java @@ -4,19 +4,19 @@ */ package org.geotools.jackson.databind.filter.mapper; +import org.geotools.api.filter.FilterFactory; import org.geotools.factory.CommonFactoryFinder; import org.geotools.jackson.databind.filter.dto.Expression.PropertyName; import org.geotools.jackson.databind.filter.dto.Literal; import org.mapstruct.ObjectFactory; import org.mapstruct.factory.Mappers; -import org.opengis.filter.FilterFactory2; import org.xml.sax.helpers.NamespaceSupport; public class ExpressionFactory { - private final FilterFactory2 factory = CommonFactoryFinder.getFilterFactory2(); + private final FilterFactory factory = CommonFactoryFinder.getFilterFactory(); - public @ObjectFactory org.opengis.filter.expression.PropertyName propertyName( + public @ObjectFactory org.geotools.api.filter.expression.PropertyName propertyName( PropertyName source) { ValueMappers values = Mappers.getMapper(ValueMappers.class); String localName = source.getPropertyName(); @@ -24,7 +24,7 @@ public class ExpressionFactory { return factory.property(localName, namespaceSupport); } - public @ObjectFactory org.opengis.filter.expression.Literal literal(Literal source) { + public @ObjectFactory org.geotools.api.filter.expression.Literal literal(Literal source) { return factory.literal(source.getValue()); } } diff --git a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/ExpressionMapper.java b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/ExpressionMapper.java index 2ca8be653..6e0fe5717 100644 --- a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/ExpressionMapper.java +++ b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/ExpressionMapper.java @@ -4,6 +4,9 @@ */ package org.geotools.jackson.databind.filter.mapper; +import org.geotools.api.filter.FilterFactory; +import org.geotools.api.filter.expression.ExpressionVisitor; +import org.geotools.api.filter.expression.NilExpression; import org.geotools.factory.CommonFactoryFinder; import org.geotools.filter.FunctionFinder; import org.geotools.filter.capability.FunctionNameImpl; @@ -18,52 +21,50 @@ import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.ObjectFactory; -import org.opengis.filter.FilterFactory2; -import org.opengis.filter.expression.ExpressionVisitor; -import org.opengis.filter.expression.NilExpression; import java.util.List; @Mapper(config = FilterMapperConfig.class) public abstract class ExpressionMapper { - private final FilterFactory2 ff = CommonFactoryFinder.getFilterFactory2(); + private final FilterFactory ff = CommonFactoryFinder.getFilterFactory(); private final ExpressionVisitor visitor = new ExpressionVisitor() { public @Override Subtract visit( - org.opengis.filter.expression.Subtract expression, Object extraData) { + org.geotools.api.filter.expression.Subtract expression, Object extraData) { return map(expression); } public @Override PropertyName visit( - org.opengis.filter.expression.PropertyName expression, Object extraData) { + org.geotools.api.filter.expression.PropertyName expression, + Object extraData) { return map(expression); } public @Override Multiply visit( - org.opengis.filter.expression.Multiply expression, Object extraData) { + org.geotools.api.filter.expression.Multiply expression, Object extraData) { return map(expression); } public @Override Literal visit( - org.opengis.filter.expression.Literal expression, Object extraData) { + org.geotools.api.filter.expression.Literal expression, Object extraData) { return map(expression); } public @Override Function visit( - org.opengis.filter.expression.Function expression, Object extraData) { + org.geotools.api.filter.expression.Function expression, Object extraData) { return map(expression); } public @Override Divide visit( - org.opengis.filter.expression.Divide expression, Object extraData) { + org.geotools.api.filter.expression.Divide expression, Object extraData) { return map(expression); } public @Override Add visit( - org.opengis.filter.expression.Add expression, Object extraData) { + org.geotools.api.filter.expression.Add expression, Object extraData) { return map(expression); } @@ -72,11 +73,11 @@ public abstract class ExpressionMapper { } }; - public Expression map(org.opengis.filter.expression.Expression source) { + public Expression map(org.geotools.api.filter.expression.Expression source) { return (Expression) source.accept(visitor, null); } - public org.opengis.filter.expression.Expression map(Expression source) { + public org.geotools.api.filter.expression.Expression map(Expression source) { if (source == null) return null; if (source instanceof Literal) return map((Literal) source); if (source instanceof PropertyName) return map((PropertyName) source); @@ -89,11 +90,11 @@ public org.opengis.filter.expression.Expression map(Expression source) { "Unrecognized expression type " + source.getClass().getName() + ": " + source); } - public @ObjectFactory org.opengis.filter.capability.FunctionName functionName( + public @ObjectFactory org.geotools.api.filter.capability.FunctionName functionName( Expression.FunctionName dto) { FunctionFinder finder = new FunctionFinder(null); String functionName = dto.getName(); - org.opengis.filter.capability.FunctionName name = + org.geotools.api.filter.capability.FunctionName name = finder.findFunctionDescription(functionName); if (name == null) { int argumentCount = dto.getArgumentCount(); @@ -107,11 +108,11 @@ public org.opengis.filter.expression.Expression map(Expression source) { return name; } - public org.opengis.filter.capability.FunctionName map(Expression.FunctionName dto) { + public org.geotools.api.filter.capability.FunctionName map(Expression.FunctionName dto) { return functionName(dto); } - public Expression.FunctionName map(org.opengis.filter.capability.FunctionName value) { + public Expression.FunctionName map(org.geotools.api.filter.capability.FunctionName value) { Expression.FunctionName dto = new Expression.FunctionName(); dto.setName(value.getName()) .setArgumentCount(value.getArgumentCount()) @@ -119,28 +120,29 @@ public Expression.FunctionName map(org.opengis.filter.capability.FunctionName va return dto; } - public abstract PropertyName map(org.opengis.filter.expression.PropertyName expression); + public abstract PropertyName map(org.geotools.api.filter.expression.PropertyName expression); - public abstract org.opengis.filter.expression.PropertyName map(PropertyName dto); + public abstract org.geotools.api.filter.expression.PropertyName map(PropertyName dto); - public abstract org.opengis.filter.expression.Literal map(Literal dto); + public abstract org.geotools.api.filter.expression.Literal map(Literal dto); - public abstract Literal map(org.opengis.filter.expression.Literal expression); + public abstract Literal map(org.geotools.api.filter.expression.Literal expression); - protected org.opengis.filter.expression.Function map(Function dto) { + protected org.geotools.api.filter.expression.Function map(Function dto) { if (dto == null) return null; - org.opengis.filter.expression.Expression[] parameters; + org.geotools.api.filter.expression.Expression[] parameters; parameters = dtoListToExpressionList(dto.getParameters()); - if (parameters == null) parameters = new org.opengis.filter.expression.Expression[0]; + if (parameters == null) parameters = new org.geotools.api.filter.expression.Expression[0]; return ff.function(dto.getName(), parameters); } - protected abstract org.opengis.filter.expression.Expression[] dtoListToExpressionList( + protected abstract org.geotools.api.filter.expression.Expression[] dtoListToExpressionList( List list); - protected abstract Expression.Function map(org.opengis.filter.expression.Function expression); + protected abstract Expression.Function map( + org.geotools.api.filter.expression.Function expression); - protected abstract Add map(org.opengis.filter.expression.Add expression); + protected abstract Add map(org.geotools.api.filter.expression.Add expression); @Mapping(target = "expr1", source = "expression1") @Mapping(target = "expr2", source = "expression2") @@ -148,7 +150,7 @@ protected abstract org.opengis.filter.expression.Expression[] dtoListToExpressio @Mapping(target = "expression2", ignore = true) protected abstract org.geotools.filter.expression.AddImpl map(Add dto); - protected abstract Subtract map(org.opengis.filter.expression.Subtract expression); + protected abstract Subtract map(org.geotools.api.filter.expression.Subtract expression); @Mapping(target = "expr1", source = "expression1") @Mapping(target = "expr2", source = "expression2") @@ -156,7 +158,7 @@ protected abstract org.opengis.filter.expression.Expression[] dtoListToExpressio @Mapping(target = "expression2", ignore = true) protected abstract org.geotools.filter.expression.SubtractImpl map(Subtract dto); - protected abstract Divide map(org.opengis.filter.expression.Divide expression); + protected abstract Divide map(org.geotools.api.filter.expression.Divide expression); @Mapping(target = "expr1", source = "expression1") @Mapping(target = "expr2", source = "expression2") @@ -164,7 +166,7 @@ protected abstract org.opengis.filter.expression.Expression[] dtoListToExpressio @Mapping(target = "expression2", ignore = true) protected abstract org.geotools.filter.expression.DivideImpl map(Divide dto); - protected abstract Multiply map(org.opengis.filter.expression.Multiply expression); + protected abstract Multiply map(org.geotools.api.filter.expression.Multiply expression); @Mapping(target = "expr1", source = "expression1") @Mapping(target = "expr2", source = "expression2") diff --git a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/FilterFactory.java b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/FilterFactory.java index c28af7354..2ff9998cc 100644 --- a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/FilterFactory.java +++ b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/FilterFactory.java @@ -4,10 +4,10 @@ */ package org.geotools.jackson.databind.filter.mapper; +import org.geotools.api.filter.ExcludeFilter; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.IncludeFilter; import org.mapstruct.ObjectFactory; -import org.opengis.filter.ExcludeFilter; -import org.opengis.filter.Filter; -import org.opengis.filter.IncludeFilter; public class FilterFactory { diff --git a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/FilterMapper.java b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/FilterMapper.java index b444cecc3..5df5d4ed6 100644 --- a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/FilterMapper.java +++ b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/FilterMapper.java @@ -4,26 +4,28 @@ */ package org.geotools.jackson.databind.filter.mapper; +import org.geotools.api.filter.expression.PropertyName; +import org.geotools.api.filter.sort.SortOrder; import org.geotools.filter.SortByImpl; import org.geotools.jackson.databind.filter.dto.Expression; import org.geotools.jackson.databind.filter.dto.SortBy; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import org.opengis.filter.expression.PropertyName; -import org.opengis.filter.sort.SortOrder; @Mapper(config = FilterMapperConfig.class) public class FilterMapper { - public org.geotools.jackson.databind.filter.dto.Filter map(org.opengis.filter.Filter filter) { + public org.geotools.jackson.databind.filter.dto.Filter map( + org.geotools.api.filter.Filter filter) { return Mappers.getMapper(FilterToDtoMapper.class).map(filter); } - public org.opengis.filter.Filter map(org.geotools.jackson.databind.filter.dto.Filter dto) { + public org.geotools.api.filter.Filter map(org.geotools.jackson.databind.filter.dto.Filter dto) { return Mappers.getMapper(DtoToFilterMapper.class).map(dto); } - public org.opengis.filter.sort.SortBy map(org.geotools.jackson.databind.filter.dto.SortBy dto) { + public org.geotools.api.filter.sort.SortBy map( + org.geotools.jackson.databind.filter.dto.SortBy dto) { if (dto == null) return null; PropertyName propertyName = Mappers.getMapper(ExpressionMapper.class).map(dto.getPropertyName()); @@ -33,7 +35,7 @@ public org.opengis.filter.sort.SortBy map(org.geotools.jackson.databind.filter.d } public org.geotools.jackson.databind.filter.dto.SortBy map( - org.opengis.filter.sort.SortBy sortBy) { + org.geotools.api.filter.sort.SortBy sortBy) { if (sortBy == null) return null; Expression.PropertyName propertyName = Mappers.getMapper(ExpressionMapper.class).map(sortBy.getPropertyName()); diff --git a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/FilterToDtoMapper.java b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/FilterToDtoMapper.java index 0e0d88bba..7e31570cc 100644 --- a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/FilterToDtoMapper.java +++ b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/FilterToDtoMapper.java @@ -4,61 +4,61 @@ */ package org.geotools.jackson.databind.filter.mapper; +import org.geotools.api.filter.And; +import org.geotools.api.filter.ExcludeFilter; +import org.geotools.api.filter.Id; +import org.geotools.api.filter.IncludeFilter; +import org.geotools.api.filter.NativeFilter; +import org.geotools.api.filter.Not; +import org.geotools.api.filter.Or; +import org.geotools.api.filter.PropertyIsBetween; +import org.geotools.api.filter.PropertyIsEqualTo; +import org.geotools.api.filter.PropertyIsGreaterThan; +import org.geotools.api.filter.PropertyIsGreaterThanOrEqualTo; +import org.geotools.api.filter.PropertyIsLessThan; +import org.geotools.api.filter.PropertyIsLessThanOrEqualTo; +import org.geotools.api.filter.PropertyIsLike; +import org.geotools.api.filter.PropertyIsNil; +import org.geotools.api.filter.PropertyIsNotEqualTo; +import org.geotools.api.filter.PropertyIsNull; +import org.geotools.api.filter.identity.FeatureId; +import org.geotools.api.filter.identity.ResourceId; +import org.geotools.api.filter.spatial.BBOX; +import org.geotools.api.filter.spatial.Beyond; +import org.geotools.api.filter.spatial.Contains; +import org.geotools.api.filter.spatial.Crosses; +import org.geotools.api.filter.spatial.DWithin; +import org.geotools.api.filter.spatial.Disjoint; +import org.geotools.api.filter.spatial.Equals; +import org.geotools.api.filter.spatial.Intersects; +import org.geotools.api.filter.spatial.Overlaps; +import org.geotools.api.filter.spatial.Touches; +import org.geotools.api.filter.spatial.Within; +import org.geotools.api.filter.temporal.After; +import org.geotools.api.filter.temporal.AnyInteracts; +import org.geotools.api.filter.temporal.Before; +import org.geotools.api.filter.temporal.Begins; +import org.geotools.api.filter.temporal.BegunBy; +import org.geotools.api.filter.temporal.During; +import org.geotools.api.filter.temporal.EndedBy; +import org.geotools.api.filter.temporal.Ends; +import org.geotools.api.filter.temporal.Meets; +import org.geotools.api.filter.temporal.MetBy; +import org.geotools.api.filter.temporal.OverlappedBy; +import org.geotools.api.filter.temporal.TContains; +import org.geotools.api.filter.temporal.TEquals; +import org.geotools.api.filter.temporal.TOverlaps; import org.geotools.jackson.databind.filter.dto.Filter; import org.geotools.jackson.databind.filter.dto.Filter.BinaryComparisonOperator; import org.geotools.jackson.databind.filter.dto.Filter.BinaryLogicOperator; import org.geotools.jackson.databind.filter.dto.Filter.BinarySpatialOperator; import org.geotools.jackson.databind.filter.dto.Filter.BinaryTemporalOperator; import org.mapstruct.Mapper; -import org.opengis.filter.And; -import org.opengis.filter.ExcludeFilter; -import org.opengis.filter.Id; -import org.opengis.filter.IncludeFilter; -import org.opengis.filter.NativeFilter; -import org.opengis.filter.Not; -import org.opengis.filter.Or; -import org.opengis.filter.PropertyIsBetween; -import org.opengis.filter.PropertyIsEqualTo; -import org.opengis.filter.PropertyIsGreaterThan; -import org.opengis.filter.PropertyIsGreaterThanOrEqualTo; -import org.opengis.filter.PropertyIsLessThan; -import org.opengis.filter.PropertyIsLessThanOrEqualTo; -import org.opengis.filter.PropertyIsLike; -import org.opengis.filter.PropertyIsNil; -import org.opengis.filter.PropertyIsNotEqualTo; -import org.opengis.filter.PropertyIsNull; -import org.opengis.filter.identity.FeatureId; -import org.opengis.filter.identity.ResourceId; -import org.opengis.filter.spatial.BBOX; -import org.opengis.filter.spatial.Beyond; -import org.opengis.filter.spatial.Contains; -import org.opengis.filter.spatial.Crosses; -import org.opengis.filter.spatial.DWithin; -import org.opengis.filter.spatial.Disjoint; -import org.opengis.filter.spatial.Equals; -import org.opengis.filter.spatial.Intersects; -import org.opengis.filter.spatial.Overlaps; -import org.opengis.filter.spatial.Touches; -import org.opengis.filter.spatial.Within; -import org.opengis.filter.temporal.After; -import org.opengis.filter.temporal.AnyInteracts; -import org.opengis.filter.temporal.Before; -import org.opengis.filter.temporal.Begins; -import org.opengis.filter.temporal.BegunBy; -import org.opengis.filter.temporal.During; -import org.opengis.filter.temporal.EndedBy; -import org.opengis.filter.temporal.Ends; -import org.opengis.filter.temporal.Meets; -import org.opengis.filter.temporal.MetBy; -import org.opengis.filter.temporal.OverlappedBy; -import org.opengis.filter.temporal.TContains; -import org.opengis.filter.temporal.TEquals; -import org.opengis.filter.temporal.TOverlaps; @Mapper(config = FilterMapperConfig.class) interface FilterToDtoMapper { - default Filter map(org.opengis.filter.Filter filter) { + default Filter map(org.geotools.api.filter.Filter filter) { if (filter == null) return null; return (Filter) filter.accept(new MappingFilterVisitor(this), null); } @@ -120,7 +120,7 @@ BinaryComparisonOperator.PropertyIsGreaterThanOrEqualTo toDto( Filter.Id toDto(Id filter); - default Filter.Id.FeatureId map(org.opengis.filter.identity.Identifier id) { + default Filter.Id.FeatureId map(org.geotools.api.filter.identity.Identifier id) { if (id == null) return null; Filter.Id.FeatureId fid; if (id instanceof ResourceId) { diff --git a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/MappingFilterVisitor.java b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/MappingFilterVisitor.java index 761a75a33..5b064e24b 100644 --- a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/MappingFilterVisitor.java +++ b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/MappingFilterVisitor.java @@ -6,49 +6,49 @@ import lombok.NonNull; -import org.opengis.filter.And; -import org.opengis.filter.ExcludeFilter; -import org.opengis.filter.FilterVisitor; -import org.opengis.filter.Id; -import org.opengis.filter.IncludeFilter; -import org.opengis.filter.NativeFilter; -import org.opengis.filter.Not; -import org.opengis.filter.Or; -import org.opengis.filter.PropertyIsBetween; -import org.opengis.filter.PropertyIsEqualTo; -import org.opengis.filter.PropertyIsGreaterThan; -import org.opengis.filter.PropertyIsGreaterThanOrEqualTo; -import org.opengis.filter.PropertyIsLessThan; -import org.opengis.filter.PropertyIsLessThanOrEqualTo; -import org.opengis.filter.PropertyIsLike; -import org.opengis.filter.PropertyIsNil; -import org.opengis.filter.PropertyIsNotEqualTo; -import org.opengis.filter.PropertyIsNull; -import org.opengis.filter.spatial.BBOX; -import org.opengis.filter.spatial.Beyond; -import org.opengis.filter.spatial.Contains; -import org.opengis.filter.spatial.Crosses; -import org.opengis.filter.spatial.DWithin; -import org.opengis.filter.spatial.Disjoint; -import org.opengis.filter.spatial.Equals; -import org.opengis.filter.spatial.Intersects; -import org.opengis.filter.spatial.Overlaps; -import org.opengis.filter.spatial.Touches; -import org.opengis.filter.spatial.Within; -import org.opengis.filter.temporal.After; -import org.opengis.filter.temporal.AnyInteracts; -import org.opengis.filter.temporal.Before; -import org.opengis.filter.temporal.Begins; -import org.opengis.filter.temporal.BegunBy; -import org.opengis.filter.temporal.During; -import org.opengis.filter.temporal.EndedBy; -import org.opengis.filter.temporal.Ends; -import org.opengis.filter.temporal.Meets; -import org.opengis.filter.temporal.MetBy; -import org.opengis.filter.temporal.OverlappedBy; -import org.opengis.filter.temporal.TContains; -import org.opengis.filter.temporal.TEquals; -import org.opengis.filter.temporal.TOverlaps; +import org.geotools.api.filter.And; +import org.geotools.api.filter.ExcludeFilter; +import org.geotools.api.filter.FilterVisitor; +import org.geotools.api.filter.Id; +import org.geotools.api.filter.IncludeFilter; +import org.geotools.api.filter.NativeFilter; +import org.geotools.api.filter.Not; +import org.geotools.api.filter.Or; +import org.geotools.api.filter.PropertyIsBetween; +import org.geotools.api.filter.PropertyIsEqualTo; +import org.geotools.api.filter.PropertyIsGreaterThan; +import org.geotools.api.filter.PropertyIsGreaterThanOrEqualTo; +import org.geotools.api.filter.PropertyIsLessThan; +import org.geotools.api.filter.PropertyIsLessThanOrEqualTo; +import org.geotools.api.filter.PropertyIsLike; +import org.geotools.api.filter.PropertyIsNil; +import org.geotools.api.filter.PropertyIsNotEqualTo; +import org.geotools.api.filter.PropertyIsNull; +import org.geotools.api.filter.spatial.BBOX; +import org.geotools.api.filter.spatial.Beyond; +import org.geotools.api.filter.spatial.Contains; +import org.geotools.api.filter.spatial.Crosses; +import org.geotools.api.filter.spatial.DWithin; +import org.geotools.api.filter.spatial.Disjoint; +import org.geotools.api.filter.spatial.Equals; +import org.geotools.api.filter.spatial.Intersects; +import org.geotools.api.filter.spatial.Overlaps; +import org.geotools.api.filter.spatial.Touches; +import org.geotools.api.filter.spatial.Within; +import org.geotools.api.filter.temporal.After; +import org.geotools.api.filter.temporal.AnyInteracts; +import org.geotools.api.filter.temporal.Before; +import org.geotools.api.filter.temporal.Begins; +import org.geotools.api.filter.temporal.BegunBy; +import org.geotools.api.filter.temporal.During; +import org.geotools.api.filter.temporal.EndedBy; +import org.geotools.api.filter.temporal.Ends; +import org.geotools.api.filter.temporal.Meets; +import org.geotools.api.filter.temporal.MetBy; +import org.geotools.api.filter.temporal.OverlappedBy; +import org.geotools.api.filter.temporal.TContains; +import org.geotools.api.filter.temporal.TEquals; +import org.geotools.api.filter.temporal.TOverlaps; class MappingFilterVisitor implements FilterVisitor { diff --git a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/ValueMappers.java b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/ValueMappers.java index 904b3b88b..8fc880974 100644 --- a/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/ValueMappers.java +++ b/src/catalog/jackson-bindings/geotools/src/main/java/org/geotools/jackson/databind/filter/mapper/ValueMappers.java @@ -4,11 +4,11 @@ */ package org.geotools.jackson.databind.filter.mapper; +import org.geotools.api.util.InternationalString; import org.geotools.jackson.databind.filter.dto.Filter.MultiValuedFilter.MatchAction; import org.geotools.util.Converters; import org.geotools.util.SimpleInternationalString; import org.mapstruct.Mapper; -import org.opengis.util.InternationalString; import org.xml.sax.helpers.NamespaceSupport; import java.util.Collections; @@ -21,9 +21,9 @@ public abstract class ValueMappers { public abstract MatchAction matchAction( - org.opengis.filter.MultiValuedFilter.MatchAction matchAction); + org.geotools.api.filter.MultiValuedFilter.MatchAction matchAction); - public abstract org.opengis.filter.MultiValuedFilter.MatchAction matchAction( + public abstract org.geotools.api.filter.MultiValuedFilter.MatchAction matchAction( MatchAction matchAction); public NamespaceSupport map(Map map) { diff --git a/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/ExpressionRoundtripTest.java b/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/ExpressionRoundtripTest.java index b99742bdb..6677158a3 100644 --- a/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/ExpressionRoundtripTest.java +++ b/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/ExpressionRoundtripTest.java @@ -10,6 +10,9 @@ import lombok.extern.slf4j.Slf4j; +import org.geotools.api.feature.type.Name; +import org.geotools.api.filter.capability.FunctionName; +import org.geotools.api.parameter.Parameter; import org.geotools.filter.FunctionFinder; import org.geotools.geometry.jts.Geometries; import org.geotools.jackson.databind.filter.dto.Expression; @@ -27,9 +30,6 @@ import org.locationtech.jts.geom.MultiPolygon; import org.locationtech.jts.io.ParseException; import org.locationtech.jts.io.WKTReader; -import org.opengis.feature.type.Name; -import org.opengis.filter.capability.FunctionName; -import org.opengis.parameter.Parameter; import si.uom.SI; @@ -52,7 +52,7 @@ /** * Abstract test suite for {@link Expression} Data Transfer Objects or POJOS; to be used both for * testing serialization/deserialization and mapping to and from {@link - * org.opengis.filter.expression.Expression} + * org.geotools.api.filter.expression.Expression} */ @Slf4j public abstract class ExpressionRoundtripTest { diff --git a/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/FilterRoundtripTest.java b/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/FilterRoundtripTest.java index a6b08a3ed..2593cf729 100644 --- a/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/FilterRoundtripTest.java +++ b/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/FilterRoundtripTest.java @@ -34,7 +34,8 @@ /** * Abstract test suite for {@link Filter} Data Transfer Objects or POJOS; to be used both for - * testing serialization/deserialization and mapping to and from {@link org.opengis.filter.Filter} + * testing serialization/deserialization and mapping to and from {@link + * org.geotools.api.filter.Filter} */ public abstract class FilterRoundtripTest { diff --git a/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/GeoToolsFilterModuleExpressionsTest.java b/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/GeoToolsFilterModuleExpressionsTest.java index b8801f65d..2b2203649 100644 --- a/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/GeoToolsFilterModuleExpressionsTest.java +++ b/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/GeoToolsFilterModuleExpressionsTest.java @@ -10,17 +10,17 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import org.geotools.api.filter.expression.Function; +import org.geotools.api.filter.expression.Literal; import org.geotools.jackson.databind.filter.dto.Expression; import org.geotools.jackson.databind.filter.dto.Expression.FunctionName; import org.geotools.jackson.databind.filter.mapper.ExpressionMapper; import org.junit.jupiter.api.BeforeEach; import org.mapstruct.factory.Mappers; -import org.opengis.filter.expression.Function; -import org.opengis.filter.expression.Literal; /** * Test suite for {@link GeoToolsFilterModule} serialization and deserialization of {@link - * org.opengis.filter.expression.Expression}s + * org.geotools.api.filter.expression.Expression}s */ public abstract class GeoToolsFilterModuleExpressionsTest extends ExpressionRoundtripTest { @@ -39,12 +39,13 @@ public abstract class GeoToolsFilterModuleExpressionsTest extends ExpressionRoun protected abstract ObjectMapper newObjectMapper(); protected @Override E roundtripTest(E dto) throws Exception { - final org.opengis.filter.expression.Expression expected = expressionMapper.map(dto); + final org.geotools.api.filter.expression.Expression expected = expressionMapper.map(dto); String serialized = objectMapper.writeValueAsString(expected); print("serialized: {}", serialized); - org.opengis.filter.expression.Expression deserialized; + org.geotools.api.filter.expression.Expression deserialized; deserialized = - objectMapper.readValue(serialized, org.opengis.filter.expression.Expression.class); + objectMapper.readValue( + serialized, org.geotools.api.filter.expression.Expression.class); if (expected instanceof Function) { assertTrue(deserialized instanceof Function); @@ -66,12 +67,12 @@ public abstract class GeoToolsFilterModuleExpressionsTest extends ExpressionRoun } protected @Override FunctionName roundtripTest(FunctionName dto) throws Exception { - org.opengis.filter.capability.FunctionName expected = expressionMapper.map(dto); + org.geotools.api.filter.capability.FunctionName expected = expressionMapper.map(dto); String serialized = objectMapper.writeValueAsString(expected); print("serialized: {}", serialized); - org.opengis.filter.capability.FunctionName deserialized = + org.geotools.api.filter.capability.FunctionName deserialized = objectMapper.readValue( - serialized, org.opengis.filter.capability.FunctionName.class); + serialized, org.geotools.api.filter.capability.FunctionName.class); assertEquals(dto.getName(), deserialized.getName()); assertEquals(dto.getArgumentCount(), deserialized.getArgumentCount()); assertEquals(dto.getArgumentNames(), deserialized.getArgumentNames()); diff --git a/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/GeoToolsFilterModuleFiltersTest.java b/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/GeoToolsFilterModuleFiltersTest.java index c2de3b865..fa6518a66 100644 --- a/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/GeoToolsFilterModuleFiltersTest.java +++ b/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/GeoToolsFilterModuleFiltersTest.java @@ -20,7 +20,7 @@ /** * Test suite for {@link GeoToolsFilterModule} serialization and deserialization of {@link - * org.opengis.filter.Filter}s + * org.geotools.api.filter.Filter}s */ @Slf4j public abstract class GeoToolsFilterModuleFiltersTest extends FilterRoundtripTest { @@ -41,21 +41,22 @@ protected void print(String logmsg, Object... args) { protected abstract ObjectMapper newObjectMapper(); protected @Override F roundtripTest(F dto) throws Exception { - final org.opengis.filter.Filter expected = filterMapper.map(dto); + final org.geotools.api.filter.Filter expected = filterMapper.map(dto); String serialized = objectMapper.writeValueAsString(expected); print("serialized: {}", serialized); - org.opengis.filter.Filter deserialized; - deserialized = objectMapper.readValue(serialized, org.opengis.filter.Filter.class); + org.geotools.api.filter.Filter deserialized; + deserialized = objectMapper.readValue(serialized, org.geotools.api.filter.Filter.class); assertEquals(expected, deserialized); return dto; } protected @Override void roundtripTest(SortBy dto) throws Exception { - final org.opengis.filter.sort.SortBy expected = filterMapper.map(dto); + final org.geotools.api.filter.sort.SortBy expected = filterMapper.map(dto); String serialized = objectMapper.writeValueAsString(expected); print("serialized: {}", serialized); - org.opengis.filter.sort.SortBy deserialized; - deserialized = objectMapper.readValue(serialized, org.opengis.filter.sort.SortBy.class); + org.geotools.api.filter.sort.SortBy deserialized; + deserialized = + objectMapper.readValue(serialized, org.geotools.api.filter.sort.SortBy.class); assertEquals(expected, deserialized); } diff --git a/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/mapper/ExpressionMapperTest.java b/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/mapper/ExpressionMapperTest.java index ab92a7901..cc8fde7e8 100644 --- a/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/mapper/ExpressionMapperTest.java +++ b/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/mapper/ExpressionMapperTest.java @@ -23,7 +23,7 @@ public class ExpressionMapperTest extends ExpressionRoundtripTest { @SuppressWarnings("unchecked") protected @Override E roundtripTest(E dto) throws Exception { - org.opengis.filter.expression.Expression expression = expressions.map(dto); + org.geotools.api.filter.expression.Expression expression = expressions.map(dto); assertNotNull(expression); Expression roundTripped = expressions.map(expression); @@ -32,7 +32,7 @@ public class ExpressionMapperTest extends ExpressionRoundtripTest { } protected @Override FunctionName roundtripTest(FunctionName dto) throws Exception { - org.opengis.filter.capability.FunctionName functionName = expressions.map(dto); + org.geotools.api.filter.capability.FunctionName functionName = expressions.map(dto); assertNotNull(functionName); assertEquals(dto.getName(), functionName.getName()); assertEquals(dto.getArgumentCount(), functionName.getArgumentCount()); diff --git a/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/mapper/FilterMapperTest.java b/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/mapper/FilterMapperTest.java index 09f3301cc..c5acfa0d7 100644 --- a/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/mapper/FilterMapperTest.java +++ b/src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/filter/mapper/FilterMapperTest.java @@ -23,7 +23,7 @@ public class FilterMapperTest extends FilterRoundtripTest { @SuppressWarnings("unchecked") protected @Override F roundtripTest(F dto) throws Exception { - org.opengis.filter.Filter ogcFilter = filterMapper.map(dto); + org.geotools.api.filter.Filter ogcFilter = filterMapper.map(dto); assertNotNull(ogcFilter); Filter roundTrippedDto = filterMapper.map(ogcFilter); @@ -32,7 +32,7 @@ public class FilterMapperTest extends FilterRoundtripTest { } protected @Override void roundtripTest(SortBy dto) throws Exception { - org.opengis.filter.sort.SortBy ogcSortBy = filterMapper.map(dto); + org.geotools.api.filter.sort.SortBy ogcSortBy = filterMapper.map(dto); assertNotNull(ogcSortBy); SortBy roundTrippedDto = filterMapper.map(ogcSortBy); diff --git a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogFacadeExtensionAdapter.java b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogFacadeExtensionAdapter.java index 1cc338779..e256cbc86 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogFacadeExtensionAdapter.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogFacadeExtensionAdapter.java @@ -27,9 +27,9 @@ import org.geoserver.catalog.plugin.forwarding.ForwardingCatalog; import org.geoserver.catalog.plugin.forwarding.ForwardingCatalogFacade; import org.geoserver.catalog.util.CloseableIterator; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.sort.SortBy; import org.geotools.util.logging.Logging; -import org.opengis.filter.Filter; -import org.opengis.filter.sort.SortBy; import java.util.List; import java.util.Spliterator; diff --git a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogInfoLookup.java b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogInfoLookup.java index 415be5568..d5691d925 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogInfoLookup.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogInfoLookup.java @@ -22,12 +22,12 @@ import org.geoserver.catalog.impl.ClassMappings; import org.geoserver.catalog.impl.LayerInfoImpl; import org.geoserver.ows.util.OwsUtils; +import org.geotools.api.feature.type.Name; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.sort.SortBy; +import org.geotools.api.filter.sort.SortOrder; import org.geotools.feature.NameImpl; import org.geotools.util.logging.Logging; -import org.opengis.feature.type.Name; -import org.opengis.filter.Filter; -import org.opengis.filter.sort.SortBy; -import org.opengis.filter.sort.SortOrder; import org.springframework.lang.Nullable; import java.lang.reflect.Method; diff --git a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogInfoRepository.java b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogInfoRepository.java index 1e8598db6..a5335ed0c 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogInfoRepository.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogInfoRepository.java @@ -16,7 +16,7 @@ import org.geoserver.catalog.StoreInfo; import org.geoserver.catalog.StyleInfo; import org.geoserver.catalog.WorkspaceInfo; -import org.opengis.filter.Filter; +import org.geotools.api.filter.Filter; import org.springframework.lang.Nullable; import java.util.Optional; diff --git a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogPlugin.java b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogPlugin.java index ed4bd7177..896a9b6f5 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogPlugin.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogPlugin.java @@ -59,19 +59,19 @@ import org.geoserver.config.util.XStreamPersister; import org.geoserver.ows.util.OwsUtils; import org.geoserver.platform.GeoServerResourceLoader; +import org.geotools.api.feature.type.Name; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.FilterFactory; +import org.geotools.api.filter.Id; +import org.geotools.api.filter.PropertyIsEqualTo; +import org.geotools.api.filter.expression.Literal; +import org.geotools.api.filter.expression.PropertyName; +import org.geotools.api.filter.identity.Identifier; +import org.geotools.api.filter.sort.SortBy; import org.geotools.factory.CommonFactoryFinder; import org.geotools.util.Converters; import org.geotools.util.SuppressFBWarnings; import org.geotools.util.logging.Logging; -import org.opengis.feature.type.Name; -import org.opengis.filter.Filter; -import org.opengis.filter.FilterFactory2; -import org.opengis.filter.Id; -import org.opengis.filter.PropertyIsEqualTo; -import org.opengis.filter.expression.Literal; -import org.opengis.filter.expression.PropertyName; -import org.opengis.filter.identity.Identifier; -import org.opengis.filter.sort.SortBy; import java.util.Collection; import java.util.Collections; @@ -1301,7 +1301,7 @@ public void fireBeforeAdded(CatalogInfo object) { } public Optional findById(@NonNull String id) { - FilterFactory2 ff = CommonFactoryFinder.getFilterFactory2(); + FilterFactory ff = CommonFactoryFinder.getFilterFactory(); final Filter filter = ff.id(ff.featureId(id)); return Stream.of( diff --git a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/ExtendedCatalogFacade.java b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/ExtendedCatalogFacade.java index 4dcf5b38f..d6c584ea6 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/ExtendedCatalogFacade.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/ExtendedCatalogFacade.java @@ -16,8 +16,8 @@ import org.geoserver.catalog.WorkspaceInfo; import org.geoserver.catalog.util.CloseableIterator; import org.geoserver.catalog.util.CloseableIteratorAdapter; -import org.opengis.filter.Filter; -import org.opengis.filter.sort.SortBy; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.sort.SortBy; import java.io.Closeable; import java.util.Objects; diff --git a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/IsolatedCatalogFacade.java b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/IsolatedCatalogFacade.java index e89bde2df..e66cc6638 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/IsolatedCatalogFacade.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/IsolatedCatalogFacade.java @@ -23,8 +23,8 @@ import org.geoserver.catalog.util.CloseableIteratorAdapter; import org.geoserver.ows.Dispatcher; import org.geoserver.ows.LocalWorkspace; -import org.opengis.filter.Filter; -import org.opengis.filter.sort.SortBy; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.sort.SortBy; import java.io.Closeable; import java.util.Collections; diff --git a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/PropertyDiff.java b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/PropertyDiff.java index 6b13ec106..fe8a05abc 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/PropertyDiff.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/PropertyDiff.java @@ -20,9 +20,9 @@ import org.geoserver.config.ServiceInfo; import org.geoserver.ows.util.ClassProperties; import org.geoserver.ows.util.OwsUtils; +import org.geotools.api.referencing.crs.CoordinateReferenceSystem; +import org.geotools.api.util.InternationalString; import org.geotools.referencing.CRS; -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.opengis.util.InternationalString; import java.io.Serializable; import java.lang.reflect.Proxy; diff --git a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/Query.java b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/Query.java index 6667f8451..e3fb44c9f 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/Query.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/Query.java @@ -12,8 +12,8 @@ import org.geoserver.catalog.CatalogInfo; import org.geoserver.catalog.Info; -import org.opengis.filter.Filter; -import org.opengis.filter.sort.SortBy; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.sort.SortBy; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/RepositoryCatalogFacadeImpl.java b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/RepositoryCatalogFacadeImpl.java index 122b12bfc..8d78a8b54 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/RepositoryCatalogFacadeImpl.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/RepositoryCatalogFacadeImpl.java @@ -22,9 +22,9 @@ import org.geoserver.catalog.StyleInfo; import org.geoserver.catalog.WorkspaceInfo; import org.geoserver.catalog.impl.ProxyUtils; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.sort.SortBy; import org.geotools.util.logging.Logging; -import org.opengis.filter.Filter; -import org.opengis.filter.sort.SortBy; import org.springframework.util.Assert; import java.lang.reflect.Proxy; diff --git a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/forwarding/ForwardingCatalog.java b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/forwarding/ForwardingCatalog.java index 880b4ae87..a26f3c6b5 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/forwarding/ForwardingCatalog.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/forwarding/ForwardingCatalog.java @@ -29,9 +29,9 @@ import org.geoserver.catalog.event.CatalogListener; import org.geoserver.catalog.util.CloseableIterator; import org.geoserver.platform.GeoServerResourceLoader; -import org.opengis.feature.type.Name; -import org.opengis.filter.Filter; -import org.opengis.filter.sort.SortBy; +import org.geotools.api.feature.type.Name; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.sort.SortBy; import java.io.Serializable; import java.util.Collection; diff --git a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/forwarding/ForwardingCatalogFacade.java b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/forwarding/ForwardingCatalogFacade.java index c41d12773..1fb6fe7ee 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/forwarding/ForwardingCatalogFacade.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/forwarding/ForwardingCatalogFacade.java @@ -18,8 +18,8 @@ import org.geoserver.catalog.StyleInfo; import org.geoserver.catalog.WorkspaceInfo; import org.geoserver.catalog.util.CloseableIterator; -import org.opengis.filter.Filter; -import org.opengis.filter.sort.SortBy; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.sort.SortBy; import java.util.List; diff --git a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/forwarding/ForwardingCatalogRepository.java b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/forwarding/ForwardingCatalogRepository.java index d3ad2712b..894cabbd8 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/forwarding/ForwardingCatalogRepository.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/forwarding/ForwardingCatalogRepository.java @@ -10,7 +10,7 @@ import org.geoserver.catalog.plugin.CatalogInfoRepository; import org.geoserver.catalog.plugin.Patch; import org.geoserver.catalog.plugin.Query; -import org.opengis.filter.Filter; +import org.geotools.api.filter.Filter; import java.util.Optional; import java.util.stream.Stream; diff --git a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/forwarding/ResolvingCatalogFacadeDecorator.java b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/forwarding/ResolvingCatalogFacadeDecorator.java index f9a389cb9..cc6e38559 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/forwarding/ResolvingCatalogFacadeDecorator.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/forwarding/ResolvingCatalogFacadeDecorator.java @@ -26,8 +26,8 @@ import org.geoserver.catalog.plugin.resolving.ResolvingCatalogFacade; import org.geoserver.catalog.util.CloseableIterator; import org.geoserver.catalog.util.CloseableIteratorAdapter; -import org.opengis.filter.Filter; -import org.opengis.filter.sort.SortBy; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.sort.SortBy; import java.util.List; import java.util.Objects; diff --git a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/validation/DefaultCatalogValidator.java b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/validation/DefaultCatalogValidator.java index 4569a9c0c..55c49cd8c 100644 --- a/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/validation/DefaultCatalogValidator.java +++ b/src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/validation/DefaultCatalogValidator.java @@ -24,7 +24,7 @@ import org.geoserver.catalog.StyleInfo; import org.geoserver.catalog.WorkspaceInfo; import org.geoserver.catalog.plugin.CatalogPlugin; -import org.geotools.styling.StyledLayerDescriptor; +import org.geotools.api.style.StyledLayerDescriptor; import org.geotools.util.logging.Logging; import java.io.IOException; diff --git a/src/catalog/plugin/src/test/java/org/geoserver/catalog/CatalogTestData.java b/src/catalog/plugin/src/test/java/org/geoserver/catalog/CatalogTestData.java index d3f149f8a..e085e24d0 100644 --- a/src/catalog/plugin/src/test/java/org/geoserver/catalog/CatalogTestData.java +++ b/src/catalog/plugin/src/test/java/org/geoserver/catalog/CatalogTestData.java @@ -35,10 +35,10 @@ import org.geoserver.wps.ProcessGroupInfoImpl; import org.geoserver.wps.WPSInfo; import org.geoserver.wps.WPSInfoImpl; +import org.geotools.api.util.InternationalString; import org.geotools.coverage.grid.io.OverviewPolicy; import org.geotools.process.factory.AnnotationDrivenProcessFactory; import org.geotools.util.Converters; -import org.opengis.util.InternationalString; import java.io.Serializable; import java.util.HashMap; diff --git a/src/catalog/plugin/src/test/java/org/geoserver/catalog/faker/CatalogFaker.java b/src/catalog/plugin/src/test/java/org/geoserver/catalog/faker/CatalogFaker.java index 4fec16fbe..3ab5c05d0 100644 --- a/src/catalog/plugin/src/test/java/org/geoserver/catalog/faker/CatalogFaker.java +++ b/src/catalog/plugin/src/test/java/org/geoserver/catalog/faker/CatalogFaker.java @@ -76,12 +76,12 @@ import org.geoserver.wfs.GMLInfo; import org.geoserver.wfs.GMLInfo.SrsNameStyle; import org.geoserver.wfs.GMLInfoImpl; +import org.geotools.api.coverage.SampleDimensionType; +import org.geotools.api.util.InternationalString; import org.geotools.util.GrowableInternationalString; import org.geotools.util.NumberRange; import org.geotools.util.SimpleInternationalString; import org.geotools.util.Version; -import org.opengis.coverage.SampleDimensionType; -import org.opengis.util.InternationalString; import org.springframework.util.Assert; import java.io.Serializable; diff --git a/src/catalog/plugin/src/test/java/org/geoserver/catalog/plugin/CatalogConformanceTest.java b/src/catalog/plugin/src/test/java/org/geoserver/catalog/plugin/CatalogConformanceTest.java index 77c552dad..cda4d5983 100644 --- a/src/catalog/plugin/src/test/java/org/geoserver/catalog/plugin/CatalogConformanceTest.java +++ b/src/catalog/plugin/src/test/java/org/geoserver/catalog/plugin/CatalogConformanceTest.java @@ -86,6 +86,10 @@ import org.geoserver.security.SecuredResourceNameChangeListener; import org.geoserver.security.impl.DataAccessRule; import org.geoserver.security.impl.DataAccessRuleDAO; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.FilterFactory; +import org.geotools.api.filter.MultiValuedFilter.MatchAction; +import org.geotools.api.filter.sort.SortBy; import org.geotools.factory.CommonFactoryFinder; import org.geotools.util.logging.Logging; import org.junit.jupiter.api.Assumptions; @@ -95,10 +99,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.mockito.Mockito; -import org.opengis.filter.Filter; -import org.opengis.filter.FilterFactory; -import org.opengis.filter.MultiValuedFilter.MatchAction; -import org.opengis.filter.sort.SortBy; import java.io.File; import java.io.IOException; @@ -1819,12 +1819,12 @@ public void testLayerEvents() { assertEquals(1, tl.modified.size()); assertEquals(l2, tl.modified.get(0).getSource()); assertTrue(tl.modified.get(0).getPropertyNames().contains("path")); - assertTrue(tl.modified.get(0).getOldValues().contains(null)); + assertTrue(tl.modified.get(0).getOldValues().contains((String) null)); assertTrue(tl.modified.get(0).getNewValues().contains("newPath")); assertEquals(1, tl.postModified.size()); assertEquals(l2, tl.postModified.get(0).getSource()); assertTrue(tl.postModified.get(0).getPropertyNames().contains("path")); - assertTrue(tl.postModified.get(0).getOldValues().contains(null)); + assertTrue(tl.postModified.get(0).getOldValues().contains((String) null)); assertTrue(tl.postModified.get(0).getNewValues().contains("newPath")); assertTrue(tl.removed.isEmpty()); diff --git a/src/catalog/plugin/src/test/java/org/geoserver/catalog/plugin/XmlCatalogInfoLookup.java b/src/catalog/plugin/src/test/java/org/geoserver/catalog/plugin/XmlCatalogInfoLookup.java index 1577d5f1a..b87d23d51 100644 --- a/src/catalog/plugin/src/test/java/org/geoserver/catalog/plugin/XmlCatalogInfoLookup.java +++ b/src/catalog/plugin/src/test/java/org/geoserver/catalog/plugin/XmlCatalogInfoLookup.java @@ -20,10 +20,10 @@ import org.geoserver.catalog.impl.ClassMappings; import org.geoserver.config.util.XStreamPersister; import org.geoserver.ows.util.OwsUtils; +import org.geotools.api.filter.Filter; +import org.geotools.api.filter.sort.SortBy; +import org.geotools.api.filter.sort.SortOrder; import org.geotools.util.logging.Logging; -import org.opengis.filter.Filter; -import org.opengis.filter.sort.SortBy; -import org.opengis.filter.sort.SortOrder; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/AbstractCatalogServiceClientRepositoryTest.java b/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/AbstractCatalogServiceClientRepositoryTest.java index ba41528b5..f5be4a09a 100644 --- a/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/AbstractCatalogServiceClientRepositoryTest.java +++ b/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/AbstractCatalogServiceClientRepositoryTest.java @@ -38,7 +38,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opengis.filter.Filter; +import org.geotools.api.filter.Filter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/LayerGroupRepositoryTest.java b/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/LayerGroupRepositoryTest.java index b134fce0e..d82555f3a 100644 --- a/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/LayerGroupRepositoryTest.java +++ b/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/LayerGroupRepositoryTest.java @@ -15,7 +15,7 @@ import org.geoserver.catalog.plugin.CatalogInfoRepository.LayerGroupRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opengis.filter.Filter; +import org.geotools.api.filter.Filter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import lombok.Getter; diff --git a/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/ResourceRepositoryTest.java b/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/ResourceRepositoryTest.java index acf9d4731..331a5e931 100644 --- a/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/ResourceRepositoryTest.java +++ b/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/ResourceRepositoryTest.java @@ -24,7 +24,7 @@ import org.geoserver.ows.util.OwsUtils; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.opengis.filter.Filter; +import org.geotools.api.filter.Filter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import lombok.Getter; diff --git a/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/StoreRepositoryTest.java b/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/StoreRepositoryTest.java index c01ed211d..bbebe3322 100644 --- a/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/StoreRepositoryTest.java +++ b/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/StoreRepositoryTest.java @@ -28,7 +28,7 @@ import org.geoserver.catalog.WorkspaceInfo; import org.geoserver.catalog.plugin.CatalogInfoRepository.StoreRepository; import org.junit.jupiter.api.Test; -import org.opengis.filter.Filter; +import org.geotools.api.filter.Filter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import lombok.Getter; diff --git a/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/StyleRepositoryTest.java b/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/StyleRepositoryTest.java index 419dfe841..26234dd67 100644 --- a/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/StyleRepositoryTest.java +++ b/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/catalog/client/reactivefeign/StyleRepositoryTest.java @@ -14,7 +14,7 @@ import org.geoserver.catalog.impl.StyleInfoImpl; import org.geoserver.catalog.plugin.CatalogInfoRepository.StyleRepository; import org.junit.jupiter.api.Test; -import org.opengis.filter.Filter; +import org.geotools.api.filter.Filter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import lombok.Getter; diff --git a/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/integration/catalog/AbstractCatalogBackendIT.java b/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/integration/catalog/AbstractCatalogBackendIT.java index ef4b92457..8690990a6 100644 --- a/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/integration/catalog/AbstractCatalogBackendIT.java +++ b/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/integration/catalog/AbstractCatalogBackendIT.java @@ -20,7 +20,7 @@ import org.geotools.ows.wmts.model.WMTSCapabilities; import org.geotools.ows.wmts.model.WMTSLayer; import org.junit.jupiter.api.Test; -import org.opengis.util.ProgressListener; +import org.geotools.api.util.ProgressListener; public abstract class AbstractCatalogBackendIT extends CatalogConformanceTest { diff --git a/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/integration/catalogservice/CatalogClientBackendIntegrationTest.java b/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/integration/catalogservice/CatalogClientBackendIntegrationTest.java index 8f667daf4..a4f0a3ffd 100644 --- a/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/integration/catalogservice/CatalogClientBackendIntegrationTest.java +++ b/src/integration-tests/catalog-service-it/src/test/java/org/geoserver/cloud/integration/catalogservice/CatalogClientBackendIntegrationTest.java @@ -26,7 +26,7 @@ import org.geoserver.cloud.integration.catalog.AbstractCatalogBackendIT; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opengis.filter.Filter; +import org.geotools.api.filter.Filter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.context.SpringBootTest; diff --git a/src/pom.xml b/src/pom.xml index 8bf26f9da..4361fd8a2 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -24,10 +24,10 @@ 2.7.14 2.15.2 3.2.6 - 2.23-CLOUD - 2.23-CLOUD - 29-SNAPSHOT - 1.0.2 + 2.24.0-CLOUD + 2.24.0-CLOUD + 30.0 + 1.2.0 4.1.41.Final @@ -1037,7 +1037,7 @@ com.google.code.findbugs findbugs - 3.0.1 + 3.0.2 com.google.code.findbugs @@ -1104,11 +1104,6 @@ asm 9.5 - - com.google.protobuf - protobuf-java - 3.19.4 - io.netty netty-buffer @@ -1177,7 +1172,7 @@ com.amazonaws aws-java-sdk-s3 - 1.12.520 + 1.12.261 com.google.oauth-client @@ -1192,12 +1187,12 @@ com.google.protobuf protobuf-java - 3.23.4 + 3.19.4 com.google.protobuf protobuf-java-util - 3.23.4 + 3.19.4 org.hsqldb @@ -1216,7 +1211,7 @@ 4.10.0 - org.json + org.jssqlite-jdbcon json 20230618