diff --git a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/model/FileChunkInfo.java b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/model/FileChunkInfo.java index a119cbaf62538ee51a8f5c30e680936a06d207f8..f63abe3450e3864847791d12e6e6e85e6a754197 100644 --- a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/model/FileChunkInfo.java +++ b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/model/FileChunkInfo.java @@ -16,6 +16,12 @@ public record FileChunkInfo( ) { public AbstractResource createUploadResource(InputStream fileInputStream) { return new AbstractResource() { + + @Override + public String getFilename() { + return upload.file().getName(); + } + @Override public String getDescription() { return "File chunk " + chunkIndex + " of " + upload.getLoggableString(); diff --git a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/model/Osi2Attachment.java b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/model/Osi2Attachment.java index dc41ec7685a33e83990ce954b9097e523dfe57cc..a948a1a1017236c3fba12508d4bcafb242287105 100644 --- a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/model/Osi2Attachment.java +++ b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/model/Osi2Attachment.java @@ -10,7 +10,7 @@ public record Osi2Attachment( String guid, OzgCloudFile file ) { - public static final long CHUNK_SIZE = 100L * (2L << 10); + public static final long CHUNK_SIZE = (2L << 14); public static Osi2Attachment from(OzgCloudFile file) { return Osi2Attachment.builder() diff --git a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/Osi2ResponseMapper.java b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/Osi2ResponseMapper.java index 74a34e0487b9e48ef2ee046d8a5f1ac707778fe6..1dda33f1d8d470dccf995000c44af49291c829a5 100644 --- a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/Osi2ResponseMapper.java +++ b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/Osi2ResponseMapper.java @@ -113,7 +113,7 @@ public interface Osi2ResponseMapper { } default void checkChunkUploadSuccess(QuarantineFileResult quarantineFileResult) { - if (!Boolean.TRUE.equals(quarantineFileResult.getSuccess())) { + if (!Optional.ofNullable(quarantineFileResult.getError()).map(String::isBlank).orElse(true)) { throw new Osi2RuntimeException( "Chunk-Upload of file %s failed: %s".formatted(quarantineFileResult.getFileUid(), quarantineFileResult.getError()), null); } diff --git a/src/main/resources/application-stage.yml b/src/main/resources/application-stage.yml index 2618fc516f3b8383f3ad2d4ddfccb4c8c06eeccb..e69cb9d817c200ebe67b7f5827fac3826e273cf0 100644 --- a/src/main/resources/application-stage.yml +++ b/src/main/resources/application-stage.yml @@ -2,7 +2,7 @@ ozgcloud: osiv2: enabled: false auth: - client-id: 'OZG-Kopfstelle' + client-id: 'OZG-Kopfstelle-SH' client-secret: 'changeme' scope: default, access_urn:dataport:osi:sh:stage:ozgkopfstelle token-uri: 'https://idp.serviceportal-stage.schleswig-holstein.de/webidp2/connect/token' diff --git a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/extension/AttachmentExampleUploadUtil.java b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/extension/AttachmentExampleUploadUtil.java index 8aa54916936532edcdc288378702867186469fe6..97cc84d99b4783bb08df5d933bc7fb171ac28c58 100644 --- a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/extension/AttachmentExampleUploadUtil.java +++ b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/extension/AttachmentExampleUploadUtil.java @@ -12,7 +12,7 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class AttachmentExampleUploadUtil { - public static final byte[] EXAMPLE_TEXT_DATA = LoremIpsum.getInstance().getParagraphs(5,100).getBytes(); + public static final byte[] EXAMPLE_TEXT_DATA = LoremIpsum.getInstance().getParagraphs(5,10).getBytes(); public static String uploadTextFile(Osi2AttachmentFileService remoteService) {