Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-13 10:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #455 from Yilinwang/fix-flaky

Browse Source 
sort getMethods for deterministic iteration order
This commit is contained in:
Lukasz Lenart
2020-12-07 13:09:53 +01:00
committed by GitHub
parent 8346becce3 fb49bc4705
commit af73a1e874
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java
+7 -2
View File
@@ -35,6 +35,7 @@ import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
import java.util.zip.GZIPOutputStream;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -410,7 +411,9 @@ public class JSONUtil {
public static Method[] listSMDMethods(Class clazz, boolean ignoreInterfaces) {
final List<Method> methods = new LinkedList<>();
if (ignoreInterfaces) {
for (Method method : clazz.getMethods()) {
Method[] classMethods = clazz.getMethods();
Arrays.sort(classMethods, (a, b) -> a.toString().compareTo(b.toString()));
for (Method method : classMethods) {
SMDMethod smdMethodAnnotation = method.getAnnotation(SMDMethod.class);
if (smdMethodAnnotation != null) {
methods.add(method);
@@ -421,7 +424,9 @@ public class JSONUtil {
// order encountered
JSONUtil.visitInterfaces(clazz, new JSONUtil.ClassVisitor() {
public boolean visit(Class aClass) {
for (Method method : aClass.getMethods()) {
Method[] classMethods = aClass.getMethods();
Arrays.sort(classMethods, (a, b) -> a.toString().compareTo(b.toString()));
for (Method method : classMethods) {
SMDMethod smdMethodAnnotation = method.getAnnotation(SMDMethod.class);
if ((smdMethodAnnotation != null) && !methods.contains(method)) {
methods.add(method);