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

Headers Cleanup

Browse Source 
Motiviation:
Some of the contains method signatures did not include the correct type of parameters for the method names.  Also these same methods were not using the correct conversion methods but instead the generic object conversion methods.

Modifications
-Correct the parameter types of the contains methods to match the method name
-Correct the implementation of these methods to use the correct conversion methods

Result:
Headers contains signatures are more correct and correct conversion methods are used.
This commit is contained in:
Scott Mitchell 2014-10-22 08:48:16 -04:00
parent 36b41570a4
commit 222d258d6e
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
codec/src/main/java/io/netty/handler/codec/DefaultHeaders.java
View File

@ -340,43 +340,43 @@ public class DefaultHeaders<T> implements Headers<T> {
} }
@Override @Override
public boolean containsBoolean(T name, int value) { public boolean containsBoolean(T name, boolean value) {
return contains(name, valueConverter.convertObject(checkNotNull(value, "value"))); return contains(name, valueConverter.convertBoolean(checkNotNull(value, "value")));
} }
@Override @Override
public boolean containsByte(T name, byte value) { public boolean containsByte(T name, byte value) {
return contains(name, valueConverter.convertObject(checkNotNull(value, "value"))); return contains(name, valueConverter.convertByte(checkNotNull(value, "value")));
} }
@Override @Override
public boolean containsChar(T name, char value) { public boolean containsChar(T name, char value) {
return contains(name, valueConverter.convertObject(checkNotNull(value, "value"))); return contains(name, valueConverter.convertChar(checkNotNull(value, "value")));
} }
@Override @Override
public boolean containsShort(T name, byte value) { public boolean containsShort(T name, short value) {
return contains(name, valueConverter.convertObject(checkNotNull(value, "value"))); return contains(name, valueConverter.convertShort(checkNotNull(value, "value")));
} }
@Override @Override
public boolean containsInt(T name, int value) { public boolean containsInt(T name, int value) {
return contains(name, valueConverter.convertObject(checkNotNull(value, "value"))); return contains(name, valueConverter.convertInt(checkNotNull(value, "value")));
} }
@Override @Override
public boolean containsLong(T name, long value) { public boolean containsLong(T name, long value) {
return contains(name, valueConverter.convertObject(checkNotNull(value, "value"))); return contains(name, valueConverter.convertLong(checkNotNull(value, "value")));
} }
@Override @Override
public boolean containsFloat(T name, float value) { public boolean containsFloat(T name, float value) {
return contains(name, valueConverter.convertObject(checkNotNull(value, "value"))); return contains(name, valueConverter.convertFloat(checkNotNull(value, "value")));
} }
@Override @Override
public boolean containsDouble(T name, double value) { public boolean containsDouble(T name, double value) {
return contains(name, valueConverter.convertObject(checkNotNull(value, "value"))); return contains(name, valueConverter.convertDouble(checkNotNull(value, "value")));
} }
@Override @Override

4
codec/src/main/java/io/netty/handler/codec/EmptyHeaders.java
View File

@ -253,7 +253,7 @@ public class EmptyHeaders<T> implements Headers<T> {
} }
@Override @Override
public boolean containsBoolean(T name, int value) { public boolean containsBoolean(T name, boolean value) {
return false; return false;
} }
@ -268,7 +268,7 @@ public class EmptyHeaders<T> implements Headers<T> {
} }
@Override @Override
public boolean containsShort(T name, byte value) { public boolean containsShort(T name, short value) {
return false; return false;
} }

4
codec/src/main/java/io/netty/handler/codec/Headers.java
View File

@ -561,7 +561,7 @@ public interface Headers<T> extends Iterable<Map.Entry<T, T>> {
* @param value the header value * @param value the header value
* @return {@code true} if it contains it {@code false} otherwise * @return {@code true} if it contains it {@code false} otherwise
*/ */
boolean containsBoolean(T name, int value); boolean containsBoolean(T name, boolean value);
/** /**
* Returns {@code true} if a header with the name and value exists. * Returns {@code true} if a header with the name and value exists.
@ -588,7 +588,7 @@ public interface Headers<T> extends Iterable<Map.Entry<T, T>> {
* @param value the header value * @param value the header value
* @return {@code true} if it contains it {@code false} otherwise * @return {@code true} if it contains it {@code false} otherwise
*/ */
boolean containsShort(T name, byte value); boolean containsShort(T name, short value);
/** /**
* Returns {@code true} if a header with the name and value exists. * Returns {@code true} if a header with the name and value exists.