[incubator-baremaps] branch 755-pool-size updated: Avoid confusing method name

[bchapuis]

This is an automated email from the ASF dual-hosted git repository.

bchapuis pushed a commit to branch 755-pool-size
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git


The following commit(s) were added to refs/heads/755-pool-size by this push:
     new 60672c64 Avoid confusing method name
60672c64 is described below

commit 60672c6445f922614a968120d10ce0813d1c30f0
Author: Bertil Chapuis <bchap...@gmail.com>
AuthorDate: Tue Sep 12 20:53:53 2023 +0200

    Avoid confusing method name
---
 .../main/java/org/apache/baremaps/cli/map/Dev.java |  2 +-
 .../java/org/apache/baremaps/cli/map/Serve.java    |  2 +-
 .../org/apache/baremaps/utils/PostgresUtils.java   | 37 ++++++++++++++--------
 .../apache/baremaps/workflow/WorkflowContext.java  |  2 +-
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Dev.java 
b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Dev.java
index 1813823b..82aa6b77 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Dev.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Dev.java
@@ -69,7 +69,7 @@ public class Dev implements Callable<Integer> {
     var configReader = new ConfigReader();
     var objectMapper = objectMapper();
     var tileset = objectMapper.readValue(configReader.read(this.tilesetPath), 
Tileset.class);
-    var datasource = PostgresUtils.createDataSource(tileset.getDatabase());
+    var datasource = 
PostgresUtils.createDataSourceFromObject(tileset.getDatabase());
 
     var tileStoreType = new TypeLiteral<Supplier<TileStore>>() {};
     var tileStoreSupplier = (Supplier<TileStore>) () -> {
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java 
b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java
index 5b827947..ae0137fe 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java
@@ -72,7 +72,7 @@ public class Serve implements Callable<Integer> {
     var configReader = new ConfigReader();
     var caffeineSpec = CaffeineSpec.parse(cache);
     var tileset = objectMapper.readValue(configReader.read(tilesetPath), 
Tileset.class);
-    var datasource = PostgresUtils.createDataSource(tileset.getDatabase());
+    var datasource = 
PostgresUtils.createDataSourceFromObject(tileset.getDatabase());
 
     var tileStoreSupplierType = new TypeLiteral<Supplier<TileStore>>() {};
     var tileStore = new PostgresTileStore(datasource, tileset);
diff --git 
a/baremaps-core/src/main/java/org/apache/baremaps/utils/PostgresUtils.java 
b/baremaps-core/src/main/java/org/apache/baremaps/utils/PostgresUtils.java
index 0e99712a..438f614b 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/utils/PostgresUtils.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/utils/PostgresUtils.java
@@ -37,16 +37,6 @@ public final class PostgresUtils {
 
   private PostgresUtils() {}
 
-  public static DataSource createDataSource(
-      String host,
-      Integer port,
-      String database,
-      String username,
-      String password) {
-    return createDataSource(
-        String.format("jdbc:postgresql://%s:%s/%s?&user=%s&password=%s", host, 
port,
-            database, username, password));
-  }
 
   /**
    * Creates a data source from an object, either a JDBC url or a json 
representation of a database.
@@ -54,7 +44,7 @@ public final class PostgresUtils {
    * @param database the database object, either a JDBC url or a json 
representation of a database
    * @return the data source
    */
-  public static DataSource createDataSource(Object database) {
+  public static DataSource createDataSourceFromObject(Object database) {
     if (database instanceof String url) {
       return createDataSource(url);
     } else {
@@ -63,6 +53,27 @@ public final class PostgresUtils {
     }
   }
 
+  /**
+   * Creates a data source from parameters.
+   *
+   * @param host the host
+   * @param port the port
+   * @param database the database
+   * @param username the username
+   * @param password the password
+   * @return the data source
+   */
+  public static DataSource createDataSource(
+      String host,
+      Integer port,
+      String database,
+      String username,
+      String password) {
+    return createDataSource(
+        String.format("jdbc:postgresql://%s:%s/%s?&user=%s&password=%s", host, 
port,
+            database, username, password));
+  }
+
   /**
    * Creates a data source from a JDBC url.
    *
@@ -163,8 +174,8 @@ public final class PostgresUtils {
    *
    * @param connection the JDBC connection
    * @param resource the path of the resource file
-   * @throws IOException
-   * @throws SQLException
+   * @throws IOException if an I/O error occurs
+   * @throws SQLException if a database access error occurs
    */
   public static void executeResource(Connection connection, String resource)
       throws IOException, SQLException {
diff --git 
a/baremaps-core/src/main/java/org/apache/baremaps/workflow/WorkflowContext.java 
b/baremaps-core/src/main/java/org/apache/baremaps/workflow/WorkflowContext.java
index dc22c8fa..4ba340a1 100644
--- 
a/baremaps-core/src/main/java/org/apache/baremaps/workflow/WorkflowContext.java
+++ 
b/baremaps-core/src/main/java/org/apache/baremaps/workflow/WorkflowContext.java
@@ -33,7 +33,7 @@ public class WorkflowContext {
    * @return the data source
    */
   public DataSource getDataSource(Object database) {
-    return dataSources.computeIfAbsent(database, 
PostgresUtils::createDataSource);
+    return dataSources.computeIfAbsent(database, 
PostgresUtils::createDataSourceFromObject);
   }
 
 }