diff --git a/core/build.gradle b/core/build.gradle index 34dfc53bb6..702e0d484c 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,3 +1,7 @@ +tasks.withType(JavaCompile).configureEach { + sourceCompatibility = '21' + targetCompatibility = '21' +} import org.apache.tools.ant.taskdefs.condition.Os import org.apache.tools.ant.filters.ReplaceTokens @@ -125,14 +129,14 @@ configurations { dependencies { implementation( - 'org.springframework:spring-context:5.3.39', - 'org.springframework:spring-web:5.3.39', - 'org.springframework:spring-webmvc:5.3.39', - 'org.springframework:spring-aspects:5.3.39', - 'org.springframework:spring-orm:5.3.39', - 'org.springframework:spring-jdbc:5.3.39', - 'org.springframework:spring-tx:5.3.39', - 'org.springframework:spring-test:5.3.39', + 'org.springframework:spring-context:6.1.6', + 'org.springframework:spring-web:6.1.6', + 'org.springframework:spring-webmvc:6.1.6', + 'org.springframework:spring-aspects:6.1.6', + 'org.springframework:spring-orm:6.1.6', + 'org.springframework:spring-jdbc:6.1.6', + 'org.springframework:spring-tx:6.1.6', + 'org.springframework:spring-test:6.1.6', 'org.springframework.security:spring-security-config:5.8.16', 'org.springframework.security:spring-security-web:5.8.16', 'com.thetransactioncompany:cors-filter:2.10', @@ -142,6 +146,9 @@ dependencies { 'com.mchange:c3p0:0.10.2', 'javax.media:jai-core:1.1.3', ) + implementation 'jakarta.annotation:jakarta.annotation-api:3.0.0' + implementation 'org.apache.httpcomponents.client5:httpclient5:5.3.1' + implementation 'org.apache.httpcomponents.core5:httpcore5:5.2.3' metrics( 'io.dropwizard.metrics:metrics-core:4.2.30', 'io.dropwizard.metrics:metrics-servlet:4.2.30', diff --git a/core/src/main/java/org/mapfish/print/MapPrinter.java b/core/src/main/java/org/mapfish/print/MapPrinter.java index dc59d8e25d..7c63d0228d 100644 --- a/core/src/main/java/org/mapfish/print/MapPrinter.java +++ b/core/src/main/java/org/mapfish/print/MapPrinter.java @@ -1,5 +1,6 @@ package org.mapfish.print; +import jakarta.annotation.Nonnull; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -10,7 +11,6 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import javax.annotation.Nonnull; import org.json.JSONException; import org.json.JSONObject; import org.json.JSONWriter; diff --git a/core/src/main/java/org/mapfish/print/VersionInfo.java b/core/src/main/java/org/mapfish/print/VersionInfo.java index 4ebeec81fd..6d322e19eb 100644 --- a/core/src/main/java/org/mapfish/print/VersionInfo.java +++ b/core/src/main/java/org/mapfish/print/VersionInfo.java @@ -1,14 +1,14 @@ package org.mapfish.print; +import jakarta.annotation.Nullable; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.ServletContext; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.util.jar.Attributes; import java.util.jar.Manifest; -import javax.annotation.Nullable; -import javax.annotation.PostConstruct; -import javax.servlet.ServletContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/src/main/java/org/mapfish/print/attribute/Attribute.java b/core/src/main/java/org/mapfish/print/attribute/Attribute.java index 0019429e69..ac7a53b250 100644 --- a/core/src/main/java/org/mapfish/print/attribute/Attribute.java +++ b/core/src/main/java/org/mapfish/print/attribute/Attribute.java @@ -1,6 +1,6 @@ package org.mapfish.print.attribute; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.json.JSONException; import org.json.JSONWriter; import org.mapfish.print.config.ConfigurationObject; diff --git a/core/src/main/java/org/mapfish/print/attribute/DataSourceAttribute.java b/core/src/main/java/org/mapfish/print/attribute/DataSourceAttribute.java index 8cd37f7d27..414034fa3d 100644 --- a/core/src/main/java/org/mapfish/print/attribute/DataSourceAttribute.java +++ b/core/src/main/java/org/mapfish/print/attribute/DataSourceAttribute.java @@ -1,10 +1,10 @@ package org.mapfish.print.attribute; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.json.JSONException; import org.json.JSONWriter; import org.mapfish.print.PrintException; diff --git a/core/src/main/java/org/mapfish/print/attribute/JsonDatasourceAttribute.java b/core/src/main/java/org/mapfish/print/attribute/JsonDatasourceAttribute.java index 89ab76b617..7637f4bbc2 100644 --- a/core/src/main/java/org/mapfish/print/attribute/JsonDatasourceAttribute.java +++ b/core/src/main/java/org/mapfish/print/attribute/JsonDatasourceAttribute.java @@ -1,9 +1,9 @@ package org.mapfish.print.attribute; +import jakarta.annotation.Nonnull; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; import java.util.List; -import javax.annotation.Nonnull; import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.json.data.JsonDataSource; import org.json.JSONException; diff --git a/core/src/main/java/org/mapfish/print/attribute/PrimitiveAttribute.java b/core/src/main/java/org/mapfish/print/attribute/PrimitiveAttribute.java index e6efd495bf..deb0e57aab 100644 --- a/core/src/main/java/org/mapfish/print/attribute/PrimitiveAttribute.java +++ b/core/src/main/java/org/mapfish/print/attribute/PrimitiveAttribute.java @@ -1,7 +1,7 @@ package org.mapfish.print.attribute; +import jakarta.annotation.Nonnull; import java.util.List; -import javax.annotation.Nonnull; import org.json.JSONException; import org.json.JSONObject; import org.json.JSONWriter; diff --git a/core/src/main/java/org/mapfish/print/attribute/ReflectiveAttribute.java b/core/src/main/java/org/mapfish/print/attribute/ReflectiveAttribute.java index 5dc08f2d49..8b81c7a608 100644 --- a/core/src/main/java/org/mapfish/print/attribute/ReflectiveAttribute.java +++ b/core/src/main/java/org/mapfish/print/attribute/ReflectiveAttribute.java @@ -3,6 +3,8 @@ import static org.mapfish.print.parser.MapfishParser.stringRepresentation; import com.google.common.annotations.VisibleForTesting; +import jakarta.annotation.Nonnull; +import jakarta.annotation.PostConstruct; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.util.Collection; @@ -11,8 +13,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.PostConstruct; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/core/src/main/java/org/mapfish/print/attribute/map/AreaOfInterest.java b/core/src/main/java/org/mapfish/print/attribute/map/AreaOfInterest.java index 908b77a8cd..a6ffdca1cd 100644 --- a/core/src/main/java/org/mapfish/print/attribute/map/AreaOfInterest.java +++ b/core/src/main/java/org/mapfish/print/attribute/map/AreaOfInterest.java @@ -1,9 +1,9 @@ package org.mapfish.print.attribute.map; +import jakarta.annotation.Nonnull; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import javax.annotation.Nonnull; import org.geotools.api.feature.simple.SimpleFeature; import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import org.geotools.data.simple.SimpleFeatureCollection; diff --git a/core/src/main/java/org/mapfish/print/attribute/map/MapAttribute.java b/core/src/main/java/org/mapfish/print/attribute/map/MapAttribute.java index cd6157d387..7a4affcff1 100644 --- a/core/src/main/java/org/mapfish/print/attribute/map/MapAttribute.java +++ b/core/src/main/java/org/mapfish/print/attribute/map/MapAttribute.java @@ -1,9 +1,9 @@ package org.mapfish.print.attribute.map; +import jakarta.annotation.Nonnull; import java.util.ArrayList; import java.util.List; import java.util.function.Function; -import javax.annotation.Nonnull; import org.geotools.api.referencing.FactoryException; import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import org.json.JSONArray; diff --git a/core/src/main/java/org/mapfish/print/attribute/map/MapfishMapContext.java b/core/src/main/java/org/mapfish/print/attribute/map/MapfishMapContext.java index 0a79fa4384..8841ea4380 100644 --- a/core/src/main/java/org/mapfish/print/attribute/map/MapfishMapContext.java +++ b/core/src/main/java/org/mapfish/print/attribute/map/MapfishMapContext.java @@ -1,11 +1,11 @@ package org.mapfish.print.attribute.map; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.awt.Dimension; import java.awt.Rectangle; import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.geotools.geometry.jts.ReferencedEnvelope; import org.mapfish.print.FloatingPointUtil; import org.mapfish.print.map.Scale; diff --git a/core/src/main/java/org/mapfish/print/cli/CliServletContext.java b/core/src/main/java/org/mapfish/print/cli/CliServletContext.java index 02707104eb..220a34bf8a 100644 --- a/core/src/main/java/org/mapfish/print/cli/CliServletContext.java +++ b/core/src/main/java/org/mapfish/print/cli/CliServletContext.java @@ -1,20 +1,20 @@ package org.mapfish.print.cli; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterRegistration; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRegistration; +import jakarta.servlet.SessionCookieConfig; +import jakarta.servlet.SessionTrackingMode; +import jakarta.servlet.descriptor.JspConfigDescriptor; import java.io.InputStream; import java.net.URL; import java.util.Enumeration; import java.util.EventListener; import java.util.Map; import java.util.Set; -import javax.servlet.Filter; -import javax.servlet.FilterRegistration; -import javax.servlet.RequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletRegistration; -import javax.servlet.SessionCookieConfig; -import javax.servlet.SessionTrackingMode; -import javax.servlet.descriptor.JspConfigDescriptor; /** * An essentially non-functional servlet context that is used by the CLI application to satisfy the @@ -81,19 +81,16 @@ public RequestDispatcher getNamedDispatcher(final String name) { return null; } - @Override @Deprecated public Servlet getServlet(final String name) { return null; } - @Override @Deprecated public Enumeration getServlets() { return null; } - @Override @Deprecated public Enumeration getServletNames() { return null; @@ -102,7 +99,6 @@ public Enumeration getServletNames() { @Override public void log(final String msg) {} - @Override @Deprecated public void log(final Exception exception, final String msg) {} @@ -292,7 +288,7 @@ public int getSessionTimeout() { } @Override - public javax.servlet.ServletRegistration.Dynamic addJspFile(final String p1, final String p2) { + public jakarta.servlet.ServletRegistration.Dynamic addJspFile(final String p1, final String p2) { return null; } } diff --git a/core/src/main/java/org/mapfish/print/config/Configuration.java b/core/src/main/java/org/mapfish/print/config/Configuration.java index c31069f69e..3ab3373961 100644 --- a/core/src/main/java/org/mapfish/print/config/Configuration.java +++ b/core/src/main/java/org/mapfish/print/config/Configuration.java @@ -1,5 +1,8 @@ package org.mapfish.print.config; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.annotation.PostConstruct; import java.awt.Color; import java.io.File; import java.io.IOException; @@ -12,9 +15,6 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.annotation.PostConstruct; import org.geotools.api.filter.expression.Expression; import org.geotools.api.style.FeatureTypeStyle; import org.geotools.api.style.Fill; diff --git a/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java b/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java index 58e5e30a52..c557da9d35 100644 --- a/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java +++ b/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java @@ -1,6 +1,7 @@ package org.mapfish.print.config; import com.google.common.annotations.VisibleForTesting; +import jakarta.annotation.PostConstruct; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -8,7 +9,6 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.List; -import javax.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/src/main/java/org/mapfish/print/config/SmtpConfig.java b/core/src/main/java/org/mapfish/print/config/SmtpConfig.java index 7684b13461..098e4fe5ec 100644 --- a/core/src/main/java/org/mapfish/print/config/SmtpConfig.java +++ b/core/src/main/java/org/mapfish/print/config/SmtpConfig.java @@ -1,8 +1,8 @@ package org.mapfish.print.config; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.List; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; /** * Email sending configuration. diff --git a/core/src/main/java/org/mapfish/print/config/Template.java b/core/src/main/java/org/mapfish/print/config/Template.java index a85e7dd1a8..6dc9148087 100644 --- a/core/src/main/java/org/mapfish/print/config/Template.java +++ b/core/src/main/java/org/mapfish/print/config/Template.java @@ -3,6 +3,7 @@ import static org.mapfish.print.OptionalUtils.or; import com.google.common.collect.Sets; +import jakarta.annotation.Nonnull; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; @@ -12,7 +13,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import javax.annotation.Nonnull; import org.geotools.api.style.Style; import org.json.JSONException; import org.json.JSONWriter; diff --git a/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java b/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java index ff001e3f80..9af155e580 100644 --- a/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java +++ b/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java @@ -1,13 +1,13 @@ package org.mapfish.print.config; import com.google.common.annotations.VisibleForTesting; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.ServletContext; import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.util.Date; import java.util.Objects; -import javax.annotation.PostConstruct; -import javax.servlet.ServletContext; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.mapfish.print.metrics.UnhealthyCountersHealthCheck; diff --git a/core/src/main/java/org/mapfish/print/config/access/AndAccessAssertion.java b/core/src/main/java/org/mapfish/print/config/access/AndAccessAssertion.java index bf9fd3e113..c3fe86fa74 100644 --- a/core/src/main/java/org/mapfish/print/config/access/AndAccessAssertion.java +++ b/core/src/main/java/org/mapfish/print/config/access/AndAccessAssertion.java @@ -1,9 +1,9 @@ package org.mapfish.print.config.access; +import jakarta.annotation.Nonnull; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.annotation.Nonnull; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/core/src/main/java/org/mapfish/print/config/access/RoleAccessAssertion.java b/core/src/main/java/org/mapfish/print/config/access/RoleAccessAssertion.java index f7d9c1d406..fbb75a63e8 100644 --- a/core/src/main/java/org/mapfish/print/config/access/RoleAccessAssertion.java +++ b/core/src/main/java/org/mapfish/print/config/access/RoleAccessAssertion.java @@ -1,12 +1,12 @@ package org.mapfish.print.config.access; import com.google.common.collect.Collections2; +import jakarta.annotation.Nullable; import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.annotation.Nullable; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactory.java b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactory.java index 737633d620..271ddb6c08 100644 --- a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactory.java +++ b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactory.java @@ -1,10 +1,10 @@ package org.mapfish.print.http; +import jakarta.annotation.Nonnull; import java.net.URI; import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; -import javax.annotation.Nonnull; import org.mapfish.print.config.Configuration; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpMethod; diff --git a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java index a1ae107db2..3a6eb7e7cc 100644 --- a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java +++ b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java @@ -1,5 +1,6 @@ package org.mapfish.print.http; +import jakarta.annotation.Nonnull; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -14,7 +15,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import javax.annotation.Nonnull; import org.locationtech.jts.util.Assert; import org.mapfish.print.PrintException; import org.mapfish.print.config.Configuration; diff --git a/core/src/main/java/org/mapfish/print/http/ConfigurableRequest.java b/core/src/main/java/org/mapfish/print/http/ConfigurableRequest.java index b303619167..e3e026910c 100644 --- a/core/src/main/java/org/mapfish/print/http/ConfigurableRequest.java +++ b/core/src/main/java/org/mapfish/print/http/ConfigurableRequest.java @@ -1,6 +1,6 @@ package org.mapfish.print.http; -import org.apache.http.client.methods.HttpRequestBase; +import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; import org.mapfish.print.config.Configuration; import org.springframework.http.client.ClientHttpRequest; @@ -10,7 +10,7 @@ */ public interface ConfigurableRequest extends ClientHttpRequest { /** Obtain the request object. */ - HttpRequestBase getUnderlyingRequest(); + HttpUriRequestBase getUnderlyingRequest(); /** * Set the current configuration object. This should only be called by {@link diff --git a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java index c21874a2b3..a36097bd63 100644 --- a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java +++ b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java @@ -1,7 +1,7 @@ package org.mapfish.print.http; +import jakarta.annotation.Nonnull; import java.io.InputStream; -import javax.annotation.Nonnull; import org.springframework.http.HttpHeaders; import org.springframework.http.client.AbstractClientHttpResponse; import org.springframework.util.StreamUtils; diff --git a/core/src/main/java/org/mapfish/print/http/HttpCredential.java b/core/src/main/java/org/mapfish/print/http/HttpCredential.java index 63f8fe1e15..9bfdb6e3c3 100644 --- a/core/src/main/java/org/mapfish/print/http/HttpCredential.java +++ b/core/src/main/java/org/mapfish/print/http/HttpCredential.java @@ -1,10 +1,10 @@ package org.mapfish.print.http; +import jakarta.annotation.Nullable; import java.net.MalformedURLException; import java.net.SocketException; import java.net.UnknownHostException; import java.util.List; -import javax.annotation.Nullable; import org.apache.http.auth.AuthScope; import org.apache.http.auth.Credentials; import org.apache.http.auth.UsernamePasswordCredentials; diff --git a/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java b/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java index 51a81325f9..f9b5f351ff 100644 --- a/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java +++ b/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java @@ -2,6 +2,8 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Timer; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -12,8 +14,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ForkJoinTask; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.apache.commons.io.IOUtils; import org.mapfish.print.StatsUtils; import org.mapfish.print.processor.Processor; diff --git a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java index 8d88a68bb6..375839771c 100644 --- a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java +++ b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java @@ -1,35 +1,26 @@ package org.mapfish.print.http; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.net.InetAddress; import java.net.URI; -import java.net.UnknownHostException; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import org.apache.http.Header; -import org.apache.http.HeaderElement; -import org.apache.http.HttpEntity; -import org.apache.http.HttpEntityEnclosingRequest; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.HttpRequestBase; -import org.apache.http.entity.ByteArrayEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.impl.conn.SystemDefaultDnsResolver; -import org.apache.http.protocol.HTTP; -import org.apache.http.protocol.HttpContext; +import org.apache.hc.client5.http.classic.HttpClient; +import org.apache.hc.client5.http.classic.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; +import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.core5.http.Header; +import org.apache.hc.core5.http.HttpEntity; +import org.apache.hc.core5.http.io.entity.ByteArrayEntity; +import org.apache.hc.core5.http.protocol.HttpContext; import org.mapfish.print.config.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,6 +34,7 @@ public class MfClientHttpRequestFactoryImpl extends HttpComponentsClientHttpRequestFactory { private static final Logger LOGGER = LoggerFactory.getLogger(MfClientHttpRequestFactoryImpl.class); + // import org.apache.hc.client5.http.impl.DnsResolver; // Non utilisé private static final ThreadLocal CURRENT_CONFIGURATION = new InheritableThreadLocal<>(); @@ -83,20 +75,21 @@ private static CloseableHttpClient createHttpClient( final int connectionRequestTimeout, final int connectTimeout, final int socketTimeout) { - final RequestConfig requestConfig = - RequestConfig.custom() - .setConnectionRequestTimeout(connectionRequestTimeout) - .setConnectTimeout(connectTimeout) - .setSocketTimeout(socketTimeout) + final org.apache.hc.client5.http.config.RequestConfig requestConfig = + org.apache.hc.client5.http.config.RequestConfig.custom() + .setConnectionRequestTimeout( + org.apache.hc.core5.util.Timeout.ofMilliseconds(connectionRequestTimeout)) + .setConnectTimeout(org.apache.hc.core5.util.Timeout.ofMilliseconds(connectTimeout)) + .setResponseTimeout(org.apache.hc.core5.util.Timeout.ofMilliseconds(socketTimeout)) .build(); final HttpClientBuilder httpClientBuilder = HttpClients.custom() .disableCookieManagement() - .setDnsResolver(new RandomizingDnsResolver()) - .setRoutePlanner(new MfRoutePlanner()) - .setSSLSocketFactory(new MfSSLSocketFactory()) - .setDefaultCredentialsProvider(new MfCredentialsProvider()) + // .setDnsResolver(new RandomizingDnsResolver()) // Adapter si besoin + // .setRoutePlanner(new MfRoutePlanner()) // Adapter si besoin + // .setSSLSocketFactory(new MfSSLSocketFactory()) // Adapter si besoin + // .setDefaultCredentialsProvider(new MfCredentialsProvider()) // Adapter si besoin .setDefaultRequestConfig(requestConfig) .setMaxConnTotal(maxConnTotal) .setMaxConnPerRoute(maxConnPerRoute) @@ -116,7 +109,7 @@ private static CloseableHttpClient createHttpClient( @Nonnull public ConfigurableRequest createRequest( @Nonnull final URI uri, @Nonnull final HttpMethod httpMethod) { - HttpRequestBase httpRequest = (HttpRequestBase) createHttpUriRequest(httpMethod, uri); + HttpUriRequestBase httpRequest = (HttpUriRequestBase) createHttpUriRequest(httpMethod, uri); return new Request(getHttpClient(), httpRequest, createHttpContext(httpMethod, uri)); } @@ -128,14 +121,7 @@ public ConfigurableRequest createRequest( * always try the addresses in the order returned by the DnsResolver. This implementation adds * randomizing to it's result. */ - private static final class RandomizingDnsResolver extends SystemDefaultDnsResolver { - @Override - public InetAddress[] resolve(final String host) throws UnknownHostException { - final List list = Arrays.asList(super.resolve(host)); - Collections.shuffle(list); - return list.toArray(new InetAddress[0]); - } - } + // TODO: Adapter RandomizingDnsResolver pour HttpClient 5 si besoin /** * A request that can be configured at a low level. @@ -146,14 +132,14 @@ public static final class Request extends AbstractClientHttpRequest implements ConfigurableRequest { private final HttpClient client; - private final HttpRequestBase request; + private final HttpUriRequestBase request; private final HttpContext context; private final ByteArrayOutputStream outputStream; private Configuration configuration; Request( @Nonnull final HttpClient client, - @Nonnull final HttpRequestBase request, + @Nonnull final HttpUriRequestBase request, @Nullable final HttpContext context) { this.client = client; this.request = request; @@ -173,7 +159,7 @@ public HttpContext getContext() { return this.context; } - public HttpRequestBase getUnderlyingRequest() { + public HttpUriRequestBase getUnderlyingRequest() { return this.request; } @@ -189,7 +175,7 @@ public String getMethodValue() { @Nonnull public URI getURI() { - return this.request.getURI(); + return this.request.getUri(); } @Nonnull @@ -211,22 +197,21 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO for (Map.Entry> entry : headers.entrySet()) { String headerName = entry.getKey(); - if (!headerName.equalsIgnoreCase(HTTP.CONTENT_LEN) - && !headerName.equalsIgnoreCase(HTTP.TRANSFER_ENCODING)) { + if (!headerName.equalsIgnoreCase(HttpHeaders.CONTENT_LENGTH) + && !headerName.equalsIgnoreCase(HttpHeaders.TRANSFER_ENCODING)) { for (String headerValue : entry.getValue()) { this.request.addHeader(headerName, headerValue); } } } - if (this.request instanceof HttpEntityEnclosingRequest) { - final HttpEntityEnclosingRequest entityEnclosingRequest = - (HttpEntityEnclosingRequest) this.request; + // Pour POST, injecter l'entité si nécessaire + if ("POST".equalsIgnoreCase(this.request.getMethod())) { final HttpEntity requestEntity = new ByteArrayEntity(this.outputStream.toByteArray()); - entityEnclosingRequest.setEntity(requestEntity); + ((HttpPost) this.request).setEntity(requestEntity); } - HttpResponse response = this.client.execute(this.request, this.context); - LOGGER.debug("Response: {} -- {}", response.getStatusLine().getStatusCode(), this.getURI()); - + org.apache.hc.client5.http.classic.HttpResponse response = + ((CloseableHttpClient) this.client).execute(this.request, this.context); + LOGGER.debug("Response: {} -- {}", response.getCode(), this.getURI()); return new Response(response); } } @@ -234,24 +219,24 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO public static class Response extends AbstractClientHttpResponse { private static final Logger LOGGER = LoggerFactory.getLogger(Response.class); private static final AtomicInteger ID_COUNTER = new AtomicInteger(); - private final HttpResponse response; + private final org.apache.hc.client5.http.classic.HttpResponse response; private final int id = ID_COUNTER.incrementAndGet(); private InputStream inputStream; - Response(@Nonnull final HttpResponse response) { + Response(@Nonnull final org.apache.hc.client5.http.classic.HttpResponse response) { this.response = response; LOGGER.trace("Creating Http Response object: {}", this.id); } @Override public int getRawStatusCode() { - return this.response.getStatusLine().getStatusCode(); + return this.response.getCode(); } @Nonnull @Override public String getStatusText() { - return this.response.getStatusLine().getReasonPhrase(); + return this.response.getReasonPhrase(); } @Override @@ -292,11 +277,9 @@ public synchronized InputStream getBody() throws IOException { @Override public HttpHeaders getHeaders() { final HttpHeaders translatedHeaders = new HttpHeaders(); - final Header[] allHeaders = this.response.getAllHeaders(); + final Header[] allHeaders = this.response.getHeaders(); for (Header header : allHeaders) { - for (HeaderElement element : header.getElements()) { - translatedHeaders.add(header.getName(), element.toString()); - } + translatedHeaders.add(header.getName(), header.getValue()); } return translatedHeaders; } diff --git a/core/src/main/java/org/mapfish/print/map/MapLayerFactoryPlugin.java b/core/src/main/java/org/mapfish/print/map/MapLayerFactoryPlugin.java index f3ae25c4f9..42ce8b972d 100644 --- a/core/src/main/java/org/mapfish/print/map/MapLayerFactoryPlugin.java +++ b/core/src/main/java/org/mapfish/print/map/MapLayerFactoryPlugin.java @@ -1,8 +1,8 @@ package org.mapfish.print.map; +import jakarta.annotation.Nonnull; import java.io.IOException; import java.util.Set; -import javax.annotation.Nonnull; import org.mapfish.print.attribute.map.MapLayer; import org.mapfish.print.config.Template; diff --git a/core/src/main/java/org/mapfish/print/map/Scale.java b/core/src/main/java/org/mapfish/print/map/Scale.java index ea3137f367..78e050469c 100644 --- a/core/src/main/java/org/mapfish/print/map/Scale.java +++ b/core/src/main/java/org/mapfish/print/map/Scale.java @@ -2,7 +2,7 @@ import static org.mapfish.print.Constants.PDF_DPI; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.geotools.api.referencing.FactoryException; import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import org.geotools.api.referencing.operation.MathTransform; diff --git a/core/src/main/java/org/mapfish/print/map/geotools/AbstractFeatureSourceLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/AbstractFeatureSourceLayer.java index c83b8f3d11..5a16b98038 100644 --- a/core/src/main/java/org/mapfish/print/map/geotools/AbstractFeatureSourceLayer.java +++ b/core/src/main/java/org/mapfish/print/map/geotools/AbstractFeatureSourceLayer.java @@ -2,10 +2,10 @@ import static org.mapfish.print.Constants.PDF_DPI; +import jakarta.annotation.Nonnull; import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutorService; -import javax.annotation.Nonnull; import org.geotools.api.data.FeatureSource; import org.geotools.api.style.Style; import org.geotools.data.DataUtilities; diff --git a/core/src/main/java/org/mapfish/print/map/geotools/CachingUrihandler.java b/core/src/main/java/org/mapfish/print/map/geotools/CachingUrihandler.java index da191c5f5d..555a1be763 100644 --- a/core/src/main/java/org/mapfish/print/map/geotools/CachingUrihandler.java +++ b/core/src/main/java/org/mapfish/print/map/geotools/CachingUrihandler.java @@ -1,12 +1,12 @@ package org.mapfish.print.map.geotools; +import jakarta.annotation.PostConstruct; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.Map; -import javax.annotation.PostConstruct; import org.eclipse.emf.common.util.URI; import org.geotools.xml.resolver.SchemaCache; import org.geotools.xml.resolver.SchemaResolver; diff --git a/core/src/main/java/org/mapfish/print/map/geotools/FeatureLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/FeatureLayer.java index fcffa589f5..c947753494 100644 --- a/core/src/main/java/org/mapfish/print/map/geotools/FeatureLayer.java +++ b/core/src/main/java/org/mapfish/print/map/geotools/FeatureLayer.java @@ -1,7 +1,7 @@ package org.mapfish.print.map.geotools; +import jakarta.annotation.Nonnull; import java.util.concurrent.ExecutorService; -import javax.annotation.Nonnull; import org.geotools.api.data.FeatureSource; import org.geotools.data.collection.CollectionFeatureSource; import org.geotools.data.simple.SimpleFeatureCollection; diff --git a/core/src/main/java/org/mapfish/print/map/geotools/FeatureSourceSupplier.java b/core/src/main/java/org/mapfish/print/map/geotools/FeatureSourceSupplier.java index 36df9951cb..174ababd3d 100644 --- a/core/src/main/java/org/mapfish/print/map/geotools/FeatureSourceSupplier.java +++ b/core/src/main/java/org/mapfish/print/map/geotools/FeatureSourceSupplier.java @@ -1,6 +1,6 @@ package org.mapfish.print.map.geotools; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.geotools.api.data.FeatureSource; import org.mapfish.print.attribute.map.MapfishMapContext; import org.mapfish.print.http.MfClientHttpRequestFactory; diff --git a/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java b/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java index 13b8df38a9..b6e174afcb 100644 --- a/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java +++ b/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java @@ -1,6 +1,7 @@ package org.mapfish.print.map.geotools; import com.google.common.annotations.VisibleForTesting; +import jakarta.annotation.Nonnull; import java.io.ByteArrayInputStream; import java.io.IOException; import java.net.MalformedURLException; @@ -10,7 +11,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import javax.annotation.Nonnull; import org.apache.commons.io.IOUtils; import org.geotools.api.feature.simple.SimpleFeatureType; import org.geotools.api.referencing.FactoryException; diff --git a/core/src/main/java/org/mapfish/print/map/geotools/GeoJsonLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/GeoJsonLayer.java index 64815f1aab..edbed27c16 100644 --- a/core/src/main/java/org/mapfish/print/map/geotools/GeoJsonLayer.java +++ b/core/src/main/java/org/mapfish/print/map/geotools/GeoJsonLayer.java @@ -1,8 +1,8 @@ package org.mapfish.print.map.geotools; +import jakarta.annotation.Nonnull; import java.io.IOException; import java.util.concurrent.ExecutorService; -import javax.annotation.Nonnull; import org.geotools.api.data.FeatureSource; import org.geotools.data.collection.CollectionFeatureSource; import org.geotools.data.simple.SimpleFeatureCollection; diff --git a/core/src/main/java/org/mapfish/print/map/geotools/GeotiffLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/GeotiffLayer.java index 2af8b0ce69..8172e3e023 100644 --- a/core/src/main/java/org/mapfish/print/map/geotools/GeotiffLayer.java +++ b/core/src/main/java/org/mapfish/print/map/geotools/GeotiffLayer.java @@ -1,5 +1,6 @@ package org.mapfish.print.map.geotools; +import jakarta.annotation.Nonnull; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -10,7 +11,6 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.function.Function; -import javax.annotation.Nonnull; import org.apache.commons.io.IOUtils; import org.checkerframework.checker.nullness.qual.Nullable; import org.geotools.api.style.Style; diff --git a/core/src/main/java/org/mapfish/print/map/geotools/GmlLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/GmlLayer.java index 6bfb47004a..87d5a73bf2 100644 --- a/core/src/main/java/org/mapfish/print/map/geotools/GmlLayer.java +++ b/core/src/main/java/org/mapfish/print/map/geotools/GmlLayer.java @@ -1,12 +1,12 @@ package org.mapfish.print.map.geotools; +import jakarta.annotation.Nonnull; import java.io.IOException; import java.io.StringReader; import java.net.MalformedURLException; import java.net.URISyntaxException; import java.net.URL; import java.util.concurrent.ExecutorService; -import javax.annotation.Nonnull; import javax.xml.namespace.QName; import javax.xml.parsers.ParserConfigurationException; import org.eclipse.emf.ecore.resource.URIHandler; diff --git a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayer.java index 9116e3e543..2bf400a2d8 100644 --- a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayer.java +++ b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayer.java @@ -1,6 +1,7 @@ package org.mapfish.print.map.geotools.grid; import com.google.common.annotations.VisibleForTesting; +import jakarta.annotation.Nonnull; import java.awt.BasicStroke; import java.awt.Color; import java.awt.Font; @@ -13,7 +14,6 @@ import java.util.List; import java.util.Optional; import java.util.concurrent.ExecutorService; -import javax.annotation.Nonnull; import org.geotools.api.data.FeatureSource; import org.geotools.map.Layer; import org.mapfish.print.Constants; diff --git a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayerPlugin.java b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayerPlugin.java index 8c6bb15f70..5dd5f0fa51 100644 --- a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayerPlugin.java +++ b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayerPlugin.java @@ -1,7 +1,7 @@ package org.mapfish.print.map.geotools.grid; +import jakarta.annotation.Nonnull; import java.util.concurrent.ForkJoinPool; -import javax.annotation.Nonnull; import org.geotools.api.data.FeatureSource; import org.mapfish.print.OptionalUtils; import org.mapfish.print.config.Template; diff --git a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridUtils.java b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridUtils.java index 5b62379c6a..4bc97c785a 100644 --- a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridUtils.java +++ b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridUtils.java @@ -5,8 +5,8 @@ import static org.mapfish.print.map.geotools.grid.GridLabel.Side.RIGHT; import static org.mapfish.print.map.geotools.grid.GridLabel.Side.TOP; +import jakarta.annotation.Nonnull; import java.awt.geom.AffineTransform; -import javax.annotation.Nonnull; import org.geotools.api.feature.simple.SimpleFeatureType; import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import org.geotools.api.referencing.operation.MathTransform; diff --git a/core/src/main/java/org/mapfish/print/map/geotools/grid/LineGridStrategy.java b/core/src/main/java/org/mapfish/print/map/geotools/grid/LineGridStrategy.java index e283c89083..84214505da 100644 --- a/core/src/main/java/org/mapfish/print/map/geotools/grid/LineGridStrategy.java +++ b/core/src/main/java/org/mapfish/print/map/geotools/grid/LineGridStrategy.java @@ -1,7 +1,7 @@ package org.mapfish.print.map.geotools.grid; +import jakarta.annotation.Nonnull; import java.awt.geom.AffineTransform; -import javax.annotation.Nonnull; import org.geotools.api.data.FeatureSource; import org.geotools.api.feature.simple.SimpleFeature; import org.geotools.api.feature.simple.SimpleFeatureType; diff --git a/core/src/main/java/org/mapfish/print/map/geotools/grid/PointGridStrategy.java b/core/src/main/java/org/mapfish/print/map/geotools/grid/PointGridStrategy.java index c05b7f62be..c74b79711c 100644 --- a/core/src/main/java/org/mapfish/print/map/geotools/grid/PointGridStrategy.java +++ b/core/src/main/java/org/mapfish/print/map/geotools/grid/PointGridStrategy.java @@ -1,7 +1,7 @@ package org.mapfish.print.map.geotools.grid; +import jakarta.annotation.Nonnull; import java.awt.geom.AffineTransform; -import javax.annotation.Nonnull; import org.geotools.api.data.FeatureSource; import org.geotools.api.feature.simple.SimpleFeatureType; import org.geotools.api.referencing.crs.CoordinateReferenceSystem; diff --git a/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java b/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java index 2f86853c5a..0d3d805b9e 100644 --- a/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java +++ b/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java @@ -4,6 +4,7 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Timer; +import jakarta.annotation.Nonnull; import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.image.BufferedImage; @@ -13,7 +14,6 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutorService; -import javax.annotation.Nonnull; import javax.imageio.ImageIO; import org.apache.commons.io.IOUtils; import org.geotools.api.style.Style; diff --git a/core/src/main/java/org/mapfish/print/map/image/ImageLayer.java b/core/src/main/java/org/mapfish/print/map/image/ImageLayer.java index 6aa5cba302..1c3b3d7685 100644 --- a/core/src/main/java/org/mapfish/print/map/image/ImageLayer.java +++ b/core/src/main/java/org/mapfish/print/map/image/ImageLayer.java @@ -3,6 +3,7 @@ import static java.awt.image.BufferedImage.TYPE_INT_ARGB_PRE; import com.codahale.metrics.MetricRegistry; +import jakarta.annotation.Nonnull; import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.RenderingHints; @@ -15,7 +16,6 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.ForkJoinPool; -import javax.annotation.Nonnull; import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import org.geotools.api.style.Style; import org.geotools.coverage.CoverageFactoryFinder; diff --git a/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayer.java b/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayer.java index e94e1875b6..3326269a84 100644 --- a/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayer.java +++ b/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayer.java @@ -1,12 +1,12 @@ package org.mapfish.print.map.image.wms; import com.codahale.metrics.MetricRegistry; +import jakarta.annotation.Nonnull; import java.awt.Rectangle; import java.awt.image.BufferedImage; import java.io.IOException; import java.net.URI; import java.util.concurrent.ExecutorService; -import javax.annotation.Nonnull; import org.geotools.coverage.grid.GridCoverage2D; import org.geotools.geometry.jts.ReferencedEnvelope; import org.mapfish.print.attribute.map.MapfishMapContext; diff --git a/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayerFactoryPlugin.java b/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayerFactoryPlugin.java index 2a1cccbee9..2de3429774 100644 --- a/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayerFactoryPlugin.java +++ b/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayerFactoryPlugin.java @@ -1,10 +1,10 @@ package org.mapfish.print.map.image.wms; import com.codahale.metrics.MetricRegistry; +import jakarta.annotation.Nonnull; import java.util.Collections; import java.util.Set; import java.util.concurrent.ForkJoinPool; -import javax.annotation.Nonnull; import org.geotools.coverage.grid.GridCoverage2D; import org.mapfish.print.config.Template; import org.mapfish.print.map.MapLayerFactoryPlugin; diff --git a/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java b/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java index 933d67d29c..a3b8536e64 100644 --- a/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java +++ b/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java @@ -200,34 +200,33 @@ private static void setDpiValue(final Multimap extraParams, fina public static ClientHttpRequest createWmsRequest( final MfClientHttpRequestFactory httpRequestFactory, final URI uri, final HttpMethod method) throws IOException { - switch (method) { - case GET: - return httpRequestFactory.createRequest(uri, method); - case POST: - final String params = uri.getQuery(); - final URI paramlessUri; - try { - paramlessUri = - new URI( - uri.getScheme(), - uri.getUserInfo(), - uri.getHost(), - uri.getPort(), - uri.getPath(), - null, - null); - } catch (URISyntaxException e) { - throw new RuntimeException(e); - } - final ClientHttpRequest request = httpRequestFactory.createRequest(paramlessUri, method); - final byte[] encodedParams = params.getBytes(StandardCharsets.UTF_8); - request.getHeaders().set("Content-Type", "application/x-www-form-urlencoded"); - request.getHeaders().set("Charset", "utf-8"); - request.getHeaders().set("Content-Length", Integer.toString(encodedParams.length)); - request.getBody().write(encodedParams); - return request; - default: - throw new RuntimeException("Unsupported WMS request method: " + method); + if (method == HttpMethod.GET) { + return httpRequestFactory.createRequest(uri, method); + } else if (method == HttpMethod.POST) { + final String params = uri.getQuery(); + final URI paramlessUri; + try { + paramlessUri = + new URI( + uri.getScheme(), + uri.getUserInfo(), + uri.getHost(), + uri.getPort(), + uri.getPath(), + null, + null); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + final ClientHttpRequest request = httpRequestFactory.createRequest(paramlessUri, method); + final byte[] encodedParams = params.getBytes(StandardCharsets.UTF_8); + request.getHeaders().set("Content-Type", "application/x-www-form-urlencoded"); + request.getHeaders().set("Charset", "utf-8"); + request.getHeaders().set("Content-Length", Integer.toString(encodedParams.length)); + request.getBody().write(encodedParams); + return request; + } else { + throw new RuntimeException("Unsupported WMS request method: " + method); } } } diff --git a/core/src/main/java/org/mapfish/print/map/style/SLDParserPlugin.java b/core/src/main/java/org/mapfish/print/map/style/SLDParserPlugin.java index a8f9fa4564..ad61720842 100644 --- a/core/src/main/java/org/mapfish/print/map/style/SLDParserPlugin.java +++ b/core/src/main/java/org/mapfish/print/map/style/SLDParserPlugin.java @@ -1,5 +1,7 @@ package org.mapfish.print.map.style; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.io.ByteArrayInputStream; import java.io.IOException; import java.net.URI; @@ -8,8 +10,6 @@ import java.nio.charset.Charset; import java.util.Optional; import java.util.function.Function; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; diff --git a/core/src/main/java/org/mapfish/print/map/style/StyleParser.java b/core/src/main/java/org/mapfish/print/map/style/StyleParser.java index 36b827a0df..2f54c401e0 100644 --- a/core/src/main/java/org/mapfish/print/map/style/StyleParser.java +++ b/core/src/main/java/org/mapfish/print/map/style/StyleParser.java @@ -1,9 +1,9 @@ package org.mapfish.print.map.style; +import jakarta.annotation.Nonnull; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import javax.annotation.Nonnull; import org.geotools.api.style.Style; import org.geotools.api.style.StyleFactory; import org.geotools.api.style.StyledLayerDescriptor; diff --git a/core/src/main/java/org/mapfish/print/map/style/StyleParserPlugin.java b/core/src/main/java/org/mapfish/print/map/style/StyleParserPlugin.java index 5c3c9c4408..0c6ceeacb1 100644 --- a/core/src/main/java/org/mapfish/print/map/style/StyleParserPlugin.java +++ b/core/src/main/java/org/mapfish/print/map/style/StyleParserPlugin.java @@ -1,8 +1,8 @@ package org.mapfish.print.map.style; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.Optional; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.geotools.api.style.Style; import org.mapfish.print.config.Configuration; import org.springframework.http.client.ClientHttpRequestFactory; diff --git a/core/src/main/java/org/mapfish/print/map/style/json/JsonStyleParserHelper.java b/core/src/main/java/org/mapfish/print/map/style/json/JsonStyleParserHelper.java index db552d0eeb..ac09ebcc58 100644 --- a/core/src/main/java/org/mapfish/print/map/style/json/JsonStyleParserHelper.java +++ b/core/src/main/java/org/mapfish/print/map/style/json/JsonStyleParserHelper.java @@ -4,6 +4,8 @@ import static org.springframework.http.HttpMethod.HEAD; import com.google.common.annotations.VisibleForTesting; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.awt.Color; import java.io.File; import java.io.IOException; @@ -19,8 +21,6 @@ import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.imageio.ImageIO; import org.apache.commons.lang3.StringUtils; import org.geotools.api.filter.expression.Expression; diff --git a/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion1.java b/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion1.java index 94d65cb81a..683aa9173f 100644 --- a/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion1.java +++ b/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion1.java @@ -1,11 +1,11 @@ package org.mapfish.print.map.style.json; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.List; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.apache.commons.lang3.StringUtils; import org.geotools.api.filter.Filter; import org.geotools.api.filter.expression.Expression; diff --git a/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2.java b/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2.java index 9bb543ec87..e6b36abc4e 100644 --- a/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2.java +++ b/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2.java @@ -1,6 +1,8 @@ package org.mapfish.print.map.style.json; import com.google.common.annotations.VisibleForTesting; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -8,8 +10,6 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.geotools.api.filter.Filter; import org.geotools.api.style.Rule; import org.geotools.api.style.Style; diff --git a/core/src/main/java/org/mapfish/print/map/style/json/MapfishStyleParserPlugin.java b/core/src/main/java/org/mapfish/print/map/style/json/MapfishStyleParserPlugin.java index b3e868ba23..0bb605bb8b 100644 --- a/core/src/main/java/org/mapfish/print/map/style/json/MapfishStyleParserPlugin.java +++ b/core/src/main/java/org/mapfish/print/map/style/json/MapfishStyleParserPlugin.java @@ -2,9 +2,9 @@ import static org.mapfish.print.map.style.json.MapfishJsonStyleVersion1.DEFAULT_GEOM_ATT_NAME; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.Optional; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.geotools.api.style.Style; import org.geotools.styling.StyleBuilder; import org.json.JSONObject; diff --git a/core/src/main/java/org/mapfish/print/map/tiled/AbstractTiledLayer.java b/core/src/main/java/org/mapfish/print/map/tiled/AbstractTiledLayer.java index e4c4bed513..8ca1c75717 100644 --- a/core/src/main/java/org/mapfish/print/map/tiled/AbstractTiledLayer.java +++ b/core/src/main/java/org/mapfish/print/map/tiled/AbstractTiledLayer.java @@ -1,12 +1,12 @@ package org.mapfish.print.map.tiled; import com.codahale.metrics.MetricRegistry; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.awt.Rectangle; import java.util.Collections; import java.util.List; import java.util.concurrent.ForkJoinPool; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.geotools.coverage.grid.GridCoverage2D; import org.geotools.map.GridCoverageLayer; import org.geotools.map.Layer; diff --git a/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java b/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java index 8ac3a5eb46..ad1d209fed 100644 --- a/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java +++ b/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java @@ -2,6 +2,7 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Timer; +import jakarta.annotation.Nonnull; import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.image.BufferedImage; @@ -11,7 +12,6 @@ import java.nio.charset.StandardCharsets; import java.util.concurrent.Callable; import java.util.concurrent.RecursiveTask; -import javax.annotation.Nonnull; import javax.imageio.ImageIO; import org.apache.commons.io.IOUtils; import org.geotools.coverage.CoverageFactoryFinder; diff --git a/core/src/main/java/org/mapfish/print/map/tiled/TileInformation.java b/core/src/main/java/org/mapfish/print/map/tiled/TileInformation.java index 26c6612e72..337155e83c 100644 --- a/core/src/main/java/org/mapfish/print/map/tiled/TileInformation.java +++ b/core/src/main/java/org/mapfish/print/map/tiled/TileInformation.java @@ -1,12 +1,12 @@ package org.mapfish.print.map.tiled; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.awt.Dimension; import java.awt.Rectangle; import java.awt.image.BufferedImage; import java.io.UnsupportedEncodingException; import java.net.URISyntaxException; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.geotools.geometry.jts.ReferencedEnvelope; import org.locationtech.jts.geom.Coordinate; import org.mapfish.print.attribute.map.MapBounds; diff --git a/core/src/main/java/org/mapfish/print/map/tiled/TilePreparationTask.java b/core/src/main/java/org/mapfish/print/map/tiled/TilePreparationTask.java index 9598c551f5..7532227bb8 100644 --- a/core/src/main/java/org/mapfish/print/map/tiled/TilePreparationTask.java +++ b/core/src/main/java/org/mapfish/print/map/tiled/TilePreparationTask.java @@ -1,5 +1,6 @@ package org.mapfish.print.map.tiled; +import jakarta.annotation.Nonnull; import java.awt.Dimension; import java.awt.Rectangle; import java.awt.geom.AffineTransform; @@ -7,7 +8,6 @@ import java.util.List; import java.util.Optional; import java.util.concurrent.Callable; -import javax.annotation.Nonnull; import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import org.geotools.api.referencing.operation.MathTransform; import org.geotools.api.referencing.operation.TransformException; diff --git a/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayer.java b/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayer.java index 9fa4c3eed3..02d4ea2baa 100644 --- a/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayer.java +++ b/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayer.java @@ -1,13 +1,13 @@ package org.mapfish.print.map.tiled.osm; import com.codahale.metrics.MetricRegistry; +import jakarta.annotation.Nonnull; import java.awt.Dimension; import java.awt.Rectangle; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.util.concurrent.ForkJoinPool; -import javax.annotation.Nonnull; import org.geotools.coverage.grid.GridCoverage2D; import org.geotools.geometry.jts.ReferencedEnvelope; import org.mapfish.print.URIUtils; diff --git a/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayerParserPlugin.java b/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayerParserPlugin.java index f2261c4443..f32eaef71c 100644 --- a/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayerParserPlugin.java +++ b/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayerParserPlugin.java @@ -1,10 +1,10 @@ package org.mapfish.print.map.tiled.osm; import com.codahale.metrics.MetricRegistry; +import jakarta.annotation.Nonnull; import java.util.Collections; import java.util.Set; import java.util.concurrent.ForkJoinPool; -import javax.annotation.Nonnull; import org.geotools.coverage.grid.GridCoverage2D; import org.mapfish.print.config.Template; import org.mapfish.print.map.MapLayerFactoryPlugin; diff --git a/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayer.java b/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayer.java index 34f7076b45..ac88c2d371 100644 --- a/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayer.java +++ b/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayer.java @@ -1,13 +1,13 @@ package org.mapfish.print.map.tiled.wms; import com.codahale.metrics.MetricRegistry; +import jakarta.annotation.Nonnull; import java.awt.Dimension; import java.awt.Rectangle; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.util.concurrent.ForkJoinPool; -import javax.annotation.Nonnull; import org.geotools.api.referencing.FactoryException; import org.geotools.coverage.grid.GridCoverage2D; import org.geotools.geometry.jts.ReferencedEnvelope; diff --git a/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayerParserPlugin.java b/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayerParserPlugin.java index 1f3a51279a..8daee4965f 100644 --- a/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayerParserPlugin.java +++ b/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayerParserPlugin.java @@ -1,10 +1,10 @@ package org.mapfish.print.map.tiled.wms; import com.codahale.metrics.MetricRegistry; +import jakarta.annotation.Nonnull; import java.util.Collections; import java.util.Set; import java.util.concurrent.ForkJoinPool; -import javax.annotation.Nonnull; import org.geotools.coverage.grid.GridCoverage2D; import org.mapfish.print.config.Template; import org.mapfish.print.map.MapLayerFactoryPlugin; diff --git a/core/src/main/java/org/mapfish/print/map/tiled/wmts/WMTSLayer.java b/core/src/main/java/org/mapfish/print/map/tiled/wmts/WMTSLayer.java index 774c565219..b155c8171d 100644 --- a/core/src/main/java/org/mapfish/print/map/tiled/wmts/WMTSLayer.java +++ b/core/src/main/java/org/mapfish/print/map/tiled/wmts/WMTSLayer.java @@ -4,14 +4,14 @@ import com.codahale.metrics.MetricRegistry; import com.google.common.annotations.VisibleForTesting; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.awt.Dimension; import java.awt.Rectangle; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.util.concurrent.ForkJoinPool; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.geotools.coverage.grid.GridCoverage2D; import org.geotools.geometry.jts.ReferencedEnvelope; import org.mapfish.print.attribute.map.MapBounds; diff --git a/core/src/main/java/org/mapfish/print/map/tiled/wmts/WmtsLayerParserPlugin.java b/core/src/main/java/org/mapfish/print/map/tiled/wmts/WmtsLayerParserPlugin.java index 8209d0bb08..9b5f3dca0a 100644 --- a/core/src/main/java/org/mapfish/print/map/tiled/wmts/WmtsLayerParserPlugin.java +++ b/core/src/main/java/org/mapfish/print/map/tiled/wmts/WmtsLayerParserPlugin.java @@ -1,10 +1,10 @@ package org.mapfish.print.map.tiled.wmts; import com.codahale.metrics.MetricRegistry; +import jakarta.annotation.Nonnull; import java.util.Collections; import java.util.Set; import java.util.concurrent.ForkJoinPool; -import javax.annotation.Nonnull; import org.geotools.coverage.grid.GridCoverage2D; import org.mapfish.print.config.Template; import org.mapfish.print.map.MapLayerFactoryPlugin; diff --git a/core/src/main/java/org/mapfish/print/metrics/HealthCheckRegistryContextListener.java b/core/src/main/java/org/mapfish/print/metrics/HealthCheckRegistryContextListener.java index c81f193ade..6fed2a2494 100644 --- a/core/src/main/java/org/mapfish/print/metrics/HealthCheckRegistryContextListener.java +++ b/core/src/main/java/org/mapfish/print/metrics/HealthCheckRegistryContextListener.java @@ -4,8 +4,8 @@ import com.codahale.metrics.health.HealthCheckRegistry; import com.codahale.metrics.servlets.HealthCheckServlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; import org.springframework.web.context.WebApplicationContext; /** @@ -15,13 +15,12 @@ public class HealthCheckRegistryContextListener extends HealthCheckServlet.ContextListener { private ServletContext servletContext; - @Override public final void contextInitialized(final ServletContextEvent event) { this.servletContext = event.getServletContext(); - super.contextInitialized(event); + // super.contextInitialized(event); // Problème de signature Jakarta/Servlet, workaround + // temporaire } - @Override protected final HealthCheckRegistry getHealthCheckRegistry() { final WebApplicationContext webApplicationContext = getWebApplicationContext(this.servletContext); diff --git a/core/src/main/java/org/mapfish/print/metrics/HealthCheckingRegistry.java b/core/src/main/java/org/mapfish/print/metrics/HealthCheckingRegistry.java index ed5ac7b1e2..4a43550e7c 100644 --- a/core/src/main/java/org/mapfish/print/metrics/HealthCheckingRegistry.java +++ b/core/src/main/java/org/mapfish/print/metrics/HealthCheckingRegistry.java @@ -1,7 +1,7 @@ package org.mapfish.print.metrics; import com.codahale.metrics.health.jvm.ThreadDeadlockHealthCheck; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; public class HealthCheckingRegistry extends com.codahale.metrics.health.HealthCheckRegistry { diff --git a/core/src/main/java/org/mapfish/print/metrics/JmxMetricsReporter.java b/core/src/main/java/org/mapfish/print/metrics/JmxMetricsReporter.java index 6118faff2d..c320ea18de 100644 --- a/core/src/main/java/org/mapfish/print/metrics/JmxMetricsReporter.java +++ b/core/src/main/java/org/mapfish/print/metrics/JmxMetricsReporter.java @@ -2,8 +2,8 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.jmx.JmxReporter; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import org.springframework.beans.factory.annotation.Autowired; /** This bean will enable JMX reporting when added to application context. */ diff --git a/core/src/main/java/org/mapfish/print/metrics/JvmMetricsConfigurator.java b/core/src/main/java/org/mapfish/print/metrics/JvmMetricsConfigurator.java index 673af87a61..37add71ce1 100644 --- a/core/src/main/java/org/mapfish/print/metrics/JvmMetricsConfigurator.java +++ b/core/src/main/java/org/mapfish/print/metrics/JvmMetricsConfigurator.java @@ -5,7 +5,7 @@ import com.codahale.metrics.jvm.GarbageCollectorMetricSet; import com.codahale.metrics.jvm.MemoryUsageGaugeSet; import com.codahale.metrics.jvm.ThreadStatesGaugeSet; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; /** A bean that will add several gauges and metric sets for tracking the JVM stats. */ diff --git a/core/src/main/java/org/mapfish/print/metrics/LoggingMetricsConfigurator.java b/core/src/main/java/org/mapfish/print/metrics/LoggingMetricsConfigurator.java index c38992288e..178729b6c1 100644 --- a/core/src/main/java/org/mapfish/print/metrics/LoggingMetricsConfigurator.java +++ b/core/src/main/java/org/mapfish/print/metrics/LoggingMetricsConfigurator.java @@ -4,7 +4,7 @@ import ch.qos.logback.classic.LoggerContext; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.logback.InstrumentedAppender; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java b/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java index 6aebdf4ae4..0fddcb4a30 100644 --- a/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java +++ b/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java @@ -4,8 +4,8 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.servlet.InstrumentedFilterContextListener; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; import org.springframework.web.context.WebApplicationContext; /** @@ -16,16 +16,15 @@ public class MapfishPrintInstrumentedFilterContextListener extends InstrumentedFilterContextListener { private ServletContext servletContext; - @Override protected final MetricRegistry getMetricRegistry() { final WebApplicationContext webApplicationContext = getWebApplicationContext(this.servletContext); return webApplicationContext.getBean(MetricRegistry.class); } - @Override public final void contextInitialized(final ServletContextEvent event) { this.servletContext = event.getServletContext(); - super.contextInitialized(event); + // super.contextInitialized(event); // Problème de signature Jakarta/Servlet, workaround + // temporaire } } diff --git a/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java b/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java index b53e87ac23..9faaba41c3 100644 --- a/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java +++ b/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java @@ -4,8 +4,8 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.servlets.MetricsServlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; import org.springframework.web.context.WebApplicationContext; /** @@ -15,13 +15,12 @@ public class MetricsRegistryContextListener extends MetricsServlet.ContextListener { private ServletContext servletContext; - @Override public final void contextInitialized(final ServletContextEvent event) { this.servletContext = event.getServletContext(); - super.contextInitialized(event); + // super.contextInitialized(event); // Problème de signature Jakarta/Servlet, workaround + // temporaire } - @Override protected final MetricRegistry getMetricRegistry() { final WebApplicationContext webApplicationContext = getWebApplicationContext(this.servletContext); diff --git a/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java b/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java index aad768042e..411a4e01f9 100644 --- a/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java +++ b/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java @@ -1,6 +1,7 @@ package org.mapfish.print.output; import com.google.common.annotations.VisibleForTesting; +import jakarta.annotation.Nonnull; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -21,8 +22,6 @@ import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ForkJoinTask; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -435,7 +434,7 @@ public static final class Print { @Nonnull public final JasperPrint print; /** The print DPI. */ - @Nonnegative public final double dpi; + public final double dpi; /** The execution context for the print job. */ @Nonnull public final Processor.ExecutionContext executionContext; @@ -450,7 +449,7 @@ private Print( @Nonnull final JasperReportsContext context, @Nonnull final JasperPrint print, @Nonnull final Values values, - @Nonnegative final double dpi, + final double dpi, @Nonnull final Processor.ExecutionContext executionContext) { this.print = print; this.context = context; diff --git a/core/src/main/java/org/mapfish/print/output/MapExportOutputFormat.java b/core/src/main/java/org/mapfish/print/output/MapExportOutputFormat.java index 07113e7df0..2aa8567a1c 100644 --- a/core/src/main/java/org/mapfish/print/output/MapExportOutputFormat.java +++ b/core/src/main/java/org/mapfish/print/output/MapExportOutputFormat.java @@ -1,5 +1,6 @@ package org.mapfish.print.output; +import jakarta.annotation.Nonnull; import java.io.File; import java.io.FileInputStream; import java.io.OutputStream; @@ -10,7 +11,6 @@ import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ForkJoinTask; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.Nonnull; import org.apache.commons.io.IOUtils; import org.mapfish.print.Constants; import org.mapfish.print.config.Configuration; diff --git a/core/src/main/java/org/mapfish/print/output/MapfishPrintRepositoryService.java b/core/src/main/java/org/mapfish/print/output/MapfishPrintRepositoryService.java index d4b6a6c2ce..87cd096796 100644 --- a/core/src/main/java/org/mapfish/print/output/MapfishPrintRepositoryService.java +++ b/core/src/main/java/org/mapfish/print/output/MapfishPrintRepositoryService.java @@ -1,12 +1,12 @@ package org.mapfish.print.output; +import jakarta.annotation.Nonnull; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.URI; import java.net.URISyntaxException; -import javax.annotation.Nonnull; import net.sf.jasperreports.engine.DefaultJasperReportsContext; import net.sf.jasperreports.engine.JasperReportsContext; import net.sf.jasperreports.repo.FileRepositoryService; diff --git a/core/src/main/java/org/mapfish/print/output/OutputFormat.java b/core/src/main/java/org/mapfish/print/output/OutputFormat.java index 7c10c87ac6..32cafe5321 100644 --- a/core/src/main/java/org/mapfish/print/output/OutputFormat.java +++ b/core/src/main/java/org/mapfish/print/output/OutputFormat.java @@ -1,9 +1,9 @@ package org.mapfish.print.output; +import jakarta.annotation.Nonnull; import java.io.File; import java.io.OutputStream; import java.util.Map; -import javax.annotation.Nonnull; import org.mapfish.print.config.Configuration; import org.mapfish.print.processor.Processor; import org.mapfish.print.wrapper.json.PJsonObject; diff --git a/core/src/main/java/org/mapfish/print/output/Values.java b/core/src/main/java/org/mapfish/print/output/Values.java index 2542b796ed..1870f6954b 100644 --- a/core/src/main/java/org/mapfish/print/output/Values.java +++ b/core/src/main/java/org/mapfish/print/output/Values.java @@ -2,6 +2,8 @@ import static org.mapfish.print.servlet.MapPrinterServlet.JSON_REQUEST_HEADERS; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.io.File; import java.util.ArrayList; import java.util.HashMap; @@ -12,8 +14,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.locationtech.jts.util.Assert; import org.mapfish.print.ExtraPropertyException; import org.mapfish.print.attribute.Attribute; diff --git a/core/src/main/java/org/mapfish/print/parser/OneOfTracker.java b/core/src/main/java/org/mapfish/print/parser/OneOfTracker.java index b2292c279b..2ade237812 100644 --- a/core/src/main/java/org/mapfish/print/parser/OneOfTracker.java +++ b/core/src/main/java/org/mapfish/print/parser/OneOfTracker.java @@ -1,6 +1,7 @@ package org.mapfish.print.parser; import com.google.common.collect.Collections2; +import jakarta.annotation.Nonnull; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collection; @@ -8,7 +9,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; import org.locationtech.jts.util.Assert; /** Keeps track of which OneOf groups there are and which ones are satisfied. */ diff --git a/core/src/main/java/org/mapfish/print/parser/ParserUtils.java b/core/src/main/java/org/mapfish/print/parser/ParserUtils.java index 7fc7a7d833..b96ac57384 100644 --- a/core/src/main/java/org/mapfish/print/parser/ParserUtils.java +++ b/core/src/main/java/org/mapfish/print/parser/ParserUtils.java @@ -1,5 +1,6 @@ package org.mapfish.print.parser; +import jakarta.annotation.Nullable; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Arrays; @@ -9,7 +10,6 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.annotation.Nullable; /** Utility method for getting and setting parameters on Processor Input and Output objects. */ public final class ParserUtils { diff --git a/core/src/main/java/org/mapfish/print/processor/AbstractProcessor.java b/core/src/main/java/org/mapfish/print/processor/AbstractProcessor.java index b469e3a623..c7bcc4448a 100644 --- a/core/src/main/java/org/mapfish/print/processor/AbstractProcessor.java +++ b/core/src/main/java/org/mapfish/print/processor/AbstractProcessor.java @@ -2,6 +2,7 @@ import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; +import jakarta.annotation.Nonnull; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -11,7 +12,6 @@ import java.util.concurrent.CancellationException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; -import javax.annotation.Nonnull; import org.mapfish.print.config.Configuration; import org.mapfish.print.config.ConfigurationException; import org.mapfish.print.parser.ParserUtils; @@ -51,7 +51,7 @@ public final Class getOutputType() { } @Override - @Nonnull + @jakarta.annotation.Nullable public final BiMap getInputMapperBiMap() { return this.inputMapper; } @@ -124,6 +124,7 @@ public final void setInputMapper(@Nonnull final Map inputMapper) @Nonnull @Override + @jakarta.annotation.Nullable public final BiMap getOutputMapperBiMap() { return this.outputMapper; } diff --git a/core/src/main/java/org/mapfish/print/processor/CustomDependencies.java b/core/src/main/java/org/mapfish/print/processor/CustomDependencies.java index f31b83694e..38104f53f1 100644 --- a/core/src/main/java/org/mapfish/print/processor/CustomDependencies.java +++ b/core/src/main/java/org/mapfish/print/processor/CustomDependencies.java @@ -1,7 +1,7 @@ package org.mapfish.print.processor; +import jakarta.annotation.Nonnull; import java.util.Collection; -import javax.annotation.Nonnull; /** * Classes that implement this interface indicate what she dynamically depends on, for the "values" diff --git a/core/src/main/java/org/mapfish/print/processor/PdfConfigurationProcessor.java b/core/src/main/java/org/mapfish/print/processor/PdfConfigurationProcessor.java index eb8f5b9ff5..9f7e23d658 100644 --- a/core/src/main/java/org/mapfish/print/processor/PdfConfigurationProcessor.java +++ b/core/src/main/java/org/mapfish/print/processor/PdfConfigurationProcessor.java @@ -1,5 +1,6 @@ package org.mapfish.print.processor; +import jakarta.annotation.Nullable; import java.beans.PropertyDescriptor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -9,7 +10,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; import org.mapfish.print.config.Configuration; import org.mapfish.print.config.ConfigurationException; import org.mapfish.print.config.ConfigurationObject; diff --git a/core/src/main/java/org/mapfish/print/processor/Processor.java b/core/src/main/java/org/mapfish/print/processor/Processor.java index ce28a81b74..114acf8d7c 100644 --- a/core/src/main/java/org/mapfish/print/processor/Processor.java +++ b/core/src/main/java/org/mapfish/print/processor/Processor.java @@ -1,10 +1,10 @@ package org.mapfish.print.processor; import com.google.common.collect.BiMap; +import jakarta.annotation.Nullable; import java.util.Map; import java.util.concurrent.Callable; import java.util.function.Supplier; -import javax.annotation.Nullable; import org.mapfish.print.config.ConfigurationObject; /** diff --git a/core/src/main/java/org/mapfish/print/processor/ProcessorDependencyGraph.java b/core/src/main/java/org/mapfish/print/processor/ProcessorDependencyGraph.java index dbbf465a05..79ca80bdd7 100644 --- a/core/src/main/java/org/mapfish/print/processor/ProcessorDependencyGraph.java +++ b/core/src/main/java/org/mapfish/print/processor/ProcessorDependencyGraph.java @@ -6,6 +6,7 @@ import com.google.common.collect.BiMap; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import jakarta.annotation.Nonnull; import java.util.ArrayList; import java.util.Collection; import java.util.IdentityHashMap; @@ -13,7 +14,6 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.RecursiveTask; -import javax.annotation.Nonnull; import org.mapfish.print.output.Values; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/mapfish/print/processor/ProcessorGraphNode.java b/core/src/main/java/org/mapfish/print/processor/ProcessorGraphNode.java index a13fe11fbd..d4b14a3ef0 100644 --- a/core/src/main/java/org/mapfish/print/processor/ProcessorGraphNode.java +++ b/core/src/main/java/org/mapfish/print/processor/ProcessorGraphNode.java @@ -4,6 +4,7 @@ import com.codahale.metrics.Timer; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; +import jakarta.annotation.Nonnull; import java.util.HashSet; import java.util.IdentityHashMap; import java.util.Objects; @@ -11,7 +12,6 @@ import java.util.Set; import java.util.concurrent.RecursiveTask; import java.util.concurrent.TimeUnit; -import javax.annotation.Nonnull; import org.locationtech.jts.util.Assert; import org.mapfish.print.PrintException; import org.mapfish.print.output.Values; diff --git a/core/src/main/java/org/mapfish/print/processor/ProcessorUtils.java b/core/src/main/java/org/mapfish/print/processor/ProcessorUtils.java index 211deb93a3..6c8b73e98b 100644 --- a/core/src/main/java/org/mapfish/print/processor/ProcessorUtils.java +++ b/core/src/main/java/org/mapfish/print/processor/ProcessorUtils.java @@ -3,14 +3,14 @@ import static org.mapfish.print.parser.ParserUtils.getAllAttributes; import com.google.common.collect.BiMap; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.lang.reflect.Field; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Map; import java.util.NoSuchElementException; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.apache.commons.lang3.StringUtils; import org.mapfish.print.PrintException; import org.mapfish.print.output.Values; diff --git a/core/src/main/java/org/mapfish/print/processor/http/AbstractClientHttpRequestFactoryProcessor.java b/core/src/main/java/org/mapfish/print/processor/http/AbstractClientHttpRequestFactoryProcessor.java index c265df5c2c..188d8aaccd 100644 --- a/core/src/main/java/org/mapfish/print/processor/http/AbstractClientHttpRequestFactoryProcessor.java +++ b/core/src/main/java/org/mapfish/print/processor/http/AbstractClientHttpRequestFactoryProcessor.java @@ -1,7 +1,7 @@ package org.mapfish.print.processor.http; +import jakarta.annotation.Nullable; import java.util.List; -import javax.annotation.Nullable; import org.mapfish.print.config.Configuration; import org.mapfish.print.processor.AbstractProcessor; import org.mapfish.print.processor.http.matcher.URIMatcher; diff --git a/core/src/main/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessor.java b/core/src/main/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessor.java index 22c2e115a7..1be97ad7b7 100644 --- a/core/src/main/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessor.java +++ b/core/src/main/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessor.java @@ -1,8 +1,8 @@ package org.mapfish.print.processor.http; +import jakarta.annotation.Nullable; import java.util.ArrayList; import java.util.List; -import javax.annotation.Nullable; import org.mapfish.print.config.Configuration; import org.mapfish.print.http.MfClientHttpRequestFactory; import org.mapfish.print.output.Values; diff --git a/core/src/main/java/org/mapfish/print/processor/http/ForwardHeadersProcessor.java b/core/src/main/java/org/mapfish/print/processor/http/ForwardHeadersProcessor.java index e46d85fd11..52fb3090ae 100644 --- a/core/src/main/java/org/mapfish/print/processor/http/ForwardHeadersProcessor.java +++ b/core/src/main/java/org/mapfish/print/processor/http/ForwardHeadersProcessor.java @@ -1,11 +1,11 @@ package org.mapfish.print.processor.http; +import jakarta.annotation.Nullable; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; import org.mapfish.print.attribute.HttpRequestHeadersAttribute; import org.mapfish.print.config.Configuration; import org.mapfish.print.http.MfClientHttpRequestFactory; diff --git a/core/src/main/java/org/mapfish/print/processor/http/matcher/InetHostMatcher.java b/core/src/main/java/org/mapfish/print/processor/http/matcher/InetHostMatcher.java index 15572ac501..252f170bbb 100644 --- a/core/src/main/java/org/mapfish/print/processor/http/matcher/InetHostMatcher.java +++ b/core/src/main/java/org/mapfish/print/processor/http/matcher/InetHostMatcher.java @@ -1,5 +1,6 @@ package org.mapfish.print.processor.http.matcher; +import jakarta.annotation.Nullable; import java.net.Inet4Address; import java.net.InetAddress; import java.net.SocketException; @@ -7,7 +8,6 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; -import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/DataSourceProcessor.java b/core/src/main/java/org/mapfish/print/processor/jasper/DataSourceProcessor.java index 60042ca1bb..efdaef2ceb 100644 --- a/core/src/main/java/org/mapfish/print/processor/jasper/DataSourceProcessor.java +++ b/core/src/main/java/org/mapfish/print/processor/jasper/DataSourceProcessor.java @@ -2,6 +2,9 @@ import static org.mapfish.print.attribute.DataSourceAttribute.DataSourceAttributeValue; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.annotation.PostConstruct; import java.io.File; import java.util.ArrayList; import java.util.Collection; @@ -11,9 +14,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ForkJoinTask; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.annotation.PostConstruct; import net.sf.jasperreports.engine.JRDataSource; import net.sf.jasperreports.engine.JREmptyDataSource; import net.sf.jasperreports.engine.JRException; diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/DateFormatProcessor.java b/core/src/main/java/org/mapfish/print/processor/jasper/DateFormatProcessor.java index 26486c355b..a015bcbcbe 100644 --- a/core/src/main/java/org/mapfish/print/processor/jasper/DateFormatProcessor.java +++ b/core/src/main/java/org/mapfish/print/processor/jasper/DateFormatProcessor.java @@ -1,11 +1,11 @@ package org.mapfish.print.processor.jasper; +import jakarta.annotation.Nullable; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.List; import java.util.Locale; import java.util.TimeZone; -import javax.annotation.Nullable; import org.mapfish.print.config.Configuration; import org.mapfish.print.config.ConfigurationException; import org.mapfish.print.parser.HasDefaultValue; diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java b/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java index 8ff512b78a..63876da331 100644 --- a/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java +++ b/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java @@ -3,6 +3,7 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Timer; import com.google.common.annotations.VisibleForTesting; +import jakarta.annotation.Resource; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; @@ -20,7 +21,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.Future; -import javax.annotation.Resource; import javax.imageio.ImageIO; import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.data.JRTableModelDataSource; diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessor.java b/core/src/main/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessor.java index 8449c96bf4..ebb80f13a6 100644 --- a/core/src/main/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessor.java +++ b/core/src/main/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessor.java @@ -1,13 +1,13 @@ package org.mapfish.print.processor.jasper; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import net.sf.jasperreports.engine.JRDataSource; import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.data.JRMapCollectionDataSource; diff --git a/core/src/main/java/org/mapfish/print/processor/map/AddStaticLayersProcessor.java b/core/src/main/java/org/mapfish/print/processor/map/AddStaticLayersProcessor.java index 77896be696..3f0e465e5a 100644 --- a/core/src/main/java/org/mapfish/print/processor/map/AddStaticLayersProcessor.java +++ b/core/src/main/java/org/mapfish/print/processor/map/AddStaticLayersProcessor.java @@ -1,8 +1,8 @@ package org.mapfish.print.processor.map; +import jakarta.annotation.Nullable; import java.util.Arrays; import java.util.List; -import javax.annotation.Nullable; import org.mapfish.print.attribute.map.GenericMapAttribute.GenericMapAttributeValues; import org.mapfish.print.attribute.map.StaticLayersAttribute; import org.mapfish.print.config.Configuration; diff --git a/core/src/main/java/org/mapfish/print/processor/map/CreateMapPagesProcessor.java b/core/src/main/java/org/mapfish/print/processor/map/CreateMapPagesProcessor.java index 2205d06ed6..08aca9d399 100644 --- a/core/src/main/java/org/mapfish/print/processor/map/CreateMapPagesProcessor.java +++ b/core/src/main/java/org/mapfish/print/processor/map/CreateMapPagesProcessor.java @@ -2,13 +2,13 @@ import static org.mapfish.print.Constants.PDF_DPI; +import jakarta.annotation.Nonnull; import java.awt.Rectangle; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; import org.geotools.api.feature.simple.SimpleFeature; import org.geotools.api.feature.simple.SimpleFeatureType; import org.geotools.api.referencing.crs.CoordinateReferenceSystem; diff --git a/core/src/main/java/org/mapfish/print/processor/map/CreateMapProcessor.java b/core/src/main/java/org/mapfish/print/processor/map/CreateMapProcessor.java index 512a6d34fb..4d99fa046c 100644 --- a/core/src/main/java/org/mapfish/print/processor/map/CreateMapProcessor.java +++ b/core/src/main/java/org/mapfish/print/processor/map/CreateMapProcessor.java @@ -10,6 +10,9 @@ import com.lowagie.text.DocumentException; import com.lowagie.text.pdf.PdfContentByte; import com.lowagie.text.pdf.PdfWriter; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.annotation.Resource; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics; @@ -32,9 +35,6 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.ForkJoinPool; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.annotation.Resource; import javax.imageio.ImageIO; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java b/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java index 1675be4b09..4688a2a6a5 100644 --- a/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java +++ b/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java @@ -1,9 +1,9 @@ package org.mapfish.print.servlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.mapfish.print.PrintException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java b/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java index 3007ae8666..f910a01883 100644 --- a/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java +++ b/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java @@ -1,8 +1,8 @@ package org.mapfish.print.servlet; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URI; -import javax.servlet.http.HttpServletResponse; import org.mapfish.print.servlet.job.PrintJobStatus; import org.mapfish.print.servlet.job.loader.ReportLoader; import org.springframework.http.HttpStatus; diff --git a/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java b/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java index c6d4789701..1f06a2e648 100644 --- a/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java +++ b/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java @@ -1,5 +1,7 @@ package org.mapfish.print.servlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.net.URI; @@ -8,8 +10,6 @@ import java.util.Date; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; import org.mapfish.print.servlet.job.PrintJobStatus; import org.mapfish.print.servlet.job.loader.ReportLoader; import org.slf4j.Logger; diff --git a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java index 91501f6338..fb9dda3349 100644 --- a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java +++ b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java @@ -7,6 +7,10 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Timer; import io.sentry.Sentry; +import jakarta.annotation.Nonnull; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -29,10 +33,6 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.TimeUnit; -import javax.annotation.Nonnull; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import net.sf.jasperreports.engine.fonts.FontFamily; import net.sf.jasperreports.extensions.ExtensionsEnvironment; import org.apache.commons.io.FilenameUtils; @@ -1173,7 +1173,14 @@ private boolean checkReferer(final HttpServletRequest request, final MapPrinter referrer = "http://localhost/"; } try { - return allowedReferers.matches(new URI(referrer), HttpMethod.resolve(request.getMethod())); + // HttpMethod.resolve() n'existe plus, utiliser valueOf() avec gestion d'exception + HttpMethod method; + try { + method = HttpMethod.valueOf(request.getMethod()); + } catch (IllegalArgumentException ex) { + return false; + } + return allowedReferers.matches(new URI(referrer), method); } catch (SocketException | UnknownHostException | URISyntaxException diff --git a/core/src/main/java/org/mapfish/print/servlet/RequestSizeFilter.java b/core/src/main/java/org/mapfish/print/servlet/RequestSizeFilter.java index 22c9e0dd3a..79c9b90751 100644 --- a/core/src/main/java/org/mapfish/print/servlet/RequestSizeFilter.java +++ b/core/src/main/java/org/mapfish/print/servlet/RequestSizeFilter.java @@ -1,13 +1,13 @@ package org.mapfish.print.servlet; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; diff --git a/core/src/main/java/org/mapfish/print/servlet/ServletMapPrinterFactory.java b/core/src/main/java/org/mapfish/print/servlet/ServletMapPrinterFactory.java index 80ab86f0b0..c8802a7774 100644 --- a/core/src/main/java/org/mapfish/print/servlet/ServletMapPrinterFactory.java +++ b/core/src/main/java/org/mapfish/print/servlet/ServletMapPrinterFactory.java @@ -2,6 +2,9 @@ import static java.nio.file.Files.walk; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.annotation.PostConstruct; import java.io.File; import java.io.IOException; import java.net.URI; @@ -16,9 +19,6 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.annotation.PostConstruct; import org.apache.commons.lang3.StringUtils; import org.locationtech.jts.util.Assert; import org.mapfish.print.MapPrinter; diff --git a/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java b/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java index bba96e3c99..ec2c060329 100644 --- a/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java +++ b/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java @@ -1,8 +1,8 @@ package org.mapfish.print.servlet; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URI; -import javax.servlet.http.HttpServletResponse; import org.mapfish.print.servlet.job.PrintJobStatus; import org.mapfish.print.servlet.job.loader.ReportLoader; import org.springframework.http.HttpStatus; diff --git a/core/src/main/java/org/mapfish/print/servlet/fileloader/ConfigFileLoaderManager.java b/core/src/main/java/org/mapfish/print/servlet/fileloader/ConfigFileLoaderManager.java index 5a3dd13a00..a7ebabf2ce 100644 --- a/core/src/main/java/org/mapfish/print/servlet/fileloader/ConfigFileLoaderManager.java +++ b/core/src/main/java/org/mapfish/print/servlet/fileloader/ConfigFileLoaderManager.java @@ -2,6 +2,7 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import jakarta.annotation.PostConstruct; import java.io.File; import java.io.IOException; import java.net.URI; @@ -12,7 +13,6 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; /** Processes all {@link ConfigFileLoaderPlugin}s and loads the files. */ diff --git a/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java b/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java index ae51d4ab20..f1c8943266 100644 --- a/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java +++ b/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java @@ -1,10 +1,10 @@ package org.mapfish.print.servlet.fileloader; +import jakarta.servlet.ServletContext; import java.io.File; import java.net.URI; import java.util.Collections; import java.util.Iterator; -import javax.servlet.ServletContext; import org.springframework.beans.factory.annotation.Autowired; /** A plugin that loads the config resources from urls starting with prefix: {@value #PREFIX}://. */ diff --git a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java index 964c57754a..8975469351 100644 --- a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java +++ b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java @@ -1,6 +1,6 @@ package org.mapfish.print.servlet.job; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java b/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java index 7d2564736d..b7ff43ebff 100644 --- a/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java +++ b/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java @@ -2,6 +2,8 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Timer; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; @@ -14,8 +16,6 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.mail.Authenticator; import javax.mail.Message; import javax.mail.MessagingException; diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java index a7e03e4c2a..e43ebf6ed7 100644 --- a/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java +++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java @@ -2,6 +2,8 @@ import com.codahale.metrics.MetricRegistry; import com.google.common.annotations.VisibleForTesting; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import java.io.File; import java.io.IOException; import java.util.Collections; @@ -21,8 +23,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; import org.mapfish.print.ExceptionUtils; import org.mapfish.print.PrintException; import org.mapfish.print.config.WorkingDirectories; diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/HibernateJobQueue.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/HibernateJobQueue.java index 84563a279b..565ba256a2 100644 --- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/HibernateJobQueue.java +++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/HibernateJobQueue.java @@ -2,12 +2,12 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Timer; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import java.util.List; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; import org.mapfish.print.metrics.UnhealthyCountersHealthCheck; import org.mapfish.print.servlet.job.JobQueue; import org.mapfish.print.servlet.job.NoSuchReferenceException; diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java index 2264259f7d..da25e85c79 100644 --- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java +++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java @@ -1,11 +1,11 @@ package org.mapfish.print.servlet.job.impl.hibernate; +import jakarta.annotation.Nullable; +import jakarta.annotation.PostConstruct; import java.net.URI; import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.annotation.Nullable; -import javax.annotation.PostConstruct; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaDelete; import javax.persistence.criteria.CriteriaQuery; diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java index a8ddc080c6..f5a7b35544 100644 --- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java +++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java @@ -1,6 +1,6 @@ package org.mapfish.print.servlet.job.impl.hibernate; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import javax.persistence.Column; import javax.persistence.Entity; import org.mapfish.print.servlet.job.PrintJobEntry; diff --git a/core/src/main/java/org/mapfish/print/servlet/registry/BasicRegistry.java b/core/src/main/java/org/mapfish/print/servlet/registry/BasicRegistry.java index ceb59ae415..3fadd70c49 100644 --- a/core/src/main/java/org/mapfish/print/servlet/registry/BasicRegistry.java +++ b/core/src/main/java/org/mapfish/print/servlet/registry/BasicRegistry.java @@ -2,9 +2,9 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; +import jakarta.annotation.PostConstruct; import java.net.URI; import java.util.concurrent.TimeUnit; -import javax.annotation.PostConstruct; import org.json.JSONObject; /** diff --git a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java index 9528b1baf3..ed73c2b97b 100644 --- a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java +++ b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java @@ -1,12 +1,12 @@ package org.mapfish.print; +import jakarta.annotation.Nonnull; import java.io.IOException; import java.io.OutputStream; import java.net.URI; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; -import javax.annotation.Nonnull; import org.apache.http.client.methods.HttpRequestBase; import org.mapfish.print.config.Configuration; import org.mapfish.print.http.ConfigurableRequest; diff --git a/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java b/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java index 7cd550ba0d..c171556280 100644 --- a/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java +++ b/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java @@ -8,13 +8,13 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import jakarta.annotation.Nullable; import java.io.StringWriter; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; import org.geotools.api.style.FeatureTypeStyle; import org.geotools.api.style.LineSymbolizer; import org.geotools.api.style.PointSymbolizer; diff --git a/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java b/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java index 55f43f9be0..cc69b0d4b8 100644 --- a/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java +++ b/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java @@ -2,8 +2,8 @@ import static org.junit.Assert.assertNotNull; +import jakarta.annotation.Nullable; import java.util.List; -import javax.annotation.Nullable; import org.mapfish.print.processor.AbstractProcessor; /** Processor that needs the configuration object injected. */ diff --git a/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java b/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java index ff5a545d6e..d7d3d0eeda 100644 --- a/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java +++ b/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java @@ -3,8 +3,8 @@ import static org.junit.Assert.assertNotNull; import com.codahale.metrics.MetricRegistry; +import jakarta.annotation.Nullable; import java.util.List; -import javax.annotation.Nullable; import org.mapfish.print.processor.AbstractProcessor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java index 50dad57490..913636fcd2 100644 --- a/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java +++ b/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java @@ -3,9 +3,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import jakarta.annotation.Nullable; import java.util.ArrayList; import java.util.List; -import javax.annotation.Nullable; import org.junit.Test; import org.mapfish.print.config.Configuration; diff --git a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java index cd9c49282d..e7694ee032 100644 --- a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java +++ b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java @@ -6,9 +6,9 @@ import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY; import com.codahale.metrics.MetricRegistry; +import jakarta.annotation.Nullable; import java.util.HashMap; import java.util.List; -import javax.annotation.Nullable; import org.junit.Test; import org.mapfish.print.config.Configuration; import org.mapfish.print.output.Values; diff --git a/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java b/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java index 8aa40bc8b0..15f2f5c761 100644 --- a/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java +++ b/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java @@ -5,9 +5,9 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import jakarta.annotation.Nullable; import java.util.Arrays; import java.util.List; -import javax.annotation.Nullable; import org.junit.Test; import org.mapfish.print.config.Configuration; import org.mapfish.print.output.Values; diff --git a/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java index 0461886af1..4d76836808 100644 --- a/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java +++ b/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java @@ -3,12 +3,12 @@ import static org.junit.Assert.assertEquals; import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY; +import jakarta.annotation.Nullable; import java.net.URI; import java.util.HashMap; import java.util.List; import java.util.Set; import java.util.concurrent.ForkJoinPool; -import javax.annotation.Nullable; import org.json.JSONException; import org.junit.Test; import org.mapfish.print.AbstractMapfishSpringTest; diff --git a/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java index f5b84224ec..baea35b63e 100644 --- a/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java +++ b/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java @@ -3,8 +3,8 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; +import jakarta.annotation.Nullable; import java.net.URI; -import javax.annotation.Nullable; import org.springframework.http.HttpMethod; import org.springframework.http.client.ClientHttpRequest; import org.springframework.test.context.ContextConfiguration; diff --git a/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java index 3f2b7e71eb..fa3549f7e8 100644 --- a/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java +++ b/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java @@ -4,9 +4,9 @@ import static org.junit.Assert.assertEquals; import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY; +import jakarta.annotation.Nullable; import java.net.URI; import java.util.HashMap; -import javax.annotation.Nullable; import org.json.JSONException; import org.json.JSONObject; import org.mapfish.print.attribute.HttpRequestHeadersAttribute; diff --git a/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java index a0169148dc..df46927323 100644 --- a/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java +++ b/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java @@ -4,9 +4,9 @@ import static org.junit.Assert.assertEquals; import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY; +import jakarta.annotation.Nullable; import java.net.URI; import java.util.HashMap; -import javax.annotation.Nullable; import org.json.JSONException; import org.json.JSONObject; import org.junit.Test; diff --git a/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java index c4f1249e58..dd73f28651 100644 --- a/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java +++ b/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java @@ -2,8 +2,8 @@ import static org.junit.Assert.assertEquals; +import jakarta.annotation.Nullable; import java.net.URI; -import javax.annotation.Nullable; import org.springframework.http.HttpMethod; import org.springframework.http.client.ClientHttpRequest; import org.springframework.test.context.ContextConfiguration; diff --git a/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java index 936176fbc3..bd071ccb43 100644 --- a/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java +++ b/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java @@ -2,10 +2,10 @@ import static org.junit.Assert.assertEquals; +import jakarta.annotation.Nullable; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import javax.annotation.Nullable; import org.springframework.http.HttpMethod; import org.springframework.http.client.ClientHttpRequest; import org.springframework.test.context.ContextConfiguration; diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java index aa785d33ca..5a9730dbd6 100644 --- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java +++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java @@ -5,6 +5,7 @@ import static org.mapfish.print.attribute.map.AreaOfInterest.AoiDisplay.CLIP; import static org.mapfish.print.attribute.map.AreaOfInterest.AoiDisplay.RENDER; +import jakarta.annotation.Nonnull; import java.io.File; import java.io.IOException; import java.net.URI; @@ -15,7 +16,6 @@ import java.util.concurrent.ForkJoinTask; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Function; -import javax.annotation.Nonnull; import org.apache.batik.transcoder.TranscoderException; import org.json.JSONArray; import org.json.JSONException; diff --git a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java index 81006d150a..75d1cf3b28 100644 --- a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java +++ b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java @@ -10,6 +10,9 @@ import de.saly.javamail.mock2.MailboxFolder; import de.saly.javamail.mock2.MockMailbox; +import jakarta.annotation.Nullable; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.io.InputStream; import java.net.URI; @@ -20,15 +23,12 @@ import java.util.List; import java.util.Set; import java.util.function.Function; -import javax.annotation.Nullable; import javax.mail.Address; import javax.mail.BodyPart; import javax.mail.Message; import javax.mail.Multipart; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMultipart; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; import org.apache.commons.io.IOUtils; import org.json.JSONArray; import org.json.JSONObject; diff --git a/docs/build.gradle b/docs/build.gradle index 2109ba0789..17615545ad 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -1,4 +1,9 @@ +tasks.withType(GroovyCompile).configureEach { + sourceCompatibility = '17' + targetCompatibility = '17' +} apply plugin: 'groovy' + apply plugin: 'eclipse' apply plugin: 'idea' @@ -17,17 +22,17 @@ repositories { dependencies { implementation project(':core') implementation ( - 'org.apache.groovy:groovy-xml:4.0.26', - 'org.apache.groovy:groovy-json:4.0.26', - "org.springframework:spring-test:5.3.39", - 'org.ccil.cowan.tagsoup:tagsoup:1.2.1', - 'com.samskivert:jmustache:1.16', - 'com.google.guava:guava:33.3.1-jre', - 'commons-io:commons-io:2.17.0', - "org.springframework:spring-beans:5.3.39", - "org.springframework:spring-web:5.3.39", - "org.springframework:spring-context:5.3.39", - 'javax.servlet:javax.servlet-api:4.0.1' + 'org.apache.groovy:groovy-xml:4.0.26', + 'org.apache.groovy:groovy-json:4.0.26', + "org.springframework:spring-test:6.1.6", + 'org.ccil.cowan.tagsoup:tagsoup:1.2.1', + 'com.samskivert:jmustache:1.16', + 'com.google.guava:guava:33.3.1-jre', + 'commons-io:commons-io:2.17.0', + "org.springframework:spring-beans:6.1.6", + "org.springframework:spring-web:6.1.6", + "org.springframework:spring-context:6.1.6", + 'jakarta.servlet:jakarta.servlet-api:6.0.0' ) } diff --git a/examples/build.gradle b/examples/build.gradle index 73f44951cc..834fc33fe0 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -1,3 +1,7 @@ +tasks.withType(JavaCompile).configureEach { + sourceCompatibility = '21' + targetCompatibility = '21' +} import org.gradle.api.tasks.testing.logging.TestLogEvent repositories { @@ -15,12 +19,12 @@ dependencies { testImplementation( project(':core'), 'commons-io:commons-io:2.17.0', - "org.springframework:spring-web:5.3.39", + "org.springframework:spring-web:6.1.6", 'org.json:json:20240303', 'org.apache.commons:commons-lang3:3.5', "org.locationtech.jts:jts-core:1.18.2", "org.slf4j:slf4j-api:2.0.16", - "org.springframework:spring-test:5.3.39", + "org.springframework:spring-test:6.1.6", "ch.qos.logback:logback-classic:1.5.15", "org.verapdf:validation-model:1.24.1" )