add option to override host; change maven publish workflow to trigger when release is published

Author: Cmnspro

.github/workflows/publish-maven-central.yml

@@ -1,37 +1,37 @@
 name: Publish to Maven Central
 on:
   release:
-    types: [created]
+    types: [published]
 jobs:
   publish:
     name: Publish to Maven Central
     runs-on: ubuntu-latest
-    
+
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-    
-    - name: Set up JDK 17
-      uses: actions/setup-java@v4
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-        server-id: central
-        server-username: MAVEN_USERNAME
-        server-password: MAVEN_PASSWORD
-        gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
-        gpg-passphrase: MAVEN_GPG_PASSPHRASE
-    
-    - name: Verify GPG setup
-      run: gpg --list-secret-keys --keyid-format LONG
-    
-    - name: Publish to Maven Central
-      run: |
-        ./mvnw deploy -B \
-        -Prelease \
-        -DskipTests
-      env:
-        # Maven Central credentials via https://central.sonatype.com/account
-        MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-        MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-        MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: "17"
+          distribution: "temurin"
+          server-id: central
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+
+      - name: Verify GPG setup
+        run: gpg --list-secret-keys --keyid-format LONG
+
+      - name: Publish to Maven Central
+        run: |
+          ./mvnw deploy -B \
+          -Prelease \
+          -DskipTests
+        env:
+          # Maven Central credentials via https://central.sonatype.com/account
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

pom.xml

@@ -7,7 +7,7 @@
   <groupId>at.allaboutapps.integresql</groupId>
   <artifactId>integresql-java-client</artifactId>
   <description>A Java client library for interacting with an IntegreSQL server.</description>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
   <name>${project.groupId}:${project.artifactId}</name>
   <url>https://github.com/allaboutapps/integresql-client-java</url>
 
@@ -128,6 +128,11 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.13.0</version>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>

src/main/java/at/allaboutapps/integresql/client/IntegresqlJavaClient.java

@@ -337,6 +337,10 @@ public void setupTemplate(String hash, Consumer<String> initializer) throws Exce
                     config.port = this.config.portOverride.get();
                 }
 
+                if (this.config.hostOverride.isPresent()) {
+                    config.host = this.config.hostOverride.get();
+                }
+
                 String connectionString = config.connectionString();
                 // Add user/password to connection string for JDBC
                 String user = Objects.requireNonNull(config.username, "Template username is null");
@@ -412,6 +416,10 @@ public void setupTemplateWithDBClient(String hash, Consumer<Connection> initiali
                 config.port = this.config.portOverride.get();
             }
 
+            if (this.config.hostOverride.isPresent()) {
+                config.host = this.config.hostOverride.get();
+            }
+
             String connectionString = config.connectionString(); // Base URL: jdbc:postgresql://host:port/database
             String user = Objects.requireNonNull(config.username, "Template username is null");
             String password = Objects.requireNonNull(config.password, "Template password is null");

src/main/java/at/allaboutapps/integresql/config/IntegresqlClientConfig.java

@@ -10,13 +10,16 @@ public class IntegresqlClientConfig {
     private final String apiVersion;
     public final Boolean debug;
     public final Optional<Integer> portOverride;
+    public final Optional<String> hostOverride;
 
     // Private constructor for builder pattern or factory method
-    private IntegresqlClientConfig(String baseUrl, String apiVersion, Boolean debug, Optional<Integer> portOverride) {
+    private IntegresqlClientConfig(String baseUrl, String apiVersion, Boolean debug, Optional<Integer> portOverride,
+            Optional<String> hostOverride) {
         this.baseUrl = baseUrl;
         this.apiVersion = apiVersion;
         this.debug = debug != null ? debug : false;
         this.portOverride = portOverride != null ? portOverride : Optional.empty();
+        this.hostOverride = hostOverride != null ? hostOverride : Optional.empty();
     }
 
     // --- Getters ---
@@ -43,7 +46,7 @@ public static IntegresqlClientConfig defaultConfigFromEnv() {
         String envBaseUrl = EnvUtil.getEnv("INTEGRESQL_CLIENT_BASE_URL", "http://integresql:5000/api");
         String envApiVersion = EnvUtil.getEnv("INTEGRESQL_CLIENT_API_VERSION", "v1");
         Boolean envDebug = EnvUtil.getEnvAsBool("INTEGRESQL_CLIENT_DEBUG", false);
-        return new IntegresqlClientConfig(envBaseUrl, envApiVersion, envDebug, Optional.empty());
+        return new IntegresqlClientConfig(envBaseUrl, envApiVersion, envDebug, Optional.empty(), Optional.empty());
     }
 
     /**
@@ -55,7 +58,7 @@ public static IntegresqlClientConfig defaultConfigFromEnv() {
      * @return A new IntegresqlClientConfig instance.
      */
     public static IntegresqlClientConfig customConfig(String baseUrl, String apiVersion, Boolean debug,
-            Optional<Integer> portOverride) {
+            Optional<Integer> portOverride, Optional<String> hostOverride) {
         if (baseUrl == null || baseUrl.trim().isEmpty()) {
             throw new IllegalArgumentException("Base URL cannot be null or empty");
         }
@@ -65,6 +68,6 @@ public static IntegresqlClientConfig customConfig(String baseUrl, String apiVers
         if (debug == null) {
             debug = false; // Default to false if not provided
         }
-        return new IntegresqlClientConfig(baseUrl, apiVersion, debug, portOverride);
+        return new IntegresqlClientConfig(baseUrl, apiVersion, debug, portOverride, hostOverride);
     }
 }

src/test/java/at/allaboutapps/integresql/IntegresqlJavaClientIntegrationTest.java

@@ -99,7 +99,8 @@ static void setupClient() {
         // Construct base URL for IntegreSQL API
         String baseUrl = String.format("http://%s:%d/api", host, mappedPortIntegreSQL);
 
-        IntegresqlClientConfig config = IntegresqlClientConfig.customConfig(baseUrl, "v1", false, Optional.empty());
+        IntegresqlClientConfig config = IntegresqlClientConfig.customConfig(baseUrl, "v1", false, Optional.empty(),
+                Optional.of(postgresContainer.getHost()));
         client = new IntegresqlJavaClient(config);
         log.info("PostgreSQL Test Container running at jdbc:postgresql://{}:{}/{} (internal alias: {})",
                 postgresContainer.getHost(), postgresContainer.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT),
@@ -234,7 +235,7 @@ void testGetTestDatabase() throws SQLException {
         // config1.host = postgresContainer.getHost(); // Use the host of the PostgreSQL
         // container
 
-        config1.host = "localhost";
+        // config1.host = "localhost";
         String url1 = config1.connectionString(); // Base URL
         log.info("Connecting to DB1: {}", url1);
         try (Connection conn1 = DriverManager.getConnection(url1, config1.username, config1.password)) {