diff --git a/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/binaryfile/StreamingFileSender.java b/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/binaryfile/StreamingFileSender.java index f70efbc3d13be6e0a4c75164a2b6d05c4f2237fe..9d0440e9e843f696a1a801a6f664c9aa3c86b163 100644 --- a/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/binaryfile/StreamingFileSender.java +++ b/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/binaryfile/StreamingFileSender.java @@ -75,13 +75,13 @@ public abstract class StreamingFileSender<Q, S> { public void cancelOnTimeout() { LOG.warn("File transfer canceled on timeout"); resultFuture.cancel(true); - closeStreams(); + closeStreamReader(); } public void cancelOnError(Throwable t) { LOG.error("File tranfer canceled on error.", t); resultFuture.cancel(true); - closeStreams(); + closeStreamReader(); } void sendNext() { @@ -129,12 +129,12 @@ public abstract class StreamingFileSender<Q, S> { communicateEndOfTransfer(); done.set(true); LOG.debug("File Transfer done."); - closeStreams(); + closeStreamReader(); } abstract void communicateEndOfTransfer(); - void closeStreams() { + void closeStreamReader() { LOG.debug("Closing streams"); streamReader.close(); } diff --git a/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/binaryfile/StreamExclusiveFileSenderTest.java b/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/binaryfile/StreamExclusiveFileSenderTest.java index 880ac38f3f969b7b582f152ad194383169584ed2..6ac54ef835b35e685a9b67b89fdba6fc5ed482a0 100644 --- a/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/binaryfile/StreamExclusiveFileSenderTest.java +++ b/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/binaryfile/StreamExclusiveFileSenderTest.java @@ -149,10 +149,10 @@ class StreamExclusiveFileSenderTest { } @Test - void shouldCloseStreams() { + void shouldCloseStreamReader() { fileSender.cancelOnTimeout(); - verify(fileSender).closeStreams(); + verify(fileSender).closeStreamReader(); } } @@ -186,10 +186,10 @@ class StreamExclusiveFileSenderTest { } @Test - void shouldCloseStreams() { + void shouldCloseStreamReader() { fileSender.cancelOnError(error); - verify(fileSender).closeStreams(); + verify(fileSender).closeStreamReader(); } } } diff --git a/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/binaryfile/StreamingFileSenderTest.java b/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/binaryfile/StreamingFileSenderTest.java index 47ddd152eefb8aff27109d6187ca59470f1369d5..f369aabc659585ba3444a42c5088edbc6be651a5 100644 --- a/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/binaryfile/StreamingFileSenderTest.java +++ b/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/binaryfile/StreamingFileSenderTest.java @@ -85,7 +85,7 @@ class StreamingFileSenderTest { void shouldCloseStreams() { fileSender.cancelOnTimeout(); - verify(fileSender).closeStreams(); + verify(fileSender).closeStreamReader(); } } @@ -112,7 +112,7 @@ class StreamingFileSenderTest { void shouldCloseStreams() { fileSender.cancelOnError(error); - verify(fileSender).closeStreams(); + verify(fileSender).closeStreamReader(); } } @@ -187,7 +187,7 @@ class StreamingFileSenderTest { void shouldCallCloseStreams() { fileSender.sendNextChunk(); - verify(fileSender).closeStreams(); + verify(fileSender).closeStreamReader(); } } } @@ -214,17 +214,17 @@ class StreamingFileSenderTest { void shouldCloseStreams() { fileSender.endTransfer(); - verify(fileSender).closeStreams(); + verify(fileSender).closeStreamReader(); } } @Nested - class TestCloseStreams { + class TestCloseStreamReader { @Test @SneakyThrows void shouldCloseInputStream() { - fileSender.closeStreams(); + fileSender.closeStreamReader(); verify(inputStream).close(); }