From ecb56789d2ee331076c300d0da8ec40441602960 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 28 Apr 2021 20:15:50 +0200
Subject: [PATCH] OZG-536 OZG-595 update grpc ozgFile naming
---
pluto-interface/src/main/protobuf/filemodel.proto | 6 +++---
.../ozg/pluto/files/GrpcFileMetaDataResponseMapper.java | 4 ++--
.../ozg/pluto/files/GrpcGetOzgFileDataResponseMapper.java | 2 +-
.../ozg/pluto/files/GrpcFileMetaDataResponseMapperTest.java | 4 ++--
.../de/itvsh/ozg/pluto/files/GrpcFileServiceITCase.java | 6 +++---
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pluto-interface/src/main/protobuf/filemodel.proto b/pluto-interface/src/main/protobuf/filemodel.proto
index 7c5002842..09e6731a4 100644
--- a/pluto-interface/src/main/protobuf/filemodel.proto
+++ b/pluto-interface/src/main/protobuf/filemodel.proto
@@ -27,7 +27,7 @@ message GrpcGetAttachmentsRequest {
string eingangId = 2;
}
message GrpcGetAttachmentsResponse {
- repeated GrpcFile file = 1;
+ repeated GrpcOzgFile file = 1;
}
@@ -36,10 +36,10 @@ message GrpcGetRepresentationsRequest {
string eingangId = 2;
}
message GrpcGetRepresentationsResponse {
- repeated GrpcFile file = 1;
+ repeated GrpcOzgFile file = 1;
}
-message GrpcFile {
+message GrpcOzgFile {
string id = 1;
string name = 2;
int64 size = 3;
diff --git a/pluto-server/src/main/java/de/itvsh/ozg/pluto/files/GrpcFileMetaDataResponseMapper.java b/pluto-server/src/main/java/de/itvsh/ozg/pluto/files/GrpcFileMetaDataResponseMapper.java
index 5e96e044e..0a53526d6 100644
--- a/pluto-server/src/main/java/de/itvsh/ozg/pluto/files/GrpcFileMetaDataResponseMapper.java
+++ b/pluto-server/src/main/java/de/itvsh/ozg/pluto/files/GrpcFileMetaDataResponseMapper.java
@@ -4,10 +4,10 @@ import java.util.List;
import org.mapstruct.Mapper;
-import de.itvsh.ozg.pluto.grpc.file.GrpcFile;
+import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
@Mapper
interface GrpcFileMetaDataResponseMapper {
- List<GrpcFile> map(List<OzgFile> files);
+ List<GrpcOzgFile> map(List<OzgFile> files);
}
diff --git a/pluto-server/src/main/java/de/itvsh/ozg/pluto/files/GrpcGetOzgFileDataResponseMapper.java b/pluto-server/src/main/java/de/itvsh/ozg/pluto/files/GrpcGetOzgFileDataResponseMapper.java
index fee076acf..b50128b92 100644
--- a/pluto-server/src/main/java/de/itvsh/ozg/pluto/files/GrpcGetOzgFileDataResponseMapper.java
+++ b/pluto-server/src/main/java/de/itvsh/ozg/pluto/files/GrpcGetOzgFileDataResponseMapper.java
@@ -7,7 +7,7 @@ import com.google.protobuf.ByteString;
import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFileData;
@Mapper
-public interface GrpcGetOzgFileDataResponseMapper {
+interface GrpcGetOzgFileDataResponseMapper {
GrpcOzgFileData map(OzgFileData file);
diff --git a/pluto-server/src/test/java/de/itvsh/ozg/pluto/files/GrpcFileMetaDataResponseMapperTest.java b/pluto-server/src/test/java/de/itvsh/ozg/pluto/files/GrpcFileMetaDataResponseMapperTest.java
index bd229c280..81bc003a3 100644
--- a/pluto-server/src/test/java/de/itvsh/ozg/pluto/files/GrpcFileMetaDataResponseMapperTest.java
+++ b/pluto-server/src/test/java/de/itvsh/ozg/pluto/files/GrpcFileMetaDataResponseMapperTest.java
@@ -7,7 +7,7 @@ import java.util.List;
import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers;
-import de.itvsh.ozg.pluto.grpc.file.GrpcFile;
+import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
class GrpcFileMetaDataResponseMapperTest {
@@ -16,7 +16,7 @@ class GrpcFileMetaDataResponseMapperTest {
@Test
void validateMapping() {
- List<GrpcFile> response = mapper.map(List.of(OzgFileTestFactory.create()));
+ List<GrpcOzgFile> response = mapper.map(List.of(OzgFileTestFactory.create()));
assertThat(response).isNotNull().hasSize(1);
}
diff --git a/pluto-server/src/test/java/de/itvsh/ozg/pluto/files/GrpcFileServiceITCase.java b/pluto-server/src/test/java/de/itvsh/ozg/pluto/files/GrpcFileServiceITCase.java
index 7ad0f5327..96be38d82 100644
--- a/pluto-server/src/test/java/de/itvsh/ozg/pluto/files/GrpcFileServiceITCase.java
+++ b/pluto-server/src/test/java/de/itvsh/ozg/pluto/files/GrpcFileServiceITCase.java
@@ -12,13 +12,13 @@ import org.springframework.data.mongodb.core.MongoOperations;
import de.itvsh.ozg.pluto.common.grpc.StreamRecorder;
import de.itvsh.ozg.pluto.common.test.DataITCase;
-import de.itvsh.ozg.pluto.grpc.file.GrpcFile;
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;
+import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFileData;
import de.itvsh.ozg.pluto.vorgang.IncomingFileTestFactory;
import de.itvsh.ozg.pluto.vorgang.Vorgang;
@@ -60,7 +60,7 @@ class GrpcFileServiceITCase {
assertThat(grpcResponse.get(0).getFileList()).hasSize(2);
- GrpcFile attachment1 = grpcResponse.get(0).getFile(0);
+ GrpcOzgFile attachment1 = grpcResponse.get(0).getFile(0);
assertThat(attachment1.getId()).isEqualTo(IncomingFileTestFactory.ID);
assertThat(attachment1.getName()).isEqualTo(IncomingFileTestFactory.NAME);
@@ -84,7 +84,7 @@ class GrpcFileServiceITCase {
assertThat(grpcResponse.get(0).getFileList()).hasSize(3);
- GrpcFile attachment1 = grpcResponse.get(0).getFile(0);
+ GrpcOzgFile attachment1 = grpcResponse.get(0).getFile(0);
assertThat(attachment1.getId()).isEqualTo(IncomingFileTestFactory.REPRESENTATION1_ID);
assertThat(attachment1.getName()).isEqualTo(IncomingFileTestFactory.REPRESENTATION1_NAME);
--
GitLab