From b6cc1114fefcfa5a28a4ded8fd40c35aced69d41 Mon Sep 17 00:00:00 2001
From: Roger Abelenda <roger.abelenda@abstracta.com.uy>
Date: Fri, 3 May 2024 13:58:10 -0300
Subject: [PATCH] Prefer methods with string parameters over specific type ones
 in bridge to simplify bridging with other languages

Only accepting string is enough in most of the cases.
---
 .../constructs/BridgedObjectConstruct.java    | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/jmeter-java-dsl-bridge/src/main/java/us/abstracta/jmeter/javadsl/bridge/serialization/constructs/BridgedObjectConstruct.java b/jmeter-java-dsl-bridge/src/main/java/us/abstracta/jmeter/javadsl/bridge/serialization/constructs/BridgedObjectConstruct.java
index cab22873..dd5debd0 100644
--- a/jmeter-java-dsl-bridge/src/main/java/us/abstracta/jmeter/javadsl/bridge/serialization/constructs/BridgedObjectConstruct.java
+++ b/jmeter-java-dsl-bridge/src/main/java/us/abstracta/jmeter/javadsl/bridge/serialization/constructs/BridgedObjectConstruct.java
@@ -5,7 +5,6 @@
 import java.lang.reflect.Parameter;
 import java.time.Duration;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -36,8 +35,30 @@ public BridgedObjectConstruct(BridgedObjectConstructor constructor, String tag,
     this.constructor = constructor;
     this.tag = tag;
     this.builders = builders;
-    builders.sort(
-        Comparator.<BuilderMethod, Integer>comparing(b -> b.getParameters().length).reversed());
+    builders.sort((b1, b2) -> {
+      int ret = compareMoreParametersFirst(b1, b2);
+      return ret != 0 ? ret : compareFirstStringParameters(b1, b2);
+    });
+  }
+
+  private int compareMoreParametersFirst(BuilderMethod b1, BuilderMethod b2) {
+    return b2.getParameters().length - b1.getParameters().length;
+  }
+
+  // prefer methods with string parameters (JMeter expressions) over specific types
+  private int compareFirstStringParameters(BuilderMethod b1, BuilderMethod b2) {
+    Parameter[] params1 = b1.getParameters();
+    Parameter[] params2 = b2.getParameters();
+    for (int i = 0; i < params1.length; i++) {
+      if (params1[i].getType().equals(String.class) && !params2[i].getType()
+          .equals(String.class)) {
+        return -1;
+      } else if (params2[i].getType().equals(String.class) && !params1[i].getType()
+          .equals(String.class)) {
+        return 1;
+      }
+    }
+    return 0;
   }
 
   private static Map<Class<?>, Function<String, Object>> solveParsers() {