Merge pull request #427 from aol/cache-cleanup

Cache cleanup

Author: jijisv

gradle.properties

@@ -1,4 +1,4 @@
-version=1.2.3
+version=1.2.4
 springVersion=5.1.8.RELEASE
 springBootVersion=2.1.6.RELEASE
 jerseyVersion=2.28

micro-elasticache/src/main/java/com/oath/micro/server/elasticache/ConfigureElasticache.java

@@ -1,6 +1,6 @@
 # Elasticache plugin for BASE microservices
 
-[micro-elasticache example apps](https://github.com/aol/micro-server/tree/master/micro-elasticache/src/test/java/app)
+[micro-memcached example apps](https://github.com/aol/micro-server/tree/master/micro-memcached/src/test/java/app)
 
 Basically Available Soft statE
 
@@ -24,11 +24,11 @@ elasticache.max.retries is the maximum number of retries before client throws er
 ```xml
      <dependency>
         <groupId>com.oath.microservices</groupId>
-        <artifactId>micro-elasticache</artifactId>
+        <artifactId>micro-memcached</artifactId>
         <version>x.yz</version>
      </dependency>
 ```
 ### Gradle
 ```groovy
-    compile 'com.oath.microservices:micro-elasticache:x.yz'
+    compile 'com.oath.microservices:micro-memcached:x.yz'
  ```

micro-elasticache/src/main/java/com/oath/micro/server/elasticache/DistributedCacheManager.java

@@ -1,4 +1,4 @@
-description = 'micro-elasticache'
+description = 'micro-memcached'
 
 apply plugin: 'groovy'
 apply plugin: 'java'
@@ -42,7 +42,7 @@ modifyPom {
     inceptionYear '2015'
 
     groupId 'com.oath.microservices'
-    artifactId 'micro-elasticache'
+    artifactId 'micro-memcached'
     version "$version"
 
 
@@ -71,6 +71,11 @@ modifyPom {
         name 'Gordon Morrow'
         email 'gordon.morrow@teamaol.com'
       }
+      developer {
+        id 'davidartplus'
+        name 'David Guzman'
+        email 'davidartplus@gmail.com'
+      }
     }
 
   }

micro-elasticache/src/main/resources/META-INF/services/com.oath.micro.server.Plugin

@@ -0,0 +1,9 @@
+package com.oath.micro.server.memcached;
+import java.util.Optional;
+
+public interface DistributedCache<K, V> {
+        void setConnectionTested(boolean result);
+        boolean isAvailable();
+        boolean add(K key, int exp, V value);
+        Optional<V> get(K key);
+}

micro-elasticache/src/test/java/com/oath/micros/server/elasticache/TransientElasticacheDataConnectionTest.java

@@ -0,0 +1,43 @@
+package com.oath.micro.server.memcached;
+
+import lombok.extern.slf4j.Slf4j;
+import net.spy.memcached.MemcachedClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+
+@Component
+@Slf4j
+public class DistributedCacheFactory {
+
+    private final ElasticacheConfig config;
+
+    @Autowired
+    public DistributedCacheFactory(ElasticacheConfig config) {
+        this.config = config;
+    }
+
+    public <K, V> DistributedCache<K, V> create() {
+        try {
+            log.info("Creating Memcached Data connection for elasticache cluster: {}", config.getHostname());
+            return new MemcachedCacheImpl(createMemcachedClient(), config.getRetryAfterSecs(), config.getMaxRetries());
+        }
+        catch (Exception e) {
+            log.error("Failed to create transient data connection", e);
+            return null;
+        }
+    }
+
+    private MemcachedClient createMemcachedClient() {
+        try {
+            log.info("Starting an instance of memcache client towards elasticache cluster");
+            return new MemcachedClient(new InetSocketAddress(config.getHostname(), config.getPort()));
+        } catch (IOException e) {
+            log.error("Could not initialize connection to elasticache cluster", e);
+            return null;
+        }
+
+    }
+}

micro-elasticache/README.md micro-memcached/README.mdmicro-elasticache/README.md renamed to micro-memcached/README.md

@@ -0,0 +1,39 @@
+package com.oath.micro.server.memcached;
+
+
+
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+
+
+import net.spy.memcached.MemcachedClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.net.InetSocketAddress;
+
+@Slf4j
+@Getter
+@Configuration
+public class ElasticacheConfig {
+    private final String hostname;
+    private final int port;
+    private final int retryAfterSecs;
+    private final int maxRetries;
+
+    @Autowired
+    public ElasticacheConfig(@Value("${elasticache.hostname:null}") String hostname,
+                             @Value("${elasticache.port:6379}") int port,
+                             @Value("${elasticache.retry.after.seconds:1}") int retryAfterSecs,
+                             @Value("${elasticache.max.retries:3}") int maxRetries) {
+        this.hostname = hostname;
+        this.port = port;
+        this.retryAfterSecs = retryAfterSecs;
+        this.maxRetries = maxRetries;
+    }
+}
+