Merge pull request #366 from groldan/build/upgrade_to_geotools30_geos…

…erver24 Upgrade to GeoTools 30/GeoServer 2.24.0
geoserver · Oct 27, 2023 · dc043e7 · dc043e7
2 parents 4379690 + 38fbeeb
commit dc043e7
Show file tree

Hide file tree

Showing 78 changed files with 447 additions and 429 deletions.
diff --git 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
diff --git a/...g/geoserver/cloud/config/catalog/backend/catalogservice/CatalogClientGeoServerLoader.java b/...g/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/...rver/cloud/config/catalog/backend/datadirectory/ParallelDataDirectoryGeoServerLoader.java b/...rver/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/.../java/org/geoserver/cloud/config/catalog/backend/jdbcconfig/CloudJdbcGeoserverFacade.java b/.../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/...ain/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlCatalogFilterSplitter.java b/...ain/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/...c/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlFilterCapabilities.java b/...c/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/...gsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlFilterToSQL.java b/...gsql/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/...sql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlQueryBuilder.java b/...sql/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/...a/org/geoserver/cloud/backend/pgsql/catalog/filter/ToPgsqlCompatibleFilterDuplicator.java b/...a/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/...java/org/geoserver/cloud/backend/pgsql/catalog/repository/PgsqlCatalogInfoRepository.java b/...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/main/java/org/geoserver/cloud/catalog/client/reactivefeign/ReactiveCatalogClient.java b/...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/...c/main/java/org/geoserver/cloud/catalog/client/repository/CatalogClientFilterSupport.java b/...c/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/main/java/org/geoserver/cloud/catalog/client/repository/CatalogClientRepository.java b/.../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/...n/java/org/geoserver/cloud/catalog/client/repository/CatalogClientResourceRepository.java b/...n/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<Res
     private final @Getter Class<ResourceInfo> 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 <T extends ResourceInfo> Stream<T> findAllByType(@Nullable Class<T> clazz) {
         return toStream(client().findAll(endpoint(), typeEnum(clazz)).map(clazz::cast));

diff --git a/.../test/java/org/geoserver/cloud/catalog/client/repository/CatalogClientRepositoryTest.java b/.../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/...er/src/main/java/org/geoserver/cloud/catalog/server/api/v1/ReactiveCatalogController.java b/...er/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/...rver/server/src/main/java/org/geoserver/cloud/catalog/server/service/BlockingCatalog.java b/...rver/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/...rver/server/src/main/java/org/geoserver/cloud/catalog/server/service/ReactiveCatalog.java b/...rver/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/.../server/src/main/java/org/geoserver/cloud/catalog/server/service/ReactiveCatalogImpl.java b/.../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/...java/org/geoserver/cloud/catalog/server/api/v1/AbstractReactiveCatalogControllerTest.java b/...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/...ver/src/test/java/org/geoserver/cloud/catalog/server/api/v1/LayerGroupControllerTest.java b/...ver/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/...r/src/test/java/org/geoserver/cloud/catalog/server/api/v1/ResourceInfoControllerTest.java b/...r/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;