OZG-2416 OzgFileData entfernt

goofy-server/src/main/java/de/itvsh/goofy/common/file/OzgFileData.java

-package de.itvsh.goofy.common.file;
-
-import lombok.Builder;
-import lombok.Getter;
-
-@Builder
-@Getter
-public class OzgFileData {
-
-	private String name;
-	private String contentType;
-	private long size;
-
-}
\ No newline at end of file

goofy-server/src/main/java/de/itvsh/goofy/common/file/OzgFileDataMapper.java

-package de.itvsh.goofy.common.file;
-
-import org.mapstruct.Mapper;
-
-import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFileData;
-import org.mapstruct.Mapping;
-
-@Mapper
-public interface OzgFileDataMapper {
-
-	OzgFileData toOzgFileData(GrpcOzgFileData data);
-
-	@Mapping(target = "mergeFrom", ignore = true)
-	@Mapping(target = "clearField", ignore = true)
-	@Mapping(target = "clearOneof", ignore = true)
-	@Mapping(target = "mergeUnknownFields", ignore = true)
-	@Mapping(target = "contentTypeBytes", ignore = true)
-	@Mapping(target = "nameBytes", ignore = true)
-	@Mapping(target = "unknownFields", ignore = true)
-	@Mapping(target = "allFields", ignore = true)
-	GrpcOzgFileData toGrpcOzgFileData(OzgFileData data);
-}
\ No newline at end of file

goofy-server/src/main/java/de/itvsh/goofy/common/file/OzgFileRemoteService.java

@@ -5,11 +5,9 @@ import java.util.stream.Stream;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.itvsh.goofy.common.binaryfile.FileId;
 import de.itvsh.goofy.common.callcontext.ContextService;
 import de.itvsh.ozg.pluto.grpc.file.FileServiceGrpc.FileServiceBlockingStub;
 import de.itvsh.ozg.pluto.grpc.file.GrpcGetAttachmentsRequest;
-import de.itvsh.ozg.pluto.grpc.file.GrpcGetOzgFileDataRequest;
 import de.itvsh.ozg.pluto.grpc.file.GrpcGetRepresentationsRequest;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
@@ -22,8 +20,6 @@ public class OzgFileRemoteService {
 	private ContextService contextService;
 	@Autowired
 	private OzgFileMapper fileMapper;
-	@Autowired
-	private OzgFileDataMapper ozgFileDataMapper;
 
 	public Stream<OzgFile> getAttachmentsByEingang(String eingangId) {
 		var response = fileServiceStub.getAttachments(buildGrpcGetAttachmentsRequest(eingangId));
@@ -50,17 +46,4 @@ public class OzgFileRemoteService {
 				.setEingangId(eingangId)
 				.build();
 	}
-
-	public OzgFileData getOzgFileData(FileId fileId) {
-		var response = fileServiceStub.getFileData(buildGetOzgFileDataRequest(fileId));
-
-		return ozgFileDataMapper.toOzgFileData(response.getFileData());
-	}
-
-	private GrpcGetOzgFileDataRequest buildGetOzgFileDataRequest(FileId fileId) {
-		return GrpcGetOzgFileDataRequest.newBuilder()
-				.setContext(contextService.createCallContext())
-				.setFileId(fileId.toString())
-				.build();
-	}
 }
\ No newline at end of file

goofy-server/src/main/java/de/itvsh/goofy/common/file/OzgFileService.java

@@ -5,8 +5,6 @@ import java.util.stream.Stream;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.itvsh.goofy.common.binaryfile.FileId;
-
 @Service
 public class OzgFileService {
 
@@ -20,8 +18,4 @@ public class OzgFileService {
 	public Stream<OzgFile> getRepresentationsByEingang(String eingangId) {
 		return remoteService.getRepresentationsByEingang(eingangId);
 	}
-
-	public OzgFileData getOzgFileData(FileId fileId) {
-		return remoteService.getOzgFileData(fileId);
-	}
 }
\ No newline at end of file

goofy-server/src/test/java/de/itvsh/goofy/common/binaryfile/BinaryFileRemoteServiceTest.java

@@ -33,7 +33,6 @@ import de.itvsh.goofy.common.GrpcCallContextTestFactory;
 import de.itvsh.goofy.common.callcontext.ContextService;
 import de.itvsh.goofy.common.file.GrpcOzgFileTestFactory;
 import de.itvsh.goofy.common.file.OzgFile;
-import de.itvsh.goofy.common.file.OzgFileDataMapper;
 import de.itvsh.goofy.common.file.OzgFileMapper;
 import de.itvsh.goofy.common.file.OzgFileTestFactory;
 import de.itvsh.kop.common.errorhandling.TechnicalException;
@@ -61,8 +60,6 @@ class BinaryFileRemoteServiceTest {
 	@Mock
 	private OzgFileMapper ozgFileMapper;
 	@Mock
-	private OzgFileDataMapper ozgFileDataMapper;
-	@Mock
 	private FileIdMapper fileIdMapper;
 
 	private GrpcCallContext callContext = GrpcCallContextTestFactory.create();

goofy-server/src/test/java/de/itvsh/goofy/common/file/GrpcOzgFileDataTestFactory.java

-package de.itvsh.goofy.common.file;
-
-import com.google.protobuf.ByteString;
-
-import de.itvsh.ozg.pluto.grpc.file.GrpcGetOzgFileDataRequest;
-import de.itvsh.ozg.pluto.grpc.file.GrpcGetOzgFileDataResponse;
-import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFileData;
-
-public class GrpcOzgFileDataTestFactory {
-
-	public static final String FILE_ID = GrpcOzgFileTestFactory.ID;
-	static final ByteString CONTENT = OzgFileDataTestFactory.CONTENT;
-	static final String NAME = OzgFileDataTestFactory.NAME;
-	static final String CONTENT_TYPE = OzgFileDataTestFactory.CONTENT_TYPE_STR;
-	static final long SIZE = OzgFileDataTestFactory.SIZE;
-
-	static final GrpcOzgFileData FILE_DATA = GrpcOzgFileDataTestFactory.create();
-
-	public static GrpcOzgFileData create() {
-		return createBuilder().build();
-	}
-
-	public static GrpcOzgFileData.Builder createBuilder() {
-		return GrpcOzgFileData.newBuilder()
-				.setName(NAME)
-				.setContentType(CONTENT_TYPE)
-				.setSize(SIZE);
-	}
-
-	public static GrpcGetOzgFileDataRequest createRequest() {
-		return createRequestBuilder().build();
-	}
-
-	public static GrpcGetOzgFileDataRequest.Builder createRequestBuilder() {
-		return GrpcGetOzgFileDataRequest.newBuilder()
-				.setFileId(FILE_ID);
-	}
-
-	public static GrpcGetOzgFileDataResponse createReponse() {
-		return createResponseBuilder().build();
-	}
-
-	public static GrpcGetOzgFileDataResponse.Builder createResponseBuilder() {
-		return GrpcGetOzgFileDataResponse.newBuilder()
-				.setFileData(FILE_DATA);
-	}
-}

goofy-server/src/test/java/de/itvsh/goofy/common/file/OzgFileDataMapperTest.java

-package de.itvsh.goofy.common.file;
-
-import static org.assertj.core.api.Assertions.*;
-
-import org.junit.jupiter.api.Test;
-import org.mapstruct.factory.Mappers;
-
-class OzgFileDataMapperTest {
-
-	private final OzgFileDataMapper mapper = Mappers.getMapper(OzgFileDataMapper.class);
-
-	@Test
-	void shouldMap() {
-		var ozgFileData = mapper.toOzgFileData(GrpcOzgFileDataTestFactory.create());
-
-		assertThat(ozgFileData).isNotNull().usingRecursiveComparison().isEqualTo(OzgFileDataTestFactory.create());
-	}
-}
\ No newline at end of file

goofy-server/src/test/java/de/itvsh/goofy/common/file/OzgFileDataTestFactory.java

-package de.itvsh.goofy.common.file;
-
-import org.springframework.http.MediaType;
-
-import com.google.protobuf.ByteString;
-
-public class OzgFileDataTestFactory {
-
-	public static final String NAME = OzgFileTestFactory.NAME;
-	public static final long SIZE = OzgFileTestFactory.SIZE;
-
-	public static final String CONTENT_TYPE_STR = MediaType.APPLICATION_OCTET_STREAM_VALUE;
-	static final ByteString CONTENT = ByteString.EMPTY;
-
-	public static OzgFileData create() {
-		return createBuilder().build();
-	}
-
-	public static OzgFileData.OzgFileDataBuilder createBuilder() {
-		return OzgFileData.builder()
-				.name(NAME)
-				.contentType(CONTENT_TYPE_STR)
-				.size(SIZE);
-	}
-}
\ No newline at end of file

goofy-server/src/test/java/de/itvsh/goofy/common/file/OzgFileRemoteServiceTest.java

@@ -21,8 +21,6 @@ import de.itvsh.ozg.pluto.grpc.command.GrpcCallContext;
 import de.itvsh.ozg.pluto.grpc.file.FileServiceGrpc.FileServiceBlockingStub;
 import de.itvsh.ozg.pluto.grpc.file.GrpcGetAttachmentsRequest;
 import de.itvsh.ozg.pluto.grpc.file.GrpcGetAttachmentsResponse;
-import de.itvsh.ozg.pluto.grpc.file.GrpcGetOzgFileDataRequest;
-import de.itvsh.ozg.pluto.grpc.file.GrpcGetOzgFileDataResponse;
 import de.itvsh.ozg.pluto.grpc.file.GrpcGetRepresentationsRequest;
 import de.itvsh.ozg.pluto.grpc.file.GrpcGetRepresentationsResponse;
 
@@ -35,8 +33,6 @@ class OzgFileRemoteServiceTest {
 	@Mock
 	private OzgFileMapper mapper;
 	@Mock
-	private OzgFileDataMapper ozgFileDataMapper;
-	@Mock
 	private ContextService contextService;
 
 	private GrpcCallContext callContext = GrpcCallContextTestFactory.create();
@@ -127,40 +123,4 @@ class OzgFileRemoteServiceTest {
 			return remoteService.getRepresentationsByEingang(EingangTestFactory.ID);
 		}
 	}
-
-	@Nested
-	class TestGetOzgFileData {
-
-		private final GrpcGetOzgFileDataResponse response = GrpcOzgFileDataTestFactory.createReponse();
-
-		@BeforeEach
-		void mock() {
-			when(serviceStub.getFileData(any())).thenReturn(response);
-		}
-
-		@Test
-		void shouldCallContextService() {
-			doServiceCall();
-
-			verify(contextService).createCallContext();
-		}
-
-		@Test
-		void shouldCallFileStub() {
-			doServiceCall();
-
-			verify(serviceStub).getFileData(any(GrpcGetOzgFileDataRequest.class));
-		}
-
-		@Test
-		void shouldCallMapper() {
-			doServiceCall();
-
-			verify(ozgFileDataMapper).toOzgFileData(GrpcOzgFileDataTestFactory.create());
-		}
-
-		private OzgFileData doServiceCall() {
-			return remoteService.getOzgFileData(OzgFileTestFactory.ID);
-		}
-	}
 }
\ No newline at end of file

goofy-server/src/test/java/de/itvsh/goofy/common/file/OzgFileServiceTest.java

@@ -37,15 +37,4 @@ class OzgFileServiceTest {
 			verify(remoteService).getRepresentationsByEingang(EingangTestFactory.ID);
 		}
 	}
-
-	@Nested
-	class TestGetOzgFileData {
-
-		@Test
-		void shouldCallRemoteService() {
-			service.getOzgFileData(OzgFileTestFactory.ID);
-
-			verify(remoteService).getOzgFileData(OzgFileTestFactory.ID);
-		}
-	}
 }
\ No newline at end of file