fix: Decompression lenient mode fails on unknown directives.

nstdio · Jan 8, 2023 · e816aa0 · e816aa0
1 parent 22eefb4
commit e816aa0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/src/main/java/io/github/nstdio/http/ext/BodyHandlers.java b/src/main/java/io/github/nstdio/http/ext/BodyHandlers.java
@@ -112,7 +112,7 @@ public DecompressingBodyHandlerBuilder failOnUnknownDirectives(boolean failOnUnk
      */
     public DecompressingBodyHandlerBuilder lenient(boolean lenient) {
       return failOnUnsupportedDirectives(!lenient)
-          .failOnUnsupportedDirectives(!lenient);
+          .failOnUnknownDirectives(!lenient);
     }
 
     /**

diff --git a/src/test/kotlin/io/github/nstdio/http/ext/DecompressingBodyHandlerTest.kt b/src/test/kotlin/io/github/nstdio/http/ext/DecompressingBodyHandlerTest.kt
@@ -37,7 +37,6 @@ import org.mockito.Mockito.verify
 import org.mockito.Mockito.verifyNoMoreInteractions
 import org.mockito.junit.jupiter.MockitoExtension
 import java.io.ByteArrayInputStream
-import java.io.IOException
 import java.io.InputStream
 import java.net.http.HttpHeaders
 import java.net.http.HttpResponse.BodyHandler
@@ -118,9 +117,6 @@ internal class DecompressingBodyHandlerTest {
 
   @ParameterizedTest
   @ValueSource(strings = ["gzip", "x-gzip"])
-  @Throws(
-    IOException::class
-  )
   fun shouldReturnGzipInputStream(directive: String?) {
     val gzipContent = ByteArrayInputStream(Compression.gzip("abc"))
 
@@ -153,8 +149,7 @@ internal class DecompressingBodyHandlerTest {
     fun shouldThrowUnsupportedOperationException(directive: String?) {
       //given
       val handler = BodyHandlers.decompressingBuilder()
-        .failOnUnsupportedDirectives(true)
-        .failOnUnknownDirectives(true)
+        .lenient(false)
         .build(mockHandler) as DecompressingBodyHandler
 
       //when + then
@@ -167,8 +162,7 @@ internal class DecompressingBodyHandlerTest {
     @ValueSource(strings = ["", "abc", "gz", "a"])
     fun shouldThrowIllegalArgumentException(directive: String?) {
       val handler = BodyHandlers.decompressingBuilder()
-        .failOnUnsupportedDirectives(true)
-        .failOnUnknownDirectives(true)
+        .lenient(false)
         .build(mockHandler) as DecompressingBodyHandler
       //when + then
       assertThatIllegalArgumentException()
@@ -178,8 +172,7 @@ internal class DecompressingBodyHandlerTest {
 
     @ParameterizedTest
     @ValueSource(strings = ["compress", "br"])
-    @DisplayName("Should not throw exception when 'failOnUnsupportedDirectives' is 'false'")
-    fun shouldNotThrowUnsupportedOperationException(directive: String?) {
+    fun `Should not throw exception when 'failOnUnsupportedDirectives' is 'false'`(directive: String?) {
       //given
       val handler = BodyHandlers.decompressingBuilder()
         .failOnUnsupportedDirectives(false)
@@ -213,5 +206,22 @@ internal class DecompressingBodyHandlerTest {
       //then
       actual shouldBeSameInstanceAs s
     }
+
+    @ParameterizedTest
+    @ValueSource(strings = ["", "abc", "gz", "a"])
+    fun `Should not throw exception in lenient mode`(directive: String?) {
+      //given
+      val handler = BodyHandlers.decompressingBuilder()
+        .lenient(true)
+        .build(mockHandler) as DecompressingBodyHandler
+      val s = InputStream.nullInputStream()
+
+      //when
+      val fn = handler.decompressionFn(directive)
+      val actual = fn.apply(s)
+
+      //then
+      actual shouldBeSameInstanceAs s
+    }
   }
 }