Use FauxPas instead of custom function

zalando · Nov 16, 2019 · af70c79 · af70c79
1 parent b449df8
commit af70c79
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/riptide-compression/src/main/java/org/zalando/riptide/compression/Compression.java b/riptide-compression/src/main/java/org/zalando/riptide/compression/Compression.java
@@ -3,6 +3,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.apiguardian.api.API;
+import org.zalando.fauxpas.ThrowingUnaryOperator;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -14,10 +15,5 @@
 @Getter
 public final class Compression {
     private final String contentEncoding;
-    private final OutputStreamDecorator outputStreamDecorator;
-
-    @FunctionalInterface
-    public interface OutputStreamDecorator {
-        OutputStream wrap(final OutputStream stream) throws IOException;
-    }
+    private final ThrowingUnaryOperator<OutputStream, IOException> outputStreamDecorator;
 }
diff --git a/...-compression/src/main/java/org/zalando/riptide/compression/WrappingHttpOutputMessage.java b/...-compression/src/main/java/org/zalando/riptide/compression/WrappingHttpOutputMessage.java
@@ -2,6 +2,7 @@
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpOutputMessage;
+import org.zalando.fauxpas.ThrowingUnaryOperator;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;
@@ -10,10 +11,10 @@
 final class WrappingHttpOutputMessage implements HttpOutputMessage, AutoCloseable {
 
     private final HttpOutputMessage message;
-    private final Compression.OutputStreamDecorator wrapper;
+    private final ThrowingUnaryOperator<OutputStream, IOException> wrapper;
     private OutputStream stream;
 
-    WrappingHttpOutputMessage(HttpOutputMessage message, Compression.OutputStreamDecorator wrapper) {
+    WrappingHttpOutputMessage(HttpOutputMessage message, ThrowingUnaryOperator<OutputStream, IOException> wrapper) {
         this.message = message;
         this.wrapper = wrapper;
     }
@@ -22,7 +23,7 @@ final class WrappingHttpOutputMessage implements HttpOutputMessage, AutoCloseabl
     @Override
     public OutputStream getBody() throws IOException {
         if (stream == null) {
-            stream = wrapper.wrap(message.getBody());
+            stream = wrapper.apply(message.getBody());
         }
         return stream;
     }

diff --git a/...pression/src/test/java/org/zalando/riptide/compression/WrappingHttpOutputMessageTest.java b/...pression/src/test/java/org/zalando/riptide/compression/WrappingHttpOutputMessageTest.java
@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpOutputMessage;
-import org.zalando.riptide.compression.Compression.OutputStreamDecorator;
+import org.zalando.fauxpas.ThrowingUnaryOperator;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -21,7 +21,10 @@
 class WrappingHttpOutputMessageTest {
 
     private final HttpOutputMessage message = mock(HttpOutputMessage.class);
-    private final OutputStreamDecorator wrapper = mock(OutputStreamDecorator.class);
+
+    @SuppressWarnings("unchecked")
+    private final ThrowingUnaryOperator<OutputStream, IOException> wrapper = mock(ThrowingUnaryOperator.class);
+
     private final WrappingHttpOutputMessage unit = new WrappingHttpOutputMessage(message, wrapper);
 
     @BeforeEach
@@ -39,7 +42,7 @@ void shouldDelegateHeaders() {
     @Test
     void shouldReturnWrapped() throws IOException {
         final OutputStream wrappedStream = mock(OutputStream.class);
-        when(wrapper.wrap(any())).thenReturn(wrappedStream);
+        when(wrapper.apply(any())).thenReturn(wrappedStream);
 
         assertThat(unit.getBody(), equalTo(wrappedStream));
         assertThat(unit.getBody(), equalTo(wrappedStream));
@@ -48,19 +51,19 @@ void shouldReturnWrapped() throws IOException {
     @Test
     void shouldWrapOnFirstAccessOnly() throws IOException {
         final OutputStream wrappedStream = mock(OutputStream.class);
-        when(wrapper.wrap(any())).thenReturn(wrappedStream);
+        when(wrapper.apply(any())).thenReturn(wrappedStream);
 
         unit.getBody();
         unit.getBody();
 
-        verify(wrapper).wrap(message.getBody());
+        verify(wrapper).apply(message.getBody());
         verifyNoMoreInteractions(wrapper);
     }
 
     @Test
     void shouldNotCloseStreamIfNeverAccessed() throws IOException {
         final OutputStream wrappedStream = mock(OutputStream.class);
-        when(wrapper.wrap(any())).thenReturn(wrappedStream);
+        when(wrapper.apply(any())).thenReturn(wrappedStream);
 
         unit.close();