Add configuration for output filename

Author: oshando

swan_assist/src/main/resources/config.properties

@@ -1,6 +1,6 @@
 log_suffix = _swanassist_log.txt
 output_dir_name = swan-assist
-output_json_suffix = output.json
+output_json_suffix = swan_results.json
 input_json_suffix = config_input.json
 train_config_file = trainingmethods.json
 swan_default_param_value = internal

swan_assist/src/main/resources/swan_core_config.properties

@@ -1 +1,2 @@
-output_train_arff_data = false
+output_train_arff_data = false
+output_file_name = swan_results

swan_core/pom.xml

@@ -6,7 +6,7 @@
 	<groupId>de.upb.cs.swt</groupId>
 	<artifactId>swan_core</artifactId>
 	<packaging>jar</packaging>
-	<version>1.3.0</version>
+	<version>1.4.0</version>
 
 	<name>SWAN Weakness Detector</name>
 	<description>SWAN is a machine-learning approach for detection of methods of interest for security in Java libraries.</description>

swan_core/src/main/java/de/fraunhofer/iem/swan/Learner.java

@@ -16,6 +16,7 @@
 
 import de.fraunhofer.iem.swan.data.Category;
 import de.fraunhofer.iem.swan.data.Method;
+import de.fraunhofer.iem.swan.util.SwanConfig;
 import weka.classifiers.Evaluation;
 import weka.classifiers.bayes.BayesNet;
 import weka.classifiers.bayes.NaiveBayes;
@@ -214,22 +215,8 @@ else if (WEKA_LEARNER_ALL.equals("Logistic"))
                 throw new Exception("Wrong WEKA learner!");
             // System.out.println("Classifier created: " + WEKA_LEARNER_ALL);
 
-            Properties config = new Properties();
-            InputStream input = getClass().getClassLoader().getResourceAsStream("swan_core_config.properties");;
-
-            try {
-                config.load(input);
-            } catch (IOException e) {
-                e.printStackTrace();
-            } finally {
-                if (input != null) {
-                    try {
-                        input.close();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
+            SwanConfig swanConfig = new SwanConfig();
+            Properties config = swanConfig.getConfig();
 
             if (Boolean.parseBoolean(config.getProperty("output_train_arff_data"))) {
                 // Save arff data.
@@ -242,7 +229,6 @@ else if (WEKA_LEARNER_ALL.equals("Logistic"))
                 fileName = fileName.replace(", ", "_");
                 saver.setFile(new File("Train_" + fileName + ".arff"));
                 saver.writeBatch();
-
             }
 
             //System.out.println( "Arff data saved at: " + saver.retrieveFile().getCanonicalPath());

swan_core/src/main/java/de/fraunhofer/iem/swan/Main.java

@@ -1,13 +1,11 @@
 package de.fraunhofer.iem.swan;
 
+import de.fraunhofer.iem.swan.data.Category;
+import de.fraunhofer.iem.swan.util.SwanConfig;
+
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import de.fraunhofer.iem.swan.data.Category;
+import java.util.*;
 
 /**
  * Runner for SWAN
@@ -215,18 +213,21 @@ private void internalRun(String sourceDir, String trainSourceCode, String trainJ
             }
             // System.out.println("***** F Measure is " + averageF/iter);
 
+            SwanConfig swanConfig = new SwanConfig();
+            Properties config = swanConfig.getConfig();
+            String fileName = config.getProperty("output_file_name");
+
             // System.out.println("***** Writing final results");
 //			Set<String> tmpFiles = Util.getFiles(outputDir);
             writer.printResultsTXT(loader.methods(),
-                    outputDir + File.separator + "txt" + File.separator + "output.txt");
+                    outputDir + File.separator + "txt" + File.separator + fileName + ".txt");
             writer.writeResultsQWEL(loader.methods(),
-                    outputDir + File.separator + "qwel" + File.separator + "output.qwel");
+                    outputDir + File.separator + "qwel" + File.separator + fileName + ".qwel");
             writer.writeResultsSoot(loader.methods(),
-                    outputDir + File.separator + "soot-qwel" + File.separator + "output.sqwel");
-            writer.printResultsJSON(loader.methods(), outputDir + File.separator + "output.json");
-            writer.writeResultsQwelXML(loader.methods(), outputDir + File.separator + "xml" + File.separator + "output.xml");
+                    outputDir + File.separator + "soot-qwel" + File.separator + fileName + ".sqwel");
+            writer.printResultsJSON(loader.methods(), outputDir + File.separator + fileName + ".json");
+            writer.writeResultsQwelXML(loader.methods(), outputDir + File.separator + fileName + ".xml");
         }
-
     }
 
     private double runClassifier(HashSet<Category> categories, boolean cweMode)

swan_core/src/main/java/de/fraunhofer/iem/swan/util/SwanConfig.java

@@ -0,0 +1,39 @@
+package de.fraunhofer.iem.swan.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+/**
+ * @author Oshando Johnson on 2019-10-11
+ */
+public class SwanConfig {
+
+    private Properties config;
+
+
+    public SwanConfig(){
+
+        config = new Properties();
+        InputStream input = getClass().getClassLoader().getResourceAsStream("swan_core_config.properties");
+
+
+        try {
+            config.load(input);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (input != null) {
+                try {
+                    input.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public Properties getConfig() {
+        return config;
+    }
+}

swan_core/src/main/resources/swan_core_config.properties

@@ -1 +1,2 @@
-output_train_arff_data = false
+output_train_arff_data = false
+output_file_name = swan_results