From 0c90829c32ac497af66b45a7d9b6a457b609f37e Mon Sep 17 00:00:00 2001 From: Dave Cramer Date: Mon, 1 Dec 2025 16:10:45 -0500 Subject: [PATCH 1/2] add more comments --- .../amazon/AwsCredentialsManagerExample.java | 9 ++++++-- .../java/software/amazon/HikariExample.java | 4 ++-- .../amazon/HikariFailoverExample.java | 23 ++++++++++++------- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/examples/AWSDriverExample/src/main/java/software/amazon/AwsCredentialsManagerExample.java b/examples/AWSDriverExample/src/main/java/software/amazon/AwsCredentialsManagerExample.java index 491e0ff69..4253212c3 100644 --- a/examples/AWSDriverExample/src/main/java/software/amazon/AwsCredentialsManagerExample.java +++ b/examples/AWSDriverExample/src/main/java/software/amazon/AwsCredentialsManagerExample.java @@ -43,8 +43,13 @@ public class AwsCredentialsManagerExample { public static void main(String[] args) throws SQLException { - // Configure AwsCredentialsManager to use EnvironmentVariableCredentialsProvider when connecting - // to MySQL and DefaultCredentialsProvider otherwise. + /* Configure AwsCredentialsManager to use EnvironmentVariableCredentialsProvider when connecting + * to MySQL and DefaultCredentialsProvider otherwise. + * There is nothing special about MySQL here, it is just used to show how to use different + * credentials providers. + * + * We just use the MYSQL_URL to pick a different credential provider + */ AwsCredentialsManager.setCustomHandler((hostSpec, props) -> { if (MYSQL_URL.equals(hostSpec.getHost())) { return EnvironmentVariableCredentialsProvider.create(); diff --git a/examples/HikariExample/src/main/java/software/amazon/HikariExample.java b/examples/HikariExample/src/main/java/software/amazon/HikariExample.java index 1c9dc5a10..1d2c0ca95 100644 --- a/examples/HikariExample/src/main/java/software/amazon/HikariExample.java +++ b/examples/HikariExample/src/main/java/software/amazon/HikariExample.java @@ -25,10 +25,10 @@ public class HikariExample { - private static final String USER = "username"; + private static final String USER = "postgres"; private static final String PASSWORD = "password"; private static final String DATABASE_NAME = "postgres"; - private static final String ENDPOINT = "db-identifier.cluster-XYZ.us-east-2.rds.amazonaws.com"; + private static final String ENDPOINT = "database-4.cluster-cgnh50a2ovor.us-east-1.rds.amazonaws.com"; public static void main(String[] args) throws SQLException { try (HikariDataSource ds = new HikariDataSource()) { diff --git a/examples/HikariExample/src/main/java/software/amazon/HikariFailoverExample.java b/examples/HikariExample/src/main/java/software/amazon/HikariFailoverExample.java index 7270769c7..b5e74d8ab 100644 --- a/examples/HikariExample/src/main/java/software/amazon/HikariFailoverExample.java +++ b/examples/HikariExample/src/main/java/software/amazon/HikariFailoverExample.java @@ -29,10 +29,10 @@ */ public class HikariFailoverExample { - private static final String USER = "username"; + private static final String USER = "postgres"; private static final String PASSWORD = "password"; private static final String DATABASE_NAME = "postgres"; - private static final String ENDPOINT = "db-identifier.cluster-XYZ.us-east-2.rds.amazonaws.com"; + private static final String ENDPOINT = "database-4.cluster-cgnh50a2ovor.us-east-1.rds.amazonaws.com"; public static void main(String[] args) throws SQLException { try (HikariDataSource ds = new HikariDataSource()) { @@ -54,7 +54,7 @@ public static void main(String[] args) throws SQLException { // seen above. ds.addDataSourceProperty( "jdbcUrl", - "jdbc:aws-wrapper:postgresql://db-identifier.cluster-XYZ.us-east-2.rds.amazonaws.com:5432/postgres"); + "jdbc:aws-wrapper:postgresql://database-4.cluster-cgnh50a2ovor.us-east-1.rds.amazonaws.com:5432/postgres"); // The failover plugin throws failover-related exceptions that need to be handled explicitly by HikariCP, // otherwise connections will be closed immediately after failover. Set `ExceptionOverrideClassName` to provide @@ -75,11 +75,18 @@ public static void main(String[] args) throws SQLException { ds.addDataSourceProperty("targetDataSourceProperties", targetDataSourceProps); // Attempt a connection: - try (final Connection conn = ds.getConnection(); - final Statement statement = conn.createStatement(); - final ResultSet rs = statement.executeQuery("SELECT * from pg_catalog.aurora_db_instance_identifier()")) { - while (rs.next()) { - System.out.println(rs.getString(1)); + while(true) { + try (final Connection conn = ds.getConnection(); + final Statement statement = conn.createStatement(); + final ResultSet rs = statement.executeQuery("SELECT * from pg_catalog.aurora_db_instance_identifier()")) { + while (rs.next()) { + System.out.println(rs.getString(1)); + } + } + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); } } } From 23ee76254a7f5a7f86bc62d71559d4ba9710e273 Mon Sep 17 00:00:00 2001 From: Dave Cramer Date: Mon, 1 Dec 2025 16:18:32 -0500 Subject: [PATCH 2/2] remove some files --- .../java/software/amazon/HikariExample.java | 4 ++-- .../amazon/HikariFailoverExample.java | 23 +++++++------------ 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/examples/HikariExample/src/main/java/software/amazon/HikariExample.java b/examples/HikariExample/src/main/java/software/amazon/HikariExample.java index 1d2c0ca95..1c9dc5a10 100644 --- a/examples/HikariExample/src/main/java/software/amazon/HikariExample.java +++ b/examples/HikariExample/src/main/java/software/amazon/HikariExample.java @@ -25,10 +25,10 @@ public class HikariExample { - private static final String USER = "postgres"; + private static final String USER = "username"; private static final String PASSWORD = "password"; private static final String DATABASE_NAME = "postgres"; - private static final String ENDPOINT = "database-4.cluster-cgnh50a2ovor.us-east-1.rds.amazonaws.com"; + private static final String ENDPOINT = "db-identifier.cluster-XYZ.us-east-2.rds.amazonaws.com"; public static void main(String[] args) throws SQLException { try (HikariDataSource ds = new HikariDataSource()) { diff --git a/examples/HikariExample/src/main/java/software/amazon/HikariFailoverExample.java b/examples/HikariExample/src/main/java/software/amazon/HikariFailoverExample.java index b5e74d8ab..7270769c7 100644 --- a/examples/HikariExample/src/main/java/software/amazon/HikariFailoverExample.java +++ b/examples/HikariExample/src/main/java/software/amazon/HikariFailoverExample.java @@ -29,10 +29,10 @@ */ public class HikariFailoverExample { - private static final String USER = "postgres"; + private static final String USER = "username"; private static final String PASSWORD = "password"; private static final String DATABASE_NAME = "postgres"; - private static final String ENDPOINT = "database-4.cluster-cgnh50a2ovor.us-east-1.rds.amazonaws.com"; + private static final String ENDPOINT = "db-identifier.cluster-XYZ.us-east-2.rds.amazonaws.com"; public static void main(String[] args) throws SQLException { try (HikariDataSource ds = new HikariDataSource()) { @@ -54,7 +54,7 @@ public static void main(String[] args) throws SQLException { // seen above. ds.addDataSourceProperty( "jdbcUrl", - "jdbc:aws-wrapper:postgresql://database-4.cluster-cgnh50a2ovor.us-east-1.rds.amazonaws.com:5432/postgres"); + "jdbc:aws-wrapper:postgresql://db-identifier.cluster-XYZ.us-east-2.rds.amazonaws.com:5432/postgres"); // The failover plugin throws failover-related exceptions that need to be handled explicitly by HikariCP, // otherwise connections will be closed immediately after failover. Set `ExceptionOverrideClassName` to provide @@ -75,18 +75,11 @@ public static void main(String[] args) throws SQLException { ds.addDataSourceProperty("targetDataSourceProperties", targetDataSourceProps); // Attempt a connection: - while(true) { - try (final Connection conn = ds.getConnection(); - final Statement statement = conn.createStatement(); - final ResultSet rs = statement.executeQuery("SELECT * from pg_catalog.aurora_db_instance_identifier()")) { - while (rs.next()) { - System.out.println(rs.getString(1)); - } - } - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - e.printStackTrace(); + try (final Connection conn = ds.getConnection(); + final Statement statement = conn.createStatement(); + final ResultSet rs = statement.executeQuery("SELECT * from pg_catalog.aurora_db_instance_identifier()")) { + while (rs.next()) { + System.out.println(rs.getString(1)); } } }