Skip to content

Commit

Permalink
refactor: Moved config under core package
Browse files Browse the repository at this point in the history
  • Loading branch information
Julien Ruaux committed Jul 5, 2022
1 parent 7b55ccf commit d871a0f
Show file tree
Hide file tree
Showing 16 changed files with 31 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.dataformat.javaprop.JavaPropsMapper;
import com.fasterxml.jackson.dataformat.javaprop.JavaPropsSchema;
import com.redis.sidecar.config.Config;
import com.redis.sidecar.core.ByteArrayResultSetCodec;
import com.redis.sidecar.core.ConfigManager;
import com.redis.sidecar.core.MeterRegistryManager;
import com.redis.sidecar.core.RedisManager;
import com.redis.sidecar.core.ResultSetCache;
import com.redis.sidecar.core.StringResultSetCache;
import com.redis.sidecar.core.config.Config;
import com.redis.sidecar.jdbc.SidecarConnection;

import io.lettuce.core.AbstractRedisClient;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import java.util.logging.Logger;
import java.util.zip.CRC32;

import com.redis.sidecar.config.Config;
import com.redis.sidecar.config.Rule;
import com.redis.sidecar.core.config.Config;
import com.redis.sidecar.core.config.Rule;

import io.lettuce.core.internal.LettuceAssert;
import io.micrometer.core.instrument.Counter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import com.redis.micrometer.RedisTimeSeriesConfig;
import com.redis.micrometer.RedisTimeSeriesMeterRegistry;
import com.redis.sidecar.config.Config;
import com.redis.sidecar.core.config.Config;

import io.lettuce.core.AbstractRedisClient;
import io.micrometer.core.instrument.Clock;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import com.redis.lettucemod.RedisModulesClient;
import com.redis.lettucemod.cluster.RedisModulesClusterClient;
import com.redis.sidecar.config.Config;
import com.redis.sidecar.core.config.Config;

import io.lettuce.core.AbstractRedisClient;
import io.lettuce.core.api.StatefulConnection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import org.apache.commons.pool2.impl.GenericObjectPool;

import com.redis.sidecar.config.Config;
import com.redis.sidecar.core.config.Config;

import io.lettuce.core.api.StatefulConnection;
import io.lettuce.core.api.sync.RedisStringCommands;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redis.sidecar.config;
package com.redis.sidecar.core.config;

public class ByteSize {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redis.sidecar.config;
package com.redis.sidecar.core.config;

import java.util.Arrays;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redis.sidecar.config;
package com.redis.sidecar.core.config;

public class Driver {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redis.sidecar.config;
package com.redis.sidecar.core.config;

import java.time.Duration;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redis.sidecar.config;
package com.redis.sidecar.core.config;

public class Redis {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redis.sidecar.config;
package com.redis.sidecar.core.config;

import java.time.Duration;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import javax.sql.rowset.CachedRowSet;
import javax.sql.rowset.RowSetFactory;

import com.redis.sidecar.config.Config;
import com.redis.sidecar.core.ResultSetCache;
import com.redis.sidecar.core.config.Config;

import io.lettuce.core.internal.LettuceAssert;
import io.micrometer.core.instrument.MeterRegistry;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

import javax.sql.rowset.CachedRowSet;

import com.redis.sidecar.config.Rule;
import com.redis.sidecar.core.config.Rule;

import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Timer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.testcontainers.containers.JdbcDatabaseContainer;

import com.redis.sidecar.SidecarDriver;
import com.redis.sidecar.config.ByteSize;
import com.redis.sidecar.core.config.ByteSize;
import com.redis.testcontainers.RedisModulesContainer;
import com.redis.testcontainers.RedisServer;
import com.redis.testcontainers.junit.AbstractTestcontainersRedisTestBase;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.junit.jupiter.params.ParameterizedTest;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.redis.sidecar.config.Config;
import com.redis.sidecar.core.config.Config;
import com.redis.testcontainers.junit.RedisTestContext;
import com.redis.testcontainers.junit.RedisTestContextsSource;

Expand Down
15 changes: 15 additions & 0 deletions demos/redis-sidecar-spring-demo/redis-sidecar-spring-demo.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
runtimeOnly project(':redis-sidecar-jdbc')
runtimeOnly 'mysql:mysql-connector-java'
runtimeOnly 'org.postgresql:postgresql'
runtimeOnly 'com.oracle.database.jdbc:ojdbc8'
runtimeOnly group: 'com.microsoft.sqlserver', name: 'mssql-jdbc', version: mssqlVersion
runtimeOnly group: 'com.ibm.db2', name: 'jcc', version: db2Version
developmentOnly 'org.springframework.boot:spring-boot-devtools'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

test {
useJUnitPlatform()
}

0 comments on commit d871a0f

Please sign in to comment.