Skip to content
Snippets Groups Projects
Commit a4d3b424 authored by OZGCloud's avatar OZGCloud
Browse files

cleanup - remove unused function and deprecation

parent 7b0ab0c5
Branches
Tags
No related merge requests found
......@@ -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;
......
......@@ -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) {
......
......@@ -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;
......
......@@ -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);
}
......
......@@ -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) {
......
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment