From fbceb90140a6507afca8081a5478a2997153bb38 Mon Sep 17 00:00:00 2001 From: Krzysztof <krzysztof.witukiewicz@mgm-tp.com> Date: Wed, 2 Apr 2025 09:27:44 +0200 Subject: [PATCH] OZG-7573 OZG-7991 Rename methode closeStreams() --- .../common/binaryfile/StreamingFileSender.java | 8 ++++---- .../binaryfile/StreamExclusiveFileSenderTest.java | 8 ++++---- .../common/binaryfile/StreamingFileSenderTest.java | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) 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 f70efbc..9d0440e 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 880ac38..6ac54ef 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 47ddd15..f369aab 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(); } -- GitLab