Refactory code

Author: gafawork

src/main/java/com/searchcode/app/config/MySQLDatabaseConfig.java

@@ -28,8 +28,8 @@ public class MySQLDatabaseConfig implements IDatabaseConfig {
     private HikariDataSource datasource = null;
 
     public MySQLDatabaseConfig() {
-        this.helpers = Singleton.getHelpers();
         this.logger = Singleton.getLogger();
+        this.helpers = Singleton.getHelpers();
 
         var config = new HikariConfig();
         config.setJdbcUrl((String)Properties.getProperties().getOrDefault("searchcode_connection_string", "jdbc:mysql://localhost:3306/searchcode?serverTimezone=UTC"));

src/main/java/com/searchcode/app/config/SphinxSearchConfig.java

@@ -10,7 +10,8 @@
 
 package com.searchcode.app.config;
 
-import com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException;
+// TODO REMOVE
+//import com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException;
 import com.searchcode.app.service.Singleton;
 import com.searchcode.app.util.Helpers;
 import com.searchcode.app.util.LoggerWrapper;
@@ -39,12 +40,13 @@ public class SphinxSearchConfig {
     private final LoggerWrapper logger;
 
     public SphinxSearchConfig() {
-        this.helpers = Singleton.getHelpers();
         this.logger = Singleton.getLogger();
+        this.helpers = Singleton.getHelpers();
 
         this.SPHINX_SERVERS_SHARDS = Properties.getProperties().getProperty(Values.SPHINX_SERVERS_SHARDS, Values.DEFAULT_SPHINX_SERVERS_SHARDS);
     }
 
+    // TODO VERIFY THROWS sqlexception
     public Optional<Connection> getConnection(String server) throws SQLException {
         Connection connection = null;
 
@@ -63,7 +65,7 @@ public Optional<Connection> getConnection(String server) throws SQLException {
             }
         } catch (ClassNotFoundException ex) {
             this.logger.severe(String.format("f9e4283d::error in class %s exception %s it appears searchcode is unable to connect sphinx using mysql connection as the driver is missing", ex.getClass(), ex.getMessage()));
-        } catch (MySQLSyntaxErrorException ex) {
+        } catch (SQLException ex) {
             this.logger.severe(String.format("2362eb21::error in class %s exception %s it appears searchcode is unable to connect sphinx", ex.getClass(), ex.getMessage()));
         }
 

src/main/java/com/searchcode/app/dao/Api.java

@@ -38,9 +38,9 @@ public Api() {
     }
 
     public Api(IDatabaseConfig dbConfig, Helpers helpers, LoggerWrapper logger) {
+        this.logger = logger;
         this.dbConfig = dbConfig;
         this.helpers = helpers;
-        this.logger = logger;
         this.createTableIfMissing();
     }
 

src/main/java/com/searchcode/app/dao/Data.java

@@ -37,9 +37,9 @@ public Data() {
     }
 
     public Data(IDatabaseConfig dbConfig, Helpers helpers, LoggerWrapper logger) {
+        this.logger = logger;
         this.dbConfig = dbConfig;
         this.helpers = helpers;
-        this.logger = logger;
 
         if (Singleton.getHelpers().isStandaloneInstance()) {
             this.createTableIfMissing();

src/main/java/com/searchcode/app/dao/LanguageType.java

@@ -38,9 +38,9 @@ public LanguageType() {
     }
 
     public LanguageType(IDatabaseConfig dbConfig, Helpers helpers, LoggerWrapper logger, Cache<String, Optional<LanguageTypeDTO>> typeCache) {
+        this.logger = logger;
         this.dbConfig = dbConfig;
         this.helpers = helpers;
-        this.logger = logger;
         this.typeCache = typeCache;
     }
 

src/main/java/com/searchcode/app/dao/SQLiteRepo.java

@@ -37,9 +37,9 @@ public SQLiteRepo() {
     }
 
     public SQLiteRepo(IDatabaseConfig dbConfig, Helpers helpers, LoggerWrapper loggerWrapper) {
+        this.logger = loggerWrapper;
         this.dbConfig = dbConfig;
         this.helpers = helpers;
-        this.logger = loggerWrapper;
         this.createTableIfMissing();
     }
 

src/main/java/com/searchcode/app/dao/SourceCode.java

@@ -45,10 +45,10 @@ public SourceCode() {
     }
 
     public SourceCode(IDatabaseConfig dbConfig, Helpers helpers, LanguageType languageType, LoggerWrapper logger, Cache<String, Optional<SourceCodeDTO>> codeCache) {
+        this.logger = logger;
         this.dbConfig = dbConfig;
         this.helpers = helpers;
         this.languageType = languageType;
-        this.logger = logger;
         this.codeCache = codeCache;
     }
 

src/main/java/com/searchcode/app/jobs/DeleteRepositoryJob.java

@@ -43,11 +43,11 @@ public class DeleteRepositoryJob implements Job {
     private final Helpers helpers;
 
     public DeleteRepositoryJob() {
+        this.logger = Singleton.getLogger();
         this.dataService = Singleton.getDataService();
         this.indexService = Singleton.getIndexService();
         this.repo = Singleton.getRepo();
         this.helpers = Singleton.getHelpers();
-        this.logger = Singleton.getLogger();
     }
 
     public void execute(JobExecutionContext context) {

src/main/java/com/searchcode/app/jobs/enqueue/EnqueueFileRepositoryJob.java

@@ -42,9 +42,9 @@ public class EnqueueFileRepositoryJob implements Job {
     private final Helpers helpers;
 
     public EnqueueFileRepositoryJob() {
+        this.logger = Singleton.getLogger();
         this.indexService = Singleton.getIndexService();
         this.repo = Singleton.getRepo();
-        this.logger = Singleton.getLogger();
         this.helpers = Singleton.getHelpers();
     }
 

src/main/java/com/searchcode/app/jobs/enqueue/EnqueueRepositoryJob.java

@@ -39,9 +39,9 @@ public class EnqueueRepositoryJob implements Job {
     private final Helpers helpers;
 
     public EnqueueRepositoryJob() {
+        this.logger = Singleton.getLogger();
         this.indexService = Singleton.getIndexService();
         this.repo = Singleton.getRepo();
-        this.logger = Singleton.getLogger();
         this.helpers = Singleton.getHelpers();
     }