andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DefaultHeaders / CharSequenceValueConverter should treat boolean consistently.

Browse Source 
Motivation:

HttpHeaders.getBoolean should return the same truth value for the same string value, regardless of the underlying type.

Modifications:

- Only treat values of true as Boolean.TRUE
- Add unit tests.

Result:

Consistent converting of values for all CharSequence implementations.
This commit is contained in:
Norman Maurer 2018-02-14 14:52:05 +01:00
parent 73f23c5faa
commit ad6af3250c
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
codec/src/main/java/io/netty/handler/codec/CharSequenceValueConverter.java
View File

@ -67,7 +67,11 @@ public class CharSequenceValueConverter implements ValueConverter<CharSequence>
@Override
public boolean convertToBoolean(CharSequence value) {
if (value instanceof AsciiString) {
return ((AsciiString) value).parseBoolean();
AsciiString asciiString = (AsciiString) value;
return asciiString.contentEqualsIgnoreCase("true");
}
if (value.length() != 4) {
return false;
}
return Boolean.parseBoolean(value.toString());
}

37
codec/src/test/java/io/netty/handler/codec/DefaultHeadersTest.java
View File

@ -14,6 +14,7 @@
*/
package io.netty.handler.codec;
import io.netty.util.AsciiString;
import org.junit.Test;
import java.util.ArrayList;
@ -640,4 +641,40 @@ public class DefaultHeadersTest {
assertNull(headers.getTimeMillis("name"));
assertEquals(Long.MAX_VALUE, headers.getTimeMillis("name1", Long.MAX_VALUE));
}
@Test
public void testGetBooleanInvalidValue() {
TestDefaultHeaders headers = newInstance();
headers.set("name1", "invalid");
headers.set("name2", new AsciiString("invalid"));
headers.set("name3", new StringBuilder("invalid"));
assertFalse(headers.getBoolean("name1", false));
assertFalse(headers.getBoolean("name2", false));
assertFalse(headers.getBoolean("name3", false));
}
@Test
public void testGetBooleanFalseValue() {
TestDefaultHeaders headers = newInstance();
headers.set("name1", "false");
headers.set("name2", new AsciiString("false"));
headers.set("name3", new StringBuilder("false"));
assertFalse(headers.getBoolean("name1", true));
assertFalse(headers.getBoolean("name2", true));
assertFalse(headers.getBoolean("name3", true));
}
@Test
public void testGetBooleanTrueValue() {
TestDefaultHeaders headers = newInstance();
headers.set("name1", "true");
headers.set("name2", new AsciiString("true"));
headers.set("name3", new StringBuilder("true"));
assertTrue(headers.getBoolean("name1", false));
assertTrue(headers.getBoolean("name2", false));
assertTrue(headers.getBoolean("name3", false));
}
}