Remove unused database related code.

Author: jpe7s

services/src/main/java/module-info.java

@@ -1,5 +1,3 @@
-import systems.glam.services.db.sql.SqlDataSource;
-import systems.glam.services.db.sql.postgres.PostgresDataSourceFactory;
 
 module systems.glam.services {
   requires java.logging;
@@ -28,14 +26,8 @@
   // Database
   requires java.sql;
   requires com.zaxxer.hikari;
-  requires org.postgresql.jdbc;
-  requires java.desktop;
-
-  uses SqlDataSource.Factory;
-  provides SqlDataSource.Factory with PostgresDataSourceFactory;
 
   exports systems.glam.services.db.sql;
-  exports systems.glam.services.db;
   exports systems.glam.services.config;
   exports systems.glam.services.execution;
   exports systems.glam.services.fulfillment.accounting;

services/src/main/java/systems/glam/services/ServiceContext.java

@@ -8,16 +8,16 @@
 import software.sava.services.core.net.http.NotifyClient;
 import software.sava.services.solana.remote.call.RpcCaller;
 import systems.glam.sdk.GlamAccounts;
-import systems.glam.services.db.sql.SqlDataSource;
 import systems.glam.services.io.FileUtils;
 
+import javax.sql.DataSource;
 import java.nio.file.Path;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 
 public interface ServiceContext {
 
-  SqlDataSource primaryDatasource();
+  DataSource primaryDatasource();
 
   Path cacheDirectory();
 

services/src/main/java/systems/glam/services/ServiceContextImpl.java

@@ -12,9 +12,9 @@
 import software.sava.services.core.remote.call.Backoff;
 import software.sava.services.solana.remote.call.RpcCaller;
 import systems.glam.sdk.GlamAccounts;
-import systems.glam.services.db.sql.SqlDataSource;
 import systems.glam.services.io.FileUtils;
 
+import javax.sql.DataSource;
 import java.math.BigInteger;
 import java.nio.file.Path;
 import java.time.Duration;
@@ -39,7 +39,7 @@ public final class ServiceContextImpl implements ServiceContext {
   private final GlamAccounts glamAccounts;
   private final NotifyClient notifyClient;
   private final RpcCaller rpcCaller;
-  private final SqlDataSource primaryDatasource;
+  private final DataSource primaryDatasource;
 
   public ServiceContextImpl(final PublicKey serviceKey,
                             final BigInteger warnFeePayerBalance, final BigInteger minFeePayerBalance,
@@ -51,7 +51,7 @@ public ServiceContextImpl(final PublicKey serviceKey,
                             final GlamAccounts glamAccounts,
                             final NotifyClient notifyClient,
                             final RpcCaller rpcCaller,
-                            final SqlDataSource primaryDatasource) {
+                            final DataSource primaryDatasource) {
     this.serviceKey = serviceKey;
     this.warnFeePayerBalance = warnFeePayerBalance;
     this.minFeePayerBalance = minFeePayerBalance;
@@ -232,7 +232,7 @@ public RpcCaller rpcCaller() {
   }
 
   @Override
-  public SqlDataSource primaryDatasource() {
+  public DataSource primaryDatasource() {
     return primaryDatasource;
   }
 

services/src/main/java/systems/glam/services/config/BaseDelegateServiceConfig.java

@@ -1,5 +1,7 @@
 package systems.glam.services.config;
 
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
 import software.sava.core.accounts.PublicKey;
 import software.sava.core.accounts.SolanaAccounts;
 import software.sava.core.tx.Transaction;
@@ -35,13 +37,12 @@
 import systems.glam.sdk.GlamAccounts;
 import systems.glam.services.ServiceContext;
 import systems.glam.services.ServiceContextImpl;
-import systems.glam.services.db.DatasourceConfig;
-import systems.glam.services.db.sql.SqlDataSource;
 import systems.glam.services.execution.ExecutionServiceContext;
 import systems.glam.services.execution.InstructionProcessor;
 import systems.glam.services.mints.MintCache;
 import systems.glam.services.rpc.AccountFetcher;
 
+import javax.sql.DataSource;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.http.HttpClient;
@@ -81,7 +82,7 @@ public record BaseDelegateServiceConfig(PublicKey glamStateKey,
                                         Backoff serviceBackoff,
                                         double defaultCuBudgetMultiplier,
                                         int maxTransactionRetries,
-                                        DatasourceConfig datasourceConfig) implements DelegateServiceConfig {
+                                        String hikariPropertiesFile) implements DelegateServiceConfig {
 
   private static final Backoff DEFAULT_NETWORK_BACKOFF = Backoff.fibonacci(1, 21);
 
@@ -169,10 +170,13 @@ public InstructionProcessor createInstructionProcessor(final TransactionProcesso
   public ServiceContext createServiceContext(final ExecutorService taskExecutor,
                                              final PublicKey serviceKey,
                                              final GlamAccounts glamAccounts) {
-    final var primaryDatasource = datasourceConfig == null
-        ? null
-        : SqlDataSource.createDataSource("price_vault_service", datasourceConfig);
-
+    final DataSource dataSource;
+    if (hikariPropertiesFile == null) {
+      dataSource = null;
+    } else {
+      final var hikariConfig = new HikariConfig(hikariPropertiesFile);
+      dataSource = new HikariDataSource(hikariConfig);
+    }
     return new ServiceContextImpl(
         serviceKey,
         warnFeePayerBalance, minFeePayerBalance,
@@ -183,7 +187,7 @@ public ServiceContext createServiceContext(final ExecutorService taskExecutor,
         solanaAccounts, glamAccounts,
         notifyClient,
         rpcCaller,
-        primaryDatasource
+        dataSource
     );
   }
 
@@ -243,7 +247,7 @@ public static class ConfigParser implements FieldBufferPredicate {
     private Backoff serviceBackoff;
     private double defaultCuBudgetMultiplier = 1.13;
     private int maxTransactionRetries = 3;
-    private DatasourceConfig datasourceConfig;
+    private String hikariPropertiesFile;
 
     protected ConfigParser(final ExecutorService taskExecutor, final HttpClient httpClient) {
       this.taskExecutor = taskExecutor;
@@ -323,7 +327,7 @@ protected final DelegateServiceConfig createBaseConfig() {
           serviceBackoff,
           defaultCuBudgetMultiplier,
           maxTransactionRetries,
-          datasourceConfig
+          hikariPropertiesFile
       );
     }
 
@@ -419,8 +423,8 @@ public boolean test(final char[] buf, final int offset, final int len, final Jso
         defaultCuBudgetMultiplier = ji.readDouble();
       } else if (fieldEquals("maxTransactionRetries", buf, offset, len)) {
         maxTransactionRetries = ji.readInt();
-      } else if (fieldEquals("datasource", buf, offset, len)) {
-        datasourceConfig = DatasourceConfig.parseConfig(ji);
+      } else if (fieldEquals("hikariPropertiesFile", buf, offset, len)) {
+        hikariPropertiesFile = ji.readString();
       } else {
         throw new IllegalStateException("Unknown service config field " + new String(buf, offset, len));
       }

services/src/main/java/systems/glam/services/config/DelegateServiceConfig.java

@@ -21,7 +21,6 @@
 import systems.glam.sdk.GlamAccounts;
 import systems.glam.services.ServiceContext;
 import systems.glam.services.execution.ExecutionServiceContext;
-import systems.glam.services.db.DatasourceConfig;
 import systems.glam.services.execution.InstructionProcessor;
 import systems.glam.services.mints.MintCache;
 import systems.glam.services.rpc.AccountFetcher;
@@ -84,7 +83,7 @@ public interface DelegateServiceConfig {
 
   int maxTransactionRetries();
 
-  DatasourceConfig datasourceConfig();
+  String hikariPropertiesFile();
 
   WebSocketManager createWebSocketManager(final HttpClient wsHttpClient,
                                           final Collection<Consumer<SolanaRpcWebsocket>> webSocketConsumers);