This is an automated email from the ASF dual-hosted git repository.
gtully pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 717808ce3f ARTEMIS-5158 added accessor to database store config for
the driver properties map
717808ce3f is described below
commit 717808ce3f1dae7614f7d02c5c84cdd9c54a875a
Author: Gary Tully <[email protected]>
AuthorDate: Fri Nov 15 14:54:18 2024 +0000
ARTEMIS-5158 added accessor to database store config for the driver
properties map
---
.../artemis/core/config/storage/DatabaseStorageConfiguration.java | 4 ++++
.../activemq/artemis/core/config/impl/ConfigurationImplTest.java | 7 +++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/storage/DatabaseStorageConfiguration.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/storage/DatabaseStorageConfiguration.java
index 51fac53c6e..d6a4a63ca3 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/storage/DatabaseStorageConfiguration.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/storage/DatabaseStorageConfiguration.java
@@ -247,6 +247,10 @@ public class DatabaseStorageConfiguration implements
StoreConfiguration {
}
}
+ public Map<String,Object> getDataSourceProperties() {
+ return dataSourceProperties;
+ }
+
public String getDataSourceProperty(String key) {
return (String)dataSourceProperties.get(key);
}
diff --git
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
index 991be2c438..7252e937ea 100644
---
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
+++
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
@@ -1871,9 +1871,12 @@ public class ConfigurationImplTest extends
AbstractConfigurationTestBase {
insertionOrderedProperties.put("storeConfiguration.jdbcLockExpirationMillis",
321);
insertionOrderedProperties.put("storeConfiguration.jdbcLockRenewPeriodMillis",
654);
insertionOrderedProperties.put("storeConfiguration.jdbcNetworkTimeout",
987);
- insertionOrderedProperties.put("storeConfiguration.jdbcPassword",
"pass");
+
insertionOrderedProperties.put("storeConfiguration.dataSourceProperties.password",
"pass");
insertionOrderedProperties.put("storeConfiguration.jdbcUser", "user");
configuration.parsePrefixedProperties(insertionOrderedProperties, null);
+
+ assertTrue(configuration.getStatus().contains("\"errors\":[]"));
+
assertTrue(configuration.getStoreConfiguration() instanceof
DatabaseStorageConfiguration);
DatabaseStorageConfiguration dsc = (DatabaseStorageConfiguration)
configuration.getStoreConfiguration();
assertEquals(dsc.getLargeMessageTableName(), "lmtn");
@@ -1888,7 +1891,7 @@ public class ConfigurationImplTest extends
AbstractConfigurationTestBase {
assertEquals(dsc.getJdbcLockExpirationMillis(), 321);
assertEquals(dsc.getJdbcLockRenewPeriodMillis(), 654);
assertEquals(dsc.getJdbcNetworkTimeout(), 987);
- assertEquals(dsc.getJdbcPassword(), "pass");
+ assertEquals(dsc.getDataSourceProperties().get("password"), "pass");
assertEquals(dsc.getJdbcUser(), "user");
assertEquals(dsc.getNodeManagerStoreTableName(), "nmtn");
assertEquals(dsc.getPageStoreTableName(), "pstn");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
