Refactor Soot method/signature processing

Author: oshando

swan-pipeline/src/main/java/de/fraunhofer/iem/swan/data/Method.java

@@ -75,7 +75,7 @@ public Method(Method methodAndClass) {
     }
 
     public Method deriveWithNewClass(String className) {
-        Method m = new Method(this.getName(), this.getParameters(), this.getReturnType(), className);
+        Method m = new Method(className + "." + this.getName(), this.getParameters(), this.getReturnType());
         m.setFramework(this.framework);
         m.setLink(this.link);
         m.setComment(this.comment);
@@ -189,8 +189,8 @@ public String getName() {
     @JsonIgnore
     public String getClassName() {
 
-        if(name.contains("."))
-        return name.substring(0, name.lastIndexOf("."));
+        if (name.contains("."))
+            return name.substring(0, name.lastIndexOf("."));
         else
             return name;
     }
@@ -208,8 +208,7 @@ public String getSubSignature() {
         if (subSignature != null)
             return subSignature;
 
-        StringBuilder sb = new StringBuilder(
-                10 + this.returnType.length() + this.name.length() + (this.parameters.size() * 30));
+        StringBuilder sb = new StringBuilder();
         if (!this.returnType.isEmpty()) {
             sb.append(this.returnType);
             sb.append(" ");
@@ -240,8 +239,7 @@ public String getSignature() {
         if (signature != null)
             return signature;
 
-        StringBuilder sb = new StringBuilder(10 + getClassName().length() + this.returnType.length()
-                + this.name.length() + (this.parameters.size() * 30));
+        StringBuilder sb = new StringBuilder();
         sb.append("<");
         sb.append(getClassName());
         sb.append(": ");

swan-pipeline/src/main/java/de/fraunhofer/iem/swan/util/SootUtils.java

@@ -5,10 +5,10 @@
 
 public class SootUtils {
 
-    public static Method convertSootSignature(String sootSignature){
+    public static Method convertSootSignature(String sootSignature) {
 
         //Ignore < and > at the beginning and end of the signature
-        String[] parts = sootSignature.substring(1, sootSignature.length()-1).split(":");
+        String[] parts = sootSignature.substring(1, sootSignature.length() - 1).split(":");
 
         String className = parts[0];
         String[] method = parts[1].trim().split(" ");
@@ -20,7 +20,9 @@ public static Method convertSootSignature(String sootSignature){
         if (methodName.contains("<init>"))
             methodName = getSimpleName(className);
 
-        return new Method(methodName, Arrays.asList(paramList), returnType, className);
+        methodName = className + "." + methodName;
+
+        return new Method(methodName, Arrays.asList(paramList), returnType);
     }
 
     /**