Remove obsolete tunnel configuration

freyacodes · Mar 11, 2018 · e8b983b · e8b983b
1 parent b84bdb3
commit e8b983b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/Database/src/main/java/fredboat/db/DatabaseManager.java b/Database/src/main/java/fredboat/db/DatabaseManager.java
@@ -38,7 +38,6 @@
 import space.npstr.sqlsauce.DatabaseConnection;
 import space.npstr.sqlsauce.DatabaseException;
 import space.npstr.sqlsauce.DatabaseWrapper;
-import space.npstr.sqlsauce.ssh.SshTunnel;
 
 import javax.annotation.Nullable;
 import java.util.Properties;
@@ -60,12 +59,8 @@ public class DatabaseManager {
     private final boolean migrateAndValidate;
     private final String mainJdbc;
     @Nullable
-    private final SshTunnel.SshDetails mainTunnel;
-    @Nullable
     private final String cacheJdbc;
     @Nullable
-    private final SshTunnel.SshDetails cacheTunnel;
-    @Nullable
     private final DatabaseConnection.EntityManagerFactoryBuilder entityManagerFactoryBuilder;
 
     @Nullable
@@ -90,19 +85,15 @@ public DatabaseManager(@Nullable HibernateStatisticsCollector hibernateStats,
                            String appName,
                            boolean migrateAndValidate,
                            String mainJdbc,
-                           @Nullable SshTunnel.SshDetails mainTunnel,
                            @Nullable String cacheJdbc,
-                           @Nullable SshTunnel.SshDetails cacheTunnel,
                            @Nullable DatabaseConnection.EntityManagerFactoryBuilder entityManagerFactoryBuilder) {
         this.hibernateStats = hibernateStats;
         this.hikariStats = hikariStats;
         this.poolsize = poolsize;
         this.appName = appName;
         this.migrateAndValidate = migrateAndValidate;
         this.mainJdbc = mainJdbc;
-        this.mainTunnel = mainTunnel;
         this.cacheJdbc = cacheJdbc;
-        this.cacheTunnel = cacheTunnel;
         this.entityManagerFactoryBuilder = entityManagerFactoryBuilder;
 
         if (mainJdbc.isEmpty()) {
@@ -197,7 +188,6 @@ private DatabaseConnection initMainDbConn() throws DatabaseException {
         DatabaseConnection databaseConnection = getBasicConnectionBuilder(MAIN_PERSISTENCE_UNIT_NAME, mainJdbc)
                 .setHibernateProps(buildHibernateProps("ehcache_main.xml"))
                 .addEntityPackage("fredboat.db.entity.main")
-                .setSshDetails(mainTunnel)
                 .setFlyway(flyway)
                 .build();
 
@@ -217,7 +207,6 @@ public DatabaseConnection initCacheConn(String jdbc) throws DatabaseException {
         DatabaseConnection databaseConnection = getBasicConnectionBuilder(CACHE_PERSISTENCE_UNIT_NAME, jdbc)
                 .setHibernateProps(buildHibernateProps("ehcache_cache.xml"))
                 .addEntityPackage("fredboat.db.entity.cache")
-                .setSshDetails(cacheTunnel)
                 .setFlyway(flyway)
                 .build();
 

diff --git a/build.gradle b/build.gradle
@@ -94,7 +94,7 @@ subprojects {
         napsterAnnotations          = '0.0.1'
 
         //database deps
-        sqlsauceVersion             = '0.0.11'
+        sqlsauceVersion             = '0.0.13'
         hibernateVersion            = '5.2.13.Final'
         flywayVersion               = '5.0.7'
         dsProxyVersion              = '1.4.6'