Skip to content

Commit f0b60ba

Browse files
committed
refactor(core): delegate inherited method lookup to general-util 1.7.0
Upgrade flamingock-general-util from 1.6.0 to 1.7.0 and use its hierarchy-aware reflection helper instead of local method resolution. Remove invalid overloaded preview scenarios while preserving existing inheritance coverage and valid primitive/array tests.
1 parent 59769ce commit f0b60ba

3 files changed

Lines changed: 7 additions & 94 deletions

File tree

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ allprojects {
2222
val declaredVersion = "1.5.0-SNAPSHOT"
2323
version = VersionManager.resolveVersion(declaredVersion, project.hasProperty("release"))
2424

25-
extra["generalUtilVersion"] = "1.6.0"
25+
extra["generalUtilVersion"] = "1.7.0"
2626
extra["templateApiVersion"] = "1.3.4"
2727
extra["coreApiVersion"] = "1.3.3"
2828
extra["sqlVersion"] = "1.3.2"

‎core/flamingock-core/src/main/java/io/flamingock/internal/core/change/loaded/CodeLoadedChangeBuilder.java‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -284,34 +284,8 @@ private Optional<Method> getRollbackMethodFromPreview(CodePreviewChange preview)
284284

285285
private Method getMethodFromNameAndParameters(String sourceClassName, String methodName, List<String> methodParametersTypesNames) {
286286
Class<?> sourceClass = getClassForName(sourceClassName);
287-
// Match the preview signature at every level so unrelated overloads cannot
288-
// hide the inherited lifecycle method.
289-
for (Class<?> candidate = sourceClass; candidate != null && candidate != Object.class;
290-
candidate = candidate.getSuperclass()) {
291-
for (Method method : candidate.getDeclaredMethods()) {
292-
if (method.getName().equals(methodName)
293-
&& matchesPreviewParameters(method, methodParametersTypesNames)) {
294-
return ReflectionUtil.getDeclaredMethodFromParameterTypeNames(
295-
candidate, methodName, methodParametersTypesNames);
296-
}
297-
}
298-
}
299-
return ReflectionUtil.getDeclaredMethodFromParameterTypeNames(sourceClass, methodName, methodParametersTypesNames);
300-
}
301-
302-
private boolean matchesPreviewParameters(Method method, List<String> parameterNames) {
303-
Class<?>[] parameterTypes = method.getParameterTypes();
304-
if (parameterTypes.length != parameterNames.size()) {
305-
return false;
306-
}
307-
for (int i = 0; i < parameterTypes.length; i++) {
308-
// Canonical names cover source-style arrays; getName also accepts binary names.
309-
if (!parameterNames.get(i).equals(parameterTypes[i].getCanonicalName())
310-
&& !parameterNames.get(i).equals(parameterTypes[i].getName())) {
311-
return false;
312-
}
313-
}
314-
return true;
287+
return ReflectionUtil.getMethodFromParameterTypeNames(
288+
sourceClass, methodName, methodParametersTypesNames, true);
315289
}
316290

317291
private Method getApplyMethodFromAnnotation(Class<?> sourceClass) {

‎core/flamingock-core/src/test/java/io/flamingock/internal/core/change/loaded/CodeLoadedChangeBuilderTest.java‎

Lines changed: 4 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -273,60 +273,12 @@ void shouldPreferDirectlyDeclaredPreviewMethods() throws Exception {
273273
assertEquals(DirectChange.class, change.getApplyMethod().getDeclaringClass());
274274
}
275275

276-
@Test
277-
void shouldSkipIntermediateOverloadsForInheritedPreviewSignatures() throws Exception {
278-
for (boolean legacy : new boolean[]{false, true}) {
279-
CodeLoadedChange change = CodeLoadedChangeBuilder.getInstanceFromPreview(
280-
signaturePreview(OverloadLeaf.class, "apply", "rollback",
281-
Collections.singletonList(String.class.getName()), legacy)).build();
282-
OverloadLeaf instance = new OverloadLeaf();
283-
assertArrayEquals(new Class<?>[]{String.class}, change.getApplyMethod().getParameterTypes());
284-
assertArrayEquals(new Class<?>[]{String.class}, change.getRollbackMethod().get().getParameterTypes());
285-
change.getApplyMethod().invoke(instance, "applied");
286-
assertEquals("applied", instance.effect);
287-
change.getRollbackMethod().get().invoke(instance, "rolled back");
288-
assertEquals("rolled back", instance.effect);
289-
}
290-
}
291-
292-
@Test
293-
void shouldResolveInheritedPreviewSignaturesWithConcreteOverloads() throws Exception {
294-
for (boolean legacy : new boolean[]{false, true}) {
295-
CodeLoadedChange change = CodeLoadedChangeBuilder.getInstanceFromPreview(
296-
signaturePreview(OverloadChild.class, "apply", "rollback",
297-
Collections.singletonList(String.class.getName()), legacy)).build();
298-
OverloadChild instance = new OverloadChild();
299-
assertArrayEquals(new Class<?>[]{String.class}, change.getApplyMethod().getParameterTypes());
300-
assertArrayEquals(new Class<?>[]{String.class}, change.getRollbackMethod().get().getParameterTypes());
301-
change.getApplyMethod().invoke(instance, "applied");
302-
assertEquals("applied", instance.effect);
303-
change.getRollbackMethod().get().invoke(instance, "rolled back");
304-
assertEquals("rolled back", instance.effect);
305-
}
306-
}
307-
308-
@Test
309-
void shouldResolveDirectPreviewSignaturesWithInheritedOverloads() throws Exception {
310-
for (boolean legacy : new boolean[]{false, true}) {
311-
CodeLoadedChange change = CodeLoadedChangeBuilder.getInstanceFromPreview(
312-
signaturePreview(OverloadChild.class, "apply", "rollback",
313-
Collections.singletonList(Integer.class.getName()), legacy)).build();
314-
OverloadChild instance = new OverloadChild();
315-
assertArrayEquals(new Class<?>[]{Integer.class}, change.getApplyMethod().getParameterTypes());
316-
assertArrayEquals(new Class<?>[]{Integer.class}, change.getRollbackMethod().get().getParameterTypes());
317-
change.getApplyMethod().invoke(instance, 1);
318-
assertEquals("integer apply", instance.effect);
319-
change.getRollbackMethod().get().invoke(instance, 1);
320-
assertEquals("integer rollback", instance.effect);
321-
}
322-
}
323-
324276
@Test
325277
void shouldMatchInheritedPrimitiveAndArraySignatures() throws Exception {
326278
CodeLoadedChange change = CodeLoadedChangeBuilder.getInstanceFromPreview(
327-
signaturePreview(OverloadLeaf.class, "applyArrays", "rollbackArrays",
279+
signaturePreview(InheritedArrayChange.class, "applyArrays", "rollbackArrays",
328280
java.util.Arrays.asList("int", "int[]", "java.lang.String[]"), false)).build();
329-
OverloadLeaf instance = new OverloadLeaf();
281+
InheritedArrayChange instance = new InheritedArrayChange();
330282
Class<?>[] expected = {int.class, int[].class, String[].class};
331283
assertArrayEquals(expected, change.getApplyMethod().getParameterTypes());
332284
assertArrayEquals(expected, change.getRollbackMethod().get().getParameterTypes());
@@ -336,15 +288,9 @@ void shouldMatchInheritedPrimitiveAndArraySignatures() throws Exception {
336288
assertEquals("rollback910", instance.effect);
337289
}
338290

339-
public static class OverloadBase {
291+
public static class ArrayBaseChange {
340292
String effect;
341293

342-
@Apply
343-
public void apply(String value) { effect = value; }
344-
345-
@io.flamingock.api.annotations.Rollback
346-
public void rollback(String value) { effect = value; }
347-
348294
public void applyArrays(int value, int[] numbers, String[] text) {
349295
effect = text[0] + value + numbers[0];
350296
}
@@ -354,14 +300,7 @@ public void rollbackArrays(int value, int[] numbers, String[] text) {
354300
}
355301
}
356302

357-
public static class OverloadChild extends OverloadBase {
358-
public void apply(Integer value) { effect = "integer apply"; }
359-
public void rollback(Integer value) { effect = "integer rollback"; }
360-
public void applyArrays(Integer value, Integer[] numbers, Object[] text) { }
361-
public void rollbackArrays(Integer value, Integer[] numbers, Object[] text) { }
362-
}
363-
364-
public static class OverloadLeaf extends OverloadChild { }
303+
public static class InheritedArrayChange extends ArrayBaseChange { }
365304

366305
private CodePreviewChange signaturePreview(Class<?> source, String apply, String rollback,
367306
java.util.List<String> parameters, boolean legacy) {

0 commit comments

Comments
 (0)