Merge pull request #3799 from mapfish/Remove_deprecated_test_code

Migrate Java 5 - 17 code to Java 21
Fix math related bugs.

Author: sebr72

.github/workflows/main.yaml

@@ -31,6 +31,11 @@ jobs:
         with:
           fetch-depth: 0
 
+      - uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
       - uses: actions/setup-python@v6
         with:
           python-version: '3.13'

core/src/main/java/org/mapfish/print/FontTools.java

@@ -4,6 +4,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -62,7 +63,7 @@ public static List<FontConfigDescription> listFontConfigFonts(final String famil
         String[] commands = {"fc-list", "-b", family};
         Process process = Runtime.getRuntime().exec(commands);
 
-        inputStreamReader = new InputStreamReader(process.getInputStream(), "utf-8");
+        inputStreamReader = new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8);
         stdInput = new BufferedReader(inputStreamReader);
         String inputLine;
         FontConfigDescription description = null;

core/src/main/java/org/mapfish/print/SvgUtil.java

@@ -42,8 +42,7 @@ private static class BufferedImageTranscoder extends ImageTranscoder {
 
     @Override
     public BufferedImage createImage(final int w, final int h) {
-      BufferedImage bi = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
-      return bi;
+      return new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
     }
 
     @Override

core/src/main/java/org/mapfish/print/URIUtils.java

@@ -9,6 +9,7 @@
 import java.net.URL;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
@@ -54,13 +55,8 @@ public static Multimap<String, String> getParameters(final String rawQuery) {
         key = pair;
         value = "";
       } else {
-
-        try {
-          key = URLDecoder.decode(pair.substring(0, pos), "UTF-8");
-          value = URLDecoder.decode(pair.substring(pos + 1), "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-          throw new PrintException("Failed to get parameters for query " + rawQuery, e);
-        }
+        key = URLDecoder.decode(pair.substring(0, pos), StandardCharsets.UTF_8);
+        value = URLDecoder.decode(pair.substring(pos + 1), StandardCharsets.UTF_8);
       }
 
       result.put(key, value);
@@ -214,7 +210,7 @@ public static URI setQueryParams(
       final URI initialUri, final Multimap<String, String> queryParams) {
     StringBuilder queryString = new StringBuilder();
     for (Map.Entry<String, String> entry : queryParams.entries()) {
-      if (queryString.length() > 0) {
+      if (!queryString.isEmpty()) {
         queryString.append("&");
       }
       queryString.append(entry.getKey()).append("=").append(entry.getValue());

core/src/main/java/org/mapfish/print/attribute/StringArrayAttribute.java

@@ -3,7 +3,6 @@
 /** An attribute that can contain an array of strings. [[examples=verboseExample]] */
 public class StringArrayAttribute extends PrimitiveAttribute<String[]> {
   /** Constructor. */
-  @SuppressWarnings("unchecked")
   public StringArrayAttribute() {
     super(String[].class);
   }

core/src/main/java/org/mapfish/print/attribute/StringAttribute.java

@@ -39,8 +39,7 @@ public final void setMaxLength(final int maxLength) {
 
   @Override
   public final void validateValue(final Object value) {
-    if (this.maxLength >= 0 && value instanceof String) {
-      String text = (String) value;
+    if (this.maxLength >= 0 && value instanceof String text) {
       if (text.length() > this.maxLength) {
         throw new IllegalArgumentException(
             "text contains more than " + this.maxLength + " characters");

core/src/main/java/org/mapfish/print/attribute/map/CenterScaleMapBounds.java

@@ -2,7 +2,9 @@
 
 import static org.mapfish.print.Constants.PDF_DPI;
 
+import com.google.common.annotations.VisibleForTesting;
 import java.awt.Rectangle;
+import java.util.Objects;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.api.referencing.operation.TransformException;
 import org.geotools.geometry.Position2D;
@@ -179,12 +181,21 @@ private ReferencedEnvelope computeGeodeticBBox(
     }
   }
 
-  private double rollLongitude(final double x) {
-    return x - (((int) (x + Math.signum(x) * 180)) / 360) * 360.0;
+  @VisibleForTesting
+  double rollLongitude(final double x) {
+    return modulo(x + 180, 360.0) - 180;
   }
 
-  private double rollLatitude(final double y) {
-    return y - (((int) (y + Math.signum(y) * 90)) / 180) * 180.0;
+  private static double modulo(final double a, final double b) {
+    return b - ((-a % b) + b) % b;
+  }
+
+  @VisibleForTesting
+  double rollLatitude(final double y) {
+    if (y > 90 || y < -90) {
+      throw new IllegalArgumentException("Latitude must be between -90 and 90");
+    }
+    return y;
   }
 
   @Override
@@ -201,10 +212,10 @@ public boolean equals(final Object o) {
 
     final CenterScaleMapBounds that = (CenterScaleMapBounds) o;
 
-    if (this.center != null ? !this.center.equals(that.center) : that.center != null) {
+    if (!Objects.equals(this.center, that.center)) {
       return false;
     }
-    return this.scale != null ? this.scale.equals(that.scale) : that.scale == null;
+    return Objects.equals(this.scale, that.scale);
   }
 
   @Override

core/src/main/java/org/mapfish/print/attribute/map/MapAttribute.java

@@ -30,7 +30,6 @@ public final class MapAttribute extends GenericMapAttribute {
       ZoomLevelSnapStrategy.CLOSEST_LOWER_SCALE_ON_TIE;
   private static final boolean DEFAULT_SNAP_GEODETIC = false;
 
-  @SuppressWarnings("unchecked")
   @Override
   public Class<MapAttributeValues> getValueType() {
     return MapAttributeValues.class;

core/src/main/java/org/mapfish/print/attribute/map/MapfishMapContext.java

@@ -301,15 +301,15 @@ public AffineTransform getTransform() {
     final AffineTransform transform = AffineTransform.getTranslateInstance(0.0, 0.0);
     // move to the center of the original map rectangle (this is the actual
     // size of the graphic)
-    transform.translate(this.mapSize.width / 2, this.mapSize.height / 2);
+    transform.translate(this.mapSize.width / 2.0, this.mapSize.height / 2.0);
 
     // then rotate around this center
     transform.rotate(this.rotation);
 
     // then move to an artificial origin (0,0) which might be outside the actual
     // painting area. this origin still keeps the center of the original map area
     // at the center of the rotated map area.
-    transform.translate(-rotatedMapSize.width / 2, -rotatedMapSize.height / 2);
+    transform.translate(-rotatedMapSize.width / 2.0, -rotatedMapSize.height / 2.0);
 
     return transform;
   }

core/src/main/java/org/mapfish/print/attribute/map/OverviewMapAttribute.java

@@ -41,7 +41,6 @@ public void setStyle(final String style) {
     this.style = style;
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   public Class<OverviewMapAttributeValues> getValueType() {
     return OverviewMapAttributeValues.class;