diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ZipBuilderService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ZipBuilderService.java index aca6b9e0dda1fb84e340e38589be81a36871fa47..032f08d765865ebeec7e2ee96916037b70882d3f 100644 --- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ZipBuilderService.java +++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ZipBuilderService.java @@ -101,7 +101,7 @@ class ZipBuilderService { } private String folderByContentType(String contentType) { - return StringUtils.equals(contentType, MimeTypeUtils.APPLICATION_XML_VALUE) ? FOLDER_NAME_XML : "/"; + return StringUtils.equals(contentType, MimeTypeUtils.APPLICATION_XML_VALUE) ? FOLDER_NAME_XML : ""; } private void addAttachments() { @@ -113,7 +113,7 @@ class ZipBuilderService { } void addFile(String folder, IncomingFile file) { - var fileName = String.format(FILE_NAME_TEMPLATE, folder, file.getName()); + var fileName = StringUtils.isEmpty(folder) ? file.getName() : String.format(FILE_NAME_TEMPLATE, folder, file.getName()); try { zipOut.putNextEntry(buildZipParameter(fileName)); diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/clientattribute/GrpcClientAttributeServiceITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/clientattribute/GrpcClientAttributeServiceITCase.java index 88d22f705dfc4f8d4cfcb405bfdca637476d9dc1..e27071e9503690210a0267b7b9b6c622d9d95168 100644 --- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/clientattribute/GrpcClientAttributeServiceITCase.java +++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/clientattribute/GrpcClientAttributeServiceITCase.java @@ -43,7 +43,6 @@ import de.ozgcloud.vorgang.common.security.PolicyService; import de.ozgcloud.vorgang.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub; import net.devh.boot.grpc.client.inject.GrpcClient; -@Disabled @SpringBootTest(properties = { "grpc.server.inProcessName=test", "grpc.server.port=-1", diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ZipBuilderServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ZipBuilderServiceTest.java index 0eb8a7311757f2c22d7fa5388ebb0a89d4fe5ef3..71e33d433457bfdb2e3fc449ae028d9484a753ca 100644 --- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ZipBuilderServiceTest.java +++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ZipBuilderServiceTest.java @@ -89,7 +89,7 @@ class ZipBuilderServiceTest { builder.addFile("", IncomingFileTestFactory.create()); verify(zipOut).putNextEntry(parametersCaptor.capture()); - assertThat(parametersCaptor.getValue().getFileNameInZip()).isEqualTo("/" + IncomingFileTestFactory.NAME); + assertThat(parametersCaptor.getValue().getFileNameInZip()).isEqualTo(IncomingFileTestFactory.NAME); } @Test