Skip to content

Commit 2e01d3a

Browse files
committed
Redo HikariModule
1 parent c96c1ae commit 2e01d3a

File tree

10 files changed

+265
-190
lines changed

10 files changed

+265
-190
lines changed

docs/asciidoc/modules/hikari.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ import io.jooby.hikari.HikariModule
109109

110110
Modules comes with 3 special databases provided by https://github.com/h2database/h2database[H2 database]:
111111

112-
- `mem`: setup an in-memory database
113-
- `fs` : a file system database at `System.getProperty("user.dir")`
114-
- `tmp`: a tmp file system database at `System.getProperty("user.dir") + "/tmp"` directory
112+
- `mem` : setup an in-memory database
113+
- `local`: a file system database at `System.getProperty("user.dir")`
114+
- `tmp` : a tmp file system database at `System.getProperty("user.dir") + "/tmp"` directory
115115

116116
=== Multiple databases
117117

@@ -188,11 +188,11 @@ maindb.url = "jdbc:mysql://localhost/main"
188188
maindb.user = myuser
189189
maindb.password = mypass
190190
191-
hikari.maindb.maximumPoolSize = 10
191+
maindb.hikari.maximumPoolSize = 10
192192
193193
auditdb.url = "jdbc:mysql://localhost/audit"
194194
auditdb.user = myuser
195195
auditdb.password = mypass
196196
197-
hikari.auditdb.maximumPoolSize = 15
197+
auditdb.hikari.maximumPoolSize = 15
198198
----

examples/src/main/java/examples/PersonRepo.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Jooby https://jooby.io
3+
* Apache License Version 2.0 https://jooby.io/LICENSE.txt
4+
* Copyright 2014 Edgar Espina
5+
*/
16
package examples;
27

38
import examples.jpa.Person;

jooby/src/main/java/io/jooby/RequestScope.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Jooby https://jooby.io
3+
* Apache License Version 2.0 https://jooby.io/LICENSE.txt
4+
* Copyright 2014 Edgar Espina
5+
*/
16
package io.jooby;
27

38
import java.util.HashMap;

jooby/src/test/java/io/jooby/EnvironmentTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,12 @@ public void flattenProperties() {
115115
Arrays.asList("a", "b")))));
116116
Environment environment = new Environment(getClass().getClassLoader(), config);
117117
assertEquals(mapOf("root.map.key1", "1", "root.map.key2", "2", "root.map.list", "a, b"), environment.getProperties("root"));
118+
119+
assertEquals(mapOf("p.map.key1", "1", "p.map.key2", "2", "p.map.list", "a, b"), environment.getProperties("root", "p"));
118120
}
119121

122+
123+
120124
private void env(String dir, Map<String, Object> args, BiConsumer<Environment, Config> consumer) {
121125
Properties sysprops = new Properties();
122126
sysprops.putAll(System.getProperties());

modules/jooby-flyway/src/main/java/io/jooby/flyway/FlywayModule.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/**
2+
* Jooby https://jooby.io
3+
* Apache License Version 2.0 https://jooby.io/LICENSE.txt
4+
* Copyright 2014 Edgar Espina
5+
*/
16
package io.jooby.flyway;
27

38
import io.jooby.Environment;

0 commit comments

Comments
 (0)