classes moved to appropriate packages

v1r3n · Dec 5, 2020 · d8961f1 · d8961f1
1 parent 1d5484b
commit d8961f1
Show file tree

Hide file tree

Showing 29 changed files with 53 additions and 52 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,3 +28,4 @@ Renamed DynoProxy to JedisProxy
 Removed support for EmbeddedElasticSearch
 
 Ignored a flaky test class - LocalOnlyLockTest.
+Test Harness module uses TestContainers for MySql,Postgres & Elasticsearch
diff --git a/...edis/configuration/AnyRedisCondition.java → ...uctor/redis/config/AnyRedisCondition.java b/...edis/configuration/AnyRedisCondition.java → ...uctor/redis/config/AnyRedisCondition.java
@@ -1,4 +1,4 @@
-package com.netflix.conductor.redis.configuration;
+package com.netflix.conductor.redis.config;
 
 import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

diff --git a/...uration/DynomiteClusterConfiguration.java → .../config/DynomiteClusterConfiguration.java b/...uration/DynomiteClusterConfiguration.java → .../config/DynomiteClusterConfiguration.java
@@ -10,9 +10,8 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.netflix.conductor.redis.configuration;
+package com.netflix.conductor.redis.config;
 
-import com.netflix.conductor.redis.config.utils.RedisProperties;
 import com.netflix.dyno.connectionpool.HostSupplier;
 import com.netflix.dyno.connectionpool.TokenMapSupplier;
 import com.netflix.dyno.connectionpool.impl.ConnectionPoolConfigurationImpl;

diff --git a/...iguration/InMemoryRedisConfiguration.java → ...is/config/InMemoryRedisConfiguration.java b/...iguration/InMemoryRedisConfiguration.java → ...is/config/InMemoryRedisConfiguration.java
@@ -10,18 +10,17 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.netflix.conductor.redis.configuration;
+package com.netflix.conductor.redis.config;
 
-import com.netflix.conductor.redis.config.utils.RedisProperties;
+import com.netflix.conductor.redis.dynoqueue.LocalhostHostSupplier;
 import com.netflix.conductor.redis.jedis.JedisMock;
-import com.netflix.conductor.redis.jedis.LocalhostHostSupplier;
 import com.netflix.dyno.connectionpool.HostSupplier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import static com.netflix.conductor.redis.configuration.RedisCommonConfiguration.DEFAULT_CLIENT_INJECTION_NAME;
-import static com.netflix.conductor.redis.configuration.RedisCommonConfiguration.READ_CLIENT_INJECTION_NAME;
+import static com.netflix.conductor.redis.config.RedisCommonConfiguration.DEFAULT_CLIENT_INJECTION_NAME;
+import static com.netflix.conductor.redis.config.RedisCommonConfiguration.READ_CLIENT_INJECTION_NAME;
 
 @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
 @Configuration(proxyBeanMethods = false)

diff --git a/...onfiguration/JedisCommandsConfigurer.java → ...redis/config/JedisCommandsConfigurer.java b/...onfiguration/JedisCommandsConfigurer.java → ...redis/config/JedisCommandsConfigurer.java
@@ -1,14 +1,13 @@
-package com.netflix.conductor.redis.configuration;
+package com.netflix.conductor.redis.config;
 
-import com.netflix.conductor.redis.config.utils.RedisProperties;
-import com.netflix.conductor.redis.jedis.ConfigurationHostSupplier;
+import com.netflix.conductor.redis.dynoqueue.ConfigurationHostSupplier;
 import com.netflix.dyno.connectionpool.HostSupplier;
 import com.netflix.dyno.connectionpool.TokenMapSupplier;
 import org.springframework.context.annotation.Bean;
 import redis.clients.jedis.commands.JedisCommands;
 
-import static com.netflix.conductor.redis.configuration.RedisCommonConfiguration.DEFAULT_CLIENT_INJECTION_NAME;
-import static com.netflix.conductor.redis.configuration.RedisCommonConfiguration.READ_CLIENT_INJECTION_NAME;
+import static com.netflix.conductor.redis.config.RedisCommonConfiguration.DEFAULT_CLIENT_INJECTION_NAME;
+import static com.netflix.conductor.redis.config.RedisCommonConfiguration.READ_CLIENT_INJECTION_NAME;
 
 abstract class JedisCommandsConfigurer {
 

diff --git a/...figuration/RedisClusterConfiguration.java → ...dis/config/RedisClusterConfiguration.java b/...figuration/RedisClusterConfiguration.java → ...dis/config/RedisClusterConfiguration.java
@@ -10,9 +10,8 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.netflix.conductor.redis.configuration;
+package com.netflix.conductor.redis.config;
 
-import com.netflix.conductor.redis.config.utils.RedisProperties;
 import com.netflix.conductor.redis.jedis.JedisCluster;
 import com.netflix.dyno.connectionpool.Host;
 import com.netflix.dyno.connectionpool.HostSupplier;

diff --git a/...nfiguration/RedisCommonConfiguration.java → ...edis/config/RedisCommonConfiguration.java b/...nfiguration/RedisCommonConfiguration.java → ...edis/config/RedisCommonConfiguration.java
@@ -1,8 +1,7 @@
-package com.netflix.conductor.redis.configuration;
+package com.netflix.conductor.redis.config;
 
 import com.google.inject.ProvisionException;
-import com.netflix.conductor.redis.config.utils.RedisProperties;
-import com.netflix.conductor.redis.config.utils.RedisQueuesShardingStrategyProvider;
+import com.netflix.conductor.redis.dynoqueue.RedisQueuesShardingStrategyProvider;
 import com.netflix.dyno.connectionpool.Host;
 import com.netflix.dyno.connectionpool.HostSupplier;
 import com.netflix.dyno.connectionpool.TokenMapSupplier;

diff --git a/...r/redis/config/utils/RedisProperties.java → ...nductor/redis/config/RedisProperties.java b/...r/redis/config/utils/RedisProperties.java → ...nductor/redis/config/RedisProperties.java
@@ -10,12 +10,14 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.netflix.conductor.redis.config.utils;
+package com.netflix.conductor.redis.config;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.stereotype.Component;
 
 @Component
+@Conditional(AnyRedisCondition.class)
 public class RedisProperties {
 
     // TODO Are cluster and cluster name really different things?
@@ -65,7 +67,7 @@ public class RedisProperties {
     @Value("${queues.dynomite.nonQuorum.port:22122}")
     private int queuesNonQuorumPort;
 
-    @Value("${workflow.dyno.queue.sharding.strategy:#{T(com.netflix.conductor.redis.config.utils.RedisQueuesShardingStrategyProvider).ROUND_ROBIN_STRATEGY}}")
+    @Value("${workflow.dyno.queue.sharding.strategy:#{T(com.netflix.conductor.redis.dynoqueue.RedisQueuesShardingStrategyProvider).ROUND_ROBIN_STRATEGY}}")
     private String queueShardingStrategy;
 
     /**

diff --git a/...iguration/RedisSentinelConfiguration.java → ...is/config/RedisSentinelConfiguration.java b/...iguration/RedisSentinelConfiguration.java → ...is/config/RedisSentinelConfiguration.java
@@ -10,9 +10,8 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.netflix.conductor.redis.configuration;
+package com.netflix.conductor.redis.config;
 
-import com.netflix.conductor.redis.config.utils.RedisProperties;
 import com.netflix.conductor.redis.jedis.JedisSentinel;
 import com.netflix.dyno.connectionpool.Host;
 import com.netflix.dyno.connectionpool.HostSupplier;

diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/BaseDynoDAO.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/BaseDynoDAO.java
@@ -15,7 +15,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.netflix.conductor.metrics.Monitors;
-import com.netflix.conductor.redis.config.utils.RedisProperties;
+import com.netflix.conductor.redis.config.RedisProperties;
 import com.netflix.conductor.redis.jedis.JedisProxy;
 import org.apache.commons.lang3.StringUtils;
 

diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/DynoQueueDAO.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/DynoQueueDAO.java
@@ -13,7 +13,7 @@
 package com.netflix.conductor.redis.dao;
 
 import com.netflix.conductor.dao.QueueDAO;
-import com.netflix.conductor.redis.configuration.AnyRedisCondition;
+import com.netflix.conductor.redis.config.AnyRedisCondition;
 import com.netflix.dyno.queues.DynoQueue;
 import com.netflix.dyno.queues.Message;
 import com.netflix.dyno.queues.redis.RedisQueues;

diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisEventHandlerDAO.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisEventHandlerDAO.java
@@ -18,8 +18,8 @@
 import com.netflix.conductor.core.exception.ApplicationException;
 import com.netflix.conductor.core.exception.ApplicationException.Code;
 import com.netflix.conductor.dao.EventHandlerDAO;
-import com.netflix.conductor.redis.config.utils.RedisProperties;
-import com.netflix.conductor.redis.configuration.AnyRedisCondition;
+import com.netflix.conductor.redis.config.AnyRedisCondition;
+import com.netflix.conductor.redis.config.RedisProperties;
 import com.netflix.conductor.redis.jedis.JedisProxy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisExecutionDAO.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisExecutionDAO.java
@@ -24,8 +24,8 @@
 import com.netflix.conductor.core.exception.ApplicationException.Code;
 import com.netflix.conductor.dao.ExecutionDAO;
 import com.netflix.conductor.metrics.Monitors;
-import com.netflix.conductor.redis.config.utils.RedisProperties;
-import com.netflix.conductor.redis.configuration.AnyRedisCondition;
+import com.netflix.conductor.redis.config.RedisProperties;
+import com.netflix.conductor.redis.config.AnyRedisCondition;
 import com.netflix.conductor.redis.jedis.JedisProxy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisMetadataDAO.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisMetadataDAO.java
@@ -20,9 +20,9 @@
 import com.netflix.conductor.core.exception.ApplicationException.Code;
 import com.netflix.conductor.dao.MetadataDAO;
 import com.netflix.conductor.metrics.Monitors;
+import com.netflix.conductor.redis.config.RedisProperties;
+import com.netflix.conductor.redis.config.AnyRedisCondition;
 import com.netflix.conductor.redis.jedis.JedisProxy;
-import com.netflix.conductor.redis.config.utils.RedisProperties;
-import com.netflix.conductor.redis.configuration.AnyRedisCondition;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisPollDataDAO.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisPollDataDAO.java
@@ -17,8 +17,8 @@
 import com.netflix.conductor.common.metadata.tasks.PollData;
 import com.netflix.conductor.dao.PollDataDAO;
 import com.netflix.conductor.redis.jedis.JedisProxy;
-import com.netflix.conductor.redis.config.utils.RedisProperties;
-import com.netflix.conductor.redis.configuration.AnyRedisCondition;
+import com.netflix.conductor.redis.config.RedisProperties;
+import com.netflix.conductor.redis.config.AnyRedisCondition;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.stereotype.Component;

diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisRateLimitingDAO.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisRateLimitingDAO.java
@@ -18,8 +18,8 @@
 import com.netflix.conductor.dao.RateLimitingDAO;
 import com.netflix.conductor.metrics.Monitors;
 import com.netflix.conductor.redis.jedis.JedisProxy;
-import com.netflix.conductor.redis.config.utils.RedisProperties;
-import com.netflix.conductor.redis.configuration.AnyRedisCondition;
+import com.netflix.conductor.redis.config.RedisProperties;
+import com.netflix.conductor.redis.config.AnyRedisCondition;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...edis/jedis/ConfigurationHostSupplier.java → .../dynoqueue/ConfigurationHostSupplier.java b/...edis/jedis/ConfigurationHostSupplier.java → .../dynoqueue/ConfigurationHostSupplier.java
@@ -10,9 +10,9 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.netflix.conductor.redis.jedis;
+package com.netflix.conductor.redis.dynoqueue;
 
-import com.netflix.conductor.redis.config.utils.RedisProperties;
+import com.netflix.conductor.redis.config.RedisProperties;
 import com.netflix.dyno.connectionpool.Host;
 import com.netflix.dyno.connectionpool.HostBuilder;
 import com.netflix.dyno.connectionpool.HostSupplier;

diff --git a/...or/redis/jedis/LocalhostHostSupplier.java → ...edis/dynoqueue/LocalhostHostSupplier.java b/...or/redis/jedis/LocalhostHostSupplier.java → ...edis/dynoqueue/LocalhostHostSupplier.java
@@ -10,10 +10,10 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.netflix.conductor.redis.jedis;
+package com.netflix.conductor.redis.dynoqueue;
 
 import com.google.common.collect.Lists;
-import com.netflix.conductor.redis.config.utils.RedisProperties;
+import com.netflix.conductor.redis.config.RedisProperties;
 import com.netflix.dyno.connectionpool.Host;
 import com.netflix.dyno.connectionpool.HostBuilder;
 import com.netflix.dyno.connectionpool.HostSupplier;

diff --git a/.../RedisQueuesShardingStrategyProvider.java → .../RedisQueuesShardingStrategyProvider.java b/.../RedisQueuesShardingStrategyProvider.java → .../RedisQueuesShardingStrategyProvider.java
@@ -10,8 +10,9 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.netflix.conductor.redis.config.utils;
+package com.netflix.conductor.redis.dynoqueue;
 
+import com.netflix.conductor.redis.config.RedisProperties;
 import com.netflix.dyno.queues.Message;
 import com.netflix.dyno.queues.ShardSupplier;
 import com.netflix.dyno.queues.redis.sharding.RoundRobinStrategy;
@@ -46,7 +47,7 @@ public ShardingStrategy get() {
         }
     }
 
-    static final class LocalOnlyStrategy implements ShardingStrategy {
+    public static final class LocalOnlyStrategy implements ShardingStrategy {
 
         private static final Logger LOGGER = LoggerFactory.getLogger(LocalOnlyStrategy.class);
 

diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/jedis/JedisProxy.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/jedis/JedisProxy.java
@@ -12,7 +12,7 @@
  */
 package com.netflix.conductor.redis.jedis;
 
-import com.netflix.conductor.redis.configuration.AnyRedisCondition;
+import com.netflix.conductor.redis.config.AnyRedisCondition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -32,7 +32,7 @@
 import java.util.Optional;
 import java.util.Set;
 
-import static com.netflix.conductor.redis.configuration.RedisCommonConfiguration.DEFAULT_CLIENT_INJECTION_NAME;
+import static com.netflix.conductor.redis.config.RedisCommonConfiguration.DEFAULT_CLIENT_INJECTION_NAME;
 
 /**
  * Proxy for the {@link JedisCommands} object.

diff --git a/...ava/com/netflix/conductor/redis/config/utils/RedisQueuesShardingStrategyProviderTest.java b/...ava/com/netflix/conductor/redis/config/utils/RedisQueuesShardingStrategyProviderTest.java
@@ -12,6 +12,8 @@
  */
 package com.netflix.conductor.redis.config.utils;
 
+import com.netflix.conductor.redis.config.RedisProperties;
+import com.netflix.conductor.redis.dynoqueue.RedisQueuesShardingStrategyProvider;
 import com.netflix.dyno.queues.Message;
 import com.netflix.dyno.queues.ShardSupplier;
 import org.junit.Test;

diff --git a/redis-persistence/src/test/java/com/netflix/conductor/redis/dao/BaseDynoDAOTest.java b/redis-persistence/src/test/java/com/netflix/conductor/redis/dao/BaseDynoDAOTest.java
@@ -14,7 +14,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.netflix.conductor.redis.jedis.JedisProxy;
-import com.netflix.conductor.redis.config.utils.RedisProperties;
+import com.netflix.conductor.redis.config.RedisProperties;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;

diff --git a/redis-persistence/src/test/java/com/netflix/conductor/redis/dao/DynoQueueDAOTest.java b/redis-persistence/src/test/java/com/netflix/conductor/redis/dao/DynoQueueDAOTest.java
@@ -13,8 +13,8 @@
 package com.netflix.conductor.redis.dao;
 
 import com.netflix.conductor.dao.QueueDAO;
-import com.netflix.conductor.redis.config.utils.RedisProperties;
-import com.netflix.conductor.redis.config.utils.RedisQueuesShardingStrategyProvider;
+import com.netflix.conductor.redis.config.RedisProperties;
+import com.netflix.conductor.redis.dynoqueue.RedisQueuesShardingStrategyProvider;
 import com.netflix.conductor.redis.jedis.JedisMock;
 import com.netflix.dyno.connectionpool.Host;
 import com.netflix.dyno.queues.ShardSupplier;
@@ -32,7 +32,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import static com.netflix.conductor.redis.config.utils.RedisQueuesShardingStrategyProvider.LOCAL_ONLY_STRATEGY;
+import static com.netflix.conductor.redis.dynoqueue.RedisQueuesShardingStrategyProvider.LOCAL_ONLY_STRATEGY;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.mockito.Mockito.mock;

diff --git a/...s-persistence/src/test/java/com/netflix/conductor/redis/dao/RedisEventHandlerDAOTest.java b/...s-persistence/src/test/java/com/netflix/conductor/redis/dao/RedisEventHandlerDAOTest.java
@@ -19,7 +19,7 @@
 import com.netflix.conductor.common.metadata.events.EventHandler.Action.Type;
 import com.netflix.conductor.common.metadata.events.EventHandler.StartWorkflow;
 import com.netflix.conductor.redis.jedis.JedisProxy;
-import com.netflix.conductor.redis.config.utils.RedisProperties;
+import com.netflix.conductor.redis.config.RedisProperties;
 import com.netflix.conductor.redis.jedis.JedisMock;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/redis-persistence/src/test/java/com/netflix/conductor/redis/dao/RedisExecutionDAOTest.java b/redis-persistence/src/test/java/com/netflix/conductor/redis/dao/RedisExecutionDAOTest.java
@@ -20,7 +20,7 @@
 import com.netflix.conductor.dao.ExecutionDAO;
 import com.netflix.conductor.dao.ExecutionDAOTest;
 import com.netflix.conductor.redis.jedis.JedisProxy;
-import com.netflix.conductor.redis.config.utils.RedisProperties;
+import com.netflix.conductor.redis.config.RedisProperties;
 import com.netflix.conductor.redis.jedis.JedisMock;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/redis-persistence/src/test/java/com/netflix/conductor/redis/dao/RedisMetadataDAOTest.java b/redis-persistence/src/test/java/com/netflix/conductor/redis/dao/RedisMetadataDAOTest.java
@@ -20,7 +20,7 @@
 import com.netflix.conductor.common.metadata.workflow.WorkflowDef;
 import com.netflix.conductor.core.exception.ApplicationException;
 import com.netflix.conductor.redis.jedis.JedisProxy;
-import com.netflix.conductor.redis.config.utils.RedisProperties;
+import com.netflix.conductor.redis.config.RedisProperties;
 import com.netflix.conductor.redis.jedis.JedisMock;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/redis-persistence/src/test/java/com/netflix/conductor/redis/dao/RedisPollDataDAOTest.java b/redis-persistence/src/test/java/com/netflix/conductor/redis/dao/RedisPollDataDAOTest.java
@@ -17,7 +17,7 @@
 import com.netflix.conductor.dao.PollDataDAO;
 import com.netflix.conductor.dao.PollDataDAOTest;
 import com.netflix.conductor.redis.jedis.JedisProxy;
-import com.netflix.conductor.redis.config.utils.RedisProperties;
+import com.netflix.conductor.redis.config.RedisProperties;
 import com.netflix.conductor.redis.jedis.JedisMock;
 import org.junit.Before;
 import org.junit.runner.RunWith;

diff --git a/redis-persistence/src/test/java/com/netflix/conductor/redis/dao/RedisRateLimitDAOTest.java b/redis-persistence/src/test/java/com/netflix/conductor/redis/dao/RedisRateLimitDAOTest.java
@@ -17,7 +17,7 @@
 import com.netflix.conductor.common.metadata.tasks.Task;
 import com.netflix.conductor.common.metadata.tasks.TaskDef;
 import com.netflix.conductor.redis.jedis.JedisProxy;
-import com.netflix.conductor.redis.config.utils.RedisProperties;
+import com.netflix.conductor.redis.config.RedisProperties;
 import com.netflix.conductor.redis.jedis.JedisMock;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/...stence/src/test/java/com/netflix/conductor/redis/jedis/ConfigurationHostSupplierTest.java b/...stence/src/test/java/com/netflix/conductor/redis/jedis/ConfigurationHostSupplierTest.java
@@ -12,7 +12,8 @@
  */
 package com.netflix.conductor.redis.jedis;
 
-import com.netflix.conductor.redis.config.utils.RedisProperties;
+import com.netflix.conductor.redis.config.RedisProperties;
+import com.netflix.conductor.redis.dynoqueue.ConfigurationHostSupplier;
 import com.netflix.dyno.connectionpool.Host;
 import org.junit.Before;
 import org.junit.Test;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,3 +28,4 @@ Renamed DynoProxy to JedisProxy
		Removed support for EmbeddedElasticSearch

		Ignored a flaky test class - LocalOnlyLockTest.
		Test Harness module uses TestContainers for MySql,Postgres & Elasticsearch