refactor: fix merge issues (planning#2251)

integration-tests/src/test/java/dev/fitko/fitconnect/integrationtests/IntegrationTestBase.java

@@ -107,7 +107,7 @@ public class IntegrationTestBase {
 
     static byte[] generateSampleSubmissionData(int sizeInMB) throws IOException {
         final ObjectMapper objectMapper = new ObjectMapper();
-        final JsonNode data = objectMapper.readTree(getResourceAsBytes("/submission_data.json"));
+        final JsonNode data = objectMapper.readTree(readResourceToString("/submission_data.json"));
         ((ObjectNode)data).put("F00000757", "a".repeat(sizeInMB << 10 << 10));
         return objectMapper.writeValueAsBytes(data);
     }

integration-tests/src/test/java/dev/fitko/fitconnect/integrationtests/ReplyIT.java

@@ -26,6 +26,7 @@ import dev.fitko.fitconnect.integrationtests.condition.EnableIfEnvironmentVariab
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Path;
 import java.util.Date;
@@ -198,7 +199,7 @@ public class ReplyIT extends IntegrationTestBase {
     }
 
     @Test
-    void testReplyDataAsAttachment() throws IOException {
+    void testReplyDataAsAttachment() throws IOException, IOException {
 
         // Given
         final AttachmentChunkingConfig attachmentChunkingConfig = AttachmentChunkingConfig.builder()
@@ -214,7 +215,7 @@ public class ReplyIT extends IntegrationTestBase {
         final JWK privateKey = jwkPair.getPrivateKey();
         final JWK publicKey = jwkPair.getPublicKey();
 
-        final String submissionData = getResourceAsString("/submission_data.json");
+        final String submissionData = readResourceToString("/submission_data.json");
 
         final var submission = SendableSubmission.Builder()
                 .setDestination(UUID.fromString(System.getenv("TEST_DESTINATION_ID")))