Skip to content

Fixes Map Based Parameter Checking for Generic Subclasses #689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
velo merged 1 commit into from
Apr 30, 2018
Merged

Fixes Map Based Parameter Checking for Generic Subclasses #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions core/src/main/java/feign/Contract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,35 @@ private static void checkMapString(String name, Class<?> type, Type genericType)
}

private static void checkMapKeys(String name, Type genericType) {
Type[] parameterTypes = ((ParameterizedType) genericType).getActualTypeArguments();
Class<?> keyClass = (Class<?>) parameterTypes[0];
checkState(String.class.equals(keyClass),
"%s key must be a String: %s", name, keyClass.getSimpleName());
Class<?> keyClass = null;

// assume our type parameterized
if (ParameterizedType.class.isAssignableFrom(genericType.getClass())) {
Type[] parameterTypes = ((ParameterizedType) genericType).getActualTypeArguments();
keyClass = (Class<?>) parameterTypes[0];
} else if (genericType instanceof Class<?>) {
// raw class, type parameters cannot be inferred directly, but we can scan any extended
// interfaces looking for any explict types
Type[] interfaces = ((Class) genericType).getGenericInterfaces();
if (interfaces != null) {
for (Type extended : interfaces) {
if (ParameterizedType.class.isAssignableFrom(extended.getClass())) {
// use the first extended interface we find.
Type[] parameterTypes = ((ParameterizedType) extended).getActualTypeArguments();
keyClass = (Class<?>) parameterTypes[0];
break;
}
}
}
}

if (keyClass != null) {
checkState(String.class.equals(keyClass),
"%s key must be a String: %s", name, keyClass.getSimpleName());
}
}


/**
* Called by parseAndValidateMetadata twice, first on the declaring class, then on the
* target type (unless they are the same).
Expand Down
15 changes: 15 additions & 0 deletions core/src/test/java/feign/DefaultContractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,12 @@ public void onlyOneHeaderMapAnnotationPermitted() throws Exception {
}
}

@Test
public void headerMapSubclass() throws Exception {
MethodMetadata md = parseAndValidateMetadata(HeaderMapInterface.class, "headerMapSubClass", SubClassHeaders.class);
assertThat(md.headerMapIndex()).isEqualTo(0);
}

interface Methods {

@RequestLine("POST /")
Expand Down Expand Up @@ -470,6 +476,9 @@ interface HeaderMapInterface {

@RequestLine("POST /")
void multipleHeaderMap(@HeaderMap Map<String, String> headers, @HeaderMap Map<String,String> queries);

@RequestLine("POST /")
void headerMapSubClass(@HeaderMap SubClassHeaders httpHeaders);
}

interface HeaderParams {
Expand Down Expand Up @@ -627,6 +636,12 @@ static class Entities<K, M> {
private List<Entity<K, M>> entities;
}


interface SubClassHeaders extends Map<String, String> {

}


@Headers("Version: 1")
interface ParameterizedApi extends ParameterizedBaseApi<String, Long> {

Expand Down