Skip to content

Commit 5820340

Browse files
committed
fix: rely on jdbc4 datasource validation
1 parent 200c795 commit 5820340

4 files changed

Lines changed: 2 additions & 7 deletions

File tree

.env.example

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ ILCR_SECURITY_ENABLED=false
55

66
# Local Oracle dev DB. Keep real local credentials in ignored .env only.
77
# Leave ILCR_DATASOURCE_ENABLED=false for the in-memory scaffold.
8-
# In Docker Compose, set ILCR_DATASOURCE_ENABLED=true to validate Oracle on startup.
8+
# In Docker Compose, set ILCR_DATASOURCE_ENABLED=true to enable Oracle connectivity.
99
# For direct Maven runs, the oracle profile also enables the datasource.
1010
ILCR_DATASOURCE_ENABLED=false
11-
ILCR_DATASOURCE_VALIDATION_QUERY=SELECT 1 FROM DUAL
1211
SPRING_DATASOURCE_URL=jdbc:oracle:thin:@//<host>:1521/<service-name>
1312
SPRING_DATASOURCE_USERNAME=<username>
1413
SPRING_DATASOURCE_PASSWORD=<password>

backend/src/main/java/ca/bc/gov/nrs/ilcr/configuration/DataSourceConfiguration.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ public DataSource dataSource(
3535
@Value("${spring.datasource.hikari.max-lifetime:180000}") long maxLifetime,
3636
@Value("${spring.datasource.hikari.keepalive-time:60000}") long keepaliveTime,
3737
@Value("${spring.datasource.hikari.initialization-fail-timeout:-1}") long initializationFailTimeout,
38-
@Value("${spring.datasource.hikari.leak-detection-threshold:60000}") long leakDetectionThreshold,
39-
@Value("${ilcr.datasource.validation-query:SELECT 1 FROM DUAL}") String validationQuery
38+
@Value("${spring.datasource.hikari.leak-detection-threshold:60000}") long leakDetectionThreshold
4039
) {
4140
requireProperty("spring.datasource.url", url);
4241
requireProperty("spring.datasource.username", username);
@@ -56,7 +55,6 @@ public DataSource dataSource(
5655
config.setKeepaliveTime(keepaliveTime);
5756
config.setInitializationFailTimeout(initializationFailTimeout);
5857
config.setLeakDetectionThreshold(leakDetectionThreshold);
59-
config.setConnectionTestQuery(validationQuery);
6058

6159
return new HikariDataSource(config);
6260
}

backend/src/main/resources/application.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ ilcr:
5555
enabled: ${ILCR_SECURITY_ENABLED:true}
5656
datasource:
5757
enabled: ${ILCR_DATASOURCE_ENABLED:true}
58-
validation-query: ${ILCR_DATASOURCE_VALIDATION_QUERY:SELECT 1 FROM DUAL}
5958

6059
features:
6160
flags:

docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ services:
1313
LOG_LEVEL: INFO
1414
ILCR_SECURITY_ENABLED: ${ILCR_SECURITY_ENABLED:-false}
1515
ILCR_DATASOURCE_ENABLED: ${ILCR_DATASOURCE_ENABLED:-false}
16-
ILCR_DATASOURCE_VALIDATION_QUERY: ${ILCR_DATASOURCE_VALIDATION_QUERY:-SELECT 1 FROM DUAL}
1716
SPRING_DATASOURCE_URL: ${SPRING_DATASOURCE_URL:-}
1817
SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME:-}
1918
SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD:-}

0 commit comments

Comments
 (0)