Ignore static methods when validating interface

Dan Jasek · Adrian Cole · commit 486bf63ed524 · 2016-03-25T19:06:21.000+08:00
Also moved tests to compile to Java 1.8 fixes OpenFeign#312
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ notifications:
     on_failure: always  # options: [always|never|change] default: always
     on_start: false     # default: false
 jdk:
-- oraclejdk7
+- oraclejdk8
 install: ./installViaTravis.sh
 script: ./buildViaTravis.sh
 cache:
diff --git a/core/build.gradle b/core/build.gradle
@@ -10,3 +10,8 @@ dependencies {
     testCompile 'com.google.code.gson:gson:2.5' // for example
     testCompile 'org.springframework:spring-context:4.2.5.RELEASE' // for example
 }
+
+configure(compileTestJava) {
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
+}
diff --git a/core/src/main/java/feign/Contract.java b/core/src/main/java/feign/Contract.java
@@ -17,6 +17,7 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -55,7 +56,8 @@ public List<MethodMetadata> parseAndValidatateMetadata(Class<?> targetType) {
       }
       Map<String, MethodMetadata> result = new LinkedHashMap<String, MethodMetadata>();
       for (Method method : targetType.getMethods()) {
-        if (method.getDeclaringClass() == Object.class) {
+        if (method.getDeclaringClass() == Object.class ||
+            (method.getModifiers() & Modifier.STATIC) != 0) {
           continue;
         }
         MethodMetadata metadata = parseAndValidateMetadata(targetType, method);
diff --git a/core/src/test/java/feign/DefaultContractTest.java b/core/src/test/java/feign/DefaultContractTest.java
@@ -693,4 +693,21 @@ public void missingMethod() throws Exception {
 
     contract.parseAndValidatateMetadata(MissingMethod.class);
   }
+
+  interface StaticMethodOnInterface {
+    @RequestLine("GET /api/{key}")
+    String get(@Param("key") String key);
+
+    static String staticMethod() {
+      return "value";
+    }
+  }
+
+  @Test
+  public void staticMethodsOnInterfaceIgnored() throws Exception {
+    List<MethodMetadata> mds = contract.parseAndValidatateMetadata(StaticMethodOnInterface.class);
+    assertThat(mds).hasSize(1);
+    MethodMetadata md = mds.get(0);
+    assertThat(md.configKey()).isEqualTo("StaticMethodOnInterface#get(String)");
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,3 +10,8 @@ dependencies {`
`10`	`10`	`testCompile 'com.google.code.gson:gson:2.5' // for example`
`11`	`11`	`testCompile 'org.springframework:spring-context:4.2.5.RELEASE' // for example`
`12`	`12`	`}`
	`13`	`+`
	`14`	`+configure(compileTestJava) {`
	`15`	`+ sourceCompatibility = 1.8`
	`16`	`+ targetCompatibility = 1.8`
	`17`	`+}`