Skip to content

support @GlobalTransactional and @GlobalLock in parent class and interface #7794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
whaon wants to merge 14 commits into
base: 2.x
Choose a base branch
from
Open

support @GlobalTransactional and @GlobalLock in parent class and interface #7794

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
52ca977
bugfix:adjust the order of org.apache.seata.saga.rm.SagaResourceManag…
Sep 5, 2025
2a2eb49
bugfix:fix unittest error
Sep 11, 2025
36c35dd
Merge branch '2.x' into 2.x
whaon Sep 12, 2025
1e36819
Merge branch '2.x' into 2.x
xjlgod Sep 13, 2025
17efeff
Merge branch 'apache:2.x' into 2.x
whaon Nov 19, 2025
2fb26b7
optimize: support @GlobalTransactional and @GlobalLock in parent clas…
Nov 19, 2025
c415798
optimize: fix style by spotless
Nov 19, 2025
e65cf2f
optimize: add test
Nov 19, 2025
43989f3
optimize: add test
Nov 19, 2025
988994b
Merge branch '2.x' into 2.x
WangzJi Nov 19, 2025
e796ae9
optimize: support @GlobalTransactional and @GlobalLock lookup on all …
Nov 25, 2025
b8cd3cf
Merge branch '2.x' of https://github.com/whaon/incubator-seata into 2.x
Nov 25, 2025
454c552
Merge branch '2.x' into 2.x
funky-eyes Jan 8, 2026
e028fef
Merge branch '2.x' into 2.x
whaon Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions common/src/main/java/org/apache/seata/common/util/ReflectionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,45 @@ public static Map<String, Object> getAnnotationValues(Annotation annotation) thr
return getFieldValue(h, "memberValues");
}

/**
*
* @param targetClass the target class
* @param methodName the method name
* @param paramTypes the param types
* @param annotationClass the annotation class
* @return the annotation
* @param <A>
Comment on lines +735 to +741
Copy link

Copilot AI Jan 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The javadoc comment is incomplete and doesn't follow the standard javadoc format. The description is unclear and contains grammatical issues. Parameter descriptions should use @param tags, and the generic type parameter description is missing.

Suggested change
*
* @param targetClass the target class
* @param methodName the method name
* @param paramTypes the param types
* @param annotationClass the annotation class
* @return the annotation
* @param <A>
* Finds an annotation of the specified type on the given class or, if a method name is provided,
* on the corresponding method in the class hierarchy.
*
* <p>This method first attempts to locate the annotation at the class level. If no class-level
* annotation is found and a non-{@code null} method name is provided, it then searches for the
* annotation on the specified method (including in superclasses, as determined by the underlying
* helper methods).</p>
*
* @param targetClass the class on which to search for the annotation
* @param methodName the name of the method for method-level lookup; may be {@code null} to
* restrict the search to class-level annotations
* @param paramTypes the parameter types of the method to match when searching for a
* method-level annotation
* @param annotationClass the type of annotation to find
* @param <A> the annotation type
* @return the first matching annotation found on the class or method, or {@code null} if none is found

Copilot uses AI. Check for mistakes.
*/
public static <A extends Annotation> A findAnnotationInHierarchy(
Copy link
Copy Markdown
Contributor

@funky-eyes funky-eyes Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe method-level annotation data should take precedence. Only if a method does not have that annotation should we check the corresponding method in the superclass. This ensures that if the same annotation appears with different configured values, the value on the method is the one that ultimately applies.

Copy link
Copy Markdown
Contributor Author

@whaon whaon Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are right! the invoker will check the actual class first just as you wish
code is here:

    private <A extends Annotation> A findAnnotation(Method method, Class<?> targetClass, Class<A> annotationClass) {
        A anno = getAnnotation(method, targetClass, annotationClass);
        if (anno == null) {
            anno = ReflectionUtil.findAnnotationInHierarchy(
                    targetClass, method.getName(), method.getParameterTypes(), annotationClass);
        }
        return anno;
    }

Class<?> targetClass, String methodName, Class<?>[] paramTypes, Class<A> annotationClass) {
Class<?> superClass = targetClass.getSuperclass();
while (superClass != null && superClass != Object.class) {
try {
Method superMethod = superClass.getDeclaredMethod(methodName, paramTypes);
Copy link
Copy Markdown
Contributor

@funky-eyes funky-eyes Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we attempt to read the annotation from the superclass instead of only checking the method itself?

Copy link
Copy Markdown
Contributor Author

@whaon whaon Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update, pls have a check

A superAnnotation = superMethod.getAnnotation(annotationClass);
if (superAnnotation != null) {
return superAnnotation;
}
} catch (NoSuchMethodException e) {
}
superClass = superClass.getSuperclass();
}

Set<Class<?>> interfaces = getInterfaces(targetClass);
for (Class<?> iface : interfaces) {
try {
Method ifaceMethod = iface.getDeclaredMethod(methodName, paramTypes);
A ifaceAnnotation = ifaceMethod.getAnnotation(annotationClass);
if (ifaceAnnotation != null) {
return ifaceAnnotation;
}
} catch (NoSuchMethodException e) {
}
}

return null;
}

// endregion

// region toString
Expand Down
14 changes: 14 additions & 0 deletions common/src/test/java/org/apache/seata/common/util/ReflectionUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,15 @@ public void testGetAnnotationValues() throws NoSuchMethodException, NoSuchFieldE
this.getClass().getMethod("testGetAnnotationValues").getAnnotation(Test.class)));
}

@Test
public void testFindAnnotationInHierarchy() throws NoSuchMethodException, NoSuchFieldException {
Assertions.assertNotNull(ReflectionUtil.findAnnotationInHierarchy(
MultiInterfaceImpl.class, "interfaceMethod", new Class<?>[] {}, Deprecated.class));

Assertions.assertNotNull(
ReflectionUtil.findAnnotationInHierarchy(TestClass.class, "m", new Class<?>[] {}, Deprecated.class));
}

// Enhanced test cases

@Test
Expand Down Expand Up @@ -458,12 +467,17 @@ public String getF2() {
public void setF2(String f2) {
this.f2 = f2;
}

@Deprecated
public void m() {}
}

interface TestInterface {}

// Enhanced test classes and interfaces
interface TestInterfaceEnhanced {

@Deprecated
void interfaceMethod();
}

Expand Down
15 changes: 13 additions & 2 deletions ...e/seata/integration/tx/api/interceptor/handler/GlobalTransactionalInterceptorHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.google.common.eventbus.Subscribe;
import org.apache.seata.common.exception.ShouldNeverHappenException;
import org.apache.seata.common.thread.NamedThreadFactory;
import org.apache.seata.common.util.ReflectionUtil;
import org.apache.seata.common.util.StringUtils;
import org.apache.seata.config.CachedConfigurationChangeListener;
import org.apache.seata.config.Configuration;
Expand Down Expand Up @@ -52,6 +53,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.LinkedHashSet;
import java.util.Set;
Expand Down Expand Up @@ -283,7 +285,7 @@ public TransactionInfo getTransactionInfo() {
}

public GlobalLockConfig getGlobalLockConfig(Method method, Class<?> targetClass) {
final GlobalLock globalLockAnno = getAnnotation(method, targetClass, GlobalLock.class);
final GlobalLock globalLockAnno = findAnnotation(method, targetClass, GlobalLock.class);
if (globalLockAnno != null) {
GlobalLockConfig config = new GlobalLockConfig();
config.setLockRetryInterval(globalLockAnno.lockRetryInterval());
Expand All @@ -296,7 +298,7 @@ public GlobalLockConfig getGlobalLockConfig(Method method, Class<?> targetClass)

public AspectTransactional getAspectTransactional(Method method, Class<?> targetClass) {
final GlobalTransactional globalTransactionalAnnotation =
getAnnotation(method, targetClass, GlobalTransactional.class);
findAnnotation(method, targetClass, GlobalTransactional.class);
return globalTransactionalAnnotation != null
? new AspectTransactional(
globalTransactionalAnnotation.timeoutMills(),
Expand All @@ -312,6 +314,15 @@ public AspectTransactional getAspectTransactional(Method method, Class<?> target
: null;
}

private <A extends Annotation> A findAnnotation(Method method, Class<?> targetClass, Class<A> annotationClass) {
A anno = getAnnotation(method, targetClass, annotationClass);
if (anno == null) {
anno = ReflectionUtil.findAnnotationInHierarchy(
targetClass, method.getName(), method.getParameterTypes(), annotationClass);
}
return anno;
}

private String formatMethod(Method method) {
StringBuilder sb = new StringBuilder(method.getName()).append("(");

Expand Down
3 changes: 2 additions & 1 deletion ...che/seata/integration/tx/api/interceptor/parser/GlobalTransactionalInterceptorParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ public class GlobalTransactionalInterceptorParser implements InterfaceParser {
@Override
public ProxyInvocationHandler parserInterfaceToProxy(Object target, String objectName) throws Exception {
Class<?> serviceInterface = DefaultTargetClassParser.get().findTargetClass(target);
Class<?>[] interfacesIfJdk = DefaultTargetClassParser.get().findInterfaces(target);
Set<Class<?>> interfaceClasses = ReflectionUtil.getInterfaces(serviceInterface);
Class<?>[] interfacesIfJdk = interfaceClasses.toArray(new Class<?>[0]);

if (existsAnnotation(serviceInterface) || existsAnnotation(interfacesIfJdk)) {
ProxyInvocationHandler proxyInvocationHandler = createProxyInvocationHandler();
Expand Down
Loading