Merge branch 'main' into HTM-1852_geotools-35.x

Author: mprins

.github/workflows/process-test-results.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: 'Download and Extract Artifacts'
-        uses: dawidd6/action-download-artifact@v17
+        uses: dawidd6/action-download-artifact@v19
         with:
           run_id: ${{ github.event.workflow_run.id }}
           path: artifacts

.github/workflows/release-drafter.yml

@@ -16,7 +16,7 @@ jobs:
       contents: write
       pull-requests: read
     steps:
-      - uses: release-drafter/release-drafter@v6
+      - uses: release-drafter/release-drafter@v7
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

pom.xml

@@ -10,7 +10,7 @@ SPDX-License-Identifier: MIT
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <!-- when updating please check version overrides using the commands in the properties section -->
-        <version>4.0.3</version>
+        <version>4.0.4</version>
     </parent>
     <groupId>org.tailormap</groupId>
     <artifactId>tailormap-api</artifactId>
@@ -123,14 +123,15 @@ SPDX-License-Identifier: MIT
         <awaitility.version>4.3.0</awaitility.version>
         <commons-codec.version>1.21.0</commons-codec.version>
         <commons-lang3.version>3.20.0</commons-lang3.version>
-        <flyway.version>12.1.0</flyway.version>
-        <hibernate.version>7.2.6.Final</hibernate.version>
-        <jackson-2-bom.version>2.21.1</jackson-2-bom.version>
+        <commons-codec.version>1.21.0</commons-codec.version>
+        <flyway.version>12.1.1</flyway.version>
+        <hibernate.version>7.2.7.Final</hibernate.version>
+        <jackson-2-bom.version>2.21.2</jackson-2-bom.version>
         <jackson-bom.version>3.1.0</jackson-bom.version>
         <json-path.version>3.0.0</json-path.version>
         <junit-jupiter.version>6.0.3</junit-jupiter.version>
         <micrometer.version>1.16.4</micrometer.version>
-        <mssql-jdbc.version>13.2.1.jre11</mssql-jdbc.version>
+        <mssql-jdbc.version>13.4.0.jre11</mssql-jdbc.version>
         <oracle-database.version>23.26.1.0.0</oracle-database.version>
         <postgresql.version>42.7.10</postgresql.version>
         <maven-clean-plugin.version>3.5.0</maven-clean-plugin.version>
@@ -149,10 +150,10 @@ SPDX-License-Identifier: MIT
         <versions-maven-plugin.version>2.21.0</versions-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
         <dependency-check-maven.version>12.2.0</dependency-check-maven.version>
-        <modernizer-maven-plugin.version>3.2.0</modernizer-maven-plugin.version>
+        <modernizer-maven-plugin.version>3.3.0</modernizer-maven-plugin.version>
         <maven-fluido-skin.version>2.1.0</maven-fluido-skin.version>
-        <swagger-ui.version>5.32.0</swagger-ui.version>
-        <sentry.version>8.35.0</sentry.version>
+        <swagger-ui.version>5.32.1</swagger-ui.version>
+        <sentry.version>8.36.0</sentry.version>
         <errorProne.version>2.48.0</errorProne.version>
         <errorProneFlags>-XepDisableWarningsInGeneratedCode</errorProneFlags>
         <errorProneExcludePaths>${project.build.directory}/generated-sources/.*</errorProneExcludePaths>
@@ -1371,7 +1372,7 @@ SPDX-License-Identifier: MIT
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.0</version>
                 <configuration>
                     <java>
                         <palantirJavaFormat>

src/main/java/org/tailormap/api/configuration/base/StaticOnlySecurityConfiguration.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2026 B3Partners B.V.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+package org.tailormap.api.configuration.base;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.savedrequest.NullRequestCache;
+import org.springframework.security.web.savedrequest.RequestCache;
+
+@Profile("static-only")
+@Configuration
+@EnableWebSecurity
+public class StaticOnlySecurityConfiguration {
+  @Bean
+  public SecurityFilterChain filterChain(HttpSecurity http) {
+    RequestCache nullRequestCache = new NullRequestCache();
+    http.csrf(AbstractHttpConfigurer::disable)
+        .authorizeHttpRequests(authorize -> authorize.anyRequest().permitAll())
+        .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.NEVER))
+        .requestCache((cache) -> cache.requestCache(nullRequestCache));
+    return http.build();
+  }
+}

src/main/java/org/tailormap/api/controller/FeaturesController.java

@@ -86,8 +86,11 @@ public class FeaturesController implements Constants {
   private final FeatureSourceRepository featureSourceRepository;
   private final FilterFactory ff = CommonFactoryFinder.getFilterFactory(GeoTools.getDefaultHints());
 
-  @Value("${tailormap-api.pageSize:100}")
-  private int pageSize;
+  @Value("${tailormap-api.default-page-size:100}")
+  private int defaultPageSize;
+
+  @Value("${tailormap-api.max-page-size:500}")
+  private int maxPageSize;
 
   @Value("${tailormap-api.feature.info.maxitems:30}")
   private int maxFeatures;
@@ -119,6 +122,7 @@ public ResponseEntity<Serializable> getFeatures(
       @RequestParam(defaultValue = "false") Boolean simplify,
       @RequestParam(required = false) String filter,
       @RequestParam(required = false) Integer page,
+      @RequestParam(required = false) Integer pageSize,
       @RequestParam(required = false) String sortBy,
       @RequestParam(required = false, defaultValue = "asc") String sortOrder,
       @RequestParam(defaultValue = "false") boolean onlyGeometries,
@@ -162,6 +166,7 @@ public ResponseEntity<Serializable> getFeatures(
           application,
           appLayerSettings,
           page,
+          pageSize,
           filter,
           sortBy,
           sortOrder,
@@ -180,13 +185,17 @@ public ResponseEntity<Serializable> getFeatures(
       @NotNull Application application,
       @NotNull AppLayerSettings appLayerSettings,
       Integer page,
+      Integer pageSize,
       String filterCQL,
       String sortBy,
       String sortOrder,
       boolean onlyGeometries,
       boolean skipGeometryOutput,
       boolean withAttachments) {
-    FeaturesResponse featuresResponse = new FeaturesResponse().page(page).pageSize(pageSize);
+    int requestedPageSize = pageSize != null ? pageSize : defaultPageSize;
+    requestedPageSize = Math.max(1, requestedPageSize);
+    int requestPageSize = Math.min(maxPageSize, requestedPageSize);
+    FeaturesResponse featuresResponse = new FeaturesResponse().page(page).pageSize(requestPageSize);
 
     SimpleFeatureSource fs = null;
     try {
@@ -264,8 +273,8 @@ public ResponseEntity<Serializable> getFeatures(
       if (sortAttrName != null) {
         q.setSortBy(ff.sort(sortAttrName, _sortOrder));
       }
-      q.setMaxFeatures(pageSize);
-      q.setStartIndex((page - 1) * pageSize);
+      q.setMaxFeatures(requestPageSize);
+      q.setStartIndex((page - 1) * requestPageSize);
       logger.debug("Attribute query: {}", q);
 
       executeQueryOnFeatureSourceAndClose(

src/main/java/org/tailormap/api/controller/SearchController.java

@@ -53,7 +53,7 @@ public class SearchController {
   @Value("${tailormap-api.solr-query-timeout-seconds:7}")
   private int solrQueryTimeout;
 
-  @Value("${tailormap-api.pageSize:100}")
+  @Value("${tailormap-api.default-page-size:100}")
   private int numResultsToReturn;
 
   public SearchController(SearchIndexRepository searchIndexRepository, SolrService solrService) {

src/main/resources/application-static-only.properties

@@ -10,7 +10,10 @@ spring.web.resources.static-locations=file:/home/cnb/static/,classpath:/static/
 
 spring.main.banner-mode=off
 
-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration,org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration,org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration
+spring.autoconfigure.exclude[0]=org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration
+spring.autoconfigure.exclude[1]=org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration
+spring.autoconfigure.exclude[2]=org.springframework.boot.security.autoconfigure.UserDetailsServiceAutoConfiguration
+spring.autoconfigure.exclude[3]=org.springframework.boot.quartz.autoconfigure.QuartzAutoConfiguration
 
 management.endpoints.access.default=none
 management.endpoints.web.exposure.exclude=*

src/main/resources/application.properties

@@ -20,7 +20,8 @@ tailormap-api.security.admin.hashed-password=${ADMIN_HASHED_PASSWORD:#{null}}
 tailormap-api.timeout=5000
 
 # page size for features
-tailormap-api.pageSize=100
+tailormap-api.default-page-size=100
+tailormap-api.max-page-size=500
 # whether the api should attempt to provide exact feature counts for all WFS requests
 # may result in double query execution, once for counting and once for the actual data
 tailormap-api.features.wfs_count_exact=false

src/main/resources/openapi/viewer-api.yaml

@@ -945,6 +945,13 @@ paths:
         schema:
           type: integer
           minimum: 1
+      - description: 'Page size to retrieve. Default value is 100. Default maximum value is 500.'
+        in: query
+        name: pageSize
+        required: false
+        schema:
+          type: integer
+          minimum: 1
       - description: '
           The attribute name (not alias) to sort by. 
           The name must be of a configured attribute and not a geometry type.

src/test/java/org/tailormap/api/controller/FeaturesControllerIntegrationTest.java

@@ -88,9 +88,12 @@ class FeaturesControllerIntegrationTest {
   @Value("${tailormap-api.features.wfs_count_exact:false}")
   private boolean exactWfsCounts;
 
-  @Value("${tailormap-api.pageSize}")
+  @Value("${tailormap-api.default-page-size}")
   private int pageSize;
 
+  @Value("${tailormap-api.max-page-size}")
+  private int maxPageSize;
+
   static Stream<Arguments> databaseArgumentsProvider() {
     return Stream.of(
         // docker host,table,url, feature count
@@ -433,6 +436,74 @@ void should_return_empty_featurecollection_for_out_of_range_page_from_wfs() thro
     assertEquals(0, features.size(), "there should be 0 provinces in the list");
   }
 
+  @Test
+  @WithMockUser(
+      username = "tm-admin",
+      authorities = {"admin"})
+  void should_use_default_page_size_when_not_specified() throws Exception {
+    final String url = apiBasePath + begroeidterreindeelUrlPostgis;
+    MvcResult result = mockMvc.perform(get(url).accept(MediaType.APPLICATION_JSON)
+            .with(setServletPath(url))
+            .param("page", "1"))
+        .andExpect(status().isOk())
+        .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+        .andExpect(jsonPath("$.page").value(1))
+        .andExpect(jsonPath("$.pageSize").value(pageSize))
+        .andExpect(jsonPath("$.features").isArray())
+        .andExpect(jsonPath("$.features").isNotEmpty())
+        .andReturn();
+
+    List<?> features = JsonPath.read(result.getResponse().getContentAsString(), "$.features");
+    assertEquals(pageSize, features.size(), "number of returned features should equal the default page size");
+  }
+
+  @Test
+  @WithMockUser(
+      username = "tm-admin",
+      authorities = {"admin"})
+  void should_use_custom_page_size_when_specified() throws Exception {
+    int requestedPageSize = pageSize - 1; // smaller than default, so the data set has enough rows
+    final String url = apiBasePath + begroeidterreindeelUrlPostgis;
+    MvcResult result = mockMvc.perform(get(url).accept(MediaType.APPLICATION_JSON)
+            .with(setServletPath(url))
+            .param("page", "1")
+            .param("pageSize", String.valueOf(requestedPageSize)))
+        .andExpect(status().isOk())
+        .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+        .andExpect(jsonPath("$.page").value(1))
+        .andExpect(jsonPath("$.pageSize").value(requestedPageSize))
+        .andExpect(jsonPath("$.features").isArray())
+        .andExpect(jsonPath("$.features").isNotEmpty())
+        .andReturn();
+
+    List<?> features = JsonPath.read(result.getResponse().getContentAsString(), "$.features");
+    assertEquals(
+        requestedPageSize, features.size(), "number of returned features should equal the requested page size");
+  }
+
+  @Test
+  @WithMockUser(
+      username = "tm-admin",
+      authorities = {"admin"})
+  void should_cap_page_size_at_max_page_size() throws Exception {
+    int oversizedPageSize = maxPageSize + 100; // well above the configured maxPageSize
+    final String url = apiBasePath + begroeidterreindeelUrlPostgis;
+    MvcResult result = mockMvc.perform(get(url).accept(MediaType.APPLICATION_JSON)
+            .with(setServletPath(url))
+            .param("page", "1")
+            .param("pageSize", String.valueOf(oversizedPageSize)))
+        .andExpect(status().isOk())
+        .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+        .andExpect(jsonPath("$.page").value(1))
+        .andExpect(jsonPath("$.pageSize").value(maxPageSize))
+        .andExpect(jsonPath("$.features").isArray())
+        .andExpect(jsonPath("$.features").isNotEmpty())
+        .andReturn();
+
+    List<?> features = JsonPath.read(result.getResponse().getContentAsString(), "$.features");
+    assertEquals(maxPageSize, features.size(), "number of returned features should be capped at maxPageSize");
+  }
+
   @Test
   @WithMockUser(
       username = "tm-admin",