fix wrong server url that contains unexpected params

Author: NekoLyn

server/src/main/java/au/org/aodn/ogcapi/server/core/service/wfs/WfsServer.java

@@ -84,8 +84,15 @@ public WfsServer(Search search,
      * Build WFS GetFeature URL
      */
     protected String createWfsRequestUrl(String wfsUrl, String layerName, List<String> fields, String cqlFilter, String outputFormat) {
-        UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(wfsUrl)
-                .scheme("https");  // Force HTTPS to fix redirect
+        UriComponents components = UriComponentsBuilder.fromUriString(wfsUrl).build();
+        UriComponentsBuilder builder = UriComponentsBuilder.newInstance()
+                .scheme("https")  // Force HTTPS to fix redirect
+                .host(components.getHost())
+                .path(Objects.requireNonNull(components.getPath()));
+
+        if (components.getPort() != -1) {
+            builder.port(components.getPort());
+        }
 
         Map<String, String> param = new HashMap<>(wfsDefaultParam.getDownload());
         param.put("typeName", layerName);
@@ -446,6 +453,7 @@ public Optional<String> getFeatureServerUrlByTitleOrQueryParam(String collection
     public Optional<String> getFeatureServerUrl(String collectionId, String layerName) {
         Optional<String> url = getFeatureServerUrlByTitleOrQueryParam(collectionId, layerName);
         if (url.isPresent()) {
+            log.debug("Found WFS link by title/query param for collectionId {} with layerName {}: {}", collectionId, layerName, url.get());
             return url;
         }
 

server/src/test/java/au/org/aodn/ogcapi/server/core/service/wfs/WfsServerTest.java

@@ -349,6 +349,50 @@ void createFeatureFieldQueryUrl_buildsCorrectUrlWithTypename() {
         assertTrue(result.contains("REQUEST=DescribeFeatureType")); // original one is replaced
     }
 
+    @Test
+    void createWfsRequestUrl_stripsOldParamsFromServerUrl() {
+        // The server URL already has query params that would cause duplicates
+        String serverUrlWithParams = "https://geoserver.imas.utas.edu.au/geoserver/seamap/wfs"
+                + "?version=1.0.0&request=GetFeature&typeName=SeamapAus_VIC_statewide_habitats_2023&outputFormat=SHAPE-ZIP";
+
+        String layerName = "seamap:SeamapAus_VIC_statewide_habitats_2023";
+        String outputFormat = "text/csv";
+
+        WfsServer server = new WfsServer(mockSearch, restTemplate, new RestTemplateUtils(restTemplate), entity, wfsDefaultParam);
+        String result = server.createWfsRequestUrl(serverUrlWithParams, layerName, null, null, outputFormat);
+
+        assertNotNull(result);
+
+        // Old param values from the server URL must NOT appear
+        assertFalse(result.contains("SHAPE-ZIP"), "Old outputFormat value should be removed");
+        assertFalse(result.contains("typeName=SeamapAus_VIC_statewide_habitats_2023&"),
+                "Old typeName (without namespace prefix) should be removed");
+
+        // New param values must be present
+        assertTrue(result.contains("typeName=seamap:SeamapAus_VIC_statewide_habitats_2023"),
+                "New typeName with namespace prefix should be present");
+        assertTrue(result.contains("outputFormat=text/csv"),
+                "New outputFormat should be present");
+
+        // Default download params from config
+        assertTrue(result.contains("SERVICE=WFS"), "SERVICE param should be present");
+        assertTrue(result.contains("VERSION=1.0.0"), "VERSION param should be present");
+        assertTrue(result.contains("REQUEST=GetFeature"), "REQUEST param should be present");
+
+        // No duplicate keys — each param name should appear exactly once
+        String query = result.substring(result.indexOf('?') + 1);
+        String[] pairs = query.split("&");
+        long typeNameCount = java.util.Arrays.stream(pairs).filter(p -> p.toLowerCase().startsWith("typename=")).count();
+        long outputFormatCount = java.util.Arrays.stream(pairs).filter(p -> p.toLowerCase().startsWith("outputformat=")).count();
+        long versionCount = java.util.Arrays.stream(pairs).filter(p -> p.toLowerCase().startsWith("version=")).count();
+        long requestCount = java.util.Arrays.stream(pairs).filter(p -> p.toLowerCase().startsWith("request=")).count();
+
+        assertEquals(1, typeNameCount, "typeName should appear exactly once");
+        assertEquals(1, outputFormatCount, "outputFormat should appear exactly once");
+        assertEquals(1, versionCount, "VERSION should appear exactly once");
+        assertEquals(1, requestCount, "REQUEST should appear exactly once");
+    }
+
     @Test
     void createCapabilitiesQueryUrl_buildsCorrectUrl() {
         // arrange