Merge pull request #59 from rohithsh/wip-swan-assist-java-and-gradle-upgrade

oshando · web-flow · commit c6b1348b42f9 · 2022-09-09T11:53:41.000+02:00
Bump SWAN from 1.3.0 to 3.2.0
diff --git a/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/RunSwanAnalysisAction.java b/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/RunSwanAnalysisAction.java
@@ -74,10 +74,10 @@ public void actionPerformed(AnActionEvent anActionEvent) {
 
             if(!swanParameters.get(Constants.CONFIGURATION_FILE).contentEquals(config.getProperty("swan_default_param_value"))){
                 String outputPath = swanParameters.get(Constants.OUTPUT_DIRECTORY) + File.separator + config.getProperty("input_json_suffix");
-                TrainingFileManager trainingFileManager = new TrainingFileManager(project);
+                //TrainingFileManager trainingFileManager = new TrainingFileManager(project);
 
-                if (trainingFileManager.mergeExport(JSONFileLoader.getAllMethods(), outputPath))
-                    swanParameters.put(Constants.CONFIGURATION_FILE, outputPath);
+                //if (trainingFileManager.mergeExport(JSONFileLoader.getAllMethods(), outputPath))
+                  //  swanParameters.put(Constants.CONFIGURATION_FILE, outputPath);
             }
 
             RunSwanAnalysisImpl processBuilder = new RunSwanAnalysisImpl(project, dialog.getParameters());
diff --git a/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/RunSwanAnalysisImpl.java b/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/RunSwanAnalysisImpl.java
@@ -13,18 +13,23 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.util.messages.MessageBus;
 import de.fraunhofer.iem.swan.Main;
+import de.fraunhofer.iem.swan.SwanPipeline;
 import de.fraunhofer.iem.swan.assist.comm.SwanNotifier;
 import de.fraunhofer.iem.swan.assist.data.JSONFileParser;
 import de.fraunhofer.iem.swan.assist.data.MethodWrapper;
 import de.fraunhofer.iem.swan.assist.util.Constants;
+import de.fraunhofer.iem.swan.cli.SwanOptions;
 import org.apache.commons.io.FileUtils;
+import org.jaxen.util.SingletonList;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.ResourceBundle;
 
 /**
@@ -78,10 +83,25 @@ public void run(@NotNull ProgressIndicator indicator) {
 
                 long start = System.currentTimeMillis();
 
-                Main.main(new String[]{parameters.get(Constants.SOURCE_DIRECTORY),
-                        parameters.get(Constants.TRAIN_DIRECTORY),
-                        parameters.get(Constants.CONFIGURATION_FILE),
-                        parameters.get(Constants.OUTPUT_DIRECTORY)});
+                SwanOptions options = new SwanOptions("", "", "",
+                        "/Users/rohith/Desktop/Work",
+                        new SingletonList("code"), "meka", new SingletonList("all"), new SingletonList("all"), false
+                        , true, 10, 0.7, "validate");
+
+                SwanPipeline swan = new SwanPipeline(options);
+                try {
+                    swan.run();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+
+
+//                Main.main(new String[]{parameters.get(Constants.SOURCE_DIRECTORY),
+//                        parameters.get(Constants.TRAIN_DIRECTORY),
+//                        parameters.get(Constants.CONFIGURATION_FILE),
+//                        });
 
                  duration = System.currentTimeMillis() - start;
             }
diff --git a/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/suggest/SuggestThread.java b/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/suggest/SuggestThread.java
@@ -10,9 +10,11 @@
 
 import com.intellij.openapi.project.Project;
 import com.intellij.util.messages.MessageBus;
-import de.fraunhofer.iem.swan.FeatureHandler;
-import de.fraunhofer.iem.swan.IFeature;
-import de.fraunhofer.iem.swan.Parser;
+import de.fraunhofer.iem.swan.features.code.CodeFeatureHandler;
+import de.fraunhofer.iem.swan.features.FeatureSet;
+import de.fraunhofer.iem.swan.features.code.type.IFeature;
+import de.fraunhofer.iem.swan.io.dataset.SrmList;
+import de.fraunhofer.iem.swan.io.dataset.SrmListUtils;
 import de.fraunhofer.iem.swan.assist.comm.SuggestNotifier;
 import de.fraunhofer.iem.swan.assist.data.MethodWrapper;
 import de.fraunhofer.iem.swan.assist.data.TrainingFileManager;
@@ -45,13 +47,17 @@ public void run() {
 
         Map<Method, Set<IFeature>> matrix = new HashMap<Method, Set<IFeature>>();
         Set<Method> methods = new HashSet<Method>();
+        try {
+            SrmList srmList = SrmListUtils.importFile(configFilePath);
+            methods = srmList.getMethods();
+        } catch (Exception e){
+            e.printStackTrace();
+        }
 
-        Parser parser = new Parser(configFilePath);
-        parser.parse(configFilePath);
-        methods = parser.methods();
-
-        FeatureHandler featureHandler = new FeatureHandler(projectPath);
-        featureHandler.initializeFeatures(0);
+        CodeFeatureHandler featureHandler = new CodeFeatureHandler();
+        featureHandler.initializeFeatures();
+        /*FeatureHandler featureHandler = new FeatureHandler(projectPath);
+        featureHandler.initializeFeatures(0);*/
 
         Set<IFeature> features = featureHandler.features().get(Category.NONE);
 
diff --git a/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/suggest/Suggester.java b/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/suggest/Suggester.java
@@ -12,10 +12,10 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import de.fraunhofer.iem.swan.IFeature;
+import de.fraunhofer.iem.swan.features.code.type.IFeature;
 import de.fraunhofer.iem.swan.assist.data.MethodWrapper;
 import de.fraunhofer.iem.swan.data.Method;
-import de.fraunhofer.iem.swan.features.WeightedFeature;
+import de.fraunhofer.iem.swan.features.code.type.WeightedFeature;
 
 
 public class Suggester {
diff --git a/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/data/JSONFileParser.java b/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/data/JSONFileParser.java
@@ -10,7 +10,8 @@
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationType;
 import com.intellij.notification.Notifications;
-import de.fraunhofer.iem.swan.Parser;
+import de.fraunhofer.iem.swan.io.dataset.SrmList;
+import de.fraunhofer.iem.swan.io.dataset.SrmListUtils;
 import de.fraunhofer.iem.swan.assist.util.Constants;
 import de.fraunhofer.iem.swan.data.Method;
 
@@ -62,11 +63,16 @@ public void setCongFilePath(String congFilePath) {
      * @return HashMap of methods
      */
     public HashMap<String, MethodWrapper> parseJSONFileMap() {
-
-        Parser parser = new Parser(congFilePath);
+        try {
+            SrmList srmList = SrmListUtils.importFile(congFilePath);
+            return parseMethods(srmList.getMethods());
+        } catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
+        /*Parser parser = new Parser(congFilePath);
         parser.parse(congFilePath);
-
-       return parseMethods(parser.methods());
+        return parseMethods(parser.methods());*/
     }
 
     /**
@@ -75,9 +81,7 @@ public HashMap<String, MethodWrapper> parseJSONFileMap() {
      */
     public HashMap<String, MethodWrapper> parseJSONFileStream(InputStreamReader streamReader) {
 
-        Parser parser = new Parser();
-        parser.parseStream(streamReader);
-        return parseMethods(parser.methods());
+        return null;
     }
 
     private HashMap<String, MethodWrapper> parseMethods(Set<Method> methodsSet){
diff --git a/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/data/JSONWriter.java b/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/data/JSONWriter.java
@@ -7,7 +7,8 @@
 
 package de.fraunhofer.iem.swan.assist.data;
 
-import de.fraunhofer.iem.swan.Writer;
+import de.fraunhofer.iem.swan.io.dataset.SrmList;
+import de.fraunhofer.iem.swan.io.dataset.SrmListUtils;
 import de.fraunhofer.iem.swan.data.Method;
 
 import java.io.IOException;
@@ -34,7 +35,8 @@ public void writeToJsonFile(ArrayList<MethodWrapper> methods, String outputPath)
             methodSet.add(method.getMethod());
         }
 
-        Writer writer = new Writer();
-        writer.outputJSONFile(methodSet, outputPath);
+        SrmListUtils.exportFile(new SrmList(methodSet), outputPath);
+//        Writer writer = new Writer();
+//        writer.outputJSONFile(methodSet, outputPath);
     }
 }
diff --git a/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/data/MethodWrapper.java b/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/data/MethodWrapper.java
@@ -66,7 +66,7 @@ public MethodWrapper(Method method) {
     public MethodWrapper(String methodName, List<String> parameters, String returnType,
                          String className) {
 
-        this.method = new Method(methodName, parameters, returnType, className);
+        this.method = new Method(methodName, parameters, returnType);
         status = MethodStatus.NONE;
 
     }
@@ -101,9 +101,9 @@ private String trimProperty(String property) {
     public String getMethodName(boolean fullyQualifiedName) {
 
         if (!fullyQualifiedName)
-            return trimProperty(method.getClassName() + "." + method.getMethodName());
+            return trimProperty(method.getClassName() + "." + method.getName());
         else
-            return method.getClassName() + "." + method.getMethodName();
+            return method.getClassName() + "." + method.getName();
     }
 
     /**
@@ -179,7 +179,7 @@ public ArrayList<String> getCWEList() {
 
         ArrayList<String> cweList = new ArrayList<String>();
 
-        for (Category category : method.getCategoriesTrained()) {
+        for (Category category : method.getAllCategories()) {
             if (category.isCwe()) {
                 cweList.add(category.toString());
             }
@@ -197,7 +197,7 @@ public ArrayList<String> getTypesList(boolean capitalize) {
 
         ArrayList<String> typesList = new ArrayList<String>();
 
-        for (Category category : method.getCategoriesTrained()) {
+        for (Category category : method.getAllCategories()) {
             if (!category.isCwe() && !capitalize) {
                 typesList.add(category.toString());
             } else if (!category.isCwe())
@@ -212,7 +212,7 @@ public ArrayList<String> getTypesList(boolean capitalize) {
      * @return Set of Method categories
      */
     public Set<Category> getCategories() {
-        return method.getCategoriesTrained();
+        return method.getAllCategories();
     }
 
     /**
@@ -221,7 +221,18 @@ public Set<Category> getCategories() {
      */
     public void setCategories(Set<Category> categories) {
 
-       method.setCategoriesTrained(categories);
+        Set<Category> cweCategories = null;
+        Set<Category> srmCategories = null;
+        for(Category category: categories) {
+            if (category.isCwe()) {
+                cweCategories.add(category);
+            } else if (category.isNone()) {
+            } else {
+                srmCategories.add(category);
+            }
+        }
+        method.setSrm(srmCategories);
+        method.setCwe(cweCategories);
     }
 
     /**
diff --git a/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/dialog/MethodPropertiesDialog.java b/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/dialog/MethodPropertiesDialog.java
@@ -43,7 +43,7 @@ public MethodPropertiesDialog(Project project, MethodWrapper method) {
         Object[][] values = {{resourceBundle.getString("Properties.Return"), method.getReturnType(true)},
                 {resourceBundle.getString("Properties.Method"), method.getMethodName(true)},
                 {resourceBundle.getString("Properties.Parameters"), StringUtils.join(method.getParameters(true), ", ") },
-                {resourceBundle.getString("Properties.Security"), method.getMethod().getSecLevel()},
+                //{resourceBundle.getString("Properties.Security"), method.getMethod().getSecLevel()},
                 {resourceBundle.getString("Properties.Discovery"), method.getMethod().getDiscovery()},
                 {resourceBundle.getString("Properties.Framework"), method.getMethod().getFramework()},
                 {resourceBundle.getString("Properties.CWE"), StringUtils.join(method.getCWEList(), ", ")},
diff --git a/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/markers/ErrorLineMarker.java b/swan-assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/markers/ErrorLineMarker.java
@@ -70,7 +70,7 @@ public void navigate(MouseEvent mouseEvent, PsiElement psiElement) {
     }
 
     @Override
-    public void collectSlowLineMarkers(@NotNull List<PsiElement> list, @NotNull Collection<LineMarkerInfo> collection) {
+    public void collectSlowLineMarkers(@NotNull List<? extends PsiElement> list, @NotNull Collection<? super LineMarkerInfo<?>> collection) {
 
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@`
`7`	`7`
`8`	`8`	`package de.fraunhofer.iem.swan.assist.data;`
`9`	`9`
`10`		`-import de.fraunhofer.iem.swan.Writer;`
	`10`	`+import de.fraunhofer.iem.swan.io.dataset.SrmList;`
	`11`	`+import de.fraunhofer.iem.swan.io.dataset.SrmListUtils;`
`11`	`12`	`import de.fraunhofer.iem.swan.data.Method;`
`12`	`13`
`13`	`14`	`import java.io.IOException;`
`@@ -34,7 +35,8 @@ public void writeToJsonFile(ArrayList<MethodWrapper> methods, String outputPath)`
`34`	`35`	`methodSet.add(method.getMethod());`
`35`	`36`	`}`
`36`	`37`
`37`		`- Writer writer = new Writer();`
`38`		`- writer.outputJSONFile(methodSet, outputPath);`
	`38`	`+ SrmListUtils.exportFile(new SrmList(methodSet), outputPath);`
	`39`	`+// Writer writer = new Writer();`
	`40`	`+// writer.outputJSONFile(methodSet, outputPath);`
`39`	`41`	`}`
`40`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public void navigate(MouseEvent mouseEvent, PsiElement psiElement) {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`@Override`
`73`		`- public void collectSlowLineMarkers(@NotNull List<PsiElement> list, @NotNull Collection<LineMarkerInfo> collection) {`
	`73`	`+ public void collectSlowLineMarkers(@NotNull List<? extends PsiElement> list, @NotNull Collection<? super LineMarkerInfo<?>> collection) {`
`74`	`74`
`75`	`75`	`}`
`76`	`76`	`}`