Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

Merge branch 'RED-6864' into 'master'

Browse Source 
Resolve RED-6864

Closes RED-6864

See merge request redactmanager/redaction-service!93
This commit is contained in:
Andrei Isvoran 2023-08-16 14:29:11 +02:00
commit 9d5d140a79
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
redaction-service-v1/redaction-service-server-v1/build.gradle.kts
View File

@ -12,7 +12,7 @@ plugins {
description = "redaction-service-server-v1" description = "redaction-service-server-v1"
val layoutParserVersion = "0.23.0" val layoutParserVersion = "0.25.0"
val jacksonVersion = "2.15.2" val jacksonVersion = "2.15.2"
val droolsVersion = "8.42.0.Final" val droolsVersion = "8.42.0.Final"
val pdfBoxVersion = "3.0.0-alpha2" val pdfBoxVersion = "3.0.0-alpha2"
@ -33,7 +33,7 @@ dependencies {
implementation("com.iqser.red.commons:metric-commons:2.3.0") implementation("com.iqser.red.commons:metric-commons:2.3.0")
implementation("com.iqser.red.commons:dictionary-merge-commons:1.5.0") implementation("com.iqser.red.commons:dictionary-merge-commons:1.5.0")
implementation("com.iqser.red.commons:storage-commons:2.25.0") implementation("com.iqser.red.commons:storage-commons:2.27.0")
implementation("com.knecon.fforesight:tenant-commons:0.10.0") implementation("com.knecon.fforesight:tenant-commons:0.10.0")
implementation("com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}") implementation("com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}")

7
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java
View File

@ -1,5 +1,7 @@
package com.iqser.red.service.redaction.v1.server.storage; package com.iqser.red.service.redaction.v1.server.storage;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream; import java.io.InputStream;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -36,7 +38,10 @@ public class RedactionStorageService {
@SneakyThrows @SneakyThrows
public InputStream getStoredObject(String storageId) { public InputStream getStoredObject(String storageId) {
return storageService.getObject(TenantContext.getTenantId(), storageId).getInputStream(); File tempFile = File.createTempFile("temp", "data");
tempFile.deleteOnExit();
storageService.downloadTo(TenantContext.getTenantId(), storageId, tempFile);
return new FileInputStream(tempFile);
} }

7
redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/FileSystemBackedStorageService.java
View File

@ -2,6 +2,7 @@ package com.iqser.red.service.redaction.v1.server;
import static java.io.File.createTempFile; import static java.io.File.createTempFile;
import java.io.BufferedInputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@ -11,9 +12,9 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.zip.GZIPInputStream;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.springframework.core.io.InputStreamResource;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.iqser.red.commons.jackson.ObjectMapperFactory; import com.iqser.red.commons.jackson.ObjectMapperFactory;
@ -34,14 +35,14 @@ public class FileSystemBackedStorageService implements StorageService {
@SneakyThrows @SneakyThrows
@Override @Override
public InputStreamResource getObject(String tenantId, String objectId) { public void downloadTo(String tenantId, String objectId, File destinationFile) {
var res = dataMap.get(objectId); var res = dataMap.get(objectId);
if (res == null) { if (res == null) {
throw new StorageObjectDoesNotExist(new RuntimeException()); throw new StorageObjectDoesNotExist(new RuntimeException());
} }
return new InputStreamResource(new FileInputStream(res));
IOUtils.copy(new FileInputStream(res), new FileOutputStream(destinationFile));
} }