From 63253581a36f6cb3912ff167b8160116215cdd68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Wed, 12 Jun 2024 11:22:45 +0200 Subject: [PATCH 1/2] RED-9334: Enabled to stream downloads > 2gb from blob storage --- .../persistence-service-processor-v1/build.gradle.kts | 2 +- .../persistence-service-server-v1/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts b/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts index 6ec669f08..1532714cd 100644 --- a/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts +++ b/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts @@ -51,7 +51,7 @@ dependencies { api("org.springframework.security:spring-security-messaging:6.1.3") api("com.iqser.red.commons:spring-commons:2.1.0") api("com.iqser.red.commons:jackson-commons:2.1.0") - api("com.iqser.red.commons:storage-commons:2.45.0") + api("com.iqser.red.commons:storage-commons:2.47.0") api("com.iqser.red.commons:spring-boot-starter-web-custom-commons:2.1.0") api("com.iqser.red.commons:metric-commons:2.1.0") api("org.apache.commons:commons-compress:1.21") diff --git a/persistence-service-v1/persistence-service-server-v1/build.gradle.kts b/persistence-service-v1/persistence-service-server-v1/build.gradle.kts index 6e14c8152..b6296ea21 100644 --- a/persistence-service-v1/persistence-service-server-v1/build.gradle.kts +++ b/persistence-service-v1/persistence-service-server-v1/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { api(project(":persistence-service-external-api-impl-v2")) api(project(":persistence-service-internal-api-impl-v1")) api(project(":persistence-service-shared-mongo-v1")) - api("com.iqser.red.commons:storage-commons:2.45.0") + api("com.iqser.red.commons:storage-commons:2.47.0") api("junit:junit:4.13.2") api("org.apache.logging.log4j:log4j-slf4j-impl:2.19.0") api("net.logstash.logback:logstash-logback-encoder:7.4") -- 2.47.2 From c90606f4c05ad14707da81c2759a4e5d7a22c5b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Wed, 12 Jun 2024 15:26:27 +0200 Subject: [PATCH 2/2] RED-9334: Fixed missing dependencies --- .../persistence-service-processor-v1/build.gradle.kts | 2 +- .../persistence-service-server-v1/build.gradle.kts | 2 +- .../peristence/v1/server/integration/tests/RulesTest.java | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts b/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts index 1532714cd..06185f7a3 100644 --- a/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts +++ b/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts @@ -51,7 +51,7 @@ dependencies { api("org.springframework.security:spring-security-messaging:6.1.3") api("com.iqser.red.commons:spring-commons:2.1.0") api("com.iqser.red.commons:jackson-commons:2.1.0") - api("com.iqser.red.commons:storage-commons:2.47.0") + api("com.iqser.red.commons:storage-commons:2.48.0") api("com.iqser.red.commons:spring-boot-starter-web-custom-commons:2.1.0") api("com.iqser.red.commons:metric-commons:2.1.0") api("org.apache.commons:commons-compress:1.21") diff --git a/persistence-service-v1/persistence-service-server-v1/build.gradle.kts b/persistence-service-v1/persistence-service-server-v1/build.gradle.kts index b6296ea21..2626c28f5 100644 --- a/persistence-service-v1/persistence-service-server-v1/build.gradle.kts +++ b/persistence-service-v1/persistence-service-server-v1/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { api(project(":persistence-service-external-api-impl-v2")) api(project(":persistence-service-internal-api-impl-v1")) api(project(":persistence-service-shared-mongo-v1")) - api("com.iqser.red.commons:storage-commons:2.47.0") + api("com.iqser.red.commons:storage-commons:2.48.0") api("junit:junit:4.13.2") api("org.apache.logging.log4j:log4j-slf4j-impl:2.19.0") api("net.logstash.logback:logstash-logback-encoder:7.4") diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/RulesTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/RulesTest.java index 6ac61f6b0..df53f3842 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/RulesTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/RulesTest.java @@ -26,7 +26,6 @@ import com.iqser.red.service.redaction.v1.model.DroolsValidation; import com.iqser.red.service.redaction.v1.model.RuleValidationModel; import feign.FeignException; -import software.amazon.awssdk.http.HttpStatusCode; public class RulesTest extends AbstractPersistenceServerServiceTest { @@ -52,7 +51,7 @@ public class RulesTest extends AbstractPersistenceServerServiceTest { assertThat(rulesClient.download(dossierTemplate.getId()).getRules()).isEqualTo("lorem ipsum"); response = rulesClient.upload(new RulesUploadRequestModel("lorem ipsum dolor sit amet", dossierTemplate.getId(), RuleFileType.ENTITY, false)); - assertThat(response.getStatusCode().value()).isEqualTo(HttpStatusCode.OK); + assertThat(response.getStatusCode().value()).isEqualTo(HttpStatus.SC_OK); assertThat(versionClient.getVersions(List.of(dossierTemplate.getId())) .get(dossierTemplate.getId()).getRulesVersion()).isEqualTo(4); assertThat(rulesClient.download(dossierTemplate.getId()).getRules()).isEqualTo("lorem ipsum dolor sit amet"); -- 2.47.2