Fix Issue Netflix#156 and Netflix#149

build.gradle

@@ -146,7 +146,6 @@ project(':ribbon') {
 
     dependencies {
         compile 'com.netflix.hystrix:hystrix-core:1.4.0-RC4'
-        compile 'com.netflix.evcache:evcache-client:1.0.5'
         compile 'javax.inject:javax.inject:1'
         compile project(':ribbon-transport')
         testCompile project(':ribbon-test')
@@ -155,6 +154,14 @@ project(':ribbon') {
     }
 }
 
+project(':ribbon-evcache') {
+    dependencies {
+        compile project(':ribbon')
+        compile 'com.netflix.evcache:evcache-client:1.0.5'
+        testCompile project(':ribbon-test')
+    }
+}
+
 project(':ribbon-guice') {
     dependencies {
         compile project(':ribbon')

ribbon-evcache/src/main/resources/META-INF/services/com.netflix.ribbon.proxy.processor.AnnotationProcessor

@@ -0,0 +1 @@
+com.netflix.ribbon.proxy.processor.EVCacheAnnotationProcessor

ribbon-evcache/src/test/java/com/netflix/ribbon/evache/ServiceLoaderTest.java

@@ -0,0 +1,30 @@
+package com.netflix.ribbon.evache;
+
+import com.netflix.ribbon.proxy.processor.AnnotationProcessor;
+import com.netflix.ribbon.proxy.processor.EVCacheAnnotationProcessor;
+import com.netflix.ribbon.proxy.processor.ProxyAnnotations;
+import org.junit.Test;
+
+import java.util.List;
+
+import static junit.framework.TestCase.assertTrue;
+
+/**
+ * @author Allen Wang
+ */
+public class ServiceLoaderTest {
+    @Test
+    public void testServiceLoader() {
+        ProxyAnnotations annotations = ProxyAnnotations.getInstance();
+        List<AnnotationProcessor> processors = annotations.getProcessors();
+        boolean hasEVCacheProcessor = false;
+        for (AnnotationProcessor processor: processors) {
+            Class<?> clazz = processor.getClass();
+            if (clazz.equals(EVCacheAnnotationProcessor.class)) {
+                hasEVCacheProcessor = true;
+                break;
+            }
+        }
+        assertTrue(hasEVCacheProcessor);
+    }
+}

ribbon-evcache/src/test/java/com/netflix/ribbon/proxy/EvCacheAnnotationTest.java

@@ -0,0 +1,110 @@
+/*
+ * Copyright 2014 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.netflix.ribbon.proxy;
+
+import com.netflix.ribbon.CacheProvider;
+import com.netflix.ribbon.RibbonRequest;
+import com.netflix.ribbon.evache.EvCacheProvider;
+import com.netflix.ribbon.http.HttpRequestBuilder;
+import com.netflix.ribbon.http.HttpRequestTemplate;
+import com.netflix.ribbon.http.HttpRequestTemplate.Builder;
+import com.netflix.ribbon.http.HttpResourceGroup;
+import com.netflix.ribbon.proxy.processor.ProxyAnnotations;
+import com.netflix.ribbon.proxy.sample.HystrixHandlers.MovieFallbackHandler;
+import com.netflix.ribbon.proxy.sample.HystrixHandlers.SampleHttpResponseValidator;
+import com.netflix.ribbon.proxy.sample.MovieServiceInterfaces.SampleMovieService;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.easymock.annotation.Mock;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import static com.netflix.ribbon.proxy.Utils.methodByName;
+import static junit.framework.Assert.assertEquals;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.expect;
+import static org.powermock.api.easymock.PowerMock.*;
+
+/**
+ * @author Tomasz Bak
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({MethodTemplateExecutor.class})
+@PowerMockIgnore("javax.management.*")
+public class EvCacheAnnotationTest {
+
+    @Mock
+    private RibbonRequest ribbonRequestMock = createMock(RibbonRequest.class);
+
+    @Mock
+    private HttpRequestBuilder requestBuilderMock = createMock(HttpRequestBuilder.class);
+
+    @Mock
+    private Builder httpRequestTemplateBuilderMock = createMock(Builder.class);
+
+    @Mock
+    private HttpRequestTemplate httpRequestTemplateMock = createMock(HttpRequestTemplate.class);
+
+    @Mock
+    private HttpResourceGroup httpResourceGroupMock = createMock(HttpResourceGroup.class);
+
+    @Before
+    public void setUp() throws Exception {
+        expect(requestBuilderMock.build()).andReturn(ribbonRequestMock);
+        expect(httpRequestTemplateBuilderMock.build()).andReturn(httpRequestTemplateMock);
+        expect(httpRequestTemplateMock.requestBuilder()).andReturn(requestBuilderMock);
+    }
+
+
+    @Test
+    public void testGetQueryWithDomainObjectResult() throws Exception {
+        expectUrlBase("GET", "/movies/{id}");
+
+        expect(requestBuilderMock.withRequestProperty("id", "id123")).andReturn(requestBuilderMock);
+        expect(httpResourceGroupMock.newTemplateBuilder("findMovieById")).andReturn(httpRequestTemplateBuilderMock);
+
+        expect(httpRequestTemplateBuilderMock.withHeader("X-MyHeader1", "value1.1")).andReturn(httpRequestTemplateBuilderMock);
+        expect(httpRequestTemplateBuilderMock.withHeader("X-MyHeader1", "value1.2")).andReturn(httpRequestTemplateBuilderMock);
+        expect(httpRequestTemplateBuilderMock.withHeader("X-MyHeader2", "value2")).andReturn(httpRequestTemplateBuilderMock);
+        expect(httpRequestTemplateBuilderMock.withRequestCacheKey("findMovieById/{id}")).andReturn(httpRequestTemplateBuilderMock);
+        expect(httpRequestTemplateBuilderMock.withFallbackProvider(anyObject(MovieFallbackHandler.class))).andReturn(httpRequestTemplateBuilderMock);
+        expect(httpRequestTemplateBuilderMock.withResponseValidator(anyObject(SampleHttpResponseValidator.class))).andReturn(httpRequestTemplateBuilderMock);
+        expect(httpRequestTemplateBuilderMock.withCacheProvider(anyObject(String.class), anyObject(CacheProvider.class))).andReturn(httpRequestTemplateBuilderMock);
+        expect(httpRequestTemplateBuilderMock.withCacheProvider(anyObject(String.class), anyObject(EvCacheProvider.class))).andReturn(httpRequestTemplateBuilderMock);
+        // expect(evCacheProviderPoolMock.getMatching(anyObject(EvCacheOptions.class))).andReturn(evCacheProviderMock);
+
+        replayAll();
+
+        MethodTemplateExecutor executor = createExecutor(SampleMovieService.class, "findMovieById");
+        RibbonRequest ribbonRequest = executor.executeFromTemplate(new Object[]{"id123"});
+
+        verifyAll();
+
+        assertEquals(ribbonRequestMock, ribbonRequest);
+    }
+
+    private void expectUrlBase(String method, String path) {
+        expect(httpRequestTemplateBuilderMock.withMethod(method)).andReturn(httpRequestTemplateBuilderMock);
+        expect(httpRequestTemplateBuilderMock.withUriTemplate(path)).andReturn(httpRequestTemplateBuilderMock);
+    }
+
+    private MethodTemplateExecutor createExecutor(Class<?> clientInterface, String methodName) {
+        MethodTemplate methodTemplate = new MethodTemplate(methodByName(clientInterface, methodName));
+        return new MethodTemplateExecutor(httpResourceGroupMock, methodTemplate, ProxyAnnotations.getInstance());
+    }
+}

ribbon-evcache/src/test/java/com/netflix/ribbon/proxy/sample/HystrixHandlers.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2014 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.netflix.ribbon.proxy.sample;
+
+import com.netflix.hystrix.HystrixExecutableInfo;
+import com.netflix.ribbon.ServerError;
+import com.netflix.ribbon.UnsuccessfulResponseException;
+import com.netflix.ribbon.http.HttpResponseValidator;
+import com.netflix.ribbon.hystrix.FallbackHandler;
+
+import io.netty.buffer.ByteBuf;
+import io.reactivex.netty.protocol.http.client.HttpClientResponse;
+import rx.Observable;
+
+import java.util.Map;
+
+/**
+ * @author Tomasz Bak
+ */
+public class HystrixHandlers {
+
+    public static class SampleHttpResponseValidator implements HttpResponseValidator {
+
+        @Override
+        public void validate(HttpClientResponse<ByteBuf> response) throws UnsuccessfulResponseException, ServerError {
+        }
+    }
+
+    public static class MovieFallbackHandler implements FallbackHandler<Movie> {
+
+        @Override
+        public Observable<Movie> getFallback(HystrixExecutableInfo<?> hystrixInfo, Map<String, Object> requestProperties) {
+            return null;
+        }
+    }
+}

ribbon-evcache/src/test/java/com/netflix/ribbon/proxy/sample/Movie.java

@@ -0,0 +1,8 @@
+package com.netflix.ribbon.proxy.sample;
+
+/**
+ * @author Tomasz Bak
+ */
+public class Movie {
+
+}