Model module restructure

Author: ZorTik

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

@@ -31,9 +31,9 @@
 import me.zort.sqllib.mapping.DefaultStatementMappingFactory;
 import me.zort.sqllib.mapping.MappingRegistryImpl;
 import me.zort.sqllib.mapping.ProxyInstanceImpl;
-import me.zort.sqllib.model.schema.DatabaseSchemaBuilder;
-import me.zort.sqllib.model.schema.EntitySchemaBuilder;
-import me.zort.sqllib.model.schema.SQLSchemaSynchronizer;
+import me.zort.sqllib.model.builder.DatabaseSchemaBuilder;
+import me.zort.sqllib.model.builder.EntitySchemaBuilder;
+import me.zort.sqllib.model.SQLSchemaSynchronizer;
 import me.zort.sqllib.pool.PooledSQLDatabaseConnection;
 import me.zort.sqllib.transaction.Transaction;
 import me.zort.sqllib.util.Validator;

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

@@ -8,9 +8,9 @@
 import me.zort.sqllib.internal.factory.SQLConnectionFactory;
 import me.zort.sqllib.internal.query.*;
 import me.zort.sqllib.internal.query.part.SetStatement;
-import me.zort.sqllib.model.column.SQLiteColumnQueryBuilder;
-import me.zort.sqllib.model.column.SQLiteColumnTypeAdjuster;
-import me.zort.sqllib.model.schema.SQLSchemaSynchronizer;
+import me.zort.sqllib.model.builder.SQLiteColumnQueryBuilder;
+import me.zort.sqllib.model.adjuster.SQLiteColumnTypeAdjuster;
+import me.zort.sqllib.model.SQLSchemaSynchronizer;
 import me.zort.sqllib.util.PrimaryKey;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

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

@@ -21,8 +21,9 @@
 import java.util.function.Function;
 
 /**
- * Represents a query builder node, a part of a
- * query builder flow.
+ * Represents a query builder node, a part of a query builder flow.
+ * This is a tree structure node, each node can represent part in a query that is prepared
+ * to be joined in a final query.
  *
  * @param <P> Parent node type.
  * @author ZorTik
@@ -198,6 +199,7 @@ private void debug(String message) {
     }
   }
 
+  @SuppressWarnings("unused")
   public Pair<String, Object[]> toPreparedQuery() {
     return getAncestor().buildQueryDetails().buildStatementDetails();
   }

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

@@ -12,6 +12,9 @@
 import java.util.List;
 import java.util.Objects;
 
+/**
+ * Represents a SELECT query.
+ */
 public class SelectQuery extends AncestorQueryNode implements
         Executive, Conditional<SelectQuery>, Limitable<SelectQuery>, ResultSetAware {
 

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

@@ -10,6 +10,9 @@
 import java.util.ArrayList;
 import java.util.Objects;
 
+/**
+ * Represents a UPDATE query.
+ */
 public class UpdateQuery extends AncestorQueryNode implements Executive, Conditional<UpdateQuery> {
 
   private String table;

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

@@ -8,6 +8,9 @@
 
 import java.util.HashMap;
 
+/**
+ * Represents an upsert (update or insert) query.
+ */
 public class UpsertQuery extends InsertQuery {
 
   @Setter

asql-core/src/main/java/me/zort/sqllib/mapping/ProxyInstanceImpl.java

@@ -10,7 +10,7 @@
 import me.zort.sqllib.api.model.TableSchema;
 import me.zort.sqllib.api.options.NamingStrategy;
 import me.zort.sqllib.mapping.annotation.Table;
-import me.zort.sqllib.model.schema.EntitySchemaBuilder;
+import me.zort.sqllib.model.builder.EntitySchemaBuilder;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;

…/model/column/SQLColumnQueryBuilder.java …/sqllib/model/SQLColumnQueryBuilder.javaasql-core/src/main/java/me/zort/sqllib/model/column/SQLColumnQueryBuilder.java renamed to asql-core/src/main/java/me/zort/sqllib/model/SQLColumnQueryBuilder.java asql-core/src/main/java/me/zort/sqllib/model/column/SQLColumnQueryBuilder.java renamed to asql-core/src/main/java/me/zort/sqllib/model/SQLColumnQueryBuilder.java

@@ -1,4 +1,4 @@
-package me.zort.sqllib.model.column;
+package me.zort.sqllib.model;
 
 import me.zort.sqllib.api.model.ColumnDefinition;
 

…/model/column/SQLColumnTypeAdjuster.java …/sqllib/model/SQLColumnTypeAdjuster.javaasql-core/src/main/java/me/zort/sqllib/model/column/SQLColumnTypeAdjuster.java renamed to asql-core/src/main/java/me/zort/sqllib/model/SQLColumnTypeAdjuster.java asql-core/src/main/java/me/zort/sqllib/model/column/SQLColumnTypeAdjuster.java renamed to asql-core/src/main/java/me/zort/sqllib/model/SQLColumnTypeAdjuster.java

@@ -1,4 +1,4 @@
-package me.zort.sqllib.model.column;
+package me.zort.sqllib.model;
 
 public interface SQLColumnTypeAdjuster {
 

…/model/schema/SQLSchemaSynchronizer.java …/sqllib/model/SQLSchemaSynchronizer.javaasql-core/src/main/java/me/zort/sqllib/model/schema/SQLSchemaSynchronizer.java renamed to asql-core/src/main/java/me/zort/sqllib/model/SQLSchemaSynchronizer.java asql-core/src/main/java/me/zort/sqllib/model/schema/SQLSchemaSynchronizer.java renamed to asql-core/src/main/java/me/zort/sqllib/model/SQLSchemaSynchronizer.java

@@ -1,4 +1,4 @@
-package me.zort.sqllib.model.schema;
+package me.zort.sqllib.model;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -8,9 +8,7 @@
 import me.zort.sqllib.api.model.SchemaSynchronizer;
 import me.zort.sqllib.api.model.TableSchema;
 import me.zort.sqllib.internal.impl.QueryResultImpl;
-import me.zort.sqllib.model.column.InnoColumnQueryBuilder;
-import me.zort.sqllib.model.column.SQLColumnQueryBuilder;
-import me.zort.sqllib.model.column.SQLColumnTypeAdjuster;
+import me.zort.sqllib.model.builder.InnoColumnQueryBuilder;
 
 import java.util.ArrayList;
 import java.util.List;