refactor: Moved all codec stuff under codec package

redis-field-engineering · Jan 30, 2023 · 86372a6 · 86372a6
1 parent e8006fe
commit 86372a6
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 23 deletions.
diff --git a/core/redis-sidecar-jdbc/redis-sidecar-jdbc.gradle b/core/redis-sidecar-jdbc/redis-sidecar-jdbc.gradle
@@ -23,7 +23,6 @@ shadowJar {
    archiveClassifier.set('')
 }
 
-// Configure Auto Relocation
 import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
 
 task relocateShadowJar(type: ConfigureShadowRelocation) {

diff --git a/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/Config.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/Config.java
@@ -7,6 +7,8 @@
 import org.apache.commons.pool2.impl.BaseObjectPoolConfig;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 
+import com.redis.sidecar.codec.ResultSetCodec;
+
 import io.lettuce.core.internal.LettuceAssert;
 
 public class Config {

diff --git a/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/ConfigManager.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/ConfigManager.java
@@ -19,6 +19,8 @@ public class ConfigManager implements AutoCloseable {
 
 	private static final Logger log = Logger.getLogger(ConfigManager.class.getName());
 
+	private static final String JSON_ROOT = "$";
+
 	private final ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
 	private final ObjectMapper mapper = new ObjectMapper();
 	private final Map<String, ScheduledFuture<?>> futures = new HashMap<>();
@@ -31,7 +33,7 @@ public synchronized Config getConfig(String key, StatefulRedisModulesConnection<
 		}
 		configs.put(key, config);
 		String json = mapper.writerFor(config.getClass()).writeValueAsString(config);
-		connection.sync().jsonSet(key, "$", json, SetMode.NX);
+		connection.sync().jsonSet(key, JSON_ROOT, json, SetMode.NX);
 		ObjectReader reader = mapper.readerForUpdating(config);
 		read(connection, key, reader);
 		long refreshRateMillis = config.getRefreshRate() * 1000;

diff --git a/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/NonRegisteringDriver.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/NonRegisteringDriver.java
@@ -31,6 +31,7 @@
 import com.redis.micrometer.RedisTimeSeriesMeterRegistry;
 import com.redis.sidecar.Config.Pool;
 import com.redis.sidecar.Config.Redis;
+import com.redis.sidecar.codec.ResultSetCodec;
 import com.redis.sidecar.rowset.SidecarRowSetFactory;
 
 import io.lettuce.core.AbstractRedisClient;

diff --git a/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/codec/BlobColumnCodec.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/codec/BlobColumnCodec.java
@@ -6,8 +6,6 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import com.redis.sidecar.ResultSetCodec;
-
 import io.netty.buffer.ByteBuf;
 
 public class BlobColumnCodec extends NullableColumnCodec<Blob> {

diff --git a/...n/java/com/redis/sidecar/ColumnCodec.java → .../com/redis/sidecar/codec/ColumnCodec.java b/...n/java/com/redis/sidecar/ColumnCodec.java → .../com/redis/sidecar/codec/ColumnCodec.java
@@ -1,4 +1,4 @@
-package com.redis.sidecar;
+package com.redis.sidecar.codec;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

diff --git a/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/codec/NullableColumnCodec.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/codec/NullableColumnCodec.java
@@ -3,8 +3,6 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import com.redis.sidecar.ColumnCodec;
-
 import io.netty.buffer.ByteBuf;
 
 abstract class NullableColumnCodec<T> implements ColumnCodec {

diff --git a/...ava/com/redis/sidecar/ResultSetCodec.java → ...m/redis/sidecar/codec/ResultSetCodec.java b/...ava/com/redis/sidecar/ResultSetCodec.java → ...m/redis/sidecar/codec/ResultSetCodec.java
@@ -1,4 +1,4 @@
-package com.redis.sidecar;
+package com.redis.sidecar.codec;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -13,18 +13,6 @@
 import javax.sql.rowset.RowSetFactory;
 import javax.sql.rowset.RowSetMetaDataImpl;
 
-import com.redis.sidecar.codec.BigDecimalColumnCodec;
-import com.redis.sidecar.codec.BinaryColumnCodec;
-import com.redis.sidecar.codec.BlobColumnCodec;
-import com.redis.sidecar.codec.BooleanColumnCodec;
-import com.redis.sidecar.codec.DateColumnCodec;
-import com.redis.sidecar.codec.DoubleColumnCodec;
-import com.redis.sidecar.codec.FloatColumnCodec;
-import com.redis.sidecar.codec.IntegerColumnCodec;
-import com.redis.sidecar.codec.LongColumnCodec;
-import com.redis.sidecar.codec.StringColumnCodec;
-import com.redis.sidecar.codec.TimeColumnCodec;
-import com.redis.sidecar.codec.TimestampColumnCodec;
 import com.redis.sidecar.rowset.SidecarRowSetFactory;
 
 import io.lettuce.core.codec.RedisCodec;

diff --git a/...dis/sidecar/SerializedResultSetCodec.java → ...decar/codec/SerializedResultSetCodec.java b/...dis/sidecar/SerializedResultSetCodec.java → ...decar/codec/SerializedResultSetCodec.java
@@ -1,4 +1,4 @@
-package com.redis.sidecar;
+package com.redis.sidecar.codec;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

diff --git a/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/codec/StringColumnCodec.java b/core/redis-sidecar-jdbc/src/main/java/com/redis/sidecar/codec/StringColumnCodec.java
@@ -3,8 +3,6 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import com.redis.sidecar.ResultSetCodec;
-
 import io.netty.buffer.ByteBuf;
 
 public class StringColumnCodec extends NullableColumnCodec<String> {

diff --git a/core/redis-sidecar-test/src/jmh/java/com/redis/sidecar/CodecExecutionPlan.java b/core/redis-sidecar-test/src/jmh/java/com/redis/sidecar/CodecExecutionPlan.java
@@ -12,6 +12,8 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 
+import com.redis.sidecar.codec.ResultSetCodec;
+import com.redis.sidecar.codec.SerializedResultSetCodec;
 import com.redis.sidecar.rowset.SidecarRowSetFactory;
 import com.redis.sidecar.test.RowSetBuilder;
 

diff --git a/core/redis-sidecar-test/src/test/java/com/redis/sidecar/CodecTests.java b/core/redis-sidecar-test/src/test/java/com/redis/sidecar/CodecTests.java
@@ -10,6 +10,8 @@
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 
+import com.redis.sidecar.codec.ResultSetCodec;
+import com.redis.sidecar.codec.SerializedResultSetCodec;
 import com.redis.sidecar.test.RowSetBuilder;
 
 @TestInstance(Lifecycle.PER_CLASS)