Merge branch 'master' into feature/DS-817-aws-s3-v2

Author: solodovn1

pom.xml

@@ -41,7 +41,7 @@
 
   <groupId>com.here.xyz</groupId>
   <artifactId>xyz-hub</artifactId>
-  <version>3.17.2-SNAPSHOT</version>
+  <version>3.17.5-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -93,7 +93,7 @@
     <!-- Dependencies versions -->
     <aws-sdk-version>1.12.772</aws-sdk-version>
     <aws-sdk2-version>2.25.8</aws-sdk2-version>
-    <vertx-version>4.4.9</vertx-version>
+    <vertx-version>4.5.14</vertx-version>
     <geo-tools-version>30.1</geo-tools-version>
     <jts-version>1.19.0</jts-version>
     <jackson-version>2.15.2</jackson-version>

xyz-connectors/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>3.17.2-SNAPSHOT</version>
+    <version>3.17.5-SNAPSHOT</version>
   </parent>
 
   <licenses>

xyz-hub-service/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>3.17.2-SNAPSHOT</version>
+    <version>3.17.5-SNAPSHOT</version>
   </parent>
 
   <licenses>

xyz-hub-service/src/main/java/io/vertx/openapi/contract/MediaType.java

@@ -6,19 +6,17 @@
 import java.util.Arrays;
 import java.util.List;
 
-/**
- * This interface represents the most important attributes of an OpenAPI Operation.
- * <br>
- * <a href="https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#media-type-Object">Operation V3.1</a>
- * <br>
- * <a href="https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#media-type-Object">Operation V3.0</a>
- */
 public interface MediaType extends OpenAPIObject {
 
+  String APPLICATION_HAL_JSON = "application/hal+json";
   String APPLICATION_JSON = HttpHeaderValues.APPLICATION_JSON.toString();
   String APPLICATION_JSON_UTF8 = APPLICATION_JSON + "; charset=utf-8";
-  List<String> SUPPORTED_MEDIA_TYPES = Arrays.asList(APPLICATION_JSON,
+  String MULTIPART_FORM_DATA = HttpHeaderValues.MULTIPART_FORM_DATA.toString();
+  List<String> SUPPORTED_MEDIA_TYPES = Arrays.asList(
+      APPLICATION_JSON,
       APPLICATION_JSON_UTF8,
+      MULTIPART_FORM_DATA,
+      APPLICATION_HAL_JSON,
       "application/vnd.here.changeset-collection",
       "application/vnd.here.changeset",
       "application/vnd.here.compact-changeset",

xyz-hub-test/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>3.17.2-SNAPSHOT</version>
+    <version>3.17.5-SNAPSHOT</version>
   </parent>
 
   <licenses>

xyz-hub-test/src/test/java/com/here/xyz/hub/rest/LimitsTestIT.java

@@ -26,12 +26,16 @@
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.equalTo;
 
+import com.here.xyz.jobs.steps.impl.transport.ImportFilesToSpace;
 import io.restassured.response.ValidatableResponse;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.util.Random;
+
 public class LimitsTestIT extends TestSpaceWithFeature {
 
   private String cleanUpId;
@@ -94,6 +98,38 @@ public void addMultipleFeatures() throws InterruptedException {
         statusCode(FORBIDDEN.code());
   }
 
+  @Test
+  public void addMoreThen10Mb() throws InterruptedException {
+    int featureCount = 1024*12; // around 12 megabytes
+    var content = generateFeatureCollection(featureCount);
+    var headers = getAuthHeaders(AuthProfile.ACCESS_ALL);
+    var response = given().
+        accept(APPLICATION_GEO_JSON).
+        contentType(APPLICATION_GEO_JSON).
+        headers(headers).
+        body(content).
+        when().post("/spaces/x-psql-test/features");
+    response.then().statusCode(OK.code());
+  }
+
+  private String generateFeatureCollection(int count) {
+    String content = "{\"type\":\"FeatureCollection\",\"features\":[";
+    for (int i = 0; i < count; i++) {
+      content += generateContentLine(i);
+      if (i < count - 1) {
+        content += ",";
+      }
+    }
+    content += "]}";
+    return content;
+  }
+
+  private String generateContentLine(int id) {
+    Random rd = new Random();
+    String randomString = RandomStringUtils.randomAlphanumeric(900);
+    return "{\"id\":\""+id+"\",\"type\":\"Feature\",\"geometry\":{\"type\":\"Point\",\"coordinates\":["+(rd.nextInt(179))+"."+(rd.nextInt(100))+","+(rd.nextInt(79))+"."+(rd.nextInt(100))+"]},\"properties\":{\"test\":\""+ randomString+"\"}}";
+  }
+
   @Test
   public void add1Feature() {
     given().

xyz-jobs/README.md

@@ -8,5 +8,6 @@ A framework that can be used to perform long-running jobs (e.g., bulk import / e
 2. Build & deploy the Job Step Lambda into the localstack by running the run-config `xyz-job-steps [install]`
 3. Start the XYZ Hub Service by running the run-config `HubService`
 4. Start the XYZ Job Service by running the run-config `JobService`
+5. Optional run `CService`
 
 Optionally: Start the JobPlayground by running `JobPlayground#main()`

xyz-jobs/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
-    <version>3.17.2-SNAPSHOT</version>
+    <version>3.17.5-SNAPSHOT</version>
   </parent>
 
   <name>XYZ Job Framework</name>

xyz-jobs/xyz-job-service/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-jobs</artifactId>
-    <version>3.17.2-SNAPSHOT</version>
+    <version>3.17.5-SNAPSHOT</version>
   </parent>
 
   <name>XYZ Job Service</name>

xyz-jobs/xyz-job-service/src/main/java/com/here/xyz/jobs/JobPlayground.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2024 HERE Europe B.V.
+ * Copyright (C) 2017-2025 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@
 import com.here.xyz.models.hub.Ref;
 import com.here.xyz.models.hub.Space;
 import com.here.xyz.util.ARN;
-import com.here.xyz.util.db.pg.XyzSpaceTableHelper.Index;
+import com.here.xyz.util.db.pg.XyzSpaceTableHelper.SystemIndex;
 import com.here.xyz.util.runtime.LambdaFunctionRuntime;
 import com.here.xyz.util.service.Core;
 import com.here.xyz.util.service.aws.SimulatedContext;
@@ -237,7 +237,7 @@ private static void startLambdaExecutions() throws IOException, WebClientExcepti
 
       runImportFilesToSpaceStep(sampleSpace.getId(), importFormat);
 
-      for (Index index : Index.values())
+      for (SystemIndex index : SystemIndex.values())
         runCreateIndexStep(sampleSpace.getId(), index);
 
       runAnalyzeSpaceTableStep(sampleSpace.getId());
@@ -483,7 +483,7 @@ public static void runImportFilesToSpaceStep(String spaceId, ImportFilesToSpace.
     runStep(new ImportFilesToSpace().withSpaceId(spaceId).withFormat(format).withUpdateStrategy(UpdateStrategy.DEFAULT_UPDATE_STRATEGY));
   }
 
-  public static void runCreateIndexStep(String spaceId, Index index) throws IOException {
+  public static void runCreateIndexStep(String spaceId, SystemIndex index) throws IOException {
     runStep(new CreateIndex().withSpaceId(spaceId).withIndex(index));
   }