Skip to content
Snippets Groups Projects
Commit 54b04bf7 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6990 don't use context wrapper in grpc binary file downloader

parent f42d522a
No related branches found
No related tags found
No related merge requests found
...@@ -25,7 +25,6 @@ package de.ozgcloud.common.binaryfile; ...@@ -25,7 +25,6 @@ package de.ozgcloud.common.binaryfile;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import de.ozgcloud.common.errorhandling.TechnicalException; import de.ozgcloud.common.errorhandling.TechnicalException;
import io.grpc.Context;
import io.grpc.stub.CallStreamObserver; import io.grpc.stub.CallStreamObserver;
import lombok.Builder; import lombok.Builder;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
...@@ -78,7 +77,7 @@ public class GrpcBinaryFileServerDownloader<T> { ...@@ -78,7 +77,7 @@ public class GrpcBinaryFileServerDownloader<T> {
void doStart() { void doStart() {
handleSafety(this::setupStreams); handleSafety(this::setupStreams);
taskExecutor.execute(Context.current().wrap(this::startDownload)); taskExecutor.execute(this::startDownload);
callObserver.setOnReadyHandler(this::onReadyHandler); callObserver.setOnReadyHandler(this::onReadyHandler);
} }
......
...@@ -119,13 +119,6 @@ class GrpcBinaryFileServerDownloaderTest { ...@@ -119,13 +119,6 @@ class GrpcBinaryFileServerDownloaderTest {
@Nested @Nested
class TestDoStart { class TestDoStart {
@Mock
private Context callContext;
@Mock
private Runnable wrappedRunnable;
@Captor
private ArgumentCaptor<Runnable> wrappedRunnableCaptor;
@Captor @Captor
private ArgumentCaptor<Runnable> runnableCaptor; private ArgumentCaptor<Runnable> runnableCaptor;
@Captor @Captor
...@@ -143,32 +136,16 @@ class GrpcBinaryFileServerDownloaderTest { ...@@ -143,32 +136,16 @@ class GrpcBinaryFileServerDownloaderTest {
verify(downloader).setupStreams(); verify(downloader).setupStreams();
} }
@Test
void shouldCallTaskExecutor() {
try (var contextMock = mockStatic(Context.class)) {
contextMock.when(Context::current).thenReturn(callContext);
when(callContext.wrap(any(Runnable.class))).thenReturn(wrappedRunnable);
downloader.doStart();
verify(taskExecutor).execute(wrappedRunnable);
}
}
@Test @Test
void shouldCallStartDownload() { void shouldCallStartDownload() {
try (var contextMock = mockStatic(Context.class)) {
contextMock.when(Context::current).thenReturn(callContext);
when(callContext.wrap(any(Runnable.class))).thenReturn(wrappedRunnable);
doNothing().when(downloader).startDownload(); doNothing().when(downloader).startDownload();
downloader.doStart(); downloader.doStart();
verify(callContext).wrap(wrappedRunnableCaptor.capture()); verify(taskExecutor).execute(runnableCaptor.capture());
wrappedRunnableCaptor.getValue().run(); runnableCaptor.getValue().run();
verify(downloader).startDownload(); verify(downloader).startDownload();
} }
}
@SneakyThrows @SneakyThrows
@Test @Test
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment