Upgrade GeoServer, decrease max distance from 1 to 0

.gitignore

@@ -12,3 +12,10 @@
 
 **/actual*.png
 **/diff*.png
+
+/examples/geoserver-data/logs/
+/examples/geoserver-data/gwc-gs.xml
+/examples/geoserver-data/gwc-layers/
+/examples/geoserver-data/security/geoserver.jceks
+/examples/geoserver-data/security/version.properties
+/examples/geoserver-data/workspaces/default.xml

Makefile

@@ -1,6 +1,10 @@
 GIT_HEAD_ARG = --build-arg=GIT_HEAD=$(shell git rev-parse HEAD)
 export DOCKER_BUILDKIT = 1
 
+.PHONY: clean
+clean:
+	rm -rf .env examples/geoserver-data/logs/
+
 .PHONY: build
 build: build-builder
 	docker build $(GIT_HEAD_ARG) --target=runner --tag=camptocamp/mapfish_print core
@@ -44,15 +48,6 @@ tests: build-builder
 
 .PHONY: acceptance-tests-up
 acceptance-tests-up: build .env
-	docker-compose down --remove-orphan
-
-	mkdir /tmp/geoserver-data || true
-	docker run --rm --volume=/tmp/geoserver-data:/mnt/geoserver_datadir camptocamp/geoserver \
-		bash -c 'rm -rf /mnt/geoserver_datadir/*'
-	mkdir /tmp/geoserver-data/www
-	cp -r examples/geoserver-data/* /tmp/geoserver-data/
-	cp -r core/src/test/resources/map-data/* /tmp/geoserver-data/www/
-
 	# Required to avoid root ownership of reports folder
 	mkdir -p examples/build/reports/ || true
 	docker-compose up --detach

core/src/main/java/org/mapfish/print/map/image/ImageLayer.java

@@ -39,6 +39,8 @@
 import org.mapfish.print.map.geotools.StyleSupplier;
 import org.mapfish.print.parser.HasDefaultValue;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
@@ -50,11 +52,14 @@
  */
 public final class ImageLayer extends AbstractSingleImageLayer {
   private final ImageParam params;
+  private final boolean failOnError;
   private final StyleSupplier<GridCoverage2D> styleSupplier;
   private final ExecutorService executorService;
   private final RenderType renderType;
   private double imageBufferScaling;
   private BufferedImage image;
+  private boolean imageLoadError = false;
+  private static final Logger LOGGER = LoggerFactory.getLogger(ImageLayer.class);
 
   /**
    * Constructor.
@@ -73,6 +78,8 @@ protected ImageLayer(
       @Nonnull final MetricRegistry registry) {
     super(executorService, styleSupplier, params, registry, configuration);
     this.params = params;
+    this.failOnError = params.failOnError;
+    params.failOnError = true;
     this.styleSupplier = styleSupplier;
     this.executorService = executorService;
     this.renderType = RenderType.fromMimeType(params.imageFormat);
@@ -83,7 +90,12 @@ protected BufferedImage loadImage(
       final MfClientHttpRequestFactory requestFactory, final MapfishMapContext transformer) {
     final ReferencedEnvelope envelopeOrig =
         transformer.getBounds().toReferencedEnvelope(transformer.getPaintArea());
-    final Rectangle paintArea = calculateNewBounds(image, envelopeOrig);
+    final Rectangle paintArea;
+    if (imageLoadError) {
+      paintArea = transformer.getPaintArea();
+    } else {
+      paintArea = calculateNewBounds(image, envelopeOrig);
+    }
     final ReferencedEnvelope envelope = transformer.getBounds().toReferencedEnvelope(paintArea);
     final BufferedImage bufferedImage =
         new BufferedImage(paintArea.width, paintArea.height, TYPE_INT_ARGB_PRE);
@@ -157,30 +169,41 @@ public double getImageBufferScaling() {
   public void prepareRender(
       final MapfishMapContext transformer,
       final MfClientHttpRequestFactory clientHttpRequestFactory) {
-    image = fetchImage(transformer, clientHttpRequestFactory);
+    try {
+      image = fetchLayerImage(transformer, clientHttpRequestFactory);
+    } catch (URISyntaxException | IOException | RuntimeException e) {
+      if (failOnError) {
+        throw new RuntimeException(e);
+      } else {
+        LOGGER.error("Error while fetching image", e);
+        image = createErrorImage(new Rectangle(1, 1));
+        imageLoadError = true;
+        imageBufferScaling = 1;
+        return;
+      }
+    }
+    imageLoadError = false;
+
     final ReferencedEnvelope envelopeOrig =
         transformer.getBounds().toReferencedEnvelope(transformer.getPaintArea());
     final Rectangle paintArea = calculateNewBounds(image, envelopeOrig);
 
+    double widthImageBufferScaling = paintArea.getWidth() / transformer.getMapSize().getWidth();
+    double heightImageBufferScaling = paintArea.getHeight() / transformer.getMapSize().getHeight();
     imageBufferScaling =
-        ((paintArea.getWidth() / transformer.getMapSize().getWidth())
-                + (paintArea.getHeight() / transformer.getMapSize().getHeight()))
-            / 2;
+        Math.sqrt(
+            (Math.pow(widthImageBufferScaling, 2) + Math.pow(heightImageBufferScaling, 2)) / 2);
   }
 
-  private BufferedImage fetchImage(
+  private BufferedImage fetchLayerImage(
       final MapfishMapContext transformer,
-      final MfClientHttpRequestFactory clientHttpRequestFactory) {
+      final MfClientHttpRequestFactory clientHttpRequestFactory)
+      throws URISyntaxException, IOException {
     BufferedImage image;
-    try {
-      final URI commonUri = new URI(this.params.getBaseUrl());
-      final ClientHttpRequest request =
-          clientHttpRequestFactory.createRequest(commonUri, HttpMethod.GET);
-      image = fetchImage(request, transformer);
-    } catch (URISyntaxException | IOException e) {
-      throw new RuntimeException(e);
-    }
-    return image;
+    final URI commonUri = new URI(this.params.getBaseUrl());
+    final ClientHttpRequest request =
+        clientHttpRequestFactory.createRequest(commonUri, HttpMethod.GET);
+    return fetchImage(request, transformer);
   }
 
   /**

core/src/main/java/org/mapfish/print/test/util/ImageSimilarity.java

@@ -48,14 +48,14 @@ public final class ImageSimilarity {
   /** The constructor, which creates the GUI and start the image processing task. */
   public ImageSimilarity(final File expectedFile) throws IOException {
     this.expectedImage = expectedFile.exists() ? ImageIO.read(expectedFile) : null;
-    if (REGENERATE_EXPECTED_IMAGES) {
+    if (REGENERATE_EXPECTED_IMAGES || !expectedFile.exists()) {
       this.expectedPath =
           new File(
               expectedFile
                   .toString()
                   .replace("/out/", "/src/")
                   .replace("/build/classes/test/", "/src/test/resources/")
-                  .replace("/src/core/build/resources/test/", "/src/core/src/test/resources/"));
+                  .replace("/build/resources/test/", "/src/test/resources/"));
     } else {
       this.expectedPath = expectedFile;
     }
@@ -257,12 +257,18 @@ private File getRelatedFile(final String name) {
         actualIterator.getPixel(x, y, actualPixel);
         maskIterator.getPixel(x, y, maskPixel);
         double squareDist = 0.0;
-        for (int i = 0; i < this.expectedImage.getSampleModel().getNumBands(); i++) {
-          double colorDist = (expectedPixel[i] - actualPixel[i]) * (maskPixel[0] / 255.0);
-          squareDist += colorDist * colorDist;
+        if (maskPixel[0] == 255) {
+          for (int i = 0; i < this.expectedImage.getSampleModel().getNumBands(); i++) {
+            double colorDist = expectedPixel[i] - actualPixel[i];
+            squareDist += colorDist * colorDist;
+          }
+        } else if (maskPixel[0] != 0) {
+          throw new RuntimeException(
+              String.format(
+                  "Mask image must be only black and white (0 and 255), got %s at %s,%s in:\n%s",
+                  maskPixel[0], x, y, this.maskImage));
         }
-        double pxDiff =
-            Math.sqrt(squareDist) / Math.sqrt(this.expectedImage.getSampleModel().getNumBands());
+        double pxDiff = Math.sqrt(squareDist / this.expectedImage.getSampleModel().getNumBands());
         dist += pxDiff / 255;
         diffGraphics.setColor(new Color((int) Math.round(pxDiff), 0, 0));
         diffGraphics.drawRect(x, y, 1, 1);
@@ -360,7 +366,7 @@ public void assertSimilarity(final File actualFile, final double maxDistance) th
    * @throws IOException if the image could not be written.
    */
   public void assertSimilarity(final BufferedImage actualImage) throws IOException {
-    assertSimilarity(actualImage, 1);
+    assertSimilarity(actualImage, 0);
   }
 
   /**
@@ -375,6 +381,7 @@ public void assertSimilarity(final BufferedImage actualImage, final double maxDi
       throws IOException {
     if (REGENERATE_EXPECTED_IMAGES || !this.expectedPath.exists()) {
       ImageIO.write(actualImage, "png", expectedPath);
+      System.out.println("The expected file has been generated: " + expectedPath.getAbsolutePath());
       if (REGENERATE_EXPECTED_IMAGES) {
         return;
       } else {

core/src/test/resources/map-data/ol-demo.html

@@ -79,7 +79,7 @@
         // create WMS layer
         var wms = new OpenLayers.Layer.WMS(
           'TOPP States',
-          'http://geoserver:8080/wms?',
+          'http://geoserver:8080/geoserver/wms?',
           {
             layers: 'topp:states',
             styles: '',

docker-compose.yaml

@@ -3,9 +3,10 @@ version: '2.1'
 
 services:
   geoserver:
-    image: camptocamp/geoserver:2.17
+    image: camptocamp/geoserver:2.22.2
     volumes:
-      - /tmp/geoserver-data:/mnt/geoserver_datadir
+      - ./examples/geoserver-data/:/mnt/geoserver_datadir
+      - ./core/src/test/resources/map-data/:/mnt/geoserver_datadir/www/map-data
 
   print:
     image: mapfish_print_tester
@@ -25,6 +26,7 @@ services:
     command: tail --follow /dev/null
     volumes:
       - ./examples/src:/src/examples/src:ro
+      - ./examples/src/test/resources/examples:/src/examples/src/test/resources/examples
       - ./examples/build/reports:/src/examples/build/reports
       - ./examples/build/resources:/src/examples/build/resources
     environment:

examples/README.md

@@ -1,4 +1,4 @@
-# Summary
+## Summary
 
 This repository is a submodule of mapfish-print and contains e2e tests for the pdf and image generation. It
 contains the code to start a Geoserver instance and run junit integration tests against the server to test as
@@ -13,16 +13,16 @@ understood by referring to:
 
 > <http://www.gradle.org/docs/current/userguide/java_plugin.html#sec:java_test>
 
-# Test client
+## Test client
 
 The test server includes a client which can be used for testing. To start the server, run:
 
     docker-compose up -d
 
-In the docker-comose context GeoServer can be accessed at <http://geoserver:8080/> and
+In the docker-comose context GeoServer can be accessed at <http://geoserver:8080/geoserver/> and
 MapFish Print can be accessed at <http://print:8080/>
 
-# Writing Tests
+## Writing Tests
 
 By default the test server is in daemon mode, which mean that the servers will be run in a background thread
 and be shutdown when the build completes. In order to be able to run the tests in a IDE one can run:
@@ -31,3 +31,16 @@ and be shutdown when the build completes. In order to be able to run the tests i
 
 This will start the test servers in non-daemon mode allowing one to start the server and then run tests in
 your IDE against that server for development.
+
+## Test images used by acceptance tests
+
+The application config will be loaded from the `src/test/resources/examples/<tested_application>/config.yaml` file.
+
+The spec files will be loaded from the `src/test/resources/examples/<tested_application>/requestData<postfix>.json` file.
+
+The expected images will be loaded from the `src/test/resources/examples/<tested_application>/expected_output/requestData<postfix>.png` file.
+
+We can optionally have a mask image that will be used to mask the tested image.
+This mask image will be loaded from the `src/test/resources/examples/<tested_application>/expected_output/mask-requestData<postfix>.png` file.
+This image should be grayscale with only full black and full white pixel values.
+If we create the mask image with Gimp, we can't create indexed image with tow colors because in the Java code we get the values 1 instead of 0 for the black pixel.

examples/build.gradle

@@ -34,7 +34,7 @@ configurations {
 
 tasks.register('geoserver' , Exec) {
     description 'Run and wait for GeoServer with test data'
-    commandLine 'curl', 'http://geoserver:8080/web/', '--output', '/dev/null'
+    commandLine 'curl', 'http://geoserver:8080/geoserver/web/', '--output', '/dev/null'
 }
 
 // prevent that the tests target can be directly called. the integration tests

examples/geoserver-data/data/README.md

@@ -0,0 +1,3 @@
+# Project used to run the examples
+
+Originally the project comes from the example project provided by GeoServer.

examples/geoserver-data/data/shapefiles/README.md

@@ -0,0 +1,3 @@
+# Shapefiles
+
+`state.shp` contains the US states, simplified with `ogr2ogr examples/geoserver-data/data/shapefiles/states.shp -update -simplify 0.01`

examples/geoserver-data/data/shapefiles/states.prj

@@ -1 +1 @@
-GEOGCS["GCS_WGS_1984",DATUM["WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]

examples/geoserver-data/demo/WFS_transactionInsert.xml

@@ -10,7 +10,7 @@
   xmlns:topp="http://www.openplans.org/topp"
   xmlns:gml="http://www.opengis.net/gml"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/WFS-transaction.xsd http://www.openplans.org/topp http://geoserver:8080/wfs/DescribeFeatureType?typename=topp:tasmania_roads">
+  xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/WFS-transaction.xsd http://www.openplans.org/topp http://geoserver:8080/geoserver/wfs/DescribeFeatureType?typename=topp:tasmania_roads">
   <wfs:Insert>
     <topp:tasmania_roads>
       <topp:the_geom>

examples/geoserver-data/demo/WMS_GetLegendGraphic-SLD.url

@@ -1 +1 @@
-wms?REQUEST=GetLegendGraphic&VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=topp:states&SLD=http://geoserver:8080/www/styles/green.sld
+wms?REQUEST=GetLegendGraphic&VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=topp:states&SLD=http://geoserver:8080/geoserver/www/styles/green.sld

examples/geoserver-data/security/filter/anonymous/config.xml

@@ -2,4 +2,4 @@
   <id>52857278:13c7ffd66a8:-7ff7</id>
   <name>anonymous</name>
   <className>org.geoserver.security.filter.GeoServerAnonymousAuthenticationFilter</className>
-</anonymousAuthentication>
+</anonymousAuthentication>

examples/geoserver-data/security/filter/basic/config.xml

@@ -3,4 +3,4 @@
   <name>basic</name>
   <className>org.geoserver.security.filter.GeoServerBasicAuthenticationFilter</className>
   <useRememberMe>true</useRememberMe>
-</basicAuthentication>
+</basicAuthentication>

examples/geoserver-data/security/filter/contextAsc/config.xml

@@ -3,4 +3,4 @@
   <name>contextAsc</name>
   <className>org.geoserver.security.filter.GeoServerSecurityContextPersistenceFilter</className>
   <allowSessionCreation>true</allowSessionCreation>
-</contextPersistence>
+</contextPersistence>

examples/geoserver-data/security/filter/contextNoAsc/config.xml

@@ -3,4 +3,4 @@
   <name>contextNoAsc</name>
   <className>org.geoserver.security.filter.GeoServerSecurityContextPersistenceFilter</className>
   <allowSessionCreation>false</allowSessionCreation>
-</contextPersistence>
+</contextPersistence>

examples/geoserver-data/security/filter/exception/config.xml

@@ -2,4 +2,4 @@
   <id>52857278:13c7ffd66a8:-7ff2</id>
   <name>exception</name>
   <className>org.geoserver.security.filter.GeoServerExceptionTranslationFilter</className>
-</exceptionTranslation>
+</exceptionTranslation>

examples/geoserver-data/security/filter/form/config.xml

@@ -4,4 +4,4 @@
   <className>org.geoserver.security.filter.GeoServerUserNamePasswordAuthenticationFilter</className>
   <passwordParameterName>password</passwordParameterName>
   <usernameParameterName>username</usernameParameterName>
-</usernamePasswordFilter>
+</usernamePasswordFilter>

examples/geoserver-data/security/filter/formLogout/config.xml

@@ -3,4 +3,4 @@
   <name>formLogout</name>
   <className>org.geoserver.security.filter.GeoServerLogoutFilter</className>
   <redirectURL>/web/</redirectURL>
-</logoutFilter>
+</logoutFilter>

examples/geoserver-data/security/filter/interceptor/config.xml

@@ -4,4 +4,4 @@
   <className>org.geoserver.security.filter.GeoServerSecurityInterceptorFilter</className>
   <allowIfAllAbstainDecisions>false</allowIfAllAbstainDecisions>
   <securityMetadataSource>geoserverMetadataSource</securityMetadataSource>
-</securityInterceptor>
+</securityInterceptor>

examples/geoserver-data/security/filter/rememberme/config.xml

@@ -2,4 +2,4 @@
   <id>52857278:13c7ffd66a8:-7ff6</id>
   <name>rememberme</name>
   <className>org.geoserver.security.filter.GeoServerRememberMeAuthenticationFilter</className>
-</rememberMeAuthentication>
+</rememberMeAuthentication>

examples/geoserver-data/security/filter/restInterceptor/config.xml

@@ -4,4 +4,4 @@
   <className>org.geoserver.security.filter.GeoServerSecurityInterceptorFilter</className>
   <allowIfAllAbstainDecisions>false</allowIfAllAbstainDecisions>
   <securityMetadataSource>restFilterDefinitionMap</securityMetadataSource>
-</securityInterceptor>
+</securityInterceptor>

examples/geoserver-data/security/filter/roleFilter/config.xml

@@ -4,4 +4,4 @@
   <className>org.geoserver.security.filter.GeoServerRoleFilter</className>
   <httpResponseHeaderAttrForIncludedRoles>roles</httpResponseHeaderAttrForIncludedRoles>
   <roleConverterName>roleConverter</roleConverterName>
-</roleFilter>
+</roleFilter>

examples/geoserver-data/security/filter/sslFilter/config.xml

@@ -3,4 +3,4 @@
   <name>sslFilter</name>
   <className>org.geoserver.security.filter.GeoServerSSLFilter</className>
   <sslPort>443</sslPort>
-</sslFilter>
+</sslFilter>

examples/src/test/resources/examples/add_overlay_layer/requestData-one-data-layer.json

@@ -10,7 +10,7 @@
       "scale": 25000,
       "layers": [
         {
-          "baseURL": "http://geoserver:8080/wms",
+          "baseURL": "http://geoserver:8080/geoserver/wms",
           "opacity": 1,
           "type": "WMS",
           "layers": ["tiger:tiger_roads"],