From a4d3b4245db13196aa2f8ca4cf3adf75ef69b11d Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 27 Aug 2024 15:45:24 +0200
Subject: [PATCH] cleanup - remove unused function and deprecation
---
.../src/main/protobuf/binaryfile.proto | 22 -------------------
.../src/main/protobuf/file.proto | 1 -
.../src/main/protobuf/filemodel.proto | 2 +-
...sistPostfachNachrichtByCommandService.java | 10 +--------
.../ozgcloud/vorgang/files/FileService.java | 8 +++----
.../vorgang/files/GrpcOzgFileMapper.java | 5 -----
6 files changed, 6 insertions(+), 42 deletions(-)
diff --git a/vorgang-manager-interface/src/main/protobuf/binaryfile.proto b/vorgang-manager-interface/src/main/protobuf/binaryfile.proto
index 8f1e06f73..9b56c7a19 100644
--- a/vorgang-manager-interface/src/main/protobuf/binaryfile.proto
+++ b/vorgang-manager-interface/src/main/protobuf/binaryfile.proto
@@ -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;
diff --git a/vorgang-manager-interface/src/main/protobuf/file.proto b/vorgang-manager-interface/src/main/protobuf/file.proto
index 05a71d514..d5137f3eb 100644
--- a/vorgang-manager-interface/src/main/protobuf/file.proto
+++ b/vorgang-manager-interface/src/main/protobuf/file.proto
@@ -30,7 +30,6 @@ import "filemodel.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) {
diff --git a/vorgang-manager-interface/src/main/protobuf/filemodel.proto b/vorgang-manager-interface/src/main/protobuf/filemodel.proto
index 87f45d6f4..0e82120cb 100644
--- a/vorgang-manager-interface/src/main/protobuf/filemodel.proto
+++ b/vorgang-manager-interface/src/main/protobuf/filemodel.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;
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandService.java
index 4c7bb459c..5c887aa6e 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandService.java
+++ b/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);
}
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/FileService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/FileService.java
index a93e596a1..0d7b3bce1 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/FileService.java
+++ b/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) {
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/GrpcOzgFileMapper.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/GrpcOzgFileMapper.java
index eb119d1fa..3a961ad8c 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/GrpcOzgFileMapper.java
+++ b/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)
--
GitLab