Naming changes

Author: ZorTik

asql-core/src/main/java/me/zort/sqllib/SQLConnectionRegistry.java

@@ -50,6 +50,7 @@ public static void debug(Connection connection, String message) {
   private static class RegistryCodeHandler implements SQLDatabaseConnection.CodeObserver {
     private final SQLDatabaseConnection connection;
 
+    // This will ensure that only connected instances are present in the registry
     @Override
     public void onNotified(int code) {
       if (code == SQLDatabaseConnection.Code.CONNECTED) {

asql-core/src/main/java/me/zort/sqllib/SQLDatabaseOptions.java

@@ -7,7 +7,6 @@
 import me.zort.sqllib.api.ISQLDatabaseOptions;
 import me.zort.sqllib.api.options.NamingStrategy;
 import me.zort.sqllib.internal.Defaults;
-import me.zort.sqllib.naming.SymbolSeparatedNamingStrategy;
 import org.jetbrains.annotations.NotNull;
 
 @AllArgsConstructor

asql-core/src/main/java/me/zort/sqllib/internal/Defaults.java

@@ -3,15 +3,15 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import me.zort.sqllib.api.options.NamingStrategy;
-import me.zort.sqllib.naming.SymbolSeparatedNamingStrategy;
+import me.zort.sqllib.naming.SnakeCaseNamingStrategy;
 
 public final class Defaults {
 
   public static final String DEFAULT_DRIVER = "com.mysql.jdbc.Driver";
   public static final boolean DEFAULT_AUTO_RECONNECT = true;
   public static final boolean DEFAULT_DEBUG = false;
   public static final boolean DEFAULT_LOG_SQL_ERRORS = true;
-  public static final NamingStrategy DEFAULT_NAMING_STRATEGY = new SymbolSeparatedNamingStrategy('_');
+  public static final NamingStrategy DEFAULT_NAMING_STRATEGY = new SnakeCaseNamingStrategy('_');
 
   public static final Gson DEFAULT_GSON = new GsonBuilder()
           .enableComplexMapKeySerialization()

asql-core/src/main/java/me/zort/sqllib/model/SQLSchemaSynchronizer.java

@@ -19,13 +19,18 @@ public class SQLSchemaSynchronizer implements SchemaSynchronizer<SQLDatabaseConn
 
   private SQLColumnQueryBuilder columnQueryBuilder = new InnoColumnQueryBuilder();
   private SQLColumnTypeAdjuster columnTypeAdjuster = type -> type;
+  // Should we execute the queries ony-by-one?
   private boolean separateQueries = false;
 
   @Override
   public QueryResult synchronize(SQLDatabaseConnection source, TableSchema from, TableSchema to) {
     List<String> columnQueries = new ArrayList<>();
+    // Order definitions to make sure we don't synchronize different columns
     ColumnDefinition[][] definitions = orderDefinitions(from, to);
+
     for (int i = 0; i < Math.max(definitions[0].length, definitions[1].length); i++) {
+      // Try to build statement that will change the column using the provided
+      // definitions pair.
       final ColumnDefinition fromDefinition = definitions[0][i];
       final ColumnDefinition toDefinition = definitions[1][i];
 
@@ -46,10 +51,12 @@ public QueryResult synchronize(SQLDatabaseConnection source, TableSchema from, T
     if (columnQueries.size() == 0) return QueryResult.noChangesResult;
     List<QueryResult> results = new ArrayList<>();
     if (separateQueries) {
+      // Execute modification queries one-by-one if requested.
       for (String query : columnQueries) {
         results.add(source.exec(query));
       }
     } else {
+      // Execute all queries at once.
       results.add(source.exec(String.join("", columnQueries)));
     }
     return results.stream().allMatch(QueryResult::isSuccessful) ? QueryResult.successful() : new QueryResultImpl(false);

…aming/SymbolSeparatedNamingStrategy.java …llib/naming/SnakeCaseNamingStrategy.javaasql-core/src/main/java/me/zort/sqllib/naming/SymbolSeparatedNamingStrategy.java renamed to asql-core/src/main/java/me/zort/sqllib/naming/SnakeCaseNamingStrategy.java asql-core/src/main/java/me/zort/sqllib/naming/SymbolSeparatedNamingStrategy.java renamed to asql-core/src/main/java/me/zort/sqllib/naming/SnakeCaseNamingStrategy.java

@@ -10,18 +10,22 @@
  * @author ZorTik
  */
 @AllArgsConstructor
-public class SymbolSeparatedNamingStrategy implements NamingStrategy {
+public class SnakeCaseNamingStrategy implements NamingStrategy {
 
   private final char symbol;
   private final boolean upperCase;
 
+  public SnakeCaseNamingStrategy() {
+    this('_');
+  }
+
   /**
    * Creates a naming strategy with provided symbol that
    * converts names to lower case.
    *
    * @param symbol The symbol to separate words with.
    */
-  public SymbolSeparatedNamingStrategy(char symbol) {
+  public SnakeCaseNamingStrategy(char symbol) {
     this(symbol, false);
   }
 

asql-core/src/main/java/me/zort/sqllib/pool/SQLConnectionPool.java

@@ -28,6 +28,20 @@
 @RequiredArgsConstructor
 public final class SQLConnectionPool {
 
+  private final ISQLConnectionBuilder<? extends SQLDatabaseConnection> builder;
+  private final int maxConnections;
+  private final long borrowObjectTimeout;
+  private final boolean blockWhenExhausted;
+  private final boolean checkConnectionValidity;
+  private final int checkConnectionValidityTimeout;
+  private final ISQLDatabaseOptions connectionOptions;
+
+  private volatile int errorCount = 0;
+
+  // --***-- Pooled connection caches --***--
+  private final Queue<PooledSQLDatabaseConnection> freeConnections = new ConcurrentLinkedQueue<>();
+  private final List<PooledSQLDatabaseConnection> usedConnections = new CopyOnWriteArrayList<>();
+
   @Data
   public static final class Options {
     // Max number of connections in the pool
@@ -43,20 +57,6 @@ public static final class Options {
     private ISQLDatabaseOptions connectionOptions = null;
   }
 
-  private final ISQLConnectionBuilder<? extends SQLDatabaseConnection> builder;
-  private final int maxConnections;
-  private final long borrowObjectTimeout;
-  private final boolean blockWhenExhausted;
-  private final boolean checkConnectionValidity;
-  private final int checkConnectionValidityTimeout;
-  private final ISQLDatabaseOptions connectionOptions;
-
-  private volatile int errorCount = 0;
-
-  // --***-- Pooled connection caches --***--
-  private final Queue<PooledSQLDatabaseConnection> freeConnections = new ConcurrentLinkedQueue<>();
-  private final List<PooledSQLDatabaseConnection> usedConnections = new CopyOnWriteArrayList<>();
-
   @SuppressWarnings("unused")
   public SQLConnectionPool(final @NotNull ISQLConnectionBuilder<? extends SQLDatabaseConnection> from) {
     this(from, new Options());

src/test/java/me/zort/sqllib/test/TestCase3.java

@@ -1,7 +1,7 @@
 package me.zort.sqllib.test;
 
 import lombok.extern.log4j.Log4j2;
-import me.zort.sqllib.naming.SymbolSeparatedNamingStrategy;
+import me.zort.sqllib.naming.SnakeCaseNamingStrategy;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
@@ -19,7 +19,7 @@ public class TestCase3 { // Smaller independent modules tests
 
   @Test
   public void testSymbolSeparatedStrategy() {
-    SymbolSeparatedNamingStrategy strategy = new SymbolSeparatedNamingStrategy('_');
+    SnakeCaseNamingStrategy strategy = new SnakeCaseNamingStrategy('_');
     assertEquals("test", strategy.fieldNameToColumn("test"));
     assertEquals("test_two", strategy.fieldNameToColumn("testTwo"));
     assertEquals("this_is_third_test", strategy.fieldNameToColumn("thisIsThirdTest"));