Skip to content

Commit

Permalink
Merge pull request square#1289 from square/jw/abstract-iterable-and-a…
Browse files Browse the repository at this point in the history 
…rray-param-actions

Extract iterable and array behavior from RequestAction.
  • Loading branch information
@swankjesse
swankjesse committed Nov 17, 2015
2 parents d46af87 + 365b210 commit 6e29d07
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 54 deletions.
79 changes: 28 additions & 51 deletions retrofit/src/main/java/retrofit/RequestAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,31 @@
abstract class RequestAction<T> {
abstract void perform(RequestBuilder builder, T value);

final RequestAction<Iterable<T>> iterable() {
return new RequestAction<Iterable<T>>() {
@Override void perform(RequestBuilder builder, Iterable<T> values) {
if (values == null) return; // Skip null values.

for (T value : values) {
RequestAction.this.perform(builder, value);
}
}
};
}

final RequestAction<Object> array() {
return new RequestAction<Object>() {
@Override void perform(RequestBuilder builder, Object values) {
if (values == null) return; // Skip null values.

for (int i = 0, size = Array.getLength(values); i < size; i++) {
//noinspection unchecked
RequestAction.this.perform(builder, (T) Array.get(values, i));
}
}
};
}

static final class Url extends RequestAction<String> {
@Override void perform(RequestBuilder builder, String value) {
builder.setRelativeUrl(value);
Expand All @@ -42,23 +67,7 @@ static final class Header extends RequestAction<Object> {

@Override void perform(RequestBuilder builder, Object value) {
if (value == null) return; // Skip null values.

if (value instanceof Iterable) {
for (Object iterableValue : (Iterable<?>) value) {
if (iterableValue != null) { // Skip null values.
builder.addHeader(name, iterableValue.toString());
}
}
} else if (value.getClass().isArray()) {
for (int x = 0, arrayLength = Array.getLength(value); x < arrayLength; x++) {
Object arrayValue = Array.get(value, x);
if (arrayValue != null) { // Skip null values.
builder.addHeader(name, arrayValue.toString());
}
}
} else {
builder.addHeader(name, value.toString());
}
builder.addHeader(name, value.toString());
}
}

Expand Down Expand Up @@ -91,23 +100,7 @@ static final class Query extends RequestAction<Object> {

@Override void perform(RequestBuilder builder, Object value) {
if (value == null) return; // Skip null values.

if (value instanceof Iterable) {
for (Object iterableValue : (Iterable<?>) value) {
if (iterableValue != null) { // Skip null values.
builder.addQueryParam(name, iterableValue.toString(), encoded);
}
}
} else if (value.getClass().isArray()) {
for (int x = 0, arrayLength = Array.getLength(value); x < arrayLength; x++) {
Object arrayValue = Array.get(value, x);
if (arrayValue != null) { // Skip null values.
builder.addQueryParam(name, arrayValue.toString(), encoded);
}
}
} else {
builder.addQueryParam(name, value.toString(), encoded);
}
builder.addQueryParam(name, value.toString(), encoded);
}
}

Expand Down Expand Up @@ -145,23 +138,7 @@ static final class Field extends RequestAction<Object> {

@Override void perform(RequestBuilder builder, Object value) {
if (value == null) return; // Skip null values.

if (value instanceof Iterable) {
for (Object iterableValue : (Iterable<?>) value) {
if (iterableValue != null) { // Skip null values.
builder.addFormField(name, iterableValue.toString(), encoded);
}
}
} else if (value.getClass().isArray()) {
for (int x = 0, arrayLength = Array.getLength(value); x < arrayLength; x++) {
Object arrayValue = Array.get(value, x);
if (arrayValue != null) { // Skip null values.
builder.addFormField(name, arrayValue.toString(), encoded);
}
}
} else {
builder.addFormField(name, value.toString(), encoded);
}
builder.addFormField(name, value.toString(), encoded);
}
}

Expand Down
33 changes: 30 additions & 3 deletions retrofit/src/main/java/retrofit/RequestFactoryParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,16 @@ private void parseParameters(Retrofit retrofit) {

} else if (methodParameterAnnotation instanceof Query) {
Query query = (Query) methodParameterAnnotation;
action = new RequestAction.Query(query.value(), query.encoded());

RequestAction<?> queryAction = new RequestAction.Query(query.value(), query.encoded());
Class<?> rawParameterType = Utils.getRawType(methodParameterType);
if (Iterable.class.isAssignableFrom(rawParameterType)) {
queryAction = queryAction.iterable();
} else if (rawParameterType.isArray()) {
queryAction = queryAction.array();
}

action = queryAction;
gotQuery = true;

} else if (methodParameterAnnotation instanceof QueryMap) {
Expand All @@ -267,14 +276,32 @@ private void parseParameters(Retrofit retrofit) {

} else if (methodParameterAnnotation instanceof Header) {
Header header = (Header) methodParameterAnnotation;
action = new RequestAction.Header(header.value());

Class<?> rawParameterType = Utils.getRawType(methodParameterType);
RequestAction<?> headerAction = new RequestAction.Header(header.value());
if (Iterable.class.isAssignableFrom(rawParameterType)) {
headerAction = headerAction.iterable();
} else if (rawParameterType.isArray()) {
headerAction = headerAction.array();
}

action = headerAction;

} else if (methodParameterAnnotation instanceof Field) {
if (!isFormEncoded) {
throw parameterError(i, "@Field parameters can only be used with form encoding.");
}
Field field = (Field) methodParameterAnnotation;
action = new RequestAction.Field(field.value(), field.encoded());

RequestAction<?> fieldAction = new RequestAction.Field(field.value(), field.encoded());
Class<?> rawParameterType = Utils.getRawType(methodParameterType);
if (Iterable.class.isAssignableFrom(rawParameterType)) {
fieldAction = fieldAction.iterable();
} else if (rawParameterType.isArray()) {
fieldAction = fieldAction.array();
}

action = fieldAction;
gotField = true;

} else if (methodParameterAnnotation instanceof FieldMap) {
Expand Down

0 comments on commit 6e29d07

Please sign in to comment.