The connection pool name is no longer required

Glyart · May 9, 2021 · a162e01 · a162e01
1 parent 23a2b22
commit a162e01
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.glyart</groupId>
     <artifactId>Mystral</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-SNAPSHOT</version>
 
     <name>Mystral</name>
 

diff --git a/src/main/java/com/glyart/mystral/database/Credentials.java b/src/main/java/com/glyart/mystral/database/Credentials.java
@@ -26,13 +26,12 @@ public class Credentials {
     @Nullable
     private String schema;
 
-    @NotNull
-    private final String poolName;
+    @Nullable
+    private String poolName;
 
-    protected Credentials(@NotNull String hostname, @NotNull String username, @NotNull String poolName) {
+    protected Credentials(@NotNull String hostname, @NotNull String username) {
         this.hostname = hostname;
         this.username = username;
-        this.poolName = poolName;
     }
     /**
      * Creates a new builder for Credentials.
@@ -91,7 +90,7 @@ public String getSchema() {
      * Gets the name of the connection pool.
      * @return the name of the pool
      */
-    @NotNull
+    @Nullable
     public String getPoolName() {
         return poolName;
     }
@@ -172,9 +171,7 @@ public CredentialsBuilder schema(@Nullable String schema) {
          * @param poolName the name of the pool
          * @return this builder instance
          */
-        public CredentialsBuilder pool(@NotNull String poolName) {
-            Preconditions.checkArgument(!Preconditions.checkNotNull(poolName, "Pool name cannot be null.").isEmpty(),
-                    "Pool name cannot be empty.");
+        public CredentialsBuilder pool(@Nullable String poolName) {
             this.poolName = poolName;
             return this;
         }
@@ -187,11 +184,12 @@ public CredentialsBuilder pool(@NotNull String poolName) {
          */
         @NotNull
         public Credentials build() {
-            Credentials credentials = new Credentials(hostname, username, poolName);
+            Credentials credentials = new Credentials(hostname, username);
 
             credentials.port = port;
             credentials.password = password;
             credentials.schema = schema;
+            credentials.poolName = poolName;
 
             return credentials;
         }

diff --git a/src/main/java/com/glyart/mystral/datasource/HikariFactory.java b/src/main/java/com/glyart/mystral/datasource/HikariFactory.java
@@ -149,6 +149,8 @@ public HikariDataSource newDataSource() throws DataSourceInitException {
             hikariConfig.setJdbcUrl(String.format(TEMPLATE_URL, "mysql", credentials.getHostname(), credentials.getPort(), credentials.getSchema()));
             hikariConfig.setUsername(credentials.getUsername());
             hikariConfig.setPassword(credentials.getPassword());
+            if (credentials.getPoolName() != null)
+                hikariConfig.setPoolName(credentials.getPoolName());
         }
         PROPS.forEach(hikariConfig::addDataSourceProperty);
         hikariConfig.setMaximumPoolSize(MAXIMUM_POOL_SIZE);