merge

Author: slorello89

README.adoc

@@ -1 +1 @@
-0.2.2-SNAPSHOT
+0.3.1-SNAPSHOT

VERSION

@@ -1,26 +1,26 @@
 package com.redis.smartcache.core;
 
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
 import io.airlift.units.DataSize;
 import io.airlift.units.DataSize.Unit;
 import io.airlift.units.Duration;
 import io.lettuce.core.SslVerifyMode;
 
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
 
 public class Config {
 
 	public static final String DEFAULT_NAME = "smartcache";
+	public static final int DEFAULT_QUERY_CACHE_CAPACITY = 10000;
 
 	private String name = DEFAULT_NAME;
+	private int queryCacheCapacity = DEFAULT_QUERY_CACHE_CAPACITY;
+
 	private DriverConfig driver = new DriverConfig();
 	private RedisConfig redis = new RedisConfig();
 	private RulesetConfig ruleset = new RulesetConfig();
 	private MetricsConfig metrics = new MetricsConfig();
-	private AnalyzerConfig analyzer = new AnalyzerConfig();
 
 	public String getName() {
 		return name;
@@ -30,6 +30,14 @@ public void setName(String name) {
 		this.name = name;
 	}
 
+	public int getQueryCacheCapacity() {
+		return queryCacheCapacity;
+	}
+
+	public void setQueryCacheCapacity(int capacity) {
+		this.queryCacheCapacity = capacity;
+	}
+
 	public DriverConfig getDriver() {
 		return driver;
 	}
@@ -62,14 +70,6 @@ public void setMetrics(MetricsConfig metrics) {
 		this.metrics = metrics;
 	}
 
-	public AnalyzerConfig getAnalyzer() {
-		return analyzer;
-	}
-
-	public void setAnalyzer(AnalyzerConfig analyzer) {
-		this.analyzer = analyzer;
-	}
-
 	@Override
 	public int hashCode() {
 		return Objects.hash(redis.getUri(), name);
@@ -234,62 +234,6 @@ public boolean equals(Object obj) {
 
 	}
 
-	public static class AnalyzerConfig {
-
-		public static final int DEFAULT_QUEUE_CAPACITY = 10000;
-		public static final int DEFAULT_THREAD_COUNT = 1;
-		public static final Duration DEFAULT_FLUSH_INTERVAL = new Duration(50, TimeUnit.MILLISECONDS);
-		public static final int DEFAULT_BATCH_SIZE = 50;
-		public static final int DEFAULT_CACHE_CAPACITY = 10000;
-
-		private int cacheCapacity = DEFAULT_CACHE_CAPACITY;
-		private int queueCapacity = DEFAULT_QUEUE_CAPACITY;
-		private int batchSize = DEFAULT_BATCH_SIZE;
-		private int threads = DEFAULT_THREAD_COUNT;
-		private Duration flushInterval = DEFAULT_FLUSH_INTERVAL;
-
-		public Duration getFlushInterval() {
-			return flushInterval;
-		}
-
-		public void setFlushInterval(Duration interval) {
-			this.flushInterval = interval;
-		}
-
-		public int getCacheCapacity() {
-			return cacheCapacity;
-		}
-
-		public void setCacheCapacity(int capacity) {
-			this.cacheCapacity = capacity;
-		}
-
-		public int getQueueCapacity() {
-			return queueCapacity;
-		}
-
-		public void setQueueCapacity(int queueCapacity) {
-			this.queueCapacity = queueCapacity;
-		}
-
-		public int getBatchSize() {
-			return batchSize;
-		}
-
-		public void setBatchSize(int batchSize) {
-			this.batchSize = batchSize;
-		}
-
-		public int getThreads() {
-			return threads;
-		}
-
-		public void setThreads(int threads) {
-			this.threads = threads;
-		}
-
-	}
-
 	public static class DriverConfig {
 
 		private String className;
@@ -312,5 +256,4 @@ public void setUrl(String url) {
 		}
 
 	}
-
 }

core/redis-smart-cache-core/src/main/java/com/redis/smartcache/core/Config.java

@@ -4,7 +4,6 @@
 import java.util.Properties;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.dataformat.javaprop.JavaPropsMapper;
 import com.fasterxml.jackson.dataformat.javaprop.JavaPropsSchema;
@@ -23,8 +22,7 @@ private Mappers() {
 
 	public static JavaPropsMapper propsMapper() {
 		return JavaPropsMapper.builder().serializationInclusion(Include.NON_NULL)
-				.propertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE)
-				.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES).build();
+				.propertyNamingStrategy(PropertyNamingStrategies.KEBAB_CASE).build();
 	}
 
 	public static Properties properties(Config config) throws IOException {

core/redis-smart-cache-core/src/main/java/com/redis/smartcache/core/Mappers.java

@@ -10,24 +10,24 @@
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
-public class RuleConfig implements Cloneable {
+public class RuleConfig implements Cloneable{
 
-    public static final Duration DEFAULT_TTL = new Duration(1, TimeUnit.HOURS);
+    public static final Duration TTL_NO_CACHING = Duration.succinctNanos(0);
+    public static final Duration DEFAULT_TTL = TTL_NO_CACHING;
 
     private final PropertyChangeSupport support = new PropertyChangeSupport(this);
 
     private List<String> tables;
     private List<String> tablesAny;
     private List<String> tablesAll;
     private String regex;
-
     private List<String> queryIds;
-    private Duration ttl = DEFAULT_TTL;
+    private Duration ttl = TTL_NO_CACHING;
 
     public RuleConfig() {
     }
 
-    private RuleConfig(RuleConfig.Builder builder) {
+    private RuleConfig(Builder builder) {
         this.tables = builder.tables;
         this.tablesAny = builder.tablesAny;
         this.tablesAll = builder.tablesAll;
@@ -36,30 +36,6 @@ private RuleConfig(RuleConfig.Builder builder) {
         this.ttl = builder.ttl;
     }
 
-    @Override
-    public RuleConfig clone(){
-        RuleConfig res = new RuleConfig();
-        if (tables != null){
-            res.tables = new ArrayList<>(this.tables);
-        }
-
-        if (tablesAll != null){
-            res.tablesAll = new ArrayList<>(this.tablesAll);
-        }
-
-        if (tablesAny != null){
-            res.tablesAny = new ArrayList<>(this.tablesAny);
-        }
-
-        if (queryIds != null){
-            res.queryIds = new ArrayList<>(this.queryIds);
-        }
-
-        res.regex = this.regex;
-        res.ttl = this.ttl;
-        return res;
-    }
-
     public void addPropertyChangeListener(PropertyChangeListener listener) {
         support.addPropertyChangeListener(listener);
     }
@@ -151,38 +127,62 @@ public boolean equals(Object obj) {
                 && Objects.equals(tablesAny, other.tablesAny) && Objects.equals(ttl, other.ttl);
     }
 
-    public static RuleConfig.Builder tables(String... tables) {
-        RuleConfig.Builder builder = new RuleConfig.Builder();
+    @Override
+    public RuleConfig clone(){
+        RuleConfig res = new RuleConfig();
+        if (tables != null){
+            res.tables = new ArrayList<>(this.tables);
+        }
+
+        if (tablesAll != null){
+            res.tablesAll = new ArrayList<>(this.tablesAll);
+        }
+
+        if (tablesAny != null){
+            res.tablesAny = new ArrayList<>(this.tablesAny);
+        }
+
+        if (queryIds != null){
+            res.queryIds = new ArrayList<>(this.queryIds);
+        }
+
+        res.regex = this.regex;
+        res.ttl = this.ttl;
+        return res;
+    }
+
+    public static Builder tables(String... tables) {
+        Builder builder = new Builder();
         builder.tables = Arrays.asList(tables);
         return builder;
     }
 
-    public static RuleConfig.Builder tablesAny(String... tables) {
-        RuleConfig.Builder builder = new RuleConfig.Builder();
+    public static Builder tablesAny(String... tables) {
+        Builder builder = new Builder();
         builder.tablesAny = Arrays.asList(tables);
         return builder;
     }
 
-    public static RuleConfig.Builder tablesAll(String... tables) {
-        RuleConfig.Builder builder = new RuleConfig.Builder();
+    public static Builder tablesAll(String... tables) {
+        Builder builder = new Builder();
         builder.tablesAll = Arrays.asList(tables);
         return builder;
     }
 
-    public static RuleConfig.Builder queryIds(String... ids) {
-        RuleConfig.Builder builder = new RuleConfig.Builder();
+    public static Builder queryIds(String... ids) {
+        Builder builder = new Builder();
         builder.queryIds = Arrays.asList(ids);
         return builder;
     }
 
-    public static RuleConfig.Builder regex(String regex) {
-        RuleConfig.Builder builder = new RuleConfig.Builder();
+    public static Builder regex(String regex) {
+        Builder builder = new Builder();
         builder.regex = regex;
         return builder;
     }
 
-    public static RuleConfig.Builder passthrough() {
-        return new RuleConfig.Builder();
+    public static Builder passthrough() {
+        return new Builder();
     }
 
     public static final class Builder {
@@ -194,35 +194,35 @@ public static final class Builder {
         private List<String> queryIds;
         private Duration ttl = DEFAULT_TTL;
 
-        public Builder() {
+        private Builder() {
         }
 
-        public RuleConfig.Builder tables(String... tables) {
+        public Builder tables(String... tables) {
             this.tables = Arrays.asList(tables);
             return this;
         }
 
-        public RuleConfig.Builder tablesAny(String... tables) {
+        public Builder tablesAny(String... tables) {
             this.tablesAny = Arrays.asList(tables);
             return this;
         }
 
-        public RuleConfig.Builder tablesAll(String... tables) {
+        public Builder tablesAll(String... tables) {
             this.tablesAll = Arrays.asList(tables);
             return this;
         }
 
-        public RuleConfig.Builder regex(String regex) {
+        public Builder regex(String regex) {
             this.regex = regex;
             return this;
         }
 
-        public RuleConfig.Builder queryIds(String... ids) {
+        public Builder queryIds(String... ids) {
             this.queryIds = Arrays.asList(ids);
             return this;
         }
 
-        public RuleConfig.Builder ttl(Duration ttl) {
+        public Builder ttl(Duration ttl) {
             this.ttl = ttl;
             return this;
         }