HTM-1852: Allow WMS capabilities loading to use DTD, add a timeout in the tests

Author: mprins

src/main/java/org/tailormap/api/persistence/helper/GeoServiceHelper.java

@@ -17,6 +17,7 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -33,6 +34,7 @@
 import org.geotools.ows.wms.WebMapServer;
 import org.geotools.ows.wmts.WebMapTileServer;
 import org.geotools.ows.wmts.model.WMTSLayer;
+import org.geotools.xml.DocumentFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -293,10 +295,15 @@ private void addLayerRecursive(
     }
   }
 
-  void loadWMSCapabilities(GeoService geoService, ResponseTeeingHTTPClient client) throws Exception {
+  private void loadWMSCapabilities(GeoService geoService, ResponseTeeingHTTPClient client) throws Exception {
     WebMapServer wms;
     try {
-      wms = new WebMapServer(new URI(geoService.getUrl()).toURL(), client);
+      wms = new WebMapServer(
+          new URI(geoService.getUrl()).toURL(),
+          client,
+          Map.of(
+              // allow DTD for WMS 1.1.x
+              DocumentFactory.ENABLE_DTD, true));
     } catch (ClassCastException | IllegalStateException e) {
       // The gt-wms module tries to cast the XML unmarshalling result expecting capabilities, but a
       // WMS 1.0.0/1.1.0 ServiceException may have been unmarshalled which leads to a
@@ -380,7 +387,7 @@ void loadWMSCapabilities(GeoService geoService, ResponseTeeingHTTPClient client)
         Set.of());
   }
 
-  void loadWMTSCapabilities(GeoService geoService, ResponseTeeingHTTPClient client) throws Exception {
+  private void loadWMTSCapabilities(GeoService geoService, ResponseTeeingHTTPClient client) throws Exception {
     WebMapTileServer wmts = new WebMapTileServer(new URI(geoService.getUrl()).toURL(), client);
     setServiceInfo(geoService, client, wmts);
 

src/test/java/org/tailormap/api/controller/admin/GeoServiceAdminControllerIntegrationTest.java

@@ -12,6 +12,7 @@
 
 import com.jayway.jsonpath.JsonPath;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 import mockwebserver3.MockResponse;
 import mockwebserver3.MockWebServer;
 import okhttp3.Headers;
@@ -105,7 +106,9 @@ void refresh_capabilities() throws Exception {
 
       assertEquals(
           "GetCapabilities",
-          Objects.requireNonNull(server.takeRequest().getUrl()).queryParameter("REQUEST"));
+          Objects.requireNonNull(Objects.requireNonNull(server.takeRequest(10, TimeUnit.SECONDS))
+                  .getUrl())
+              .queryParameter("REQUEST"));
 
       // This capabilities document has an extra layer
       body = getResourceString(wmsTestCapabilitiesUpdated);
@@ -118,7 +121,9 @@ void refresh_capabilities() throws Exception {
 
       assertEquals(
           "GetCapabilities",
-          Objects.requireNonNull(server.takeRequest().getUrl()).queryParameter("REQUEST"));
+          Objects.requireNonNull(Objects.requireNonNull(server.takeRequest(10, TimeUnit.SECONDS))
+                  .getUrl())
+              .queryParameter("REQUEST"));
 
       mockMvc.perform(get(selfLink).accept(MediaType.APPLICATION_JSON))
           .andExpect(status().isOk())