Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added test. Fixed bugs 

Signed-off-by: Greg Wilkins <gregw@webtide.com>
This commit is contained in:
Greg Wilkins 2020-08-13 11:17:19 +02:00
parent f1a13521df
commit f31604cff2
3 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
View File

@ -292,6 +292,11 @@ public class HttpField
return _name.equalsIgnoreCase(field.getName());
}
public boolean is(String name)
{
return _name.equalsIgnoreCase(name);
}
private int nameHashCode()
{
int h = this.hash;

32
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
View File

@ -171,8 +171,8 @@ public class HttpFields implements Iterable<HttpField>
int first = -1;
for (; i < _size; i++)
{
HttpField f = _fields[i++];
if (f.getName().equalsIgnoreCase(name))
HttpField f = _fields[i];
if (f.is(name))
{
first = i++;
break;
@ -192,8 +192,8 @@ public class HttpFields implements Iterable<HttpField>
List<HttpField> found = null;
for (; i < _size; i++)
{
HttpField f = _fields[i++];
if (f.getName().equalsIgnoreCase(name))
HttpField f = _fields[i];
if (f.is(name))
{
if (found == null)
{
@ -296,7 +296,7 @@ public class HttpFields implements Iterable<HttpField>
for (int i = 0; i < _size; i++)
{
HttpField f = _fields[i];
if (f.getName().equalsIgnoreCase(name))
if (f.is(name))
return f;
}
return null;
@ -324,7 +324,7 @@ public class HttpFields implements Iterable<HttpField>
for (int i = 0; i < _size; i++)
{
HttpField f = _fields[i];
if (f.getName().equalsIgnoreCase(name))
if (f.is(name))
{
if (fields == null)
fields = new ArrayList<>();
@ -361,7 +361,7 @@ public class HttpFields implements Iterable<HttpField>
for (int i = _size; i-- > 0; )
{
HttpField f = _fields[i];
if (f.getName().equalsIgnoreCase(name) && f.contains(value))
if (f.is(name) && f.contains(value))
return true;
}
return false;
@ -383,7 +383,7 @@ public class HttpFields implements Iterable<HttpField>
for (int i = _size; i-- > 0; )
{
HttpField f = _fields[i];
if (f.getName().equalsIgnoreCase(name))
if (f.is(name))
return true;
}
return false;
@ -417,7 +417,7 @@ public class HttpFields implements Iterable<HttpField>
for (int i = 0; i < _size; i++)
{
HttpField f = _fields[i];
if (f.getName().equalsIgnoreCase(header))
if (f.is(header))
return f.getValue();
}
return null;
@ -453,7 +453,7 @@ public class HttpFields implements Iterable<HttpField>
for (int i = 0; i < _size; i++)
{
HttpField f = _fields[i];
if (f.getName().equalsIgnoreCase(name))
if (f.is(name))
{
if (list == null)
list = new ArrayList<>(size() - i);
@ -508,7 +508,7 @@ public class HttpFields implements Iterable<HttpField>
for (int i = 0; i < _size; i++)
{
HttpField f = _fields[i];
if (f.getName().equalsIgnoreCase(name))
if (f.is(name))
{
if (existing == null)
existing = new QuotedCSV(false);
@ -596,7 +596,7 @@ public class HttpFields implements Iterable<HttpField>
QuotedCSV values = null;
for (HttpField f : this)
{
if (f.getName().equalsIgnoreCase(name))
if (f.is(name))
{
if (values == null)
values = new QuotedCSV(keepQuotes);
@ -654,7 +654,7 @@ public class HttpFields implements Iterable<HttpField>
QuotedQualityCSV values = null;
for (HttpField f : this)
{
if (f.getName().equalsIgnoreCase(name))
if (f.is(name))
{
if (values == null)
values = new QuotedQualityCSV();
@ -676,7 +676,7 @@ public class HttpFields implements Iterable<HttpField>
{
final HttpField f = _fields[i];
if (f.getName().equalsIgnoreCase(name) && f.getValue() != null)
if (f.is(name) && f.getValue() != null)
{
final int first = i;
return new Enumeration<String>()
@ -692,7 +692,7 @@ public class HttpFields implements Iterable<HttpField>
while (i < _size)
{
field = _fields[i++];
if (field.getName().equalsIgnoreCase(name) && field.getValue() != null)
if (field.is(name) && field.getValue() != null)
return true;
}
field = null;
@ -924,7 +924,7 @@ public class HttpFields implements Iterable<HttpField>
for (int i = _size; i-- > 0; )
{
HttpField f = _fields[i];
if (f.getName().equalsIgnoreCase(name))
if (f.is(name))
{
removed = f;
remove(i);

28
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
View File

@ -866,4 +866,32 @@ public class HttpFieldsTest
assertThat(header.stream().count(), is(3L));
assertThat(header.stream().map(HttpField::getName).filter("name2"::equalsIgnoreCase).count(), is(1L));
}
@Test
public void testCompute()
{
HttpFields header = new HttpFields();
assertThat(header.size(), is(0));
header.computeField("Test", (n, f) -> null);
assertThat(header.size(), is(0));
header.add(new HttpField("Before", "value"));
assertThat(header.stream().map(HttpField::toString).collect(Collectors.toList()), contains("Before: value"));
header.computeField("Test", (n, f) -> new HttpField(n, "one"));
assertThat(header.stream().map(HttpField::toString).collect(Collectors.toList()), contains("Before: value", "Test: one"));
header.add(new HttpField("After", "value"));
assertThat(header.stream().map(HttpField::toString).collect(Collectors.toList()), contains("Before: value", "Test: one", "After: value"));
header.add(new HttpField("Test", "extra"));
assertThat(header.stream().map(HttpField::toString).collect(Collectors.toList()), contains("Before: value", "Test: one", "After: value", "Test: extra"));
header.computeField("Test", (n, f) -> new HttpField("TEST", "count=" + f.size()));
assertThat(header.stream().map(HttpField::toString).collect(Collectors.toList()), contains("Before: value", "TEST: count=2", "After: value"));
header.computeField("TEST", (n, f) -> null);
assertThat(header.stream().map(HttpField::toString).collect(Collectors.toList()), contains("Before: value", "After: value"));
}
}