fixes spring tests

openzipkin · Feb 12, 2018 · af5ef03 · af5ef03
1 parent 1a528b5
commit af5ef03
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...bmvc/src/it/spring25/src/test/java/brave/spring/webmvc25/ITTracingHandlerInterceptor.java b/...bmvc/src/it/spring25/src/test/java/brave/spring/webmvc25/ITTracingHandlerInterceptor.java
@@ -8,6 +8,7 @@
 import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
+import org.junit.Ignore;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -23,6 +24,10 @@
 
 public class ITTracingHandlerInterceptor extends ITServletContainer {
 
+  @Override @Ignore("HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE doesn't exist until Spring 3")
+  public void supportsHttpTemplate() {
+  }
+
   @Controller
   public static class TestController {
     final Tracer tracer;

diff --git a/...ion/spring-webmvc/src/test/java/brave/spring/webmvc/ITTracingAsyncHandlerInterceptor.java b/...ion/spring-webmvc/src/test/java/brave/spring/webmvc/ITTracingAsyncHandlerInterceptor.java
@@ -72,8 +72,8 @@ public Callable<ResponseEntity<Void>> disconnectAsync() {
     }
 
     @RequestMapping(value = "/items/{itemId}")
-    public ResponseEntity<Void> items(@PathVariable String itemId) throws IOException {
-      return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<String> items(@PathVariable String itemId) {
+      return new ResponseEntity<>(itemId, HttpStatus.OK);
     }
   }