You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2018/07/26 21:26:00 UTC

httpcomponents-core git commit: HTTPCORE-546: Update org.apache.hc.core5.http.message.HeaderGroup.removeHeader(Header) to return a boolean

Repository: httpcomponents-core
Updated Branches:
  refs/heads/master f5f24a7f3 -> 87545dc29


HTTPCORE-546: Update
org.apache.hc.core5.http.message.HeaderGroup.removeHeader(Header) to
return a boolean

Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/87545dc2
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/87545dc2
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/87545dc2

Branch: refs/heads/master
Commit: 87545dc29251529a8370bc6a41b2bec8edb4157f
Parents: f5f24a7
Author: Gary Gregory <gg...@apache.org>
Authored: Thu Jul 26 15:25:56 2018 -0600
Committer: Gary Gregory <gg...@apache.org>
Committed: Thu Jul 26 15:25:56 2018 -0600

----------------------------------------------------------------------
 RELEASE_NOTES.txt                                   |  3 +++
 .../java/org/apache/hc/core5/http/HttpMessage.java  |  3 ++-
 .../core5/http/message/AbstractMessageWrapper.java  |  4 ++--
 .../apache/hc/core5/http/message/HeaderGroup.java   |  8 +++++---
 .../hc/core5/http/message/TestHeaderGroup.java      | 16 ++++++++--------
 5 files changed, 20 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/87545dc2/RELEASE_NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 895d260..823cf2b 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -39,6 +39,9 @@ adds several incremental improvements.
   
 * HTTPCORE-545: Add org.apache.hc.core5.http.message.HeaderGroup.removeHeaders(Header)
   Contributed by Gary Gregory <ggregory at apache.org>
+  
+* HTTPCORE-546: Update org.apache.hc.core5.http.message.HeaderGroup.removeHeader(Header) to return a boolean  
+  Contributed by Gary Gregory <ggregory at apache.org>
 
 Release 5.0-BETA2
 -------------------

http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/87545dc2/httpcore5/src/main/java/org/apache/hc/core5/http/HttpMessage.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/HttpMessage.java b/httpcore5/src/main/java/org/apache/hc/core5/http/HttpMessage.java
index 6e62cfa..4b95937 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/HttpMessage.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/HttpMessage.java
@@ -102,8 +102,9 @@ public interface HttpMessage extends MessageHeaders {
      * Removes a header from this message.
      *
      * @param header the header to remove.
+     * @return <code>true</code> if a header was removed as a result of this call.
      */
-    void removeHeader(Header header);
+    boolean removeHeader(Header header);
 
     /**
      * Removes all headers with a certain name from this message.

http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/87545dc2/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractMessageWrapper.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractMessageWrapper.java b/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractMessageWrapper.java
index f1c8bc2..16bf01c 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractMessageWrapper.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractMessageWrapper.java
@@ -82,8 +82,8 @@ public abstract class AbstractMessageWrapper implements HttpMessage {
     }
 
     @Override
-    public void removeHeader(final Header header) {
-        message.removeHeader(header);
+    public boolean removeHeader(final Header header) {
+        return message.removeHeader(header);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/87545dc2/httpcore5/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java b/httpcore5/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java
index a983eaa..52e1575 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java
@@ -92,18 +92,20 @@ public class HeaderGroup implements MessageHeaders, Serializable {
      * Removes the first given header.
      *
      * @param header the header to remove
+     * @return <code>true</code> if a header was removed as a result of this call.
      */
-    public void removeHeader(final Header header) {
+    public boolean removeHeader(final Header header) {
         if (header == null) {
-            return;
+            return false;
         }
         for (int i = 0; i < this.headers.size(); i++) {
             final Header current = this.headers.get(i);
             if (headerEquals(header, current)) {
                 this.headers.remove(current);
-                return;
+                return true;
             }
         }
+        return false;
     }
 
     private boolean headerEquals(final Header header1, final Header header2) {

http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/87545dc2/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java
index abdeb70..f364ae3 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java
@@ -61,14 +61,14 @@ public class TestHeaderGroup {
 
     @Test
     public void testAddRemoveHeader() {
-        final HeaderGroup headergroup = new HeaderGroup();
+        final HeaderGroup headerGroup = new HeaderGroup();
         final Header header = new BasicHeader("name", "value");
-        headergroup.addHeader(header);
-        headergroup.addHeader(null);
-        Assert.assertEquals(1, headergroup.getAllHeaders().length);
-        headergroup.removeHeader(header);
-        headergroup.removeHeader(null);
-        Assert.assertEquals(0, headergroup.getAllHeaders().length);
+        headerGroup.addHeader(header);
+        headerGroup.addHeader(null);
+        Assert.assertEquals(1, headerGroup.getAllHeaders().length);
+        Assert.assertTrue(headerGroup.removeHeader(header));
+        Assert.assertFalse(headerGroup.removeHeader(null));
+        Assert.assertEquals(0, headerGroup.getAllHeaders().length);
     }
 
     @Test
@@ -89,7 +89,7 @@ public class TestHeaderGroup {
         final Header header2 = new BasicHeader("name", "value");
         headergroup.addHeader(header);
         Assert.assertEquals(1, headergroup.getAllHeaders().length);
-        headergroup.removeHeader(header2);
+        Assert.assertTrue(headergroup.removeHeader(header2));
         Assert.assertEquals(0, headergroup.getAllHeaders().length);
     }