Merge remote-tracking branch 'origin/master' into OZG-5899-SchnittstelleEinzelnerBescheid

vorgang-manager-interface/src/main/protobuf/binaryfile.proto

@@ -26,7 +26,7 @@ syntax = "proto3";
 package de.ozgcloud.vorgang.grpc.binaryFile;
 
 import "callcontext.proto";
-import "filemodel.proto";
+import "file.model.proto";
 
 option java_multiple_files = true;
 option java_package = "de.ozgcloud.vorgang.grpc.binaryFile";
@@ -42,12 +42,6 @@ service BinaryFileService {
 	
 	rpc FindBinaryFilesMetaData(GrpcBinaryFilesRequest) returns (GrpcFindFilesResponse) {
 	}
-	
-	rpc GetAttachments(GrpcGetAttachmentsRequest) returns (GrpcGetAttachmentsResponse) {
-	}
-	
-	rpc GetRepresentations(GrpcGetRepresentationsRequest) returns (GrpcGetRepresentationsResponse) {
-	}
 }
 
 message GrpcBinaryFilesRequest {
@@ -93,22 +87,6 @@ message GrpcGetBinaryFileDataResponse {
 	bytes fileContent = 1;
 }
 
-message GrpcGetAttachmentsRequest {
-	de.ozgcloud.vorgang.grpc.command.GrpcCallContext context = 1;
-	string eingangId = 2;
-}
-message GrpcGetAttachmentsResponse {
-	repeated GrpcBinaryFile file = 1;
-}
-
-message GrpcGetRepresentationsRequest {
-	de.ozgcloud.vorgang.grpc.command.GrpcCallContext context = 1;
-	string eingangId = 2;
-}
-message GrpcGetRepresentationsResponse {
-	repeated GrpcBinaryFile file = 1;
-}
-
 message GrpcBinaryFile {
 	string id = 1;
 	string name = 2;

vorgang-manager-interface/src/main/protobuf/filemodel.proto → vorgang-manager-interface/src/main/protobuf/file.model.proto

@@ -29,7 +29,7 @@ import "callcontext.proto";
 
 option java_multiple_files = true;
 option java_outer_classname = "FileModelProto";
-option deprecated = true;
+
 
 message GrpcGetAttachmentsRequest {
 	de.ozgcloud.vorgang.grpc.command.GrpcCallContext context = 1;

vorgang-manager-interface/src/main/protobuf/file.proto

@@ -25,12 +25,11 @@ syntax = "proto3";
 
 package de.ozgcloud.vorgang.grpc.file;
 
-import "filemodel.proto";
+import "file.model.proto";
 
 option java_multiple_files = true;
 option java_package = "de.ozgcloud.vorgang.grpc.file";
 option java_outer_classname = "FileProto";
-option deprecated = true;
 
 service FileService {
 	rpc GetAttachments(GrpcGetAttachmentsRequest) returns (GrpcGetAttachmentsResponse) {

vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandService.java

@@ -25,9 +25,6 @@ import java.net.URLConnection;
 import java.util.Base64;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.stream.Stream;
 
 import jakarta.activation.MimetypesFileTypeMap;
@@ -98,12 +95,7 @@ class PersistPostfachNachrichtByCommandService implements PersistPostfachNachric
 					createUploadedFilesReference(vorgangId),
 					createOzgFile(attachment.getName(), contentType, decContent.length),
 					Optional.empty(),
-					new ByteArrayInputStream(decContent)).get(10, TimeUnit.MINUTES).toString();
-		} catch (ExecutionException | TimeoutException e) {
-			throw new TechnicalException(e.getMessage(), e);
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-			throw new TechnicalException(e.getMessage(), e);
+					new ByteArrayInputStream(decContent)).toString();
 		} catch (IOException e) {
 			throw new TechnicalException("Can not read attached file", e);
 		}

vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/FileService.java

@@ -60,17 +60,17 @@ public class FileService implements BinaryFileService {
 		return repository.findRepresentationsByEingangId(eingangId);
 	}
 
-	public CompletableFuture<FileId> uploadFileStream(UploadedFilesReference ref, OzgFile file, Optional<String> userId, InputStream content) {
+	public FileId uploadFileStream(UploadedFilesReference ref, OzgFile file, Optional<String> userId, InputStream content) {
 		return uploadFile(ref, file, userId, content);
 	}
 
 	@Async
 	public CompletableFuture<FileId> uploadFileStreamAsync(UploadedFilesReference ref, OzgFile file, Optional<String> userId, InputStream content) {
-		return uploadFile(ref, file, userId, content);
+		return CompletableFuture.completedFuture(uploadFile(ref, file, userId, content));
 	}
 
-	CompletableFuture<FileId> uploadFile(UploadedFilesReference ref, OzgFile file, Optional<String> userId, InputStream content) {
-		return CompletableFuture.completedFuture(binaryFileRepository.addContentStream(ref, file, userId, content));
+	FileId uploadFile(UploadedFilesReference ref, OzgFile file, Optional<String> userId, InputStream content) {
+		return binaryFileRepository.addContentStream(ref, file, userId, content);
 	}
 
 	public InputStream getUploadedFileStream(FileId fileId) {

vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/GrpcOzgFileMapper.java

@@ -32,12 +32,7 @@ import org.mapstruct.NullValueCheckStrategy;
 import de.ozgcloud.vorgang.grpc.file.GrpcOzgFile;
 
 // TODO rename to GrpcBinaryFileMapper
-/**
- * @deprecated will be renamed to GrpcBinaryFileMapper
- *
- */
 @Mapper(uses = FileIdMapper.class, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
-@Deprecated(since = "0.25", forRemoval = true)
 interface GrpcOzgFileMapper {
 
 	@Mapping(target = "mergeFrom", ignore = true)

vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandServiceTest.java

@@ -30,7 +30,6 @@ import static org.mockito.Mockito.*;
 import java.io.InputStream;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
 
 import org.apache.http.entity.ContentType;
@@ -196,7 +195,7 @@ class PersistPostfachNachrichtByCommandServiceTest {
 	class TestPersistAttachment {
 		@BeforeEach
 		void init() {
-			when(fileService.uploadFileStream(any(), any(), any(), any())).thenReturn(CompletableFuture.completedFuture(FileId.from("42")));
+			when(fileService.uploadFileStream(any(), any(), any(), any())).thenReturn(FileId.from("42"));
 		}
 
 		@DisplayName("Upload files Reference")

vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileServiceTest.java

@@ -32,7 +32,6 @@ import java.io.InputStream;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Optional;
-import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -112,8 +111,7 @@ class FileServiceTest {
 
 		@Test
 		void shouldReturnId() throws Exception {
-			var id = service.uploadFileStream(ref, file, user, contentStream).get(5,
-					TimeUnit.SECONDS);
+			var id = service.uploadFileStream(ref, file, user, contentStream);
 
 			assertThat(id).isEqualTo(IncomingFileTestFactory.ID);
 		}