ozgcloud-common-lib/src/main/java/de/ozgcloud/common/binaryfile/StreamExclusiveFileSender.java

@@ -48,7 +48,6 @@ class StreamExclusiveFileSender<Q, S> extends StreamingFileSender<Q, S> {
 	public StreamExclusiveFileSender<Q, S> send() {
 		LOG.debug("Start sending File.");
 
-		// this responseObserver registers also onReadyHandler
 		var responseObserver = BinaryFileUploadStreamObserver.create(getResultFuture(), this::sendNext);
 		requestObserver = reqObserverBuilder.apply(responseObserver);
 

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() {
@@ -125,16 +125,16 @@ public abstract class StreamingFileSender<Q, S> {
 		}
 	}
 
-	protected void endTransfer() {
+	void endTransfer() {
 		communicateEndOfTransfer();
 		done.set(true);
 		LOG.debug("File Transfer done.");
-		closeStreams();
+		closeStreamReader();
 	}
 
 	abstract void communicateEndOfTransfer();
 
-	void closeStreams() {
+	void closeStreamReader() {
 		LOG.debug("Closing streams");
 		streamReader.close();
 	}

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();
 		}
 	}
 }

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();
 		}
 	}
 
@@ -125,7 +125,7 @@ class StreamingFileSenderTest {
 		}
 
 		@Test
-		void shouldCallSendMetaData() {
+		void shouldSendMetaData() {
 			fileSender.sendNext();
 
 			verify(fileSender).sendMetaData();
@@ -157,7 +157,7 @@ class StreamingFileSenderTest {
 			}
 
 			@Test
-			void shouldCallSendChunk() {
+			void shouldSendChunk() {
 				fileSender.sendNextChunk();
 
 				verify(fileSender).sendChunk(chunkCaptor.capture(), eq(content.length));
@@ -176,18 +176,17 @@ class StreamingFileSenderTest {
 			}
 
 			@Test
-			void shouldNotCallSendChunk() {
+			void shouldNotSendChunk() {
 				fileSender.sendNextChunk();
 
 				verify(fileSender, never()).sendChunk(any(), anyInt());
 			}
 
 			@Test
-			@SneakyThrows
-			void shouldCallCloseStreams() {
+			void shouldEndTransfer() {
 				fileSender.sendNextChunk();
 
-				verify(fileSender).closeStreams();
+				verify(fileSender).endTransfer();
 			}
 		}
 	}
@@ -211,20 +210,20 @@ class StreamingFileSenderTest {
 		}
 
 		@Test
-		void shouldCloseStreams() {
+		void shouldCloseStreamReader() {
 			fileSender.endTransfer();
 
-			verify(fileSender).closeStreams();
+			verify(fileSender).closeStreamReader();
 		}
 	}
 
 	@Nested
-	class TestCloseStreams {
+	class TestCloseStreamReader {
 
 		@Test
 		@SneakyThrows
 		void shouldCloseInputStream() {
-			fileSender.closeStreams();
+			fileSender.closeStreamReader();
 
 			verify(inputStream).close();
 		}
@@ -283,6 +282,7 @@ class StreamingFileSenderTest {
 		@Test
 		void shouldSendMetadataOnlyOnce() {
 			fileSender.withMetaData(metaData).sendMetaData();
+
 			fileSender.sendMetaData();
 
 			verify(requestObserver).onNext(metaData);