SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #577 from alexVengrovsk/master

Browse Source 
* pull577:
  Use instanceof for better readability
This commit is contained in:
Spencer Gibb
2015-10-08 14:50:50 -06:00
parent 8147b7de51 e4b63a5b51
commit d433096779
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/SpringMvcContract.java
View File

@@ -128,9 +128,7 @@ public class SpringMvcContract extends Contract.BaseContract {
boolean isHttpAnnotation = false;
// TODO: support spring parameter annotations?
for (Annotation parameterAnnotation : annotations) {
Class<? extends Annotation> annotationType = parameterAnnotation
.annotationType();
if (annotationType == PathVariable.class) {
if (parameterAnnotation instanceof PathVariable) {
String name = PathVariable.class.cast(parameterAnnotation).value();
checkState(emptyToNull(name) != null,
"PathVariable annotation was empty on param %s.", paramIndex);
@@ -143,7 +141,7 @@ public class SpringMvcContract extends Contract.BaseContract {
data.formParams().add(name);
}
}
else if (annotationType == RequestParam.class) {
else if (parameterAnnotation instanceof RequestParam) {
String name = RequestParam.class.cast(parameterAnnotation).value();
checkState(emptyToNull(name) != null,
"QueryParam.value() was empty on parameter %s", paramIndex);
@@ -153,7 +151,7 @@ public class SpringMvcContract extends Contract.BaseContract {
nameParam(data, name, paramIndex);
isHttpAnnotation = true;
}
else if (annotationType == RequestHeader.class) {
else if (parameterAnnotation instanceof RequestHeader) {
String name = RequestHeader.class.cast(parameterAnnotation).value();
checkState(emptyToNull(name) != null,
"HeaderParam.value() was empty on parameter %s", paramIndex);