Merge commit '26bb4ec356040e1666d9ab922ab1116c529b43c7'

Author: SebaDro

CHANGELOG.md

@@ -1,6 +1,26 @@
 # Change Log
 
-## 4.1.1
+## 4.2.0-beta.1
+* Set default log level to DEBUG [1582c81](1582c81a3bf31e627492c6be7e217e44d2f55de6)
+* Fix empty value list for aggregation [2e70c12](2e70c12940b34f8890b9a8c828285290ee0f233c)
+* Fix higher spatial unit aggregation [f8b4d32](f8b4d32f94595914c65c6303b6919e3a589b5536)
+* Increase minor version [3f8d5c7](3f8d5c72d010c905c7c4e361fd618bd52b287712)
+* Implement further agregation functions and add tests [b19e2af](b19e2af397881d59369deae73949dc73dbd5e076)
+* Refactor unit tests and add tests for aggregation count [3d439d7](3d439d75d1853b6725990dcff59a1be6c74b39b4)
+* Add aggregation type to models [b313283](b313283ae302721ff566f1921f302a0fb5d8d3c8)
+* Fix count aggregation [c24693f](c24693f23dfd782bd003be2d682e316bc2d4222c)
+* Adjust docker test setup [b0bc09b](b0bc09b42175a170ffb31862b2241041f86b3823)
+* Include successfully aggregated features in response [56335a7](56335a7636a7577e806b7f7f4ca02dab9dce0151)
+* Take into account results for aggregations in response and monitor [460c434](460c43444772e1463fa82e042d906b84a306ce16)
+* Implement aggregation unit tests [09c66bf](09c66bfc7b0c169ac41d3a021231ebfec37ef25a)
+* Implement count aggregation [cf081ad](cf081ad657ffcee15a576359be0696faecf73175)
+* Fix tests [200a3c6](200a3c670c25e1daad8a70a2de5e08f458d7dd27)
+* Introduce aggregation for higher spatial units [1f89cf5](1f89cf5f551cc4625d5c0453411b1585e492a45e)
+* Replace deprecated mock annotation [7b2a86b](7b2a86b83c037609f8cea0563e1658f7a68172a9)
+* Refactor DataSourceRetrieverRepository [be426e5](be426e5e94f60ae1827b39fedc454ab809bcdfae)
+* Refactor controller classes [38b6c0d](38b6c0d59c017c6716877cdd0acbea64c2c302b1)
+* Regenerate API classes for introducing required POST body constraint [1ef3e3d](1ef3e3dc26cd7102edbad8f9d7c039f46dac8b6a)
+* Generate models for new aggregation parameter [07f32d9](07f32d9ccd2576faa103ab2e4d39e0dbe381d62b)
 * Change model class generation config and regenerate models [9538269](9538269c5d6bbd75952a043d1aedf599471b840c)
 * Update API client classes [6241bf2](6241bf2e9142034cd66c8b2df9fec1f4d691c9db)
 * Regenerate model classes [da681a5](da681a5fd250920a432fab2905116c6254edd1c3)

docker/config/data-management.env

@@ -48,7 +48,7 @@ DB_SCHEMA_INDICATORS=public # only relevant with GeoServer connection
 #     Keycloak      #
 #####################
 KEYCLOAK_RESOURCE=kommonitor-data-management # client/resource id of data management component in Keycloak realm
-KEYCLOAK_CLI_SECRET=data-management-secret
+KEYCLOAK_CLI_SECRET=keycloak-cli-secret
 
 #####################
 #    Swagger-UI     #

docker/docker-compose.yml

@@ -51,6 +51,8 @@ services:
       - "8085:8085"
     networks:
       - kommonitor
+    volumes:
+      - ./storage/database/data:/var/lib/postgresql/data
     links:
       - kommonitor-db
     env_file:

docker/realms/realm-export.json

@@ -698,7 +698,7 @@
       "enabled": true,
       "alwaysDisplayInConsole": false,
       "clientAuthenticatorType": "client-secret",
-      "secret": "**********",
+      "secret": "keycloak-cli-secret",
       "redirectUris": [],
       "webOrigins": [],
       "notBefore": 0,

kommonitor-datamanagement-api-client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.n52.kommonitor</groupId>
         <artifactId>kommonitor-importer</artifactId>
-        <version>4.1.1</version>
+        <version>4.2.0-beta.1</version>
     </parent>
 
     <artifactId>kommonitor-data-management-api-client</artifactId>

kommonitor-importer-api/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.n52.kommonitor</groupId>
         <artifactId>kommonitor-importer</artifactId>
-        <version>4.1.1</version>
+        <version>4.2.0-beta.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kommonitor-importer-api/src/main/java/org/n52/kommonitor/importer/api/ConvertersApiController.java

@@ -51,7 +51,7 @@ public ResponseEntity<ConverterType> getConverterByName(
         LOG.info("Recevied 'getConverterByName' request for name: {}", name);
 
         Optional<AbstractConverter> converterOpt = converterRepository.getConverter(name);
-        if (!converterOpt.isPresent()) {
+        if (converterOpt.isEmpty()) {
             throw new ResourceNotFoundException(AbstractConverter.class, name);
         }
         return new ResponseEntity<ConverterType>(encoder.encode(converterOpt.get()), HttpStatus.OK);

kommonitor-importer-api/src/main/java/org/n52/kommonitor/importer/api/DatasourceTypesApiController.java

@@ -51,8 +51,8 @@ public ResponseEntity<DataSourceType> getSupportedDataSourceTypeByType(
             @PathVariable("type") String type) {
         LOG.info("Recevied 'getSupportedDataSourceTypeByType' request for type: {}", type);
 
-        Optional<AbstractDataSourceRetriever> retrieverOpt = retrieverRepository.getDataSourceRetriever(type);
-        if (!retrieverOpt.isPresent()) {
+        Optional<AbstractDataSourceRetriever<?>> retrieverOpt = retrieverRepository.getDataSourceRetriever(type);
+        if (retrieverOpt.isEmpty()) {
             throw new ResourceNotFoundException(AbstractDataSourceRetriever.class, type);
         }
         return new ResponseEntity<DataSourceType>(encoder.encode(retrieverOpt.get()), HttpStatus.OK);

kommonitor-importer-api/src/main/java/org/n52/kommonitor/importer/api/GeoresourcesApi.java

@@ -37,7 +37,7 @@
 import java.util.Optional;
 import jakarta.annotation.Generated;
 
-@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2025-09-01T10:33:50.760291700+02:00[Europe/Berlin]", comments = "Generator version: 7.15.0")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2025-09-04T08:36:34.666758+02:00[Europe/Berlin]", comments = "Generator version: 7.15.0")
 @Validated
 @Tag(name = "georesources", description = "Additional georesources that are necessary for the computation of indicators (e.g. land use, locations of schools, streets/ways)")
 public interface GeoresourcesApi {
@@ -47,7 +47,7 @@ public interface GeoresourcesApi {
      * POST /georesources : Import a new geo-resource
      * Import a geo-resource dataset for a certain period of time. Parses Input source, extracts relevant data, performs schema mapping to KomMonitor data model and calls POST /georesources of KomMonitor Data Management API
      *
-     * @param importGeoresourcePOSTInputType Definitions to create georesources (optional)
+     * @param importGeoresourcePOSTInputType Definitions to create georesources (required)
      * @return List of created feature IDs (status code 200)
      *         or Bad Request (status code 400)
      *         or Unauthenticated (status code 401)
@@ -79,7 +79,7 @@ public interface GeoresourcesApi {
     )
 
     ResponseEntity<ImportResponseType> importGeoresource(
-        @Parameter(name = "ImportGeoresourcePOSTInputType", description = "Definitions to create georesources") @Valid @RequestBody(required = false) @Nullable ImportGeoresourcePOSTInputType importGeoresourcePOSTInputType
+        @Parameter(name = "ImportGeoresourcePOSTInputType", description = "Definitions to create georesources", required = true) @Valid @RequestBody ImportGeoresourcePOSTInputType importGeoresourcePOSTInputType
     ) throws Exception;
 
 
@@ -88,7 +88,7 @@ ResponseEntity<ImportResponseType> importGeoresource(
      * POST /georesources/update : Update a georesource
      * Update a georesource dataset for a certain period of time. Parses Input source, extracts relevant data, performs schema mapping to KomMonitor data model and calls PUT /georesources of KomMonitor Data Management API
      *
-     * @param updateGeoresourcePOSTInputType Definitions to update georesources (optional)
+     * @param updateGeoresourcePOSTInputType Definitions to update georesources (required)
      * @return List of created feature IDs (status code 200)
      *         or Bad Request (status code 400)
      *         or Unauthenticated (status code 401)
@@ -120,7 +120,7 @@ ResponseEntity<ImportResponseType> importGeoresource(
     )
 
     ResponseEntity<ImportResponseType> updateGeoresource(
-        @Parameter(name = "UpdateGeoresourcePOSTInputType", description = "Definitions to update georesources") @Valid @RequestBody(required = false) @Nullable UpdateGeoresourcePOSTInputType updateGeoresourcePOSTInputType
+        @Parameter(name = "UpdateGeoresourcePOSTInputType", description = "Definitions to update georesources", required = true) @Valid @RequestBody UpdateGeoresourcePOSTInputType updateGeoresourcePOSTInputType
     ) throws Exception;
 
 }

kommonitor-importer-api/src/main/java/org/n52/kommonitor/importer/api/GeoresourcesApiController.java

@@ -8,9 +8,7 @@
 import org.n52.kommonitor.importer.api.exceptions.ImportException;
 import org.n52.kommonitor.importer.api.handler.AbstractRequestHandler;
 import org.n52.kommonitor.importer.api.handler.RequestHandlerRepository;
-import org.n52.kommonitor.importer.converter.ConverterRepository;
 import org.n52.kommonitor.importer.exceptions.ImportParameterException;
-import org.n52.kommonitor.importer.io.datasource.DataSourceRetrieverRepository;
 import org.n52.kommonitor.models.ImportGeoresourcePOSTInputType;
 import org.n52.kommonitor.models.ImportResponseType;
 import org.n52.kommonitor.models.UpdateGeoresourcePOSTInputType;
@@ -29,12 +27,6 @@ public class GeoresourcesApiController implements GeoresourcesApi {
 
     private static final Logger LOG = LoggerFactory.getLogger(GeoresourcesApiController.class);
 
-    @Autowired
-    private ConverterRepository converterRepository;
-
-    @Autowired
-    private DataSourceRetrieverRepository retrieverRepository;
-
     @Autowired
     private RequestHandlerRepository requestHandlerRepository;
 
@@ -48,28 +40,30 @@ public GeoresourcesApiController(ObjectMapper objectMapper, HttpServletRequest r
         this.request = request;
     }
 
+    @Override
     public ResponseEntity<ImportResponseType> importGeoresource(
             @Parameter(description = "feature data", required = true)
             @Valid @RequestBody ImportGeoresourcePOSTInputType featureData) throws ImportException, ImportParameterException {
         LOG.info("Received 'importGeoresource' request for dataset name: {}", featureData.getGeoresourcePostBody().getDatasetName());
         LOG.debug("'importGeoresource' POST request body: {}", featureData);
 
-        Optional<AbstractRequestHandler> requestHandlertOpt = requestHandlerRepository.getRequestHandler(featureData);
-        if (!requestHandlertOpt.isPresent()) {
+        Optional<AbstractRequestHandler<ImportGeoresourcePOSTInputType>> requestHandlerOpt = requestHandlerRepository.getRequestHandler(featureData);
+        if (requestHandlerOpt.isEmpty()) {
             throw new ImportException(String.format("No request handler found for request type '%s'", featureData.getClass()));
         }
-        return requestHandlertOpt.get().handleRequest(featureData, featureData.getDataSource(), featureData.getConverter());
+        return requestHandlerOpt.get().handleRequest(featureData, featureData.getDataSource(), featureData.getConverter());
     }
 
     @Override
     public ResponseEntity<ImportResponseType> updateGeoresource(@Valid UpdateGeoresourcePOSTInputType featureData) throws ImportException, ImportParameterException {
         LOG.info("Received 'updateGeoresource' request for Georesource: {}", featureData.getGeoresourceId());
         LOG.debug("'updateGeoresource' POST request body: {}", featureData);
 
-        Optional<AbstractRequestHandler> requestHandlertOpt = requestHandlerRepository.getRequestHandler(featureData);
-        if (!requestHandlertOpt.isPresent()) {
+        Optional<AbstractRequestHandler<UpdateGeoresourcePOSTInputType>> requestHandlerOpt = requestHandlerRepository.getRequestHandler(featureData);
+
+        if (requestHandlerOpt.isEmpty()) {
             throw new ImportException(String.format("No request handler found for request type '%s'", featureData.getClass()));
         }
-        return requestHandlertOpt.get().handleRequest(featureData, featureData.getDataSource(), featureData.getConverter());
+        return requestHandlerOpt.get().handleRequest(featureData, featureData.getDataSource(), featureData.getConverter());
     }
 }