HTTPCORE-499 Make interface Header extend NameValuePair.

Author: garydgregory

RELEASE_NOTES.txt

@@ -7,6 +7,9 @@ Changelog
 * HTTPCORE-496: Add API org.apache.http.protocol.UriPatternMatcher.entrySet().
   Contributed by Gary Gregory <ggregory at apache.org>
 
+* HTTPCORE-499 Make interface Header extend NameValuePair
+  Contributed by Gary Gregory <ggregory at apache.org>
+
 
 Release 5.0-BETA1
 -------------------

httpcore5/src/main/java/org/apache/hc/core5/http/Header.java

@@ -28,31 +28,21 @@
 package org.apache.hc.core5.http;
 
 /**
- * Represents an HTTP header field consisting of a field name and a field value..
+ * Represents an HTTP header field consisting of a field name and a field
+ * value.
  *
  * @since 4.0
  */
-public interface Header {
-
-    /**
-     * Get the name of the Header.
-     *
-     * @return the name of the Header,  never {@code null}
-     */
-    String getName();
-
-    /**
-     * Get the value of the Header.
-     *
-     * @return the value of the Header,  may be {@code null}
-     */
-    String getValue();
+public interface Header extends NameValuePair {
 
     /**
      * Returns {@code true} if the header should be considered sensitive.
      * <p>
      * Some encoding schemes such as HPACK impose restrictions on encoded
      * representation of sensitive headers.
+     * </p>
+     *
+     * @return {@code true} if the header should be considered sensitive.
      *
      * @since 5.0
      */

httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHeader.java

@@ -27,28 +27,23 @@
 
 package org.apache.hc.core5.http.message;
 
-import java.io.Serializable;
-import java.util.Locale;
 import java.util.Objects;
 
 import org.apache.hc.core5.annotation.Contract;
 import org.apache.hc.core5.annotation.ThreadingBehavior;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.util.Args;
-import org.apache.hc.core5.util.LangUtils;
 
 /**
  * Immutable {@link Header}.
  *
  * @since 4.0
  */
 @Contract(threading = ThreadingBehavior.IMMUTABLE)
-public class BasicHeader implements Header, Serializable {
+public class BasicHeader extends BasicNameValuePair implements Header {
 
     private static final long serialVersionUID = -5427236326487562174L;
 
-    private final String name;
-    private final String value;
     private final boolean sensitive;
 
     /**
@@ -61,9 +56,7 @@ public class BasicHeader implements Header, Serializable {
      * @since 5.0
      */
     public BasicHeader(final String name, final Object value, final boolean sensitive) {
-        super();
-        this.name = Args.notNull(name, "Name");
-        this.value = Objects.toString(value, null);
+        super(Args.notNull(name, "Name"), Objects.toString(value, null));
         this.sensitive = sensitive;
     }
 
@@ -77,16 +70,6 @@ public BasicHeader(final String name, final Object value) {
         this(name, value, false);
     }
 
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    @Override
-    public String getValue() {
-        return this.value;
-    }
-
     @Override
     public boolean isSensitive() {
         return this.sensitive;
@@ -95,30 +78,11 @@ public boolean isSensitive() {
     @Override
     public String toString() {
         final StringBuilder buf = new StringBuilder();
-        buf.append(this.name).append(": ");
-        if (this.value != null) {
-            buf.append(this.value);
+        buf.append(this.getName()).append(": ");
+        if (this.getValue() != null) {
+            buf.append(this.getValue());
         }
         return buf.toString();
     }
 
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj instanceof BasicHeader) {
-            final BasicHeader that = (BasicHeader) obj;
-            return this.name.equalsIgnoreCase(that.name) && LangUtils.equals(this.value, that.value);
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = LangUtils.HASH_SEED;
-        hash = LangUtils.hashCode(hash, this.name.toLowerCase(Locale.ROOT));
-        hash = LangUtils.hashCode(hash, this.value);
-        return hash;
-    }
 }

httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicNameValuePair.java

@@ -28,11 +28,13 @@
 package org.apache.hc.core5.http.message;
 
 import java.io.Serializable;
+import java.util.Locale;
 
 import org.apache.hc.core5.annotation.Contract;
 import org.apache.hc.core5.annotation.ThreadingBehavior;
 import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.util.Args;
+import org.apache.hc.core5.util.LangUtils;
 
 /**
  * Basic implementation of {@link NameValuePair}.
@@ -84,4 +86,24 @@ public String toString() {
         return buffer.toString();
     }
 
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj instanceof BasicNameValuePair) {
+            final BasicNameValuePair that = (BasicNameValuePair) obj;
+            return this.name.equalsIgnoreCase(that.name) && LangUtils.equals(this.value, that.value);
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = LangUtils.HASH_SEED;
+        hash = LangUtils.hashCode(hash, this.name.toLowerCase(Locale.ROOT));
+        hash = LangUtils.hashCode(hash, this.value);
+        return hash;
+    }
+
 }