Use getRawStatusCode to don't get an exception on fake status code 999

mapfish · Nov 1, 2024 · 6e9e764 · 6e9e764
1 parent 076c971
commit 6e9e764
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 18 deletions.
diff --git a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
@@ -9,8 +9,8 @@
 public class ErrorResponseClientHttpResponse extends AbstractClientHttpResponse {
   private final Exception exception;
 
-  /** HTTP code use in response for non HTTP errors. */
-  private static final int FAKE_HTTP_ERROR_CODE = 999;
+  /** HTTP code use in response for non HTTP errors, (Not Acceptable). */
+  private static final int FAKE_HTTP_ERROR_CODE = 406;
 
   public ErrorResponseClientHttpResponse(final Exception e) {
     assert e != null;

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
@@ -93,7 +93,7 @@ static final CoordinateReferenceSystem parseCoordinateReferenceSystem(
                   requestFactory.createRequest(new URI(uri), HttpMethod.GET);
               try (ClientHttpResponse response = request.execute()) {
 
-                if (response.getStatusCode() == HttpStatus.OK) {
+                if (response.getRawStatusCode() == HttpStatus.OK.value()) {
                   final String wkt =
                       IOUtils.toString(response.getBody(), Constants.DEFAULT_ENCODING);
                   try {

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
@@ -202,14 +202,15 @@ private boolean isResponseStatusCodeValid(
       final String stringBody,
       final String baseMetricName)
       throws IOException {
-    if (httpResponse.getStatusCode() != HttpStatus.OK) {
+    if (httpResponse.getRawStatusCode() != HttpStatus.OK.value()) {
       String message =
           String.format(
-              "Invalid status code for %s (%d!=%d).With request headers:\n%s\n"
+              "Invalid status code for %s (%d!=%d), status: %s. With request headers:\n%s\n"
                   + "The response was: '%s'\nWith response headers:\n%s",
               request.getURI(),
-              httpResponse.getStatusCode().value(),
+              httpResponse.getRawStatusCode(),
               HttpStatus.OK.value(),
+              httpResponse.getStatusText(),
               String.join("\n", Utils.getPrintableHeadersList(request.getHeaders())),
               httpResponse.getStatusText(),
               String.join("\n", Utils.getPrintableHeadersList(httpResponse.getHeaders())));

diff --git a/core/src/main/java/org/mapfish/print/map/style/ParserPluginUtils.java b/core/src/main/java/org/mapfish/print/map/style/ParserPluginUtils.java
@@ -34,7 +34,7 @@ public static Optional<Style> loadStyleAsURI(
       final ClientHttpRequestFactory clientHttpRequestFactory,
       final String styleRef,
       final Function<byte[], @Nullable Optional<Style>> loadFunction) {
-    HttpStatus statusCode;
+    int statusCode;
     final byte[] input;
 
     URI uri;
@@ -47,13 +47,13 @@ public static Optional<Style> loadStyleAsURI(
     try {
       final ClientHttpRequest request = clientHttpRequestFactory.createRequest(uri, HttpMethod.GET);
       try (ClientHttpResponse response = request.execute()) {
-        statusCode = response.getStatusCode();
+        statusCode = response.getRawStatusCode();
         input = IOUtils.toByteArray(response.getBody());
       }
     } catch (Exception e) {
       return Optional.empty();
     }
-    if (statusCode == HttpStatus.OK) {
+    if (statusCode == HttpStatus.OK.value()) {
       return loadFunction.apply(input);
     } else {
       return Optional.empty();

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
@@ -254,16 +254,17 @@ protected Tile compute() {
 
     private Tile handleSpecialStatuses(
         final ClientHttpResponse response, final String baseMetricName) throws IOException {
-      final HttpStatus statusCode = response.getStatusCode();
-      if (statusCode == HttpStatus.NO_CONTENT || statusCode == HttpStatus.NOT_FOUND) {
-        if (statusCode == HttpStatus.NOT_FOUND) {
+      final int statusCode = response.getRawStatusCode();
+      if (statusCode == HttpStatus.NO_CONTENT.value()
+          || statusCode == HttpStatus.NOT_FOUND.value()) {
+        if (statusCode == HttpStatus.NOT_FOUND.value()) {
           LOGGER.info(
               "The request {} returns a not found status code, we consider it as an empty tile.",
               this.tileRequest.getURI());
         }
         // Empty response, nothing special to do
         return new Tile(null, getTileIndexX(), getTileIndexY());
-      } else if (statusCode != HttpStatus.OK) {
+      } else if (statusCode != HttpStatus.OK.value()) {
         return handleNonOkStatus(statusCode, response, baseMetricName);
       }
       return null;
@@ -282,7 +283,7 @@ private BufferedImage getImageFromResponse(
     }
 
     private Tile handleNonOkStatus(
-        final HttpStatus statusCode, final ClientHttpResponse response, final String baseMetricName)
+        final int statusCode, final ClientHttpResponse response, final String baseMetricName)
         throws IOException {
       String errorMessage =
           String.format(

diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/HttpImageResolver.java b/core/src/main/java/org/mapfish/print/processor/jasper/HttpImageResolver.java
@@ -82,7 +82,7 @@ public BufferedImage resolve(final MfClientHttpRequestFactory requestFactory, fi
 
   private BufferedImage getImageFromResponse(final ClientHttpResponse response, final URI url)
       throws IOException {
-    if (response.getStatusCode() == HttpStatus.OK) {
+    if (response.getRawStatusCode() == HttpStatus.OK.value()) {
       try {
         final BufferedImage image = ImageIO.read(response.getBody());
         if (image == null) {
@@ -97,7 +97,7 @@ private BufferedImage getImageFromResponse(final ClientHttpResponse response, fi
       LOGGER.warn(
           "Error loading the table row image: {}.\nStatus Code: {}\nStatus Text: {}",
           url,
-          response.getStatusCode(),
+          response.getRawStatusCode(),
           response.getStatusText());
     }
     return this.defaultImage;

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
@@ -392,7 +392,7 @@ private BufferedImage loadImage(final URI uri) {
           try (Timer.Context ignored =
               LegendProcessor.this.metricRegistry.timer(metricName).time()) {
             try (ClientHttpResponse httpResponse = request.execute()) {
-              if (httpResponse.getStatusCode() == HttpStatus.OK) {
+              if (httpResponse.getRawStatusCode() == HttpStatus.OK.value()) {
                 image = ImageIO.read(httpResponse.getBody());
                 if (image == null) {
                   LOGGER.warn("There is no image in this response body {}", httpResponse.getBody());
@@ -422,7 +422,7 @@ private void logNotOkResponseStatus(final ClientHttpResponse httpResponse) throw
               + "\tResponse Text: {}\n"
               + "\tWith Headers:\n\t{}",
           this.icon,
-          httpResponse.getStatusCode(),
+          httpResponse.getRawStatusCode(),
           httpResponse.getStatusText(),
           String.join("\n\t", Utils.getPrintableHeadersList(httpResponse.getHeaders())));
     }