Add tests for warning headers removing.

Author: nstdio

src/main/java/io/github/nstdio/http/ext/CacheEntryMetadata.java

@@ -22,7 +22,6 @@
 import java.time.Clock;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
-import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
@@ -34,7 +33,6 @@
 import static io.github.nstdio.http.ext.Headers.parseInstant;
 import static io.github.nstdio.http.ext.Headers.toRFC1123;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.stream.Collectors.toUnmodifiableList;
 
 public final class CacheEntryMetadata {
   private final HttpRequest request;
@@ -236,15 +234,14 @@ synchronized void update(HttpHeaders responseHeaders, long requestTimeMs, long r
     this.requestTimeMs = requestTimeMs;
     this.responseTimeMs = responseTimeMs;
 
-    List<String> toRemove = response.headers()
-        .allValues(HEADER_WARNING)
-        .stream()
-        .filter(warn -> warn.startsWith("1"))
-        .collect(toUnmodifiableList());
+    var headersBuilder = new HttpHeadersBuilder(response.headers());
 
-    HttpHeadersBuilder headersBuilder = new HttpHeadersBuilder(response.headers());
+    for (String warn : response.headers().allValues(HEADER_WARNING)) {
+      if (warn.startsWith("1")) {
+        headersBuilder.remove(HEADER_WARNING, warn);
+      }
+    }
 
-    toRemove.forEach(value -> headersBuilder.remove(HEADER_WARNING, value));
     responseHeaders.map().forEach(headersBuilder::set);
 
     response = ImmutableResponseInfo.toBuilder(response).headers(headersBuilder.build()).build();

src/test/kotlin/io/github/nstdio/http/ext/CacheEntryMetadataTest.kt

@@ -15,9 +15,14 @@
  */
 package io.github.nstdio.http.ext
 
+import io.github.nstdio.http.ext.Headers.HEADER_WARNING
+import io.github.nstdio.http.ext.Helpers.responseInfo
+import io.github.nstdio.http.ext.Helpers.responseInfo0
 import io.kotest.matchers.booleans.shouldBeFalse
 import io.kotest.matchers.booleans.shouldBeTrue
+import io.kotest.matchers.collections.shouldContainOnly
 import io.kotest.matchers.longs.shouldBeNegative
+import io.kotest.matchers.should
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Nested
@@ -47,7 +52,7 @@ internal class CacheEntryMetadataTest {
         "Accept-Language", "en-EN"
       )
       .build()
-    val m = CacheEntryMetadata(0, 0, Helpers.responseInfo(headers), r, Clock.systemDefaultZone())
+    val m = CacheEntryMetadata(0, 0, responseInfo(headers), r, Clock.systemDefaultZone())
 
     //when
     val actual = m.varyHeaders()
@@ -59,6 +64,34 @@ internal class CacheEntryMetadataTest {
       .hasHeaderWithValues("User-Agent", "Java/11")
   }
 
+  @Test
+  fun `Should remove warning header from response`() {
+    //given
+    val request = HttpRequest.newBuilder(URI.create("https://example.com")).build()
+    val responseInfo = responseInfo0(
+      mapOf(
+        HEADER_WARNING to listOf(
+          "112 - \"cache down\" \"Wed, 21 Oct 2015 07:28:00 GMT\"",
+          "110 anderson/1.3.37 \"Response is stale\"",
+          "299 - \"Deprecated\""
+        )
+      )
+    )
+    val metadata = CacheEntryMetadata(0, 0, responseInfo, request, Clock.systemDefaultZone())
+    val responseHeaders = HttpHeadersBuilder()
+      .add("X-A", "B")
+      .build()
+
+    //when
+    metadata.update(responseHeaders, 0, 0)
+
+    //then
+    metadata.response().headers().should {
+      it.allValues(HEADER_WARNING).shouldContainOnly("299 - \"Deprecated\"")
+      it.allValues("X-A").shouldContainOnly("B")
+    }
+  }
+
   @Test
   fun shouldGenerateHeuristicExpirationWarning() {
     //given
@@ -68,7 +101,7 @@ internal class CacheEntryMetadataTest {
     // Creating Last-Modified just about to exceed 24 hour limit
     val lastModified = baseInstant.minus(241, ChronoUnit.HOURS)
     val expectedExpirationTime = baseInstant.plus(2, ChronoUnit.DAYS)
-    val info = Helpers.responseInfo(
+    val info = responseInfo(
       mutableMapOf(
         "Last-Modified" to Headers.toRFC1123(lastModified),
         "Date" to Headers.toRFC1123(Instant.ofEpochSecond(0))
@@ -110,7 +143,7 @@ internal class CacheEntryMetadataTest {
     val baseClock = Clock.systemUTC()
     val dateHeader = baseClock.instant()
     val clock = FixedRateTickClock.of(baseClock, Duration.ofSeconds(1))
-    val info = Helpers.responseInfo(
+    val info = responseInfo(
       mutableMapOf(
         "Cache-Control" to "max-age=1,must-revalidate",
         "Date" to Headers.toRFC1123(dateHeader)
@@ -141,7 +174,7 @@ internal class CacheEntryMetadataTest {
       val responseTimeMs: Long = 350
       val serverDate = responseTimeMs - 50
       val clock = Clock.fixed(Instant.ofEpochMilli(responseTimeMs + 5), ZoneId.systemDefault())
-      val info = Helpers.responseInfo(
+      val info = responseInfo(
         mutableMapOf(
           "Cache-Control" to "max-age=1",
           "Date" to Headers.toRFC1123(Instant.ofEpochMilli(serverDate))

src/test/kotlin/io/github/nstdio/http/ext/Helpers.kt

@@ -20,21 +20,13 @@ import java.net.http.HttpHeaders
 import java.net.http.HttpResponse.ResponseInfo
 
 internal object Helpers {
-  fun responseInfo(headers: Map<String, String>): ResponseInfo {
-    return object : ResponseInfo {
-      override fun statusCode(): Int {
-        return 200
-      }
+  fun responseInfo(headers: Map<String, String>) = responseInfo0(headers.mapValues { listOf(it.value) }.toMutableMap())
 
-      override fun headers(): HttpHeaders {
-        return HttpHeaders.of(headers
-          .mapValues { listOf(it.value) }
-          .toMutableMap()) { _, _ -> true }
-      }
+  fun responseInfo0(headers: Map<String, List<String>>): ResponseInfo = object : ResponseInfo {
+    override fun statusCode() = 200
 
-      override fun version(): HttpClient.Version {
-        return HttpClient.Version.HTTP_1_1
-      }
-    }
+    override fun headers() = HttpHeaders.of(headers) { _, _ -> true }
+
+    override fun version() = HttpClient.Version.HTTP_1_1
   }
 }