Revize 31e75674

#14 Saving configuration threshold values added

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/controller/AppController.java

@@ -234 +234 @@
     @PostMapping("/configuration")
     public String configurationPost(Model model,
                                     @RequestParam(value = "thresholdValues", required = false) String[] thresholdValues,
-                                    @RequestParam(value = "thresholdNames", required = false) String[] thresholdNames) {
+                                    @RequestParam(value = "thresholdNames", required = false) String[] thresholdNames,
+                                    @RequestParam(value = "antiPatternNames", required = false) String[] antiPatternNames,
+                                    HttpSession session) {
+
+        String currentConfigurationName = configurationGetFromSession(session);
 
         List<AntiPattern> antiPatterns = antiPatternService.antiPatternsToModel(antiPatternService.getAllAntiPatterns());
-        List<String> wrongParameters = antiPatternService.saveNewConfiguration(thresholdNames, thresholdValues);
+
+        List<String> wrongParameters = configurationService.saveNewConfiguration(antiPatterns, currentConfigurationName, antiPatternNames, thresholdNames, thresholdValues);
 
         if (wrongParameters.isEmpty()) {
             model.addAttribute("successMessage", "All configuration values has been successfully saved.");
@@ -247 +252 @@
         }
 
         model.addAttribute("antiPatterns", antiPatterns);
+        model.addAttribute("configurations", configurationService.getConfigurationByName(currentConfigurationName));
         return "configuration";
     }
 
@@ -268 +274 @@
                                    RedirectAttributes redirectAttrs) {
 
         AntiPattern antiPattern = antiPatternService.antiPatternToModel(antiPatternService.getAntiPatternById(id));
-        List<String> wrongParameters = antiPatternService.saveNewConfiguration(thresholdNames, thresholdValues);
+        //List<String> wrongParameters = antiPatternService.saveNewConfiguration(thresholdNames, thresholdValues);
+        List<String> wrongParameters = new ArrayList<>(); //TODO
 
         if (wrongParameters.isEmpty()) {
             redirectAttrs.addFlashAttribute("successMessage", "All threshold values has been successfully saved.");

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

@@ -18 +18 @@
 
     List<AntiPatternDetector> getAllAntiPatternsForGivenIds(Long[] ids);
 
-    List<String> saveNewConfiguration(String[] configNames, String[] configValues);
-
     void saveAnalyzedProjects(String[] selectedProjects, String[] selectedAntiPatterns);
 
     String[] getAnalyzedProjects();

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

@@ -78 +78 @@
         return antiPatternDetectors;
     }
 
-    public List<String> saveNewConfiguration(String[] thresholdNames, String[] thresholdValues) {
-        List<AntiPatternDetector> antiPatternDetectors = antiPatternRepository.getAllAntiPatterns();
-        List<String> incorrectParameters = new ArrayList<>();
-
-        for (AntiPatternDetector antiPatternDetector : antiPatternDetectors) {
-            // not every anti-pattern should have thresholds
-            if (antiPatternDetector.getAntiPatternModel().getThresholds() == null) {
-                continue;
-            }
-            for (int i = 0; i < thresholdNames.length; i++) {
-                if (antiPatternDetector.getAntiPatternModel().getThresholds().containsKey(thresholdNames[i])) {
-
-                    if (antiPatternDetector.getAntiPatternModel().getThresholds().get(thresholdNames[i]).getValue().getClass() == Integer.class) {
-                        try {
-                            antiPatternDetector.getAntiPatternModel().getThresholds().get(thresholdNames[i]).setValue((Integer.parseInt(thresholdValues[i])));
-                            setConfigurationChanged(true);
-                        } catch (NumberFormatException e) {
-                            incorrectParameters.add(thresholdNames[i]);
-                        }
-
-                    } else if (antiPatternDetector.getAntiPatternModel().getThresholds().get(thresholdNames[i]).getValue().getClass() == Percentage.class) {
-                        try {
-                            antiPatternDetector.getAntiPatternModel().getThresholds().get(thresholdNames[i]).setValue((Percentage.parsePercentage(thresholdValues[i])));
-                            setConfigurationChanged(true);
-                        } catch (NumberFormatException e) {
-                            incorrectParameters.add(thresholdNames[i]);
-                        }
-                    } else if (antiPatternDetector.getAntiPatternModel().getThresholds().get(thresholdNames[i]).getValue().getClass() == PositiveInteger.class) {
-                        try {
-                            antiPatternDetector.getAntiPatternModel().getThresholds().get(thresholdNames[i]).setValue((PositiveInteger.parsePositiveInteger(thresholdValues[i])));
-                            setConfigurationChanged(true);
-                        } catch (NumberFormatException e) {
-                            incorrectParameters.add(thresholdNames[i]);
-                        }
-                    } else if (antiPatternDetector.getAntiPatternModel().getThresholds().get(thresholdNames[i]).getValue().getClass() == PositiveFloat.class) {
-                        try {
-                            antiPatternDetector.getAntiPatternModel().getThresholds().get(thresholdNames[i]).setValue((PositiveFloat.parsePositiveFloat(thresholdValues[i])));
-                            setConfigurationChanged(true);
-                        } catch (NumberFormatException e) {
-                            incorrectParameters.add(thresholdNames[i]);
-                        }
-                    } else if (antiPatternDetector.getAntiPatternModel().getThresholds().get(thresholdNames[i]).getValue().getClass() == Float.class) {
-                        try {
-                            antiPatternDetector.getAntiPatternModel().getThresholds().get(thresholdNames[i]).setValue((Float.parseFloat(thresholdValues[i])));
-                            setConfigurationChanged(true);
-                        } catch (NumberFormatException e) {
-                            incorrectParameters.add(thresholdNames[i]);
-                        }
-                    } else if (antiPatternDetector.getAntiPatternModel().getThresholds().get(thresholdNames[i]).getValue().getClass() == Double.class) {
-                        try {
-                            antiPatternDetector.getAntiPatternModel().getThresholds().get(thresholdNames[i]).setValue((Double.parseDouble(thresholdValues[i])));
-                            setConfigurationChanged(true);
-                        } catch (NumberFormatException e) {
-                            incorrectParameters.add(thresholdNames[i]);
-                        }
-                    } else if (antiPatternDetector.getAntiPatternModel().getThresholds().get(thresholdNames[i]).getValue().getClass() == String.class) {
-                        if (Utils.checkStringSubstrings(thresholdValues[i])) {
-                            antiPatternDetector.getAntiPatternModel().getThresholds().get(thresholdNames[i]).setValue((thresholdValues[i]));
-                            setConfigurationChanged(true);
-
-                        } else {
-                            incorrectParameters.add(thresholdNames[i]);
-                        }
-                    }
-                }
-            }
-        }
-        return incorrectParameters;
-    }
-
     @Override
     public void saveAnalyzedProjects(String[] selectedProjects, String[] selectedAntiPatterns) {
         this.cacheablesValues.setAnalyzedProjects(selectedProjects);

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

@@ -1 +1 @@
 package cz.zcu.fav.kiv.antipatterndetectionapp.service;
 
+import cz.zcu.fav.kiv.antipatterndetectionapp.model.AntiPattern;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -11 +13 @@
     List<String> getDefaultConfigurationNames();
 
     Map<String, Map<String, String>> getConfigurationByName(String configurationName);
+
+    List<String> saveNewConfiguration(List<AntiPattern> antiPatterns, String configurationName, String[] antiPatternNames, String[] thresholdNames, String[] thresholdValues);
 }

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

@@ -1 +1 @@
 package cz.zcu.fav.kiv.antipatterndetectionapp.service;
 
+import cz.zcu.fav.kiv.antipatterndetectionapp.model.AntiPattern;
+import cz.zcu.fav.kiv.antipatterndetectionapp.model.types.Percentage;
+import cz.zcu.fav.kiv.antipatterndetectionapp.model.types.PositiveFloat;
+import cz.zcu.fav.kiv.antipatterndetectionapp.model.types.PositiveInteger;
 import cz.zcu.fav.kiv.antipatterndetectionapp.repository.ConfigurationRepository;
+import cz.zcu.fav.kiv.antipatterndetectionapp.utils.Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -40 +46 @@
     public Map<String, Map<String, String>> getConfigurationByName(String configurationName) {
         return configurationRepository.allConfigurations.get(configurationName);
     }
+
+    @Override
+    public List<String> saveNewConfiguration(List<AntiPattern> antiPatterns, String configurationName, String[] antiPatternNames, String[] thresholdNames, String[] thresholdValues){
+        Map<String, Map<String, String>> newConfiguration = new HashMap<>();
+        List<String> incorrectParameters = new ArrayList<>();
+
+        for(AntiPattern antiPattern : antiPatterns){
+            if(antiPattern.getThresholds() == null)
+                continue;
+
+            for(int i = 0; i < thresholdNames.length; i++){
+                if(antiPattern.getThresholds().containsKey(thresholdNames[i])){
+                    if(antiPattern.getThresholds().get(thresholdNames[i]).getValue().getClass() == Integer.class){
+                        try {
+                            Integer.parseInt(thresholdValues[i]);
+                        }
+                        catch(NumberFormatException e){
+                            incorrectParameters.add(thresholdNames[i]);
+                        }
+                    }
+                    else if(antiPattern.getThresholds().get(thresholdNames[i]).getValue().getClass() == Percentage.class){
+                        try {
+                            Percentage.parsePercentage(thresholdValues[i]);
+                        }
+                        catch(NumberFormatException e){
+                            incorrectParameters.add(thresholdNames[i]);
+                        }
+                    }
+                    else if(antiPattern.getThresholds().get(thresholdNames[i]).getValue().getClass() == PositiveInteger.class){
+                        try {
+                            PositiveInteger.parsePositiveInteger(thresholdValues[i]);
+                        }
+                        catch(NumberFormatException e){
+                            incorrectParameters.add(thresholdNames[i]);
+                        }
+                    }
+                    else if(antiPattern.getThresholds().get(thresholdNames[i]).getValue().getClass() == PositiveFloat.class){
+                        try {
+                            PositiveFloat.parsePositiveFloat(thresholdValues[i]);
+                        }
+                        catch(NumberFormatException e){
+                            incorrectParameters.add(thresholdNames[i]);
+                        }
+                    }
+                    else if(antiPattern.getThresholds().get(thresholdNames[i]).getValue().getClass() == Float.class){
+                        try {
+                            Float.parseFloat(thresholdValues[i]);
+                        }
+                        catch(NumberFormatException e){
+                            incorrectParameters.add(thresholdNames[i]);
+                        }
+                    }
+                    else if(antiPattern.getThresholds().get(thresholdNames[i]).getValue().getClass() == Double.class){
+                        try {
+                            Double.parseDouble(thresholdValues[i]);
+                        }
+                        catch(NumberFormatException e){
+                            incorrectParameters.add(thresholdNames[i]);
+                        }
+                    }
+                    else if(antiPattern.getThresholds().get(thresholdNames[i]).getValue().getClass() == String.class){
+                        if (Utils.checkStringSubstrings(thresholdValues[i]) == false) {
+                            incorrectParameters.add(thresholdNames[i]);
+                        }
+                    }
+                }
+            }
+        }
+
+        if(incorrectParameters.size() != 0)
+            return incorrectParameters;
+
+        for(int i = 0; i < antiPatternNames.length; i++){
+            if(newConfiguration.get(antiPatternNames[i]) == null)
+                newConfiguration.put(antiPatternNames[i], new HashMap<>());
+
+            newConfiguration.get(antiPatternNames[i]).put(thresholdNames[i], thresholdValues[i]);
+        }
+
+        if(configurationRepository.allConfigurations.get(configurationName) == null)
+            configurationRepository.allConfigurations.put(configurationName, newConfiguration);
+        else
+            configurationRepository.allConfigurations.replace(configurationName, newConfiguration);
+
+        return incorrectParameters;
+    }
 }

src/main/webapp/WEB-INF/templates/configuration.html

@@ -55 +55 @@
                                            name="thresholdValues">
                                     <input th:value="${threshold.value.name}" style="display: none" class="form-control"
                                            name="thresholdNames">
+                                    <input th:value="${antiPattern.name}" style="display: none" class="form-control"
+                                           name="antiPatternNames">
                                 </div>
                                 <div th:if="${#strings.contains(threshold.value.name,'Substrings')}" id="second"
                                      style="margin: 10px; padding-left: 10px">