Skip to content

Commit 9155fb9

Browse files
committed
[c3p0] Bump to 0.10.1 and drop support for proxy reflection as dropped from c3p0
1 parent f2f4018 commit 9155fb9

File tree

4 files changed

+4
-29
lines changed

4 files changed

+4
-29
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
<dependency>
174174
<groupId>com.mchange</groupId>
175175
<artifactId>c3p0</artifactId>
176-
<version>0.10.0-pre3</version>
176+
<version>0.10.1</version>
177177
<optional>true</optional>
178178
</dependency>
179179

src/main/java/org/mybatis/guice/datasource/c3p0/C3p0DataSourceProvider.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2023 the original author or authors.
2+
* Copyright 2009-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -371,18 +371,6 @@ public void setUnreturnedConnectionTimeout(
371371
dataSource.setUnreturnedConnectionTimeout(unreturnedConnectionTimeout);
372372
}
373373

374-
/**
375-
* Sets the uses traditional reflective proxies.
376-
*
377-
* @param usesTraditionalReflectiveProxies
378-
* the new uses traditional reflective proxies
379-
*/
380-
@com.google.inject.Inject(optional = true)
381-
public void setUsesTraditionalReflectiveProxies(
382-
@Named("c3p0.usesTraditionalReflectiveProxies") final boolean usesTraditionalReflectiveProxies) {
383-
dataSource.setUsesTraditionalReflectiveProxies(usesTraditionalReflectiveProxies);
384-
}
385-
386374
@Override
387375
public DataSource get() {
388376
if (username != null) {

src/site/xdoc/datasources/c3p0.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2009-2022 the original author or authors.
4+
Copyright 2009-2024 the original author or authors.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -195,11 +195,6 @@
195195
<td>false</td>
196196
<td>int</td>
197197
</tr>
198-
<tr>
199-
<td>c3p0.usesTraditionalReflectiveProxies</td>
200-
<td>false</td>
201-
<td>boolean</td>
202-
</tr>
203198
</tbody>
204199
</table>
205200
</section>

src/test/java/org/mybatis/guice/datasource/c3p0/C3p0DataSourceProviderTest.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 the original author or authors.
2+
* Copyright 2009-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -65,7 +65,6 @@ void get() {
6565
final boolean testConnectionOnCheckin = true;
6666
final boolean testConnectionOnCheckout = true;
6767
final int unreturnedConnectionTimeout = 160;
68-
final boolean usesTraditionalReflectiveProxies = true;
6968
Injector injector = Guice.createInjector(new AbstractModule() {
7069
@Override
7170
protected void configure() {
@@ -98,8 +97,6 @@ protected void configure() {
9897
bindConstant().annotatedWith(Names.named("c3p0.testConnectionOnCheckin")).to(testConnectionOnCheckin);
9998
bindConstant().annotatedWith(Names.named("c3p0.testConnectionOnCheckout")).to(testConnectionOnCheckout);
10099
bindConstant().annotatedWith(Names.named("c3p0.unreturnedConnectionTimeout")).to(unreturnedConnectionTimeout);
101-
bindConstant().annotatedWith(Names.named("c3p0.usesTraditionalReflectiveProxies"))
102-
.to(usesTraditionalReflectiveProxies);
103100
}
104101
});
105102
C3p0DataSourceProvider provider = injector.getInstance(C3p0DataSourceProvider.class);
@@ -134,7 +131,6 @@ protected void configure() {
134131
assertEquals(testConnectionOnCheckin, dataSource.isTestConnectionOnCheckin());
135132
assertEquals(testConnectionOnCheckout, dataSource.isTestConnectionOnCheckout());
136133
assertEquals(unreturnedConnectionTimeout, dataSource.getUnreturnedConnectionTimeout());
137-
assertEquals(usesTraditionalReflectiveProxies, dataSource.isUsesTraditionalReflectiveProxies());
138134
}
139135

140136
@Test
@@ -167,7 +163,6 @@ void get_OtherValues() {
167163
final boolean testConnectionOnCheckin = false;
168164
final boolean testConnectionOnCheckout = false;
169165
final int unreturnedConnectionTimeout = 161;
170-
final boolean usesTraditionalReflectiveProxies = false;
171166
Injector injector = Guice.createInjector(new AbstractModule() {
172167
@Override
173168
protected void configure() {
@@ -200,8 +195,6 @@ protected void configure() {
200195
bindConstant().annotatedWith(Names.named("c3p0.testConnectionOnCheckin")).to(testConnectionOnCheckin);
201196
bindConstant().annotatedWith(Names.named("c3p0.testConnectionOnCheckout")).to(testConnectionOnCheckout);
202197
bindConstant().annotatedWith(Names.named("c3p0.unreturnedConnectionTimeout")).to(unreturnedConnectionTimeout);
203-
bindConstant().annotatedWith(Names.named("c3p0.usesTraditionalReflectiveProxies"))
204-
.to(usesTraditionalReflectiveProxies);
205198
}
206199
});
207200
C3p0DataSourceProvider provider = injector.getInstance(C3p0DataSourceProvider.class);
@@ -236,7 +229,6 @@ protected void configure() {
236229
assertEquals(testConnectionOnCheckin, dataSource.isTestConnectionOnCheckin());
237230
assertEquals(testConnectionOnCheckout, dataSource.isTestConnectionOnCheckout());
238231
assertEquals(unreturnedConnectionTimeout, dataSource.getUnreturnedConnectionTimeout());
239-
assertEquals(usesTraditionalReflectiveProxies, dataSource.isUsesTraditionalReflectiveProxies());
240232
}
241233

242234
@Test

0 commit comments

Comments
 (0)