OZG-2416 Legacy code entfernen

pluto-interface/src/main/protobuf/binaryfile.proto

@@ -11,17 +11,9 @@ option java_outer_classname = "BinaryFileProto";
 
 service BinaryFileService {
 
-	rpc UploadBinaryFile(GrpcUploadRequest) returns (GrpcUploadResponse) {
-		option deprecated = true;
-	}
-	
 	rpc FindBinaryFiles(GrpcBinaryFilesRequest) returns (GrpcFindFilesResponse) {
 	}
 		
-	rpc GetBinaryFileData(GrpcBinaryFileDataRequest) returns (GrpcBinaryFileDataResponse) {
-		option deprecated = true;
-	}
-	
 	rpc UploadBinaryFileAsStream(stream GrpcUploadBinaryFileRequest) returns (GrpcUploadBinaryFileResponse) {
 	}
 	
@@ -40,10 +32,6 @@ message GrpcUploadRequest {
 	de.itvsh.ozg.pluto.grpc.file.GrpcOzgFileData file = 4;
 }
 
-message GrpcUploadResponse {
-	string fileId = 1;
-}
-
 message GrpcBinaryFilesRequest {
 	de.itvsh.ozg.pluto.grpc.command.GrpcCallContext context = 1;
 	repeated string fileId = 2;
@@ -58,10 +46,6 @@ message GrpcBinaryFileDataRequest {
 	string fileId = 2;
 }
 
-message GrpcBinaryFileDataResponse {
-	de.itvsh.ozg.pluto.grpc.file.GrpcOzgFileData data = 1;
-}
-
 message GrpcUploadBinaryFileRequest {
 	oneof request {
     	GrpcUploadBinaryFileMetaData metadata = 1;

pluto-interface/src/main/protobuf/filemodel.proto

@@ -19,7 +19,6 @@ message GrpcOzgFileData {
     string name = 1;
 	string contentType = 2;
 	int64 size = 3;
-	bytes content = 4;
 }
 
 message GrpcGetAttachmentsRequest {

pluto-server/src/main/java/de/itvsh/ozg/pluto/files/GrpcBinaryFileService.java

@@ -12,16 +12,12 @@ import org.springframework.scheduling.annotation.Async;
 import com.google.protobuf.ByteString;
 
 import de.itvsh.ozg.pluto.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceImplBase;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcBinaryFileDataRequest;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcBinaryFileDataResponse;
 import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcBinaryFilesRequest;
 import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcFindFilesResponse;
 import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcGetBinaryFileDataRequest;
 import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcGetBinaryFileDataResponse;
 import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileRequest;
 import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileResponse;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadRequest;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadResponse;
 import io.grpc.stub.CallStreamObserver;
 import io.grpc.stub.StreamObserver;
 import lombok.extern.log4j.Log4j2;
@@ -41,26 +37,6 @@ public class GrpcBinaryFileService extends BinaryFileServiceImplBase {
 	@Autowired
 	private GrpcGetOzgFileDataResponseMapper grpcGetOzgFileDataResponseMapper;
 
-	/**
-	 * @deprecated Nach dem Ausrollen der Version 0.23.0 entfernen
-	 */
-	@Deprecated
-	@Override
-	public void uploadBinaryFile(GrpcUploadRequest request, StreamObserver<GrpcUploadResponse> responseObserver) {
-		var fileId = service.uploadFile(buildReference(request), fileMapper.toFile(request.getFile()), request.getFile().getContent().toByteArray());
-
-		responseObserver.onNext(GrpcUploadResponse.newBuilder().setFileId(fileId.toString()).build());
-		responseObserver.onCompleted();
-	}
-
-	private UploadedFilesReference buildReference(GrpcUploadRequest request) {
-		return UploadedFilesReference.builder()
-				.client(CLIENT)
-				.name(request.getField())
-				.vorgangId(request.getVorgangId())
-				.build();
-	}
-
 	@Override
 	public void findBinaryFiles(GrpcBinaryFilesRequest request, StreamObserver<GrpcFindFilesResponse> responseObserver) {
 		var found = service.findFiles(mapFileIds(request.getFileIdList()));
@@ -95,18 +71,6 @@ public class GrpcBinaryFileService extends BinaryFileServiceImplBase {
 		return fileIdList.stream().map(FileId::from).toList();
 	}
 
-	/**
-	 * @deprecated Nach dem Ausrollen der Version 0.23.0 entfernen
-	 */
-	@Deprecated
-	@Override
-	public void getBinaryFileData(GrpcBinaryFileDataRequest request, StreamObserver<GrpcBinaryFileDataResponse> responseObserver) {
-		var data = service.getUploadedFileContent(FileId.from(request.getFileId()));
-
-		responseObserver.onNext(GrpcBinaryFileDataResponse.newBuilder().setData(grpcGetOzgFileDataResponseMapper.map(data)).build());
-		responseObserver.onCompleted();
-	}
-
 	@Override
 	public StreamObserver<GrpcUploadBinaryFileRequest> uploadBinaryFileAsStream(StreamObserver<GrpcUploadBinaryFileResponse> responseObserver) {
 		return new UploadStreamObserver(responseObserver, service);

pluto-server/src/test/java/de/itvsh/ozg/pluto/files/GrpcBinaryFileServiceTest.java

@@ -21,14 +21,12 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcBinaryFileDataResponse;
 import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcFindFilesResponse;
 import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcGetBinaryFileDataRequest;
 import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcGetBinaryFileDataResponse;
 import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileMetaData;
 import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileRequest;
 import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileResponse;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadResponse;
 import de.itvsh.ozg.pluto.vorgang.IncomingFileTestFactory;
 import de.itvsh.ozg.pluto.vorgang.VorgangTestFactory;
 import io.grpc.stub.CallStreamObserver;
@@ -49,12 +47,8 @@ class GrpcBinaryFileServiceTest {
 
 	@Nested
 	class TestUploadBinaryFile {
-		@Mock
-		private StreamObserver<GrpcUploadResponse> responseObserver;
 		@Captor
 		private ArgumentCaptor<UploadedFilesReference> referenceCaptor;
-		@Captor
-		private ArgumentCaptor<GrpcUploadResponse> responseCaptor;
 
 		@BeforeEach
 		void init() {
@@ -124,46 +118,6 @@ class GrpcBinaryFileServiceTest {
 		}
 	}
 
-	@Deprecated
-	@Nested
-	class TestFindBinaryFilesLegacy {
-
-		@Mock
-		private StreamObserver<GrpcFindFilesResponse> responseObserver;
-		@Captor
-		private ArgumentCaptor<Collection<FileId>> fileIdsCaptor;
-		@Captor
-		private ArgumentCaptor<GrpcFindFilesResponse> responseCaptor;
-
-		@Test
-		void shouldCallService() {
-			findBinaryFiles();
-
-			verify(service).findFiles(fileIdsCaptor.capture());
-			assertThat(fileIdsCaptor.getValue()).contains(OzgFileTestFactory.ID);
-		}
-
-		@Test
-		void shouldReturnList() {
-			findBinaryFiles();
-
-			verify(responseObserver).onNext(responseCaptor.capture());
-		}
-
-		@Test
-		void shouldCallComplete() {
-			findBinaryFiles();
-
-			verify(responseObserver).onCompleted();
-		}
-
-		private void findBinaryFiles() {
-			grpcService.findBinaryFiles(GrpcBinaryFilesRequestTestFactory.create(), responseObserver);
-
-			verify(responseObserver).onNext(responseCaptor.capture());
-		}
-	}
-
 	@Nested
 	class TestFindBinaryFilesMetaData {
 

pluto-server/src/test/java/de/itvsh/ozg/pluto/files/GrpcGetOzgFileDataResponseMapperTest.java

@@ -27,12 +27,4 @@ class GrpcGetOzgFileDataResponseMapperTest {
 
 		assertThat(joined.toString(Charset.defaultCharset())).isEqualTo("Hello World");
 	}
-
-	@Test
-	void shouldMapContent() {
-		var mapped = mapper.map(OzgFileDataTestFactory.create());
-
-		assertThat(mapped.getContent().toByteArray()).isEqualTo(OzgFileDataTestFactory.CONTENT);
-	}
-
 }

pluto-server/src/test/java/de/itvsh/ozg/pluto/files/GrpcOzgFileDataTestFactory.java

@@ -2,8 +2,6 @@ package de.itvsh.ozg.pluto.files;
 
 import static de.itvsh.ozg.pluto.files.OzgFileDataTestFactory.*;
 
-import com.google.protobuf.ByteString;
-
 import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFileData;
 
 public class GrpcOzgFileDataTestFactory {
@@ -15,7 +13,6 @@ public class GrpcOzgFileDataTestFactory {
 		return GrpcOzgFileData.newBuilder()
 				.setName(NAME)
 				.setContentType(CONTENT_TYPE)
-				.setSize(SIZE)
-				.setContent(ByteString.copyFrom(CONTENT));
+				.setSize(SIZE);
 	}
 }