diff --git a/src/main/java/com/zaxxer/hikari/HikariConfig.java b/src/main/java/com/zaxxer/hikari/HikariConfig.java old mode 100644 new mode 100755 index dce0b072..8dac93ca --- a/src/main/java/com/zaxxer/hikari/HikariConfig.java +++ b/src/main/java/com/zaxxer/hikari/HikariConfig.java @@ -1043,7 +1043,26 @@ public class HikariConfig implements HikariConfigMXBean } } + /** + * Deprecated, use {@link #copyStateTo(HikariConfig)}. + *

+ * Copies the state of {@code this} into {@code other}. + *

+ * + * @param other Other {@link HikariConfig} to copy the state to. + */ + @Deprecated public void copyState(HikariConfig other) + { + copyStateTo(other); + } + + /** + * Copies the state of {@code this} into {@code other}. + * + * @param other Other {@link HikariConfig} to copy the state to. + */ + public void copyStateTo(HikariConfig other) { for (Field field : HikariConfig.class.getDeclaredFields()) { if (!Modifier.isFinal(field.getModifiers())) { diff --git a/src/main/java/com/zaxxer/hikari/HikariDataSource.java b/src/main/java/com/zaxxer/hikari/HikariDataSource.java index bc0f16c7..ef414d3b 100644 --- a/src/main/java/com/zaxxer/hikari/HikariDataSource.java +++ b/src/main/java/com/zaxxer/hikari/HikariDataSource.java @@ -66,7 +66,7 @@ public class HikariDataSource extends HikariConfig implements DataSource, Closea public HikariDataSource(HikariConfig configuration) { configuration.validate(); - configuration.copyState(this); + configuration.copyStateTo(this); LOGGER.info("{} - Starting...", configuration.getPoolName()); pool = fastPathPool = new HikariPool(this); diff --git a/src/test/java/com/zaxxer/hikari/pool/HouseKeeperCleanupTest.java b/src/test/java/com/zaxxer/hikari/pool/HouseKeeperCleanupTest.java old mode 100644 new mode 100755 index f62de435..670143d1 --- a/src/test/java/com/zaxxer/hikari/pool/HouseKeeperCleanupTest.java +++ b/src/test/java/com/zaxxer/hikari/pool/HouseKeeperCleanupTest.java @@ -62,7 +62,7 @@ public class HouseKeeperCleanupTest config.setScheduledExecutor(executor); HikariConfig config2 = newHikariConfig(); - config.copyState(config2); + config.copyStateTo(config2); try ( final HikariDataSource ds1 = new HikariDataSource(config);