Merge pull request #157 from allenxwang/pluggable-annotations

Fix Issue #156, #149 and #141

Author: Allen Wang

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,15 @@ project(':ribbon') {
     }
 }
 
+project(':ribbon-evcache') {
+    dependencies {
+        compile project(':ribbon')
+        compile 'com.netflix.evcache:evcache-client:1.0.5'
+        testCompile project(':ribbon-test')
+        testCompile project(':ribbon').sourceSets.test.output
+    }
+}
+
 project(':ribbon-guice') {
     dependencies {
         compile project(':ribbon')

ribbon-core/src/main/java/com/netflix/client/config/ClientConfigFactory.java

@@ -26,10 +26,8 @@ public static class DefaultClientConfigFactory implements ClientConfigFactory {
         @Override
         public IClientConfig newConfig() {
             IClientConfig config = new DefaultClientConfigImpl();
-            config.loadDefaultValues();
             return config;
-            
-        }        
+        }
     }
 
     public static final ClientConfigFactory DEFAULT = new DefaultClientConfigFactory();

ribbon-core/src/main/java/com/netflix/client/config/CommonClientConfigKey.java

@@ -17,7 +17,7 @@
 */
 package com.netflix.client.config;
 
-import static com.google.common.base.Preconditions.checkArgument;
+import com.google.common.reflect.TypeToken;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -26,7 +26,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import com.google.common.reflect.TypeToken;
+import static com.google.common.base.Preconditions.checkArgument;
 
 public abstract class CommonClientConfigKey<T> implements IClientConfigKey<T> {
 
@@ -214,6 +214,25 @@ public static IClientConfigKey[] values() {
     public static Set<IClientConfigKey> keys() {
         return keys;
     }
+
+    public static IClientConfigKey valueOf(final String name) {
+        for (IClientConfigKey key: keys()) {
+            if (key.key().equals(name)) {
+                return key;
+            }
+        }
+        return new IClientConfigKey() {
+            @Override
+            public String key() {
+                return name;
+            }
+
+            @Override
+            public Class type() {
+                return String.class;
+            }
+        };
+    }
 
     private final String configKey;
     private final Class<T> type;

ribbon/src/main/java/com/netflix/ribbon/evache/CacheFaultException.java renamed to ribbon-evcache/src/main/java/com/netflix/ribbon/evache/CacheFaultException.java

@@ -0,0 +1,97 @@
+package com.netflix.ribbon.proxy.processor;
+
+import com.netflix.evcache.EVCacheTranscoder;
+import com.netflix.ribbon.ResourceGroup.GroupBuilder;
+import com.netflix.ribbon.ResourceGroup.TemplateBuilder;
+import com.netflix.ribbon.RibbonResourceFactory;
+import com.netflix.ribbon.evache.EvCacheOptions;
+import com.netflix.ribbon.evache.EvCacheProvider;
+import com.netflix.ribbon.proxy.ProxyAnnotationException;
+import com.netflix.ribbon.proxy.Utils;
+import com.netflix.ribbon.proxy.annotation.EvCache;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Allen Wang
+ */
+public class EVCacheAnnotationProcessor implements AnnotationProcessor<GroupBuilder, TemplateBuilder> {
+
+    private static final class CacheId {
+        private final String appName;
+        private final String cacheName;
+
+        CacheId(String appName, String cacheName) {
+            this.appName = appName;
+            this.cacheName = cacheName;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            CacheId cacheId = (CacheId) o;
+
+            if (!appName.equals(cacheId.appName)) {
+                return false;
+            }
+            return cacheName.equals(cacheId.cacheName);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = appName.hashCode();
+            result = 31 * result + cacheName.hashCode();
+            return result;
+        }
+    }
+
+    private Map<CacheId, EvCacheProvider<?>> evCacheProviderPool = new HashMap<CacheId, EvCacheProvider<?>>();
+
+    @Override
+    public void process(String templateName, TemplateBuilder templateBuilder, Method method) {
+        EvCache annotation = method.getAnnotation(EvCache.class);
+        if (annotation == null) {
+            return;
+        }
+
+        Class<? extends EVCacheTranscoder<?>>[] transcoderClasses = annotation.transcoder();
+        EVCacheTranscoder<?> transcoder;
+        if (transcoderClasses.length == 0) {
+            transcoder = null;
+        } else if (transcoderClasses.length > 1) {
+            throw new ProxyAnnotationException("Multiple transcoders defined on method " + method.getName());
+        } else {
+            transcoder = Utils.newInstance(transcoderClasses[0]);
+        }
+
+        EvCacheOptions evCacheOptions = new EvCacheOptions(
+                annotation.appName(),
+                annotation.name(),
+                annotation.enableZoneFallback(),
+                annotation.ttl(),
+                transcoder,
+                annotation.key());
+        if (evCacheOptions != null) {
+            CacheId cacheId = new CacheId(evCacheOptions.getAppName(), evCacheOptions.getCacheName());
+            EvCacheProvider<?> provider = evCacheProviderPool.get(cacheId);
+            if (provider == null) {
+                provider = new EvCacheProvider(evCacheOptions);
+                evCacheProviderPool.put(cacheId, provider);
+            }
+            templateBuilder.withCacheProvider(evCacheOptions.getCacheKeyTemplate(), provider);
+        }
+
+    }
+
+    @Override
+    public void process(String groupName, GroupBuilder groupBuilder, RibbonResourceFactory factory, Class<?> interfaceClass) {
+    }
+}

ribbon/src/main/java/com/netflix/ribbon/evache/CacheMissException.java renamed to ribbon-evcache/src/main/java/com/netflix/ribbon/evache/CacheMissException.java

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