Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace tomcat-jdbc with HikariCP #525

Merged
merged 1 commit into from
Feb 19, 2025
Merged

Replace tomcat-jdbc with HikariCP #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions ...e/src/main/java/org/grails/forge/feature/database/DatabaseDriverConfigurationFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,24 +54,6 @@ default void applyDefaultConfig(DatabaseDriverFeature dbFeature, Map<String, Obj
config.put(ENVIRONMENTS_KEY + "." + PROD_ENVIRONMENT_KEY + "." + getDbCreateKey(), "none");
Optional.ofNullable(dbFeature.getJdbcProdUrl()).ifPresent(url -> config.put(ENVIRONMENTS_KEY + "." + PROD_ENVIRONMENT_KEY + "." + getUrlKey(), url));

addProductionDataSourceProperties(config, "jmxEnabled", true);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sane defaults are one of the best features of HikariCP!

addProductionDataSourceProperties(config, "initialSize", 5);
addProductionDataSourceProperties(config, "maxActive", 50);
addProductionDataSourceProperties(config, "minIdle", 5);
addProductionDataSourceProperties(config, "maxIdle", 25);
addProductionDataSourceProperties(config, "maxWait", 10000);
addProductionDataSourceProperties(config, "maxAge", 600000);
addProductionDataSourceProperties(config, "timeBetweenEvictionRunsMillis", 5000);
addProductionDataSourceProperties(config, "minEvictableIdleTimeMillis", 60000);
addProductionDataSourceProperties(config, "validationQuery", "SELECT 1");
addProductionDataSourceProperties(config, "validationQueryTimeout", 3);
addProductionDataSourceProperties(config, "validationInterval", 15000);
addProductionDataSourceProperties(config, "testOnBorrow", true);
addProductionDataSourceProperties(config, "testWhileIdle", true);
addProductionDataSourceProperties(config, "testOnReturn", false);
addProductionDataSourceProperties(config, "jdbcInterceptors", "ConnectionState");
addProductionDataSourceProperties(config, "defaultTransactionIsolation", 2);

final Map<String, Object> additionalConfig = dbFeature.getAdditionalConfig();
if (!additionalConfig.isEmpty()) {
config.putAll(additionalConfig);
Expand Down
4 changes: 2 additions & 2 deletions grails-forge-core/src/main/java/org/grails/forge/feature/database/HibernateGorm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ public void apply(GeneratorContext generatorContext) {
.artifactId("hibernate5")
.implementation());
generatorContext.addDependency(Dependency.builder()
.groupId("org.apache.tomcat")
.artifactId("tomcat-jdbc")
.groupId("com.zaxxer")
.artifactId("HikariCP")
.runtimeOnly());
}

Expand Down
22 changes: 2 additions & 20 deletions grails-forge-core/src/test/groovy/org/grails/forge/feature/database/HibernateGormSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ class HibernateGormSpec extends ApplicationContextSpec implements CommandOutputF

then:
template.contains('implementation "org.grails.plugins:hibernate5"')
template.contains("runtimeOnly \"org.apache.tomcat:tomcat-jdbc\"")
template.contains("runtimeOnly \"com.h2database:h2\"")
template.contains('runtimeOnly "com.zaxxer:HikariCP"')
template.contains('runtimeOnly "com.h2database:h2"')
}

void "test dependencies are present for buildSrc"() {
Expand Down Expand Up @@ -81,23 +81,5 @@ class HibernateGormSpec extends ApplicationContextSpec implements CommandOutputF
config.environments.development.dataSource.url == 'jdbc:h2:mem:devDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE'
config.environments.test.dataSource.url == 'jdbc:h2:mem:testDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE'
config.environments.production.dataSource.url == 'jdbc:h2:./prodDb;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE'

config.environments.production.dataSource.properties.jmxEnabled == true
config.environments.production.dataSource.properties.initialSize == 5
config.environments.production.dataSource.properties.maxActive == 50
config.environments.production.dataSource.properties.minIdle == 5
config.environments.production.dataSource.properties.maxIdle == 25
config.environments.production.dataSource.properties.maxWait == 10000
config.environments.production.dataSource.properties.maxAge == 600000
config.environments.production.dataSource.properties.timeBetweenEvictionRunsMillis == 5000
config.environments.production.dataSource.properties.minEvictableIdleTimeMillis == 60000
config.environments.production.dataSource.properties.validationQuery == "SELECT 1"
config.environments.production.dataSource.properties.validationQueryTimeout == 3
config.environments.production.dataSource.properties.validationInterval == 15000
config.environments.production.dataSource.properties.testOnBorrow == true
config.environments.production.dataSource.properties.testWhileIdle == true
config.environments.production.dataSource.properties.testOnReturn == false
config.environments.production.dataSource.properties.jdbcInterceptors == "ConnectionState"
config.environments.production.dataSource.properties.defaultTransactionIsolation == 2
}
}
Loading