Skip to content

Commit b4df123

Browse files
jknackjknack
committed
hikari 2.6.1 fix #692 
1 parent b58579e commit b4df123

9 files changed

Lines changed: 130 additions & 19 deletions

File tree

‎jooby-ebean/src/test/java/org/jooby/ebean/EbeanbyTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.jooby.ebean;
22

3+
import static com.typesafe.config.ConfigValueFactory.fromAnyRef;
34
import static org.easymock.EasyMock.expect;
45
import static org.easymock.EasyMock.isA;
56

@@ -190,6 +191,7 @@ private Config config() {
190191
.withValue("application.tmpdir", ConfigValueFactory.fromAnyRef("target"))
191192
.withValue("application.name", ConfigValueFactory.fromAnyRef("model"))
192193
.withValue("application.charset", ConfigValueFactory.fromAnyRef("UTF-8"))
194+
.withValue("runtime.processors-x2", fromAnyRef("4"))
193195
.resolve();
194196
}
195197

@@ -285,6 +287,7 @@ private Block props(final String dataSourceClassName, final String url, final St
285287
}
286288
expect(properties.remove("dataSource.dataSourceClassName")).andReturn(dataSourceClassName);
287289
expect(properties.setProperty("poolName", name)).andReturn(null);
290+
expect(properties.setProperty("maximumPoolSize", "4")).andReturn(null);
288291

289292
unit.registerMock(Properties.class, properties);
290293
};

‎jooby-hbm/src/test/java/org/jooby/hbm/HbmTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.jooby.hbm;
22

3+
import static com.typesafe.config.ConfigValueFactory.fromAnyRef;
34
import static javaslang.Predicates.instanceOf;
45
import static org.easymock.EasyMock.expect;
56
import static org.easymock.EasyMock.isA;
@@ -889,6 +890,7 @@ private Config config(final String db) {
889890
.withValue("application.tmpdir", ConfigValueFactory.fromAnyRef("target"))
890891
.withValue("application.name", ConfigValueFactory.fromAnyRef(db))
891892
.withValue("application.charset", ConfigValueFactory.fromAnyRef("UTF-8"))
893+
.withValue("runtime.processors-x2", fromAnyRef("4"))
892894
.resolve();
893895
}
894896

@@ -959,6 +961,7 @@ private Block props(final String dataSourceClassName, final String url, final St
959961
}
960962
expect(properties.remove("dataSource.dataSourceClassName")).andReturn(dataSourceClassName);
961963
expect(properties.setProperty("poolName", name)).andReturn(null);
964+
expect(properties.setProperty("maximumPoolSize", "4")).andReturn(null);
962965

963966
unit.registerMock(Properties.class, properties);
964967
};

‎jooby-hbm4/src/test/java/org/jooby/hbm/HbmTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public void defaults() throws Exception {
7272
.withValue("application.name", fromAnyRef("jdbctest"))
7373
.withValue("application.tmpdir", fromAnyRef("target"))
7474
.withValue("application.charset", fromAnyRef("UTF-8"))
75+
.withValue("runtime.processors-x2", fromAnyRef("4"))
7576
.resolve();
7677

7778
new MockUnit(Env.class, Binder.class, HibernateEntityManagerFactory.class)
@@ -96,6 +97,7 @@ public void prod() throws Exception {
9697
.withValue("application.name", fromAnyRef("jdbctest"))
9798
.withValue("application.tmpdir", fromAnyRef("target"))
9899
.withValue("application.charset", fromAnyRef("UTF-8"))
100+
.withValue("runtime.processors-x2", fromAnyRef("4"))
99101
.resolve();
100102

101103
new MockUnit(Env.class, Binder.class, HibernateEntityManagerFactory.class)
@@ -120,6 +122,7 @@ public void onStop() throws Exception {
120122
.withValue("application.name", fromAnyRef("jdbctest"))
121123
.withValue("application.tmpdir", fromAnyRef("target"))
122124
.withValue("application.charset", fromAnyRef("UTF-8"))
125+
.withValue("runtime.processors-x2", fromAnyRef("4"))
123126
.resolve();
124127

125128
new MockUnit(Env.class, Binder.class, HibernateEntityManagerFactory.class)
@@ -151,6 +154,7 @@ public void defaultsScan() throws Exception {
151154
.withValue("application.name", fromAnyRef("jdbctest"))
152155
.withValue("application.tmpdir", fromAnyRef("target"))
153156
.withValue("application.charset", fromAnyRef("UTF-8"))
157+
.withValue("runtime.processors-x2", fromAnyRef("4"))
154158
.resolve();
155159

156160
new MockUnit(Env.class, Binder.class, HibernateEntityManagerFactory.class)
@@ -312,6 +316,7 @@ private Block props(final String dataSourceClassName, final String url, final St
312316
}
313317
expect(properties.remove("dataSource.dataSourceClassName")).andReturn(dataSourceClassName);
314318
expect(properties.setProperty("poolName", name)).andReturn(null);
319+
expect(properties.setProperty("maximumPoolSize", "4")).andReturn(null);
315320

316321
unit.registerMock(Properties.class, properties);
317322
};

‎jooby-jdbc/src/main/resources/org/jooby/jdbc/jdbc.conf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,6 @@ databases {
129129
dataSourceClassName = org.sqlite.SQLiteDataSource
130130
}
131131
}
132+
133+
hikari.maximumPoolSize = ${runtime.processors-x2}
134+

‎jooby-jdbc/src/test/java/org/jooby/jdbc/JdbcTest.java‎

Lines changed: 106 additions & 18 deletions
Large diffs are not rendered by default.

‎jooby-jooq/src/test/java/org/jooby/jooq/jOOQTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.jooby.jooq;
22

3+
import static com.typesafe.config.ConfigValueFactory.fromAnyRef;
34
import static org.easymock.EasyMock.expect;
45
import static org.easymock.EasyMock.isA;
56
import static org.junit.Assert.assertEquals;
@@ -156,6 +157,7 @@ private Config config() {
156157
.withValue("application.tmpdir", ConfigValueFactory.fromAnyRef("target"))
157158
.withValue("application.name", ConfigValueFactory.fromAnyRef("jdbctest"))
158159
.withValue("application.charset", ConfigValueFactory.fromAnyRef("UTF-8"))
160+
.withValue("runtime.processors-x2", fromAnyRef("4"))
159161
.resolve();
160162
}
161163

@@ -228,6 +230,7 @@ private Block props(final String dataSourceClassName, final String url, final St
228230
}
229231
expect(properties.remove("dataSource.dataSourceClassName")).andReturn(dataSourceClassName);
230232
expect(properties.setProperty("poolName", name)).andReturn(null);
233+
expect(properties.setProperty("maximumPoolSize", "4")).andReturn(null);
231234

232235
unit.registerMock(Properties.class, properties);
233236
};

‎jooby-querydsl/src/test/java/org/jooby/querydsl/QueryDSLTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.jooby.querydsl;
22

3+
import static com.typesafe.config.ConfigValueFactory.fromAnyRef;
34
import static org.easymock.EasyMock.expect;
45
import static org.easymock.EasyMock.isA;
56
import static org.junit.Assert.assertEquals;
@@ -302,6 +303,7 @@ public Config config(final String db) {
302303
.withValue("application.tmpdir", ConfigValueFactory.fromAnyRef("target"))
303304
.withValue("application.name", ConfigValueFactory.fromAnyRef("jdbctest"))
304305
.withValue("application.charset", ConfigValueFactory.fromAnyRef("UTF-8"))
306+
.withValue("runtime.processors-x2", fromAnyRef("4"))
305307
.resolve();
306308
}
307309

@@ -371,6 +373,7 @@ private Block props(final String dataSourceClassName, final String url, final St
371373
}
372374
expect(properties.remove("dataSource.dataSourceClassName")).andReturn(dataSourceClassName);
373375
expect(properties.setProperty("poolName", name)).andReturn(null);
376+
expect(properties.setProperty("maximumPoolSize", "4")).andReturn(null);
374377

375378
unit.registerMock(Properties.class, properties);
376379
};

‎jooby-rxjava-jdbc/src/test/java/org/jooby/rx/RxJdbcTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.jooby.rx;
22

3+
import static com.typesafe.config.ConfigValueFactory.fromAnyRef;
34
import static org.easymock.EasyMock.expect;
45
import static org.easymock.EasyMock.isA;
56

@@ -118,6 +119,7 @@ private Config config() {
118119
.withValue("application.tmpdir", ConfigValueFactory.fromAnyRef("target"))
119120
.withValue("application.name", ConfigValueFactory.fromAnyRef("jdbctest"))
120121
.withValue("application.charset", ConfigValueFactory.fromAnyRef("UTF-8"))
122+
.withValue("runtime.processors-x2", fromAnyRef("4"))
121123
.resolve();
122124
}
123125

@@ -187,6 +189,7 @@ private Block props(final String dataSourceClassName, final String url, final St
187189
}
188190
expect(properties.remove("dataSource.dataSourceClassName")).andReturn(dataSourceClassName);
189191
expect(properties.setProperty("poolName", name)).andReturn(null);
192+
expect(properties.setProperty("maximumPoolSize", "4")).andReturn(null);
190193

191194
unit.registerMock(Properties.class, properties);
192195
};

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2943,7 +2943,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
29432943
<handlebars.version>4.0.5</handlebars.version>
29442944
<h2.version>1.4.190</h2.version>
29452945
<mysql-connector-java.version>5.1.38</mysql-connector-java.version>
2946-
<hikariCP.version>2.6.0</hikariCP.version>
2946+
<hikariCP.version>2.6.1</hikariCP.version>
29472947
<hibernate.version>5.2.1.Final</hibernate.version>
29482948
<hibernate4.version>4.3.9.Final</hibernate4.version>
29492949
<jsr305.version>3.0.0</jsr305.version>

0 commit comments

Comments
 (0)