Skip to content

Commit dba4020

Browse files
author
Ke Wang
committed
issue 74: micro-jdbc plugin use default maxPoolSize=10 for
HikariDataSource
1 parent e6be020 commit dba4020

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

‎micro-jdbc/src/main/java/com/aol/micro/server/spring/datasource/DataDataSourceBuilder.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import javax.sql.DataSource;
55

66
import lombok.AllArgsConstructor;
7-
import lombok.experimental.Builder;
7+
import lombok.Builder;
88
import lombok.NoArgsConstructor;
99

1010
import org.springframework.context.annotation.Bean;
@@ -33,6 +33,7 @@ private DataSource getDataSource() {
3333
ds.setJdbcUrl(env.getUrl());
3434
ds.setUsername(env.getUsername());
3535
ds.setPassword(env.getPassword());
36+
ds.setMaximumPoolSize(env.getMaxPoolSize());
3637

3738
return ds;
3839
}

‎micro-jdbc/src/main/java/com/aol/micro/server/spring/datasource/JdbcConfig.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import java.util.Properties;
44

5-
import lombok.experimental.Builder;
65
import lombok.Getter;
6+
import lombok.experimental.Builder;
77

88
import org.springframework.beans.factory.annotation.Autowired;
99
import org.springframework.beans.factory.annotation.Qualifier;
@@ -29,12 +29,13 @@ public class JdbcConfig {
2929
private final Properties properties;
3030
private final String name;
3131
private final String generateDdl;
32+
private final int maxPoolSize;
3233

3334
public JdbcConfig(@Value("${db.connection.driver:}") String driverClassName, @Value("${db.connection.url:}") String url,
3435
@Value("${db.connection.username:}") String username, @Value("${db.connection.password:}") String password,
3536
@Value("${db.connection.hibernate.showsql:false}") String showSql, @Value("${db.connection.dialect:}") String dialect,
3637
@Value("${db.connection.ddl.auto:#{null}}") String ddlAuto) {
37-
this(driverClassName, url, username, password, showSql, dialect, ddlAuto, new Properties(), "db", "false");
38+
this(driverClassName, url, username, password, showSql, dialect, ddlAuto, new Properties(), "db", "false", 100);
3839

3940
}
4041

@@ -43,7 +44,8 @@ public JdbcConfig(@Value("${db.connection.driver:}") String driverClassName, @Va
4344
@Value("${db.connection.username:}") String username, @Value("${db.connection.password:}") String password,
4445
@Value("${db.connection.hibernate.showsql:false}") String showSql, @Value("${db.connection.dialect:}") String dialect,
4546
@Value("${db.connection.ddl.auto:#{null}}") String ddlAuto, @Qualifier("propertyFactory") Properties properties,
46-
@Value("${internal.not.use.microserver:#{null}}") String name, @Value("${db.connection.generate.ddl:false}") String generateDdl) {
47+
@Value("${internal.not.use.microserver:#{null}}") String name, @Value("${db.connection.generate.ddl:false}") String generateDdl,
48+
@Value("${db.connection.max.pool.size:100}") int maxPoolSize) {
4749
this.properties = properties;
4850
this.name = UsefulStaticMethods.either(name, new ConfigAccessor().get().getDefaultDataSourceName());
4951
this.driverClassName = UsefulStaticMethods.either(driverClassName, extract("connection.driver"));
@@ -54,6 +56,7 @@ public JdbcConfig(@Value("${db.connection.driver:}") String driverClassName, @Va
5456
this.dialect = UsefulStaticMethods.either(dialect, extract("connection.dialect"));
5557
this.ddlAuto = UsefulStaticMethods.either(ddlAuto, extract("connection.ddl.auto"));
5658
this.generateDdl = UsefulStaticMethods.either(generateDdl, extract("connection.generate.ddl"));
59+
this.maxPoolSize = maxPoolSize;
5760

5861
}
5962

‎micro-jdbc/src/test/java/com/aol/micro/server/JdbcConfigTest.java

+12-10
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,24 @@
1515
public class JdbcConfigTest {
1616

1717
JdbcConfig config;
18+
1819
@Before
1920
public void setUp() throws Exception {
2021
Config.instance();
21-
config = new JdbcConfig("driverClassName", "url", "username", "password", "showSql", "mysql", "none", new Properties(), null, "false");
22-
22+
config = new JdbcConfig("driverClassName", "url", "username", "password", "showSql", "mysql", "none", new Properties(), null, "false", 100);
23+
2324
}
2425

2526
@Test
2627
public void test() {
27-
assertThat (config, notNullValue());
28-
assertThat(config.getDdlAuto(),is("none"));
29-
assertThat(config.getDialect(),is("mysql"));
30-
assertThat(config.getDriverClassName(),is("driverClassName"));
31-
assertThat(config.getUrl(),is("url"));
32-
assertThat(config.getUsername(),is("username"));
33-
assertThat(config.getPassword(),is("password"));
34-
assertThat(config.getShowSql(),is("showSql"));
28+
assertThat(config, notNullValue());
29+
assertThat(config.getDdlAuto(), is("none"));
30+
assertThat(config.getDialect(), is("mysql"));
31+
assertThat(config.getDriverClassName(), is("driverClassName"));
32+
assertThat(config.getUrl(), is("url"));
33+
assertThat(config.getUsername(), is("username"));
34+
assertThat(config.getPassword(), is("password"));
35+
assertThat(config.getShowSql(), is("showSql"));
36+
assertThat(config.getMaxPoolSize(), is(100));
3537
}
3638
}

0 commit comments

Comments
 (0)