You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2016/12/22 08:34:27 UTC
svn commit: r1775588 - in /httpcomponents/httpcore/trunk/httpcore5/src:
main/java/org/apache/hc/core5/http/message/
test/java/org/apache/hc/core5/http/message/
Author: olegk
Date: Thu Dec 22 08:34:26 2016
New Revision: 1775588
URL: http://svn.apache.org/viewvc?rev=1775588&view=rev
Log:
HTTPCORE-439: BasicHeader #equals and #hashcode implementation
Contributed by John W. Lewis <johnw.lewis at sas.com>
Added:
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicHeader.java (with props)
Modified:
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHeader.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHeader.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHeader.java?rev=1775588&r1=1775587&r2=1775588&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHeader.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHeader.java Thu Dec 22 08:34:26 2016
@@ -28,12 +28,14 @@
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}.
@@ -100,4 +102,23 @@ public class BasicHeader implements Head
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;
+ }
}
Added: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicHeader.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicHeader.java?rev=1775588&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicHeader.java (added)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicHeader.java Thu Dec 22 08:34:26 2016
@@ -0,0 +1,188 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+package org.apache.hc.core5.http.message;
+
+import org.apache.hc.core5.http.Header;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Tests for {@link BasicHeader}.
+ */
+public class TestBasicHeader {
+
+ @Test
+ public void testNullNotEqual() throws Exception {
+ final Header header = new BasicHeader("name", "value");
+
+ Assert.assertFalse(header.equals(null));
+ }
+
+ @Test
+ public void testObjectNotEqual() throws Exception {
+ final Header header = new BasicHeader("name", "value");
+
+ Assert.assertFalse(header.equals(new Object()));
+ }
+
+ @Test
+ public void testNameEquals() throws Exception {
+ final Header header = new BasicHeader("name", "value");
+ final Header header2 = new BasicHeader("NAME", "value");
+
+ Assert.assertEquals(header, header2);
+ Assert.assertEquals(header.hashCode(), header2.hashCode());
+
+ final Header header3 = new BasicHeader("NAME", "value");
+ final Header header4 = new BasicHeader("name", "value");
+
+ Assert.assertEquals(header3, header4);
+ Assert.assertEquals(header3.hashCode(), header4.hashCode());
+}
+
+ @Test
+ public void testValueEquals() throws Exception {
+ final Header header = new BasicHeader("name", "value");
+ final Header header2 = new BasicHeader("name", "value");
+
+ Assert.assertEquals(header, header2);
+ Assert.assertEquals(header.hashCode(), header2.hashCode());
+
+ final Header header3 = new BasicHeader("name", "VALUE");
+ final Header header4 = new BasicHeader("name", "value");
+
+ Assert.assertNotEquals(header3, header4);
+ Assert.assertNotEquals(header3.hashCode(), header4.hashCode());
+}
+
+ @Test
+ public void testNameNotEqual() throws Exception {
+ final Header header = new BasicHeader("name", "value");
+ final Header header2 = new BasicHeader("name2", "value");
+
+ Assert.assertNotEquals(header, header2);
+ }
+
+ @Test
+ public void testValueNotEqual() throws Exception {
+ final Header header = new BasicHeader("name", "value");
+ final Header header2 = new BasicHeader("name", "value2");
+
+ Assert.assertNotEquals(header, header2);
+
+ // one sensitive header causes a sensitive comparison
+ final Header header3 = new BasicHeader("name", "value");
+ final Header header4 = new BasicHeader("name", "VALUE");
+
+ Assert.assertNotEquals(header3, header4);
+
+ // Now, make the other header sensitive.
+ final Header header5 = new BasicHeader("name", "VALUE");
+ final Header header6 = new BasicHeader("name", "value");
+
+ Assert.assertNotEquals(header5, header6);
+}
+
+ @Test
+ public void testNullValuesEquals() throws Exception {
+ final Header header = new BasicHeader("name", null);
+ final Header header2 = new BasicHeader("name", null);
+
+ Assert.assertEquals(header, header2);
+ Assert.assertEquals(header.hashCode(), header2.hashCode());
+
+ final Header header3 = new BasicHeader("name", null);
+ final Header header4 = new BasicHeader("name", null);
+
+ Assert.assertEquals(header3, header4);
+ Assert.assertEquals(header3.hashCode(), header4.hashCode());
+
+ final Header header5 = new BasicHeader("name", null);
+ final Header header6 = new BasicHeader("name", null);
+
+ Assert.assertEquals(header5, header6);
+ Assert.assertEquals(header5.hashCode(), header6.hashCode());
+ }
+
+ @Test
+ public void testNullValueNotEqual() throws Exception {
+ final Header header = new BasicHeader("name", null);
+ final Header header2 = new BasicHeader("name", "value");
+
+ Assert.assertNotEquals(header, header2);
+ }
+
+ @Test
+ public void testNullValue2NotEqual() throws Exception {
+ final Header header = new BasicHeader("name", "value");
+ final Header header2 = new BasicHeader("name", null);
+
+ Assert.assertNotEquals(header, header2);
+ }
+
+ @Test
+ public void testEquals() throws Exception {
+ final Header header = new BasicHeader("name", "value");
+ final Header header2 = new BasicHeader("name", "VALUE");
+
+ Assert.assertEquals(header, header);
+ Assert.assertEquals(header.hashCode(), header.hashCode());
+ Assert.assertEquals(header2, header2);
+ Assert.assertEquals(header2.hashCode(), header2.hashCode());
+ Assert.assertNotEquals(header, header2);
+ Assert.assertNotEquals(header.hashCode(), header2.hashCode());
+
+ final Header header3 = new BasicHeader("name", "value");
+ final Header header4 = new BasicHeader("name", "value");
+
+ Assert.assertEquals(header3, header3);
+ Assert.assertEquals(header3.hashCode(), header3.hashCode());
+ Assert.assertEquals(header4, header4);
+ Assert.assertEquals(header4.hashCode(), header4.hashCode());
+ Assert.assertEquals(header3, header4);
+ Assert.assertEquals(header3.hashCode(), header4.hashCode());
+ }
+
+ @Test
+ public void testHashCode() throws Exception {
+ final Header header = new BasicHeader("name", null);
+ final Header header2 = new BasicHeader("name2", null);
+
+ Assert.assertNotEquals(header.hashCode(), header2.hashCode());
+
+ final Header header3 = new BasicHeader("name", "value");
+ final Header header4 = new BasicHeader("name", "value2");
+
+ Assert.assertNotEquals(header3.hashCode(), header4.hashCode());
+
+ final Header header5 = new BasicHeader("name", "value");
+ final Header header6 = new BasicHeader("name", null);
+
+ Assert.assertNotEquals(header5.hashCode(), header6.hashCode());
+}
+
+}
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicHeader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicHeader.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicHeader.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java?rev=1775588&r1=1775587&r2=1775588&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java Thu Dec 22 08:34:26 2016
@@ -72,6 +72,17 @@ public class TestHeaderGroup {
}
@Test
+ public void testAddRemoveHeaderWithDifferentButEqualHeaders() {
+ final HeaderGroup headergroup = new HeaderGroup();
+ final Header header = new BasicHeader("name", "value");
+ final Header header2 = new BasicHeader("name", "value");
+ headergroup.addHeader(header);
+ Assert.assertEquals(1, headergroup.getAllHeaders().length);
+ headergroup.removeHeader(header2);
+ Assert.assertEquals(0, headergroup.getAllHeaders().length);
+ }
+
+ @Test
public void testUpdateHeader() {
final HeaderGroup headergroup = new HeaderGroup();
final Header header1 = new BasicHeader("name1", "value1");