Skip to content

Commit c973d9f

Browse files
committed
Code quality
Changed: * Moved come constants to Defaults.java * Deleted Constants.java * Optimized imports
1 parent 36865fa commit c973d9f

4 files changed

Lines changed: 14 additions & 14 deletions

File tree

core/src/main/java/me/zort/sqllib/SQLConnectionBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import me.zort.sqllib.api.ISQLDatabaseOptions;
66
import me.zort.sqllib.api.SQLEndpoint;
77
import me.zort.sqllib.api.cache.CacheManager;
8-
import me.zort.sqllib.internal.Constants;
98
import me.zort.sqllib.internal.exception.SQLDriverNotFoundException;
109
import me.zort.sqllib.internal.exception.SQLEndpointNotValidException;
1110
import me.zort.sqllib.internal.factory.SQLConnectionFactory;
@@ -96,7 +95,7 @@ public SQLConnectionBuilder(@Nullable SQLEndpoint endpoint) {
9695
private @NotNull SQLDatabaseConnection buildConnection(@Nullable String driver, @Nullable ISQLDatabaseOptions options) {
9796
Objects.requireNonNull(endpoint, "Endpoint must be set!");
9897
Objects.requireNonNull(jdbc);
99-
if (driver == null) driver = Constants.DEFAULT_DRIVER;
98+
if (driver == null) driver = SQLDatabaseConnectionImpl.DEFAULT_DRIVER;
10099
SQLConnectionFactory connectionFactory = new LocalConnectionFactory(driver);
101100
return jdbc.contains("jdbc:sqlite")
102101
? new SQLiteDatabaseConnectionImpl(connectionFactory, options)

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import me.zort.sqllib.internal.factory.SQLConnectionFactory;
2424
import me.zort.sqllib.internal.fieldResolver.ConstructorParameterResolver;
2525
import me.zort.sqllib.internal.fieldResolver.LinkedOneFieldResolver;
26-
import me.zort.sqllib.naming.SymbolSeparatedNamingStrategy;
2726
import me.zort.sqllib.internal.impl.DefaultObjectMapper;
2827
import me.zort.sqllib.internal.impl.QueryResultImpl;
2928
import me.zort.sqllib.mapping.DefaultStatementMappingFactory;
@@ -61,10 +60,11 @@ public class SQLDatabaseConnectionImpl extends PooledSQLDatabaseConnection {
6160

6261
// --***-- Default Constants --***--
6362

64-
public static final boolean DEFAULT_AUTO_RECONNECT = true;
65-
public static final boolean DEFAULT_DEBUG = false;
66-
public static final boolean DEFAULT_LOG_SQL_ERRORS = true;
67-
public static final NamingStrategy DEFAULT_NAMING_STRATEGY = new SymbolSeparatedNamingStrategy('_');
63+
public static final String DEFAULT_DRIVER = Defaults.DEFAULT_DRIVER;
64+
public static final boolean DEFAULT_AUTO_RECONNECT = Defaults.DEFAULT_AUTO_RECONNECT;
65+
public static final boolean DEFAULT_DEBUG = Defaults.DEFAULT_DEBUG;
66+
public static final boolean DEFAULT_LOG_SQL_ERRORS = Defaults.DEFAULT_LOG_SQL_ERRORS;
67+
public static final NamingStrategy DEFAULT_NAMING_STRATEGY = Defaults.DEFAULT_NAMING_STRATEGY;
6868
public static final Gson DEFAULT_GSON = Defaults.DEFAULT_GSON;
6969

7070
// --***-- Options & Utilities --***--

core/src/main/java/me/zort/sqllib/internal/Constants.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,17 @@
22

33
import com.google.gson.Gson;
44
import com.google.gson.GsonBuilder;
5+
import me.zort.sqllib.api.options.NamingStrategy;
6+
import me.zort.sqllib.naming.SymbolSeparatedNamingStrategy;
57

68
public final class Defaults {
79

10+
public static final String DEFAULT_DRIVER = "com.mysql.jdbc.Driver";
11+
public static final boolean DEFAULT_AUTO_RECONNECT = true;
12+
public static final boolean DEFAULT_DEBUG = false;
13+
public static final boolean DEFAULT_LOG_SQL_ERRORS = true;
14+
public static final NamingStrategy DEFAULT_NAMING_STRATEGY = new SymbolSeparatedNamingStrategy('_');
15+
816
public static final Gson DEFAULT_GSON = new GsonBuilder()
917
.enableComplexMapKeySerialization()
1018
.create();

0 commit comments

Comments
 (0)