Changes according to code review comments.

Netflix · Aug 25, 2014 · b3fc37a · b3fc37a
1 parent 9683e0f
commit b3fc37a
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 348 deletions.
diff --git a/build.gradle b/build.gradle
@@ -159,6 +159,7 @@ project(':ribbon-evcache') {
         compile project(':ribbon')
         compile 'com.netflix.evcache:evcache-client:1.0.5'
         testCompile project(':ribbon-test')
+        testCompile project(':ribbon').sourceSets.test.output
     }
 }
 

diff --git a/ribbon-evcache/src/test/java/com/netflix/ribbon/proxy/EvCacheAnnotationTest.java b/ribbon-evcache/src/test/java/com/netflix/ribbon/proxy/EvCacheAnnotationTest.java
@@ -25,7 +25,7 @@
 import com.netflix.ribbon.proxy.processor.AnnotationProcessorsProvider;
 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 com.netflix.ribbon.proxy.sample.SampleMovieServiceWithEVCache;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -91,11 +91,10 @@ public void testGetQueryWithDomainObjectResult() throws Exception {
         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");
+        MethodTemplateExecutor executor = createExecutor(SampleMovieServiceWithEVCache.class, "findMovieById");
         RibbonRequest ribbonRequest = executor.executeFromTemplate(new Object[]{"id123"});
 
         verifyAll();

diff --git a/ribbon-evcache/src/test/java/com/netflix/ribbon/proxy/sample/HystrixHandlers.java b/ribbon-evcache/src/test/java/com/netflix/ribbon/proxy/sample/HystrixHandlers.java
diff --git a/ribbon-evcache/src/test/java/com/netflix/ribbon/proxy/sample/Movie.java b/ribbon-evcache/src/test/java/com/netflix/ribbon/proxy/sample/Movie.java
diff --git a/ribbon-evcache/src/test/java/com/netflix/ribbon/proxy/sample/MovieServiceInterfaces.java b/ribbon-evcache/src/test/java/com/netflix/ribbon/proxy/sample/MovieServiceInterfaces.java
diff --git a/ribbon-evcache/src/test/java/com/netflix/ribbon/proxy/sample/MovieTransformer.java b/ribbon-evcache/src/test/java/com/netflix/ribbon/proxy/sample/MovieTransformer.java
diff --git a/ribbon-evcache/src/test/java/com/netflix/ribbon/proxy/sample/ResourceGroupClasses.java b/ribbon-evcache/src/test/java/com/netflix/ribbon/proxy/sample/ResourceGroupClasses.java
diff --git a/ribbon-evcache/src/test/java/com/netflix/ribbon/proxy/sample/SampleCacheProviderFactory.java b/ribbon-evcache/src/test/java/com/netflix/ribbon/proxy/sample/SampleCacheProviderFactory.java