Make findMethodByUniqueName return value optional

Sinytra · Jul 24, 2024 · e61a58e · e61a58e
1 parent 17cfd0b
commit e61a58e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/definition/src/main/java/org/sinytra/adapter/patch/analysis/MethodCallAnalyzer.java b/definition/src/main/java/org/sinytra/adapter/patch/analysis/MethodCallAnalyzer.java
@@ -42,12 +42,12 @@ public static List<String> findLambdasInMethod(ClassNode cls, MethodNode method,
         return list;
     }
 
-    public static MethodNode findMethodByUniqueName(ClassNode cls, String name) {
+    public static Optional<MethodNode> findMethodByUniqueName(ClassNode cls, String name) {
         List<MethodNode> methods = cls.methods.stream().filter(m -> m.name.equals(name)).toList();
         if (methods.size() != 1) {
-            throw new IllegalStateException("Multiple candidates found for method " + name + " in class " + cls.name);
+            return Optional.empty();
         }
-        return methods.getFirst();
+        return Optional.of(methods.getFirst());
     }
 
     public static Multimap<String, MethodInsnNode> getMethodCalls(MethodNode node, List<String> callOrder) {

diff --git a/...on/src/main/java/org/sinytra/adapter/patch/transformer/dynfix/DynFixMethodComparison.java b/...on/src/main/java/org/sinytra/adapter/patch/transformer/dynfix/DynFixMethodComparison.java
@@ -205,8 +205,8 @@ private static Patch.Result handleTargetModification(List<List<AbstractInsnNode>
         for (List<AbstractInsnNode> insns : hunkLabels) {
             for (AbstractInsnNode insn : insns) {
                 if (insn instanceof MethodInsnNode minsn && minsn.owner.equals(dirtyTarget.name)) {
-                    MethodNode method = MethodCallAnalyzer.findMethodByUniqueName(dirtyTarget, minsn.name);
-                    if (!methodContext.findInjectionTargetInsns(new MethodContext.TargetPair(dirtyTarget, method)).isEmpty()) {
+                    MethodNode method = MethodCallAnalyzer.findMethodByUniqueName(dirtyTarget, minsn.name).orElse(null);
+                    if (method != null && !methodContext.findInjectionTargetInsns(new MethodContext.TargetPair(dirtyTarget, method)).isEmpty()) {
                         return BundledMethodTransform.builder().modifyTarget(minsn.name + minsn.desc).apply(methodContext);
                     }
                 }

diff --git a/definition/src/main/java/org/sinytra/adapter/patch/transformer/dynfix/DynFixSplitMethod.java b/definition/src/main/java/org/sinytra/adapter/patch/transformer/dynfix/DynFixSplitMethod.java
@@ -69,7 +69,7 @@ public Patch.Result apply(ClassNode classNode, MethodNode methodNode, MethodCont
         if (candidates.isEmpty()) {
             List<MethodNode> nestedLambdas = invocations.stream()
                 .flatMap(m -> MethodCallAnalyzer.findLambdasInMethod(dirtyTargetClass, m, null).stream())
-                .map(s -> MethodCallAnalyzer.findMethodByUniqueName(dirtyTargetClass, s))
+                .flatMap(s -> MethodCallAnalyzer.findMethodByUniqueName(dirtyTargetClass, s).stream())
                 .toList();
             candidates = findInsnsCalls(nestedLambdas, methodContext);
         }