From 329c22899d0c0bafd4953a333e0d9fc1d0b3e275 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Thu, 3 Dec 2020 11:55:35 -0500
Subject: [PATCH] fix shard dependency

---
 .../cobbzilla/wizard/dao/shard/AbstractShardedDAO.java |  9 +++------
 .../wizard/server/config/DatabaseConfiguration.java    | 10 +---------
 .../server/config/DatabaseShardConfiguration.java      |  4 ++--
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/dao/shard/AbstractShardedDAO.java b/wizard-server/src/main/java/org/cobbzilla/wizard/dao/shard/AbstractShardedDAO.java
index 24a4c33..7e29e9e 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/dao/shard/AbstractShardedDAO.java
+++ b/wizard-server/src/main/java/org/cobbzilla/wizard/dao/shard/AbstractShardedDAO.java
@@ -8,13 +8,13 @@ import org.cobbzilla.util.reflect.ReflectionUtil;
 import org.cobbzilla.wizard.cache.redis.HasRedisConfiguration;
 import org.cobbzilla.wizard.cache.redis.RedisService;
 import org.cobbzilla.wizard.dao.DAO;
-import org.cobbzilla.wizard.model.search.SearchResults;
 import org.cobbzilla.wizard.dao.shard.cache.ShardCacheableFindByUnique2FieldFinder;
 import org.cobbzilla.wizard.dao.shard.cache.ShardCacheableFindByUnique3FieldFinder;
 import org.cobbzilla.wizard.dao.shard.cache.ShardCacheableIdentityFinder;
 import org.cobbzilla.wizard.dao.shard.cache.ShardCacheableUniqueFieldFinder;
 import org.cobbzilla.wizard.dao.shard.task.*;
 import org.cobbzilla.wizard.model.search.SearchQuery;
+import org.cobbzilla.wizard.model.search.SearchResults;
 import org.cobbzilla.wizard.model.shard.ShardIO;
 import org.cobbzilla.wizard.model.shard.ShardMap;
 import org.cobbzilla.wizard.model.shard.ShardRange;
@@ -22,10 +22,7 @@ import org.cobbzilla.wizard.model.shard.Shardable;
 import org.cobbzilla.wizard.server.ApplicationContextConfig;
 import org.cobbzilla.wizard.server.CustomBeanResolver;
 import org.cobbzilla.wizard.server.RestServer;
-import org.cobbzilla.wizard.server.config.DatabaseConfiguration;
-import org.cobbzilla.wizard.server.config.HasDatabaseConfiguration;
-import org.cobbzilla.wizard.server.config.RestServerConfiguration;
-import org.cobbzilla.wizard.server.config.ShardSetConfiguration;
+import org.cobbzilla.wizard.server.config.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.transaction.annotation.Transactional;
@@ -104,7 +101,7 @@ public abstract class AbstractShardedDAO<E extends Shardable, D extends SingleSh
     protected String getSpringShardContextPath() { return "spring-shard.xml"; }
 
     public abstract ShardSetConfiguration getShardConfiguration();
-    protected abstract DatabaseConfiguration getMasterDbConfiguration();
+    protected abstract DatabaseShardConfiguration getMasterDbConfiguration();
     protected abstract ShardMapDAO getShardDAO();
 
     public AbstractShardedDAO() {
diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/DatabaseConfiguration.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/DatabaseConfiguration.java
index 0514da0..f2ff0c8 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/DatabaseConfiguration.java
+++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/DatabaseConfiguration.java
@@ -5,8 +5,6 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.cobbzilla.util.collection.SingletonSet;
-import org.cobbzilla.wizard.model.shard.ShardMap;
-import org.cobbzilla.wizard.model.shard.Shardable;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -51,18 +49,12 @@ public class DatabaseConfiguration {
         return DriverManager.getConnection(url, user, password);
     }
 
-    public DatabaseConfiguration getShardDatabaseConfiguration(ShardMap map) { return this; }
-
+    // Use DatabaseShardConfiguration if you want sharding
     public boolean hasShards() { return false; }
-
     @Getter(lazy=true) private final Set<String> shardSetNames = initShardSetNames();
-
     public static final String DEFAULT_SHARD = "getShardSetName:default";
-
     protected Set<String> initShardSetNames() { return new SingletonSet<>(DEFAULT_SHARD); }
 
-    public <E extends Shardable> String getShardSetName(Class<E> entityClass) { return DEFAULT_SHARD; }
-
     public void setDatabaseName(String dbName) {
         final String url = getUrl();
         final int lastSlash = url.lastIndexOf('/');
diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/DatabaseShardConfiguration.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/DatabaseShardConfiguration.java
index 416ab00..cb31306 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/DatabaseShardConfiguration.java
+++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/DatabaseShardConfiguration.java
@@ -23,7 +23,7 @@ public class DatabaseShardConfiguration extends DatabaseConfiguration {
         return null;
     }
 
-    @Override public DatabaseConfiguration getShardDatabaseConfiguration(ShardMap map) {
+    public DatabaseConfiguration getShardDatabaseConfiguration(ShardMap map) {
         final DatabaseConfiguration config = new DatabaseConfiguration();
         config.setDriver(driver);
         config.setUrl(map.getUrl());
@@ -52,7 +52,7 @@ public class DatabaseShardConfiguration extends DatabaseConfiguration {
         return ShardSetConfiguration.DEFAULT_LOGICAL_SHARDS;
     }
 
-    @Override public <E extends Shardable> String getShardSetName(Class<E> entityClass) {
+    public <E extends Shardable> String getShardSetName(Class<E> entityClass) {
         if (empty(shard)) return null;
         for (ShardSetConfiguration config : shard) {
             if (config.getEntity().equals(entityClass.getName())) return config.getName();