|
5 | 5 | import java.lang.reflect.Parameter;
|
6 | 6 | import java.time.Duration;
|
7 | 7 | import java.util.Arrays;
|
8 |
| -import java.util.Comparator; |
9 | 8 | import java.util.HashMap;
|
10 | 9 | import java.util.LinkedHashMap;
|
11 | 10 | import java.util.List;
|
@@ -36,8 +35,30 @@ public BridgedObjectConstruct(BridgedObjectConstructor constructor, String tag,
|
36 | 35 | this.constructor = constructor;
|
37 | 36 | this.tag = tag;
|
38 | 37 | this.builders = builders;
|
39 |
| - builders.sort( |
40 |
| - Comparator.<BuilderMethod, Integer>comparing(b -> b.getParameters().length).reversed()); |
| 38 | + builders.sort((b1, b2) -> { |
| 39 | + int ret = compareMoreParametersFirst(b1, b2); |
| 40 | + return ret != 0 ? ret : compareFirstStringParameters(b1, b2); |
| 41 | + }); |
| 42 | + } |
| 43 | + |
| 44 | + private int compareMoreParametersFirst(BuilderMethod b1, BuilderMethod b2) { |
| 45 | + return b2.getParameters().length - b1.getParameters().length; |
| 46 | + } |
| 47 | + |
| 48 | + // prefer methods with string parameters (JMeter expressions) over specific types |
| 49 | + private int compareFirstStringParameters(BuilderMethod b1, BuilderMethod b2) { |
| 50 | + Parameter[] params1 = b1.getParameters(); |
| 51 | + Parameter[] params2 = b2.getParameters(); |
| 52 | + for (int i = 0; i < params1.length; i++) { |
| 53 | + if (params1[i].getType().equals(String.class) && !params2[i].getType() |
| 54 | + .equals(String.class)) { |
| 55 | + return -1; |
| 56 | + } else if (params2[i].getType().equals(String.class) && !params1[i].getType() |
| 57 | + .equals(String.class)) { |
| 58 | + return 1; |
| 59 | + } |
| 60 | + } |
| 61 | + return 0; |
41 | 62 | }
|
42 | 63 |
|
43 | 64 | private static Map<Class<?>, Function<String, Object>> solveParsers() {
|
|
0 commit comments