Move withFallbackHandler implementation to RequestTemplate.

ribbon-client-extensions/src/main/java/com/netflix/ribbonclientextensions/RequestTemplate.java

@@ -14,6 +14,7 @@ public abstract class RequestTemplate<T, R> {
     private final String name;
     private final ResourceGroup<?> group;
     private final Class<? extends T> classType;
+    private FallbackHandler<T> fallbackHandler;
 
     public RequestTemplate(String name,
             ResourceGroup<?> group,
@@ -41,8 +42,15 @@ public abstract class RequestTemplate<T, R> {
     
     public abstract RequestTemplate<T, R> copy(String name);
         
-    public abstract RequestTemplate<T, R> withFallbackProvider(FallbackHandler<T> fallbackHandler);
+    public RequestTemplate<T, R> withFallbackProvider(FallbackHandler<T> fallbackHandler) {
+        this.fallbackHandler = fallbackHandler;
+        return this;
+    }
     
+    public FallbackHandler<T> fallbackHandler() {
+        return fallbackHandler;
+    }
+
     public abstract RequestTemplate<T, R> withResponseValidator(ResponseValidator<R> validator);
         
     /**

ribbon-client-extensions/src/main/java/com/netflix/ribbonclientextensions/http/HttpRequestTemplate.java

@@ -79,8 +79,7 @@ public class HttpRequestTemplate<T> extends RequestTemplate<T, HttpClientRespons
     
     @Override
     public HttpRequestTemplate<T> withFallbackProvider(FallbackHandler<T> fallbackHandler) {
-        this.fallbackHandler = fallbackHandler;
-        return this;
+        return (HttpRequestTemplate<T>) super.withFallbackProvider(fallbackHandler);
     }
 
     @Override
@@ -150,11 +149,7 @@ public class HttpRequestTemplate<T> extends RequestTemplate<T, HttpClientRespons
     ResponseValidator<HttpClientResponse<ByteBuf>> responseValidator() {
         return validator;
     }
-    
-    FallbackHandler<T> fallbackHandler() {
-        return fallbackHandler;
-    }
-    
+        
     ParsedTemplate uriTemplate() {
         return parsedUriTemplate;
     }