Skip to content

Commit a28461c

Browse files
committed
Removed resolveParamTypes() as it was not necessary to fix #321.
1 parent 3e8ca88 commit a28461c

File tree

2 files changed

+0
-77
lines changed

2 files changed

+0
-77
lines changed

src/main/java/org/apache/ibatis/reflection/TypeParameterResolver.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,6 @@
2323

2424
public class TypeParameterResolver {
2525

26-
public static Type[] resolveParamTypes(Method method, Type mapper) {
27-
Type[] paramTypes = method.getGenericParameterTypes();
28-
Class<?> declaringClass = method.getDeclaringClass();
29-
Type[] result = new Type[paramTypes.length];
30-
for (int i = 0; i < paramTypes.length; i++) {
31-
if (paramTypes[i] instanceof Class) {
32-
result[i] = paramTypes[i];
33-
} else if (paramTypes[i] instanceof TypeVariable) {
34-
result[i] = resolveTypeVar((TypeVariable<?>) paramTypes[i], mapper, declaringClass);
35-
} else if (paramTypes[i] instanceof ParameterizedType) {
36-
result[i] = resolveParameterizedType((ParameterizedType) paramTypes[i], mapper, declaringClass);
37-
} else {
38-
// TODO: other types?
39-
}
40-
}
41-
return result;
42-
}
43-
4426
public static Type resolveReturnType(Method method, Type mapper) {
4527
Type returnType = method.getGenericReturnType();
4628
Class<?> declaringClass = method.getDeclaringClass();

src/test/java/org/apache/ibatis/reflection/TypeParameterResolverTest.java

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -216,63 +216,4 @@ public void testReturn_LV2Map() throws Exception {
216216
assertEquals(String.class, paramType.getActualTypeArguments()[0]);
217217
assertEquals(Integer.class, paramType.getActualTypeArguments()[1]);
218218
}
219-
220-
@Test
221-
public void testParam_Primitive() throws Exception {
222-
Class<?> clazz = Level2Mapper.class;
223-
Method method = clazz.getMethod("simpleSelectPrimitive", int.class);
224-
Type[] result = TypeParameterResolver.resolveParamTypes(method, clazz);
225-
assertEquals(1, result.length);
226-
assertEquals(int.class, result[0]);
227-
}
228-
229-
@Test
230-
public void testParam_Simple() throws Exception {
231-
Class<?> clazz = Level1Mapper.class;
232-
Method method = clazz.getMethod("simpleSelectVoid", Integer.class);
233-
Type[] result = TypeParameterResolver.resolveParamTypes(method, clazz);
234-
assertEquals(1, result.length);
235-
assertEquals(Integer.class, result[0]);
236-
}
237-
238-
@Test
239-
public void testParam_Lv1Single() throws Exception {
240-
Class<?> clazz = Level1Mapper.class;
241-
Method method = clazz.getMethod("select", Object.class);
242-
Type[] result = TypeParameterResolver.resolveParamTypes(method, clazz);
243-
assertEquals(1, result.length);
244-
assertEquals(String.class, result[0]);
245-
}
246-
247-
@Test
248-
public void testParam_Lv2Single() throws Exception {
249-
Class<?> clazz = Level2Mapper.class;
250-
Method method = clazz.getMethod("select", Object.class);
251-
Type[] result = TypeParameterResolver.resolveParamTypes(method, clazz);
252-
assertEquals(1, result.length);
253-
assertEquals(String.class, result[0]);
254-
}
255-
256-
@Test
257-
public void testParam_Lv2Multiple() throws Exception {
258-
Class<?> clazz = Level2Mapper.class;
259-
Method method = clazz.getMethod("selectList", Object.class, Object.class);
260-
Type[] result = TypeParameterResolver.resolveParamTypes(method, clazz);
261-
assertEquals(2, result.length);
262-
assertEquals(Integer.class, result[0]);
263-
assertEquals(String.class, result[1]);
264-
}
265-
266-
@Test
267-
public void testParam_Lv2CustomClass() throws Exception {
268-
Class<?> clazz = Level2Mapper.class;
269-
Method method = clazz.getMethod("selectCalculator", Calculator.class);
270-
Type[] result = TypeParameterResolver.resolveParamTypes(method, clazz);
271-
assertEquals(1, result.length);
272-
assertTrue(result[0] instanceof ParameterizedType);
273-
ParameterizedType paramType = (ParameterizedType) result[0];
274-
assertEquals(Calculator.class, paramType.getRawType());
275-
assertEquals(1, paramType.getActualTypeArguments().length);
276-
assertEquals(String.class, paramType.getActualTypeArguments()[0]);
277-
}
278219
}

0 commit comments

Comments
 (0)