allow empty headers (#844)

nats-io · Feb 8, 2023 · 116a208 · 116a208
1 parent a97243d
commit 116a208
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/src/examples/java/io/nats/examples/jetstream/NatsJsPushSubBasicSync.java b/src/examples/java/io/nats/examples/jetstream/NatsJsPushSubBasicSync.java
@@ -64,7 +64,7 @@ public static void main(String[] args) {
             // Build our subscription options.
             // * A push subscription means the server will "push" us messages.
             // * Durable means the server will remember where we are if we use that name.
-            // * Durable can by null or empty, the builder treats them the same.
+            // * Durable can be null or empty, the builder treats them the same.
             // * The stream name is not technically required. If it is not provided, the
             //   code building the subscription will look it up by making a request to the server.
             //   If you know the stream name, you might as well supply it and save a trip to the server.

diff --git a/src/main/java/io/nats/client/support/IncomingHeadersProcessor.java b/src/main/java/io/nats/client/support/IncomingHeadersProcessor.java
@@ -94,10 +94,6 @@ private void initHeader(byte[] serialized, int len, Token tCrlf, boolean hadStat
             peek = new Token(serialized, len, tCrlf, null);
         }
         peek.mustBe(TokenType.CRLF);
-
-        if ((headers == null || headers.size() == 0) && !hadStatus) {
-            throw new IllegalArgumentException(INVALID_HEADER_COMPOSITION);
-        }
     }
 
     private Token initStatus(byte[] serialized, int len, Token tSpace) {

diff --git a/src/test/java/io/nats/client/impl/HeadersTests.java b/src/test/java/io/nats/client/impl/HeadersTests.java
@@ -472,14 +472,11 @@ public void constructHeadersWithInvalidBytes() {
         assertThrows(IllegalArgumentException.class, () -> new IncomingHeadersProcessor("NATS/1.0 \r\n".getBytes()));
         assertThrows(IllegalArgumentException.class, () -> new IncomingHeadersProcessor("NATS/1.0X\r\n".getBytes()));
         assertThrows(IllegalArgumentException.class, () -> new IncomingHeadersProcessor("NATS/1.0 \r\n\r\n".getBytes()));
-        assertThrows(IllegalArgumentException.class, () -> new IncomingHeadersProcessor("NATS/1.0\r\n\r\n".getBytes()));
         assertThrows(IllegalArgumentException.class, () -> new IncomingHeadersProcessor("NATS/1.0\r\n".getBytes()));
         assertThrows(IllegalArgumentException.class, () -> new IncomingHeadersProcessor("NATS/1.0 503\r".getBytes()));
         assertThrows(IllegalArgumentException.class, () -> new IncomingHeadersProcessor("NATS/1.0 503\n".getBytes()));
         assertThrows(IllegalArgumentException.class, () -> new IncomingHeadersProcessor("NATS/1.0 FiveOhThree\r\n".getBytes()));
         assertThrows(IllegalArgumentException.class, () -> new IncomingHeadersProcessor("NATS/1.0\r\n".getBytes()));
-        assertThrows(IllegalArgumentException.class, () -> new IncomingHeadersProcessor("NATS/1.0\r\n\r\n".getBytes()));
-        assertThrows(IllegalArgumentException.class, () -> new IncomingHeadersProcessor("NATS/1.0\r\n\r\n\r\n".getBytes()));
         assertThrows(IllegalArgumentException.class, () -> new IncomingHeadersProcessor("NATS/1.0\r\nk1:v1".getBytes()));
         assertThrows(IllegalArgumentException.class, () -> new IncomingHeadersProcessor("NATS/1.0\r\nk1:v1\r\n".getBytes()));
         assertThrows(IllegalArgumentException.class, () -> new IncomingHeadersProcessor("NATS/1.0\r\nk1:v1\r\r\n".getBytes()));
@@ -492,6 +489,7 @@ public void constructHeadersWithValidBytes() {
         assertValidHeader("NATS/1.0\r\nk1:\r\n\r\n", "k1", EMPTY);
         assertValidHeader("NATS/1.0\r\nks1: \r\n\r\n", "ks1", EMPTY);
         assertValidHeader("NATS/1.0\r\ncolons::::\r\n\r\n", "colons", ":::");
+        assertValidHeader("NATS/1.0\r\n\r\n\r\n", null, null);
     }
 
     @Test
@@ -540,11 +538,16 @@ private IncomingHeadersProcessor assertValidHeader(String test, String key, Stri
 
     private IncomingHeadersProcessor assertValidHeader(IncomingHeadersProcessor ihp, String key, String val) {
         Headers headers = ihp.getHeaders();
-        assertNotNull(headers);
-        assertEquals(1, headers.size());
-        assertTrue(headers.containsKey(key));
-        assertEquals(1, headers.get(key).size());
-        assertEquals(val, headers.get(key).get(0));
+        if (key == null) {
+            assertNull(headers);
+        }
+        else {
+            assertNotNull(headers);
+            assertEquals(1, headers.size());
+            assertTrue(headers.containsKey(key));
+            assertEquals(1, headers.get(key).size());
+            assertEquals(val, headers.get(key).get(0));
+        }
         return ihp;
     }