update tranistions 3

state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/VariableTracer.java

@@ -542,19 +542,40 @@ public class VariableTracer {
         return -1;
     }
 
+    private String resolveTargetMethodFqn(MethodInvocation mi, String currentMethodFqn) {
+        if (currentMethodFqn == null || !currentMethodFqn.contains(".")) return null;
+        String currentClass = currentMethodFqn.substring(0, currentMethodFqn.lastIndexOf('.'));
+        if (mi.getExpression() == null || mi.getExpression().toString().equals("this")) {
+            return currentClass + "." + mi.getName().getIdentifier();
+        }
+        if (mi.getExpression() instanceof SimpleName sn) {
+            String declaredType = getVariableDeclaredType(currentMethodFqn, sn.getIdentifier());
+            if (declaredType != null) {
+                return declaredType + "." + mi.getName().getIdentifier();
+            }
+        } else if (mi.getExpression() instanceof FieldAccess fa) {
+            String declaredType = getVariableDeclaredType(currentMethodFqn, fa.getName().getIdentifier());
+            if (declaredType != null) {
+                return declaredType + "." + mi.getName().getIdentifier();
+            }
+        }
+        return null;
+    }
+
     private Expression unwrapMethodInvocation(MethodInvocation mi, int depth, String methodFqn) {
         if (depth > 5) return mi;
-        if (mi.getExpression() != null) {
-            String exprStr = mi.getExpression().toString();
-            if (!exprStr.equals("Optional") && !exprStr.equals("Stream") && !exprStr.equals("List") && !exprStr.equals("Set") && !exprStr.equals("Arrays") && !exprStr.equals("Objects") && !exprStr.equals("Mono") && !exprStr.equals("Flux")) {
-                return mi;
-            }
-        } else {
-            if (methodFqn != null && methodFqn.contains(".")) {
-                String className = methodFqn.substring(0, methodFqn.lastIndexOf('.'));
-                TypeDeclaration td = context.getTypeDeclaration(className);
+        
+        String targetMethodFqn = resolveTargetMethodFqn(mi, methodFqn);
+        if (targetMethodFqn != null && targetMethodFqn.contains(".")) {
+            String className = targetMethodFqn.substring(0, targetMethodFqn.lastIndexOf('.'));
+            String methodName = targetMethodFqn.substring(targetMethodFqn.lastIndexOf('.') + 1);
+            
+            TypeDeclaration currentTd = methodFqn != null && methodFqn.contains(".") ? context.getTypeDeclaration(methodFqn.substring(0, methodFqn.lastIndexOf('.'))) : null;
+            CompilationUnit cu = currentTd != null && currentTd.getRoot() instanceof CompilationUnit ? (CompilationUnit) currentTd.getRoot() : null;
+            
+            TypeDeclaration td = context.getTypeDeclaration(className, cu);
             if (td != null) {
-                    MethodDeclaration localMd = context.findMethodDeclaration(td, mi.getName().getIdentifier(), true);
+                MethodDeclaration localMd = context.findMethodDeclaration(td, methodName, true);
                 if (localMd != null) {
                     int paramIdx = getReturnedParameterIndex(localMd);
                     if (paramIdx >= 0 && paramIdx < mi.arguments().size()) {
@@ -567,8 +588,13 @@ public class VariableTracer {
                 }
             }
         }
+
+        if (mi.getExpression() != null) {
+            String exprStr = mi.getExpression().toString();
+            if (!exprStr.equals("Optional") && !exprStr.equals("Stream") && !exprStr.equals("List") && !exprStr.equals("Set") && !exprStr.equals("Arrays") && !exprStr.equals("Objects") && !exprStr.equals("Mono") && !exprStr.equals("Flux")) {
                 return mi;
             }
+        }
         
         if (!mi.arguments().isEmpty()) {
             String mName = mi.getName().getIdentifier();
@@ -582,7 +608,7 @@ public class VariableTracer {
                 lowerName.startsWith("derive") || lowerName.startsWith("determine") ||
                 lowerName.startsWith("calculate") || lowerName.startsWith("decode") ||
                 lowerName.startsWith("extract") || lowerName.startsWith("get") ||
-                lowerName.startsWith("find")) {
+                lowerName.startsWith("find") || lowerName.startsWith("validate")) {
                 return mi;
             }