Revize 1e41f6ff

Refactor loading query from file

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/detecting/detectors/AntiPatternDetector.java

@@ -4 +4 @@
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.AntiPattern;
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.Project;
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.QueryResultItem;
+import cz.zcu.fav.kiv.antipatterndetectionapp.utils.Utils;
 
-public interface AntiPatternDetector {
+import java.util.List;
 
-    AntiPattern getAntiPatternModel();
+public abstract class AntiPatternDetector {
 
-    QueryResultItem analyze(Project project, DatabaseConnection databaseConnection);
+    public abstract AntiPattern getAntiPatternModel();
+
+    public abstract String getAntiPatternSqlFileName();
+
+    public QueryResultItem analyze(Project project, DatabaseConnection databaseConnection) {
+        return this.analyze(project, databaseConnection, Utils.loadQueryFromFile(getAntiPatternSqlFileName()));
+    }
+
+    public abstract QueryResultItem analyze(Project project, DatabaseConnection databaseConnection, List<String> sql);
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/detecting/detectors/BusinessAsUsualDetectorImpl.java

@@ -7 +7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class BusinessAsUsualDetectorImpl implements AntiPatternDetector {
+import java.util.List;
+
+public class BusinessAsUsualDetectorImpl extends AntiPatternDetector {
 
     private final Logger LOGGER = LoggerFactory.getLogger(BusinessAsUsualDetectorImpl.class);
 
@@ -25 +27 @@
     }
 
     @Override
-    public QueryResultItem analyze(Project project, DatabaseConnection databaseConnection) {
-        return new QueryResultItem(this.antiPattern, true, null);
+    public String getAntiPatternSqlFileName() {
+        return this.sqlFileName;
+    }
+
+    @Override
+    public QueryResultItem analyze(Project project, DatabaseConnection databaseConnection, List<String> sql) {
+
+        return new QueryResultItem(this.antiPattern, false, null);
     }
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/detecting/detectors/TooLongSprintDetectorImpl.java

@@ -7 +7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TooLongSprintDetectorImpl implements AntiPatternDetector {
+import java.util.List;
+
+public class TooLongSprintDetectorImpl extends AntiPatternDetector {
 
     private final Logger LOGGER = LoggerFactory.getLogger(TooLongSprintDetectorImpl.class);
 
@@ -28 +30 @@
     }
 
     @Override
-    public QueryResultItem analyze(Project project, DatabaseConnection databaseConnection) {
+    public String getAntiPatternSqlFileName() {
+        return this.sqlFileName;
+    }
+
+    @Override
+    public QueryResultItem analyze(Project project, DatabaseConnection databaseConnection, List<String> sql) {
         return new QueryResultItem(this.antiPattern, false, null);
     }
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/detecting/detectors/VaryingSprintLengthDetectorImpl.java

@@ -7 +7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class VaryingSprintLengthDetectorImpl implements AntiPatternDetector {
+import java.util.List;
+
+public class VaryingSprintLengthDetectorImpl extends AntiPatternDetector {
 
     private final Logger LOGGER = LoggerFactory.getLogger(VaryingSprintLengthDetectorImpl.class);
 
@@ -28 +30 @@
     }
 
     @Override
-    public QueryResultItem analyze(Project project, DatabaseConnection databaseConnection) {
+    public String getAntiPatternSqlFileName() {
+        return this.sqlFileName;
+    }
+
+    @Override
+    public QueryResultItem analyze(Project project, DatabaseConnection databaseConnection, List<String> sql) {
         return new QueryResultItem(this.antiPattern, true, null);
     }
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/utils/Utils.java

@@ -21 +21 @@
 
     public static List<String> loadQueryFromFile(String fileName) {
         List<String> queries = new ArrayList<>();
-        InputStream is = Utils.class.getClassLoader().getResourceAsStream(fileName);
+        InputStream is = Utils.class.getClassLoader().getResourceAsStream("./queries/" + fileName);
         BufferedReader reader = new BufferedReader(new InputStreamReader(is));
         try {
             while (reader.ready()) {