Skip to content

Commit 9a66c60

Browse files
committed
Merge master into pr/3418
2 parents 2433820 + 1a145cd commit 9a66c60

File tree

5 files changed

+33
-13
lines changed

5 files changed

+33
-13
lines changed

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@
7272

7373
<clirr.comparisonVersion>3.4.6</clirr.comparisonVersion>
7474

75-
<byte-buddy.version>1.17.1</byte-buddy.version>
75+
<byte-buddy.version>1.17.2</byte-buddy.version>
7676
<derby.version>10.17.1.0</derby.version>
7777
<log4j.version>2.24.3</log4j.version>
78-
<mockito.version>5.15.2</mockito.version>
78+
<mockito.version>5.16.0</mockito.version>
7979
<mssql-jdbc.version>12.8.1.jre11</mssql-jdbc.version>
80-
<testcontainers.version>1.20.5</testcontainers.version>
80+
<testcontainers.version>1.20.6</testcontainers.version>
8181
<git-build-hook.version>3.5.0</git-build-hook.version>
8282

8383
<!-- Add slow test groups here and annotate classes similar to @Tag('groupName'). -->
@@ -107,7 +107,7 @@
107107
<dependency>
108108
<groupId>ognl</groupId>
109109
<artifactId>ognl</artifactId>
110-
<version>3.4.5</version>
110+
<version>3.4.6</version>
111111
<scope>compile</scope>
112112
<optional>true</optional>
113113
</dependency>
@@ -297,15 +297,15 @@
297297
<dependency>
298298
<groupId>org.slf4j</groupId>
299299
<artifactId>slf4j-api</artifactId>
300-
<version>2.0.16</version>
300+
<version>2.0.17</version>
301301
<optional>true</optional>
302302
</dependency>
303303

304304
<!-- Logging Support used in testing -->
305305
<dependency>
306306
<groupId>ch.qos.logback</groupId>
307307
<artifactId>logback-classic</artifactId>
308-
<version>1.5.16</version>
308+
<version>1.5.17</version>
309309
<scope>test</scope>
310310
</dependency>
311311
<dependency>
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* Copyright 2009-2025 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.apache.ibatis.binding;
17+
18+
import java.lang.reflect.Method;
19+
20+
import org.apache.ibatis.session.SqlSession;
21+
22+
public interface MapperMethodInvoker {
23+
24+
Object invoke(Object proxy, Method method, Object[] args, SqlSession sqlSession) throws Throwable;
25+
26+
}

src/main/java/org/apache/ibatis/binding/MapperProxy.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,6 @@ private MethodHandle getMethodHandleJava9(Method method)
9393
declaringClass);
9494
}
9595

96-
interface MapperMethodInvoker {
97-
Object invoke(Object proxy, Method method, Object[] args, SqlSession sqlSession) throws Throwable;
98-
}
99-
10096
private static class PlainMethodInvoker implements MapperMethodInvoker {
10197
private final MapperMethod mapperMethod;
10298

src/main/java/org/apache/ibatis/binding/MapperProxyFactory.java

Lines changed: 1 addition & 2 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-2025 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.
@@ -20,7 +20,6 @@
2020
import java.util.Map;
2121
import java.util.concurrent.ConcurrentHashMap;
2222

23-
import org.apache.ibatis.binding.MapperProxy.MapperMethodInvoker;
2423
import org.apache.ibatis.session.SqlSession;
2524

2625
/**

src/test/java/org/apache/ibatis/binding/BindingTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import net.sf.cglib.proxy.Factory;
4646

4747
import org.apache.ibatis.BaseDataTest;
48-
import org.apache.ibatis.binding.MapperProxy.MapperMethodInvoker;
4948
import org.apache.ibatis.cursor.Cursor;
5049
import org.apache.ibatis.domain.blog.Author;
5150
import org.apache.ibatis.domain.blog.Blog;

0 commit comments

Comments
 (0)