Revize 232d388e

Change list in anti pattern repository to map and fix selections

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/detecting/AntiPatternManagerImpl.java

@@ -7 +7 @@
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.QueryResultItem;
 import cz.zcu.fav.kiv.antipatterndetectionapp.service.AntiPatternService;
 import cz.zcu.fav.kiv.antipatterndetectionapp.service.ProjectService;
+import cz.zcu.fav.kiv.antipatterndetectionapp.utils.Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25 +26 @@
     @Override
     public List<QueryResult> analyze(String[] selectedProjects, String[] selectedAntiPatterns) {
 
-        return this.analyze(antiPatternService.getAllAntiPatterns(), projectService.getAllProjects());
+        return this.analyze(projectService.getAllProjectsForGivenIds(Utils.arrayOfStringsToArrayOfLongs(selectedProjects)),
+                antiPatternService.getAllAntiPatternsForGivenIds(Utils.arrayOfStringsToArrayOfLongs(selectedAntiPatterns)));
     }
 
-    private List<QueryResult> analyze(List<AntiPatternDetector> antiPatternDetectors, List<Project> projects) {
+    private List<QueryResult> analyze(List<Project> projects, List<AntiPatternDetector> antiPatternDetectors) {
         DatabaseConnection databaseConnection = new DatabaseConnection();
 
         List<QueryResult> queryResults = new ArrayList<>();

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/repository/AntiPatternRepository.java

@@ -7 +7 @@
 import org.springframework.stereotype.Component;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 @Component
 public class AntiPatternRepository {
 
     private final Logger LOGGER = LoggerFactory.getLogger(AntiPatternRepository.class);
 
-    private List<AntiPatternDetector> antiPatternDetectors = init();
+    private Map<Long ,AntiPatternDetector> antiPatternDetectors = init();
 
-    private List<AntiPatternDetector> init() {
-        List<AntiPatternDetector> antiPatterns = new LinkedList<>();
+    private Map<Long ,AntiPatternDetector> init() {
+        Map<Long ,AntiPatternDetector> antiPatterns = new HashMap<>();
         try {
             Reflections reflections = new Reflections("cz.zcu.fav.kiv.antipatterndetectionapp");
             Set<Class<? extends AntiPatternDetector>> subTypes = reflections.getSubTypesOf(AntiPatternDetector.class);
             for (Class<? extends AntiPatternDetector> subType : subTypes) {
-                antiPatterns.add(subType.getDeclaredConstructor().newInstance());
+                AntiPatternDetector antiPatternDetector = subType.getDeclaredConstructor().newInstance();
+                antiPatterns.putIfAbsent(antiPatternDetector.getAntiPatternId(), antiPatternDetector);
             }
         } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException | InstantiationException e) {
             e.printStackTrace();
@@ -34 +33 @@
     }
 
     public List<AntiPatternDetector> getAllAntiPatterns() {
-        return antiPatternDetectors;
+        return new ArrayList<>(this.antiPatternDetectors.values());
     }
 
     public AntiPatternDetector getAntiPatternById(Long id) {
-        for (AntiPatternDetector antiPatternDetector : antiPatternDetectors) {
-            if (antiPatternDetector.getAntiPatternId().equals(id)) {
-                return antiPatternDetector;
-            }
-            return antiPatternDetector;
-        }
-        return null;
+        return this.antiPatternDetectors.getOrDefault(id, null);
     }
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/service/AntiPatternService.java

@@ -15 +15 @@
 
     AntiPattern antiPatternToModel(AntiPatternDetector antiPatternDetector);
 
+    List<AntiPatternDetector> getAllAntiPatternsForGivenIds(Long[] ids);
+
 
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/service/AntiPatternServiceImpl.java

@@ -6 +6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -39 +40 @@
     public AntiPattern antiPatternToModel(AntiPatternDetector antiPatternDetector) {
         return antiPatternDetector.getAntiPatternModel();
     }
+
+    @Override
+    public List<AntiPatternDetector> getAllAntiPatternsForGivenIds(Long[] ids) {
+        List<AntiPatternDetector> antiPatternDetectors = new ArrayList<>();
+
+        for (Long id : ids) {
+            antiPatternDetectors.add(antiPatternRepository.getAntiPatternById(id));
+        }
+        return antiPatternDetectors;
+    }
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/service/ProjectService.java

@@ -9 +9 @@
     List<Project> getAllProjects();
 
     Project getProjectById(Long id);
+
+    List<Project> getAllProjectsForGivenIds(Long[] ids);
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/service/ProjectServiceImpl.java

@@ -6 +6 @@
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -30 +31 @@
             return result.get();
         }
     }
+
+    @Override
+    public List<Project> getAllProjectsForGivenIds(Long[] ids) {
+        List<Project> projects = new ArrayList<>();
+
+        for (Long id : ids) {
+            projects.add(getProjectById(id));
+        }
+        return projects;
+    }
 }

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

@@ -38 +38 @@
         return queries;
     }
 
+    public static Long[] arrayOfStringsToArrayOfLongs(String[] strings) {
+        Long[] longs = new Long[strings.length];
+        for (int i = 0; i < strings.length; i++) {
+            longs[i] = Long.parseLong(strings[i]);
+        }
+        return longs;
+    }
+
     public static long daysBetween(Date firstDate, Date secondDate) {
         //24-May-2017, change this to your desired Start Date
         LocalDate dateBefore = firstDate.toLocalDate();