Final refactoring

Veirisa · Veirisa · commit c65a8632912e · 2022-11-29T20:12:43.000+01:00
diff --git a/driver/src/main/java/jdbc/client/RedisClientFactory.java b/driver/src/main/java/jdbc/client/RedisClientFactory.java
@@ -1,5 +1,9 @@
 package jdbc.client;
 
+import jdbc.client.impl.cluster.RedisJedisClusterURI;
+import jdbc.client.impl.standalone.RedisJedisClient;
+import jdbc.client.impl.standalone.RedisJedisURI;
+
 import java.sql.SQLException;
 import java.util.Properties;
 
diff --git a/driver/src/main/java/jdbc/client/helpers/result/parser/ResultParserWrapper.java b/driver/src/main/java/jdbc/client/helpers/result/parser/ResultParserWrapper.java
@@ -9,6 +9,7 @@
 import java.util.function.Predicate;
 
 public class ResultParserWrapper {
+
     private final ResultParser resultParser;
     private final Predicate<RedisQuery> isApplicable;
 
diff --git a/driver/src/main/java/jdbc/client/helpers/result/parser/converter/Converter.java b/driver/src/main/java/jdbc/client/helpers/result/parser/converter/Converter.java
@@ -7,7 +7,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-abstract class Converter<T, V, MV> {
+public abstract class Converter<T, V, MV> {
 
     @Contract("null -> null; !null -> !null")
     public final V convert(T encoded) {
diff --git a/driver/src/main/java/jdbc/client/helpers/result/parser/converter/ObjectConverter.java b/driver/src/main/java/jdbc/client/helpers/result/parser/converter/ObjectConverter.java
@@ -27,7 +27,7 @@ public abstract class ObjectConverter<T> extends Converter<T, Map<String, Object
     }
 
     @Override
-    protected @NotNull List<Map<String, Object>> convertMapImpl(@NotNull Map<String, T> encoded) {
+    protected final @NotNull List<Map<String, Object>> convertMapImpl(@NotNull Map<String, T> encoded) {
         return encoded.entrySet().stream().map(this::convertEntryImpl).collect(Collectors.toList());
     }
 }
diff --git a/driver/src/main/java/jdbc/client/helpers/result/parser/converter/type/TypeFactory.java b/driver/src/main/java/jdbc/client/helpers/result/parser/converter/type/TypeFactory.java
@@ -220,7 +220,7 @@ protected Function<List<Tuple>, List<?>> getValuesConverter() {
     };
 
     private static abstract class KeyedListType<T> extends ObjectType<KeyValue<String, List<T>>> {
-        KeyedListType() {
+        protected KeyedListType() {
             add("key", STRING, KeyValue::getKey);
             add("values", LIST, KeyValue::getValue, getValuesConverter());
         }
@@ -257,7 +257,7 @@ protected Function<List<Map.Entry<String, String>>, List<?>> getResultsConverter
     };
 
     private static abstract class ScanResultType<T> extends ObjectType<ScanResult<T>> {
-        ScanResultType() {
+        protected ScanResultType() {
             add("cursor", STRING, ScanResult::getCursor);
             add("results", LIST, ScanResult::getResult, getResultsConverter());
         }
diff --git a/driver/src/main/java/jdbc/client/helpers/result/parser/encoder/EncoderFactory.java b/driver/src/main/java/jdbc/client/helpers/result/parser/encoder/EncoderFactory.java
@@ -374,7 +374,7 @@ private abstract static class SimpleListEncoder<T> extends ListEncoder<T> {
         protected abstract @NotNull Builder<List<T>> getListBuilder();
 
         @Override
-        public @NotNull List<T> encode(Object data) {
+        public final @NotNull List<T> encode(Object data) {
             if (data == null) return Collections.emptyList();
             return getListBuilder().build(data);
         }
@@ -390,7 +390,7 @@ private abstract static class SimpleMapEncoder<T> extends MapEncoder<T> {
         protected abstract @NotNull Builder<Map<String, T>> getMapBuilder();
 
         @Override
-        public @NotNull Map<String, T> encode(Object data) {
+        public final @NotNull Map<String, T> encode(Object data) {
             if (data == null) return Collections.emptyMap();
             return getMapBuilder().build(data);
         }
diff --git a/driver/src/main/java/jdbc/client/impl/RedisClientBase.java b/driver/src/main/java/jdbc/client/impl/RedisClientBase.java
@@ -1,5 +1,6 @@
-package jdbc.client;
+package jdbc.client.impl;
 
+import jdbc.client.RedisClient;
 import jdbc.client.helpers.query.RedisQueryHelper;
 import jdbc.client.helpers.result.RedisResultHelper;
 import jdbc.client.structures.query.RedisBlockingQuery;
@@ -13,10 +14,10 @@
 
 import static jdbc.Utils.parseSqlDbIndex;
 
-abstract class RedisClientBase implements RedisClient {
+public abstract class RedisClientBase implements RedisClient {
 
     @Override
-    public RedisResult execute(String sql) throws SQLException {
+    public final RedisResult execute(String sql) throws SQLException {
         try {
             RedisQuery query = RedisQueryHelper.parseQuery(sql);
             Object data =
@@ -38,7 +39,7 @@ private Object execute(@NotNull RedisSetDatabaseQuery query) {
     }
 
     @Override
-    public void setDatabase(String db) throws SQLException {
+    public final void setDatabase(String db) throws SQLException {
         try {
             setDatabase(parseSqlDbIndex(db));
         } catch (JedisException e) {
@@ -49,7 +50,7 @@ public void setDatabase(String db) throws SQLException {
     protected abstract String setDatabase(int index);
 
     @Override
-    public void close() throws SQLException {
+    public final void close() throws SQLException {
         try {
             doClose();
         } catch (JedisException e) {
diff --git a/driver/src/main/java/jdbc/client/impl/RedisJedisURIBase.java b/driver/src/main/java/jdbc/client/impl/RedisJedisURIBase.java
@@ -1,4 +1,4 @@
-package jdbc.client;
+package jdbc.client.impl;
 
 import jdbc.Utils;
 import org.jetbrains.annotations.NotNull;
@@ -12,7 +12,7 @@
 import static jdbc.properties.RedisDefaultConfig.CONFIG;
 import static jdbc.properties.RedisDriverPropertyInfoHelper.*;
 
-abstract class RedisJedisURIBase implements JedisClientConfig {
+public abstract class RedisJedisURIBase implements JedisClientConfig {
 
     // auth
     private String user;
diff --git a/driver/src/main/java/jdbc/client/impl/cluster/RedisJedisClusterClient.java b/driver/src/main/java/jdbc/client/impl/cluster/RedisJedisClusterClient.java
@@ -1,5 +1,6 @@
-package jdbc.client;
+package jdbc.client.impl.cluster;
 
+import jdbc.client.impl.RedisClientBase;
 import jdbc.client.structures.query.RedisBlockingQuery;
 import jdbc.client.structures.query.RedisQuery;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
@@ -10,7 +11,7 @@
 
 import java.sql.SQLException;
 
-class RedisJedisClusterClient extends RedisClientBase {
+public class RedisJedisClusterClient extends RedisClientBase {
 
     private final JedisCluster jedisCluster;
 
diff --git a/driver/src/main/java/jdbc/client/impl/cluster/RedisJedisClusterURI.java b/driver/src/main/java/jdbc/client/impl/cluster/RedisJedisClusterURI.java
@@ -1,5 +1,6 @@
-package jdbc.client;
+package jdbc.client.impl.cluster;
 
+import jdbc.client.impl.RedisJedisURIBase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import redis.clients.jedis.HostAndPort;
@@ -13,7 +14,7 @@
 import static jdbc.properties.RedisDefaultConfig.CONFIG;
 import static jdbc.properties.RedisDriverPropertyInfoHelper.MAX_ATTEMPTS;
 
-class RedisJedisClusterURI extends RedisJedisURIBase {
+public class RedisJedisClusterURI extends RedisJedisURIBase {
 
     private static final String PREFIX = "jdbc:redis:cluster://";
 
diff --git a/driver/src/main/java/jdbc/client/impl/standalone/RedisJedisClient.java b/driver/src/main/java/jdbc/client/impl/standalone/RedisJedisClient.java
@@ -1,5 +1,6 @@
-package jdbc.client;
+package jdbc.client.impl.standalone;
 
+import jdbc.client.impl.RedisClientBase;
 import jdbc.client.structures.query.RedisBlockingQuery;
 import jdbc.client.structures.query.RedisQuery;
 import org.jetbrains.annotations.NotNull;
@@ -8,7 +9,7 @@
 
 import java.sql.SQLException;
 
-class RedisJedisClient extends RedisClientBase {
+public class RedisJedisClient extends RedisClientBase {
 
     private final Jedis jedis;
 
diff --git a/driver/src/main/java/jdbc/client/impl/standalone/RedisJedisURI.java b/driver/src/main/java/jdbc/client/impl/standalone/RedisJedisURI.java
@@ -1,12 +1,13 @@
-package jdbc.client;
+package jdbc.client.impl.standalone;
 
+import jdbc.client.impl.RedisJedisURIBase;
 import org.jetbrains.annotations.NotNull;
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.Protocol;
 
 import java.util.Properties;
 
-class RedisJedisURI extends RedisJedisURIBase {
+public class RedisJedisURI extends RedisJedisURIBase {
 
     private static final String PREFIX = "jdbc:redis://";
 
diff --git a/driver/src/main/java/jdbc/client/structures/query/ColumnHint.java b/driver/src/main/java/jdbc/client/structures/query/ColumnHint.java
@@ -3,6 +3,7 @@
 import org.jetbrains.annotations.NotNull;
 
 public class ColumnHint {
+
     private final String name;
     private final String[] values;
 
diff --git a/driver/src/main/java/jdbc/client/structures/query/CompositeCommand.java b/driver/src/main/java/jdbc/client/structures/query/CompositeCommand.java
@@ -8,6 +8,7 @@
 import java.util.Objects;
 
 public class CompositeCommand {
+
     private final Command command;
     private final Keyword keyword;
 
diff --git a/driver/src/main/java/jdbc/client/structures/query/RedisQuery.java b/driver/src/main/java/jdbc/client/structures/query/RedisQuery.java
@@ -11,6 +11,7 @@
 import java.util.stream.Collectors;
 
 public class RedisQuery {
+
     private final CompositeCommand compositeCommand;
     private final String[] params;
     private Set<String> paramsSet;
diff --git a/driver/src/main/java/jdbc/client/structures/query/RedisSetDatabaseQuery.java b/driver/src/main/java/jdbc/client/structures/query/RedisSetDatabaseQuery.java
@@ -4,6 +4,7 @@
 import org.jetbrains.annotations.Nullable;
 
 public class RedisSetDatabaseQuery extends RedisQuery {
+
     private final int dbIndex;
 
     public RedisSetDatabaseQuery(@NotNull CompositeCommand compositeCommand, int dbIndex, @Nullable ColumnHint columnHint) {
diff --git a/driver/src/main/java/jdbc/properties/RedisDriverPropertyInfoHelper.java b/driver/src/main/java/jdbc/properties/RedisDriverPropertyInfoHelper.java
@@ -6,6 +6,7 @@
 import static jdbc.properties.RedisDefaultConfig.CONFIG;
 
 public class RedisDriverPropertyInfoHelper {
+
     public static final String USER = "user";
     public static final String PASSWORD = "password";
     public static final String DATABASE = "database";
diff --git a/driver/src/main/java/jdbc/resultset/RedisResultSetBase.java b/driver/src/main/java/jdbc/resultset/RedisResultSetBase.java
@@ -33,7 +33,7 @@ public abstract class RedisResultSetBase<T, RR, R> implements ResultSet {
 
     private boolean isClosed = false;
 
-    public RedisResultSetBase(RedisStatement statement) {
+    protected RedisResultSetBase(RedisStatement statement) {
         this.statement = statement;
         this.metaData = new RedisResultSetMetaData(Collections.emptyList());
         this.rows = Collections.emptyList();
diff --git a/driver/src/main/java/jdbc/types/ArrayImpl.java b/driver/src/main/java/jdbc/types/ArrayImpl.java
@@ -9,6 +9,7 @@
 
 
 public class ArrayImpl implements Array {
+
     private Object[] array;
 
     public ArrayImpl(Object[] array) {
diff --git a/driver/src/main/java/jdbc/types/RedisColumnTypeHelper.java b/driver/src/main/java/jdbc/types/RedisColumnTypeHelper.java
@@ -7,6 +7,7 @@
 import static jdbc.Utils.toLowerCase;
 
 public class RedisColumnTypeHelper {
+    
     public static final String OBJECT = "object";
     public static final String STRING = "string";
     public static final String LONG = "long";
diff --git a/driver/src/test/jdbc/client/RedisURITest.java b/driver/src/test/jdbc/client/RedisURITest.java
@@ -1,5 +1,7 @@
 package jdbc.client;
 
+import jdbc.client.impl.cluster.RedisJedisClusterURI;
+import jdbc.client.impl.standalone.RedisJedisURI;
 import org.junit.Test;
 import redis.clients.jedis.HostAndPort;
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public abstract class ObjectConverter<T> extends Converter<T, Map<String, Object`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
`30`		`- protected @NotNull List<Map<String, Object>> convertMapImpl(@NotNull Map<String, T> encoded) {`
	`30`	`+ protected final @NotNull List<Map<String, Object>> convertMapImpl(@NotNull Map<String, T> encoded) {`
`31`	`31`	`return encoded.entrySet().stream().map(this::convertEntryImpl).collect(Collectors.toList());`
`32`	`32`	`}`
`33`	`33`	`}`