[ssl/format] Tabs to spaces and add new ssl params for redis 2.9.0

mybatis · Nov 20, 2016 · e7d4f07 · e7d4f07 · harawata · Jul 6, 2017
1 parent 350ebb3
commit e7d4f07
Show file tree

Hide file tree

Showing 6 changed files with 240 additions and 195 deletions.
diff --git a/src/main/java/org/mybatis/caches/redis/RedisCache.java b/src/main/java/org/mybatis/caches/redis/RedisCache.java
@@ -42,9 +42,10 @@ public RedisCache(final String id) {
     }
     this.id = id;
     RedisConfig redisConfig = RedisConfigurationBuilder.getInstance().parseConfiguration();
-	pool = new JedisPool(redisConfig, redisConfig.getHost(), redisConfig.getPort(),
-			redisConfig.getConnectionTimeout(), redisConfig.getSoTimeout(), redisConfig.getPassword(),
-			redisConfig.getDatabase(), redisConfig.getClientName());
+    pool = new JedisPool(redisConfig, redisConfig.getHost(), redisConfig.getPort(),
+            redisConfig.getConnectionTimeout(), redisConfig.getSoTimeout(), redisConfig.getPassword(),
+            redisConfig.getDatabase(), redisConfig.getClientName(), redisConfig.isSsl(),
+            redisConfig.getSslSocketFactory(), redisConfig.getSslParameters(), redisConfig.getHostnameVerifier());
   }
 
   private Object execute(RedisCallback callback) {

diff --git a/src/main/java/org/mybatis/caches/redis/RedisCallback.java b/src/main/java/org/mybatis/caches/redis/RedisCallback.java
@@ -19,5 +19,5 @@
 
 public interface RedisCallback {
 
-	Object doWithRedis(Jedis jedis);
+    Object doWithRedis(Jedis jedis);
 }
diff --git a/src/main/java/org/mybatis/caches/redis/RedisConfig.java b/src/main/java/org/mybatis/caches/redis/RedisConfig.java
@@ -15,82 +15,122 @@
  */
 package org.mybatis.caches.redis;
 
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLParameters;
+import javax.net.ssl.SSLSocketFactory;
+
 import redis.clients.jedis.JedisPoolConfig;
 import redis.clients.jedis.Protocol;
 
 public class RedisConfig extends JedisPoolConfig {
 
-	private String host = Protocol.DEFAULT_HOST;
-	private int port = Protocol.DEFAULT_PORT;
-	private int connectionTimeout = Protocol.DEFAULT_TIMEOUT;
-	private int soTimeout = Protocol.DEFAULT_TIMEOUT;
-	private String password;
-	private int database = Protocol.DEFAULT_DATABASE;
-	private String clientName;
-
-	public String getHost() {
-		return host;
-	}
-
-	public void setHost(String host) {
-		if (host == null || "".equals(host)) {
-			host = Protocol.DEFAULT_HOST;
-		}
-		this.host = host;
-	}
-
-	public int getPort() {
-		return port;
-	}
-
-	public void setPort(int port) {
-		this.port = port;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		if ("".equals(password)) {
-			password = null;
-		}
-		this.password = password;
-	}
-
-	public int getDatabase() {
-		return database;
-	}
-
-	public void setDatabase(int database) {
-		this.database = database;
-	}
-
-	public String getClientName() {
-		return clientName;
-	}
-
-	public void setClientName(String clientName) {
-		if ("".equals(clientName)) {
-			clientName = null;
-		}
-		this.clientName = clientName;
-	}
-
-	public int getConnectionTimeout() {
-		return connectionTimeout;
-	}
-
-	public void setConnectionTimeout(int connectionTimeout) {
-		this.connectionTimeout = connectionTimeout;
-	}
-
-	public int getSoTimeout() {
-		return soTimeout;
-	}
-
-	public void setSoTimeout(int soTimeout) {
-		this.soTimeout = soTimeout;
-	}
+    private String host = Protocol.DEFAULT_HOST;
+    private int port = Protocol.DEFAULT_PORT;
+    private int connectionTimeout = Protocol.DEFAULT_TIMEOUT;
+    private int soTimeout = Protocol.DEFAULT_TIMEOUT;
+    private String password;
+    private int database = Protocol.DEFAULT_DATABASE;
+    private String clientName;
+    private boolean ssl;
+    private SSLSocketFactory sslSocketFactory;
+    private SSLParameters sslParameters;
+    private HostnameVerifier hostnameVerifier;
+
+    public boolean isSsl() {
+        return ssl;
+    }
+
+    public void setSsl(boolean ssl) {
+        this.ssl = ssl;
+    }
+
+    public SSLSocketFactory getSslSocketFactory() {
+        return sslSocketFactory;
+    }
+
+    public void setSslSocketFactory(SSLSocketFactory sslSocketFactory) {
+        this.sslSocketFactory = sslSocketFactory;
+    }
+
+    public SSLParameters getSslParameters() {
+        return sslParameters;
+    }
+
+    public void setSslParameters(SSLParameters sslParameters) {
+        this.sslParameters = sslParameters;
+    }
+
+    public HostnameVerifier getHostnameVerifier() {
+        return hostnameVerifier;
+    }
+
+    public void setHostnameVerifier(HostnameVerifier hostnameVerifier) {
+        this.hostnameVerifier = hostnameVerifier;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public void setHost(String host) {
+        if (host == null || "".equals(host)) {
+            host = Protocol.DEFAULT_HOST;
+        }
+        this.host = host;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public void setPort(int port) {
+        this.port = port;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        if ("".equals(password)) {
+            password = null;
+        }
+        this.password = password;
+    }
+
+    public int getDatabase() {
+        return database;
+    }
+
+    public void setDatabase(int database) {
+        this.database = database;
+    }
+
+    public String getClientName() {
+        return clientName;
+    }
+
+    public void setClientName(String clientName) {
+        if ("".equals(clientName)) {
+            clientName = null;
+        }
+        this.clientName = clientName;
+    }
+
+    public int getConnectionTimeout() {
+        return connectionTimeout;
+    }
+
+    public void setConnectionTimeout(int connectionTimeout) {
+        this.connectionTimeout = connectionTimeout;
+    }
+
+    public int getSoTimeout() {
+        return soTimeout;
+    }
+
+    public void setSoTimeout(int soTimeout) {
+        this.soTimeout = soTimeout;
+    }
 
 }