Use first() instead of sole() on HTTP fields #39

Browsers generally ignore duplicate field values so we should do the same.

Author: ato

src/org/netpreserve/jwarc/HttpRequest.java

@@ -84,7 +84,7 @@ private static HttpRequest parse(ReadableByteChannel channel, ByteBuffer buffer,
             copyTo.write(buffer.duplicate());
         }
         MessageHeaders headers = parser.headers();
-        long contentLength = headers.sole("Content-Length").map(Long::parseLong).orElse(-1L);
+        long contentLength = headers.first("Content-Length").map(Long::parseLong).orElse(-1L);
         LengthedBody body = LengthedBody.create(channel, buffer, contentLength);
         return new HttpRequest(parser.method(), parser.target(), parser.version(), headers, body);
     }

src/org/netpreserve/jwarc/HttpResponse.java

@@ -86,7 +86,7 @@ private static HttpResponse parse(ReadableByteChannel channel, WritableByteChann
                 SeekableByteChannel seekable = (SeekableByteChannel) channel;
                 contentLength = seekable.size() - seekable.position() + buffer.remaining();
             } else {
-                contentLength = headers.sole("Content-Length").map(Long::parseLong).orElse(0L);
+                contentLength = headers.first("Content-Length").map(Long::parseLong).orElse(0L);
             }
             body = LengthedBody.create(channel, buffer, contentLength);
         }

src/org/netpreserve/jwarc/Message.java

@@ -57,7 +57,7 @@ public MessageVersion version() {
      * Returns "application/octet-stream" if the Content-Type header is missing.
      */
     public MediaType contentType() {
-        return headers.sole("Content-Type").map(MediaType::parse).orElse(MediaType.OCTET_STREAM);
+        return headers.first("Content-Type").map(MediaType::parse).orElse(MediaType.OCTET_STREAM);
     }
 
     void serializeHeaderTo(Appendable output) throws IOException {