Implement fetching of inner classes in partial uri parser (#260)

Author: MrLightful

core/src/main/java/eu/fasten/core/utils/FastenUriUtils.java

@@ -1,8 +1,14 @@
 package eu.fasten.core.utils;
 
+import eu.fasten.core.dbconnectors.PostgresConnector;
+import eu.fasten.core.maven.GraphMavenResolver;
+import eu.fasten.core.maven.data.Revision;
+
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -86,28 +92,29 @@ public static List<String> parsePartialFastenUri(String partialFastenUri) {
             throw new IllegalArgumentException(partialUriFormatException);
 
         // Class: `/{class}.*(`
-        Pattern classPattern = Pattern.compile("(?<=/)([^\\/]+)(?=\\.([^./]+)\\()");
+        Pattern classPattern = Pattern.compile("(?<=/)([^,;./]+?)(?=(\\$|\\.)([^./]+)\\()");
         Matcher classMatcher = classPattern.matcher(partialFastenUri);
         if (!classMatcher.find() || classMatcher.group(0).isEmpty())
             throw new IllegalArgumentException(partialUriFormatException);
 
 
         // Method: `.{method}(`
-        Pattern methodNamePattern = Pattern.compile("(?<=\\.)([^.]+)(?=\\()");
+        Pattern methodNamePattern = Pattern.compile("(?<=\\.(\\$?))([^,;./$]+?)(?=\\()");
         Matcher methodNameMatcher = methodNamePattern.matcher(partialFastenUri);
         if (!methodNameMatcher.find() || methodNameMatcher.group(0).isEmpty())
             throw new IllegalArgumentException(partialUriFormatException);
 
 
         // Method Args: `({args})`
-        Pattern methodArgsPattern = Pattern.compile("(?<=\\()(.*)(?=\\))");
+        Pattern methodArgsPattern = Pattern.compile("(?<=" + methodNameMatcher.group(0) + "\\()(.*?)(?=\\))");
         Matcher methodArgsMatcher = methodArgsPattern.matcher(partialFastenUri);
         if (!methodArgsMatcher.find())
             throw new IllegalArgumentException(partialUriFormatException);
 
 
         // Method Return Type: `)/{type}`
-        Pattern methodReturnPattern = Pattern.compile("(?<=\\))(.*)");
+        Pattern methodReturnPattern = Pattern.compile(
+                "(?<=" + methodNameMatcher.group(0) + "\\(" + methodArgsMatcher.group(0) + "\\))(.*)");
         Matcher methodReturnMatcher = methodReturnPattern.matcher(partialFastenUri);
         if (!methodReturnMatcher.find() || methodReturnMatcher.group(0).isEmpty())
             throw new IllegalArgumentException(partialUriFormatException);
@@ -121,4 +128,9 @@ public static List<String> parsePartialFastenUri(String partialFastenUri) {
 
         return List.of(namespace, className, methodName, methodArgs, methodReturnType);
     }
+
+    public static void main(String[] args) {
+        var partial = "/nl.tudelft.jpacman.ui/PacManUiBuilder$addStopButton%28Lnl$tudelft$jpacman$game$Game%3A%29V%3A30$Lambda.$newInstance(%2Fnl.tudelft.jpacman.game%2FGame)PacManUiBuilder$addStopButton%28Lnl$tudelft$jpacman$game$Game%3A%29V%3A30$Lambda";
+        System.out.println(parsePartialFastenUri(partial));
+    }
 }

core/src/test/java/eu/fasten/core/utils/FastenUriUtilsTest.java

@@ -186,4 +186,22 @@ void testParsePartialFastenUriFailedMissingNamespace() {
         assertEquals(partialUriFormatException, actualMessage);
     }
 
+    @Test
+    void testInnerClassesSuccess() {
+        var partialUri = "/nl.tudelft.jpacman.ui/PacManUiBuilder$addStopButton(Lnl$tudelft$jpacman$game$Game:)V:30$Lambda.$newInstance(/nl.tudelft.jpacman.game/Game)PacManUiBuilder$addStopButton(Lnl$tudelft$jpacman$game$Game:)V:30$Lambda";
+        var expectedNamespace = "nl.tudelft.jpacman.ui";
+        var expectedClass = "PacManUiBuilder";
+        var expectedMethod = "newInstance";
+        var expectedArgs = "/nl.tudelft.jpacman.game/Game";
+        var expectedReturnType = "PacManUiBuilder$addStopButton(Lnl$tudelft$jpacman$game$Game:)V:30$Lambda";
+
+        var actual = FastenUriUtils.parsePartialFastenUri(partialUri);
+
+        assertEquals(expectedNamespace, actual.get(0));
+        assertEquals(expectedClass, actual.get(1));
+        assertEquals(expectedMethod, actual.get(2));
+        assertEquals(expectedArgs, actual.get(3));
+        assertEquals(expectedReturnType, actual.get(4));
+    }
+
 }