Skip to content

Formatting feedback #6

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
merged 1 commit into from
Apr 12, 2019
Merged

Formatting feedback #6

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
16 changes: 7 additions & 9 deletions ...ocs-core/src/main/java/capital/scalable/restdocs/payload/AbstractJacksonFieldSnippet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,15 @@ protected FieldDescriptors createFieldDescriptors(Operation operation,

protected Type firstGenericType(MethodParameter param) {
Type type = param.getGenericParameterType();
if(type instanceof TypeVariable) {
TypeVariable tv = (TypeVariable)type;
if (type instanceof TypeVariable) {
TypeVariable tv = (TypeVariable) type;
return findTypeFromTypeVariable(tv, param.getContainingClass());
} else if (type instanceof ParameterizedType) {
ParameterizedType parameterizedType = (ParameterizedType) type;
Type actualArgument = parameterizedType.getActualTypeArguments()[0];
if(actualArgument instanceof Class) {
if (actualArgument instanceof Class) {
return actualArgument;
} else if(actualArgument instanceof TypeVariable) {
} else if (actualArgument instanceof TypeVariable) {
TypeVariable typeVariable = (TypeVariable)actualArgument;
return findTypeFromTypeVariable(typeVariable, param.getContainingClass());
}
Expand All @@ -109,16 +109,14 @@ protected Type firstGenericType(MethodParameter param) {
}

protected Type findTypeFromTypeVariable(TypeVariable typeVariable, Class<?> clazz) {
Type defaultReturnValue = Object.class;

String variableName = typeVariable.getName();
Map<TypeVariable, Type> typeMap = GenericTypeResolver.getTypeVariableMap(clazz);
for(TypeVariable tv : typeMap.keySet()) {
if(StringUtils.equals(tv.getName(), variableName)) {
for (TypeVariable tv : typeMap.keySet()) {
if (StringUtils.equals(tv.getName(), variableName)) {
return typeMap.get(tv);
}
}
return defaultReturnValue;
return Object.class;
}

protected abstract Type getType(HandlerMethod method);
Expand Down