Revize 710124fa

#2 Implement check of used vs. set parameters

- added functionality that checks if the thresholds have changed
- if the thresholds have changed, the user is informed
- added button for recalculation values

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

@@ -4 +4 @@
 import cz.zcu.fav.kiv.antipatterndetectionapp.detecting.AntiPatternManager;
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.AntiPattern;
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.Query;
+import cz.zcu.fav.kiv.antipatterndetectionapp.model.QueryResult;
 import cz.zcu.fav.kiv.antipatterndetectionapp.service.AntiPatternService;
 import cz.zcu.fav.kiv.antipatterndetectionapp.service.ProjectService;
 import org.slf4j.Logger;
@@ -14 +15 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 @Controller
@@ -74 +77 @@
             return "index";
         }
 
-        model.addAttribute("queryResults", antiPatternManager.analyze(selectedProjects, selectedAntiPatterns));
+        List<QueryResult> results = antiPatternManager.analyze(selectedProjects, selectedAntiPatterns);
+        antiPatternService.saveAnalyzedProjects(selectedProjects, selectedAntiPatterns);
+        antiPatternService.saveResults(results);
+        antiPatternService.setConfigurationChanged(false);
 
+        model.addAttribute("queryResults", results);
+        model.addAttribute("recalculationTime", DateTimeFormatter.ofPattern("HH:mm:ss").format(LocalTime.now()));
+
+        return "result";
+    }
+
+
+    @GetMapping("/analyze")
+    public String analyzeGet(Model model) {
+        if (antiPatternService.isConfigurationChanged()) {
+            model.addAttribute("isConfigurationChanged", true);
+        }
+        antiPatternService.setConfigurationChanged(false);
+
+        model.addAttribute("queryResults", antiPatternService.getResults());
+        model.addAttribute("recalculationTime", DateTimeFormatter.ofPattern("HH:mm:ss").format(LocalTime.now()));
+
+        return "result";
+    }
+
+    @GetMapping("/recalculate")
+    public String recalculateGet(Model model) {
+        return analyzeGet(model);
+    }
+
+    @PostMapping("/recalculate")
+    public String resultRecalculate(Model model) {
+
+        List<QueryResult> results = antiPatternManager.analyze(antiPatternService.getAnalyzedProjects(),
+                antiPatternService.getAnalyzedAntiPatterns());
+
+        antiPatternService.saveResults(results);
+        antiPatternService.setConfigurationChanged(false);
+
+        model.addAttribute("queryResults", results);
+        model.addAttribute("recalculationTime", DateTimeFormatter.ofPattern("HH:mm:ss").format(LocalTime.now()));
         return "result";
     }
 

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

@@ -1 +1 @@
 package cz.zcu.fav.kiv.antipatterndetectionapp.detecting;
 
 
-import cz.zcu.fav.kiv.antipatterndetectionapp.model.Query;
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.QueryResult;
 
 import java.util.List;

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/model/CacheablesValues.java

@@ +1 @@
+package cz.zcu.fav.kiv.antipatterndetectionapp.model;
+
+import java.util.List;
+
+public class CacheablesValues {
+
+    // these values ​​store information about currently processed projects and anti-patterns
+    private String[] analyzedProjects;
+    private String[] analyzedAntiPatterns;
+
+    // this value indicate if configuration values have changed
+    private boolean configurationChanged = false;
+    private List<QueryResult> results;
+
+    public String[] getAnalyzedProjects() {
+        return analyzedProjects;
+    }
+
+    public void setAnalyzedProjects(String[] analyzedProjects) {
+        this.analyzedProjects = analyzedProjects;
+    }
+
+    public String[] getAnalyzedAntiPatterns() {
+        return analyzedAntiPatterns;
+    }
+
+    public void setAnalyzedAntiPatterns(String[] analyzedAntiPatterns) {
+        this.analyzedAntiPatterns = analyzedAntiPatterns;
+    }
+
+    public boolean isConfigurationChanged() {
+        return configurationChanged;
+    }
+
+    public void setConfigurationChanged(boolean configurationChanged) {
+        this.configurationChanged = configurationChanged;
+    }
+
+    public List<QueryResult> getResults() {
+        return results;
+    }
+
+    public void setResults(List<QueryResult> results) {
+        this.results = results;
+    }
+}

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

@@ -2 +2 @@
 
 import cz.zcu.fav.kiv.antipatterndetectionapp.detecting.detectors.AntiPatternDetector;
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.AntiPattern;
+import cz.zcu.fav.kiv.antipatterndetectionapp.model.QueryResult;
 
 import java.util.List;
 
@@ -18 +19 @@
     List<AntiPatternDetector> getAllAntiPatternsForGivenIds(Long[] ids);
 
     boolean saveNewConfiguration(String[] configNames, String[] configValues);
+
+    void saveAnalyzedProjects(String[] selectedProjects, String[] selectedAntiPatterns);
+
+    String[] getAnalyzedProjects();
+
+    String[] getAnalyzedAntiPatterns();
+
+    boolean isConfigurationChanged();
+
+    void setConfigurationChanged(boolean configurationChanged);
+
+    void saveResults(List<QueryResult> results);
+
+    List<QueryResult> getResults();
+
 }

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

@@ -2 +2 @@
 
 import cz.zcu.fav.kiv.antipatterndetectionapp.detecting.detectors.AntiPatternDetector;
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.AntiPattern;
+import cz.zcu.fav.kiv.antipatterndetectionapp.model.CacheablesValues;
+import cz.zcu.fav.kiv.antipatterndetectionapp.model.QueryResult;
 import cz.zcu.fav.kiv.antipatterndetectionapp.repository.AntiPatternRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17 +19 @@
     @Autowired
     private AntiPatternRepository antiPatternRepository;
 
+    // class that stores cached values
+    private CacheablesValues cacheablesValues = new CacheablesValues();
+
     @Override
     public List<AntiPatternDetector> getAllAntiPatterns() {
         return antiPatternRepository.getAllAntiPatterns();
@@ -66 +71 @@
                     if (antiPatternDetector.getAntiPatternModel().getConfigurations().get(configNames[i]).getValue().getClass() == Integer.class) {
                         try {
                             antiPatternDetector.getAntiPatternModel().getConfigurations().get(configNames[i]).setValue((Integer.parseInt(configValues[i])));
+                            setConfigurationChanged(true);
                         } catch (NumberFormatException e) {
                             return false;
                         }
@@ -73 +79 @@
                     } else if (antiPatternDetector.getAntiPatternModel().getConfigurations().get(configNames[i]).getValue().getClass() == Float.class) {
                         try {
                             antiPatternDetector.getAntiPatternModel().getConfigurations().get(configNames[i]).setValue((Float.parseFloat(configValues[i])));
+                            setConfigurationChanged(true);
                         } catch (NumberFormatException e) {
                             return false;
                         }
                     } else if (antiPatternDetector.getAntiPatternModel().getConfigurations().get(configNames[i]).getValue().getClass() == Double.class) {
                         try {
                             antiPatternDetector.getAntiPatternModel().getConfigurations().get(configNames[i]).setValue((Double.parseDouble(configValues[i])));
+                            setConfigurationChanged(true);
                         } catch (NumberFormatException e) {
                             return false;
                         }
@@ -88 +96 @@
         }
         return true;
     }
+
+    @Override
+    public void saveAnalyzedProjects(String[] selectedProjects, String[] selectedAntiPatterns) {
+        this.cacheablesValues.setAnalyzedProjects(selectedProjects);
+        this.cacheablesValues.setAnalyzedAntiPatterns(selectedAntiPatterns);
+    }
+
+    @Override
+    public String[] getAnalyzedProjects() {
+        return this.cacheablesValues.getAnalyzedProjects();
+    }
+
+    @Override
+    public String[] getAnalyzedAntiPatterns() {
+        return this.cacheablesValues.getAnalyzedAntiPatterns();
+    }
+
+    @Override
+    public void setConfigurationChanged(boolean configurationChanged) {
+        this.cacheablesValues.setConfigurationChanged(configurationChanged);
+    }
+
+    @Override
+    public boolean isConfigurationChanged() {
+        return this.cacheablesValues.isConfigurationChanged();
+    }
+
+    @Override
+    public void saveResults(List<QueryResult> results) {
+        this.cacheablesValues.setResults(results);
+    }
+
+    @Override
+    public List<QueryResult> getResults() {
+        return this.cacheablesValues.getResults();
+    }
 }

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

@@ -21 +21 @@
         .icon-style {
             border-radius: 30px;
         }
+
+        input, button, submit {
+            border: none;
+        }
     </style>
 
 </head>
@@ -31 +35 @@
 
 <!-- Result table container -->
 <div class="container">
+    <!-- Container for show success message -->
+    <div class="container">
+        <div th:if="${isConfigurationChanged}" class="alert alert-warning" role="alert">
+            Configuration values have changed! Would you like to
+            <form action="#" th:action="@{/recalculate}" method="post" style="display: inline-block">
+                <button type="submit"
+                        style="display: inline-block;background-color: #FEF3CD; color: #167AF6; text-decoration: underline;">
+                    recalculate
+                </button>
+            </form>
+            the results?
+        </div>
+    </div>
+    <!-- ./Container for show success message -->
     <h1>Results</h1>
     <table class="table table-bordered table-hover">
         <!-- Result table header -->
@@ -91 +109 @@
         </tbody>
         <!-- ./Result table content -->
     </table>
+    <p><small th:text="@{Last recalculated at &#160;} + ${ recalculationTime}"></small></p>
 
     <!-- Table legend -->
     <h6>Legend:</h6>
@@ -114 +133 @@
 </div>
 <!-- ./Result table container -->
 
-<!-- Script to popover -->
+<!-- Scripts -->
 <script>
+    // script to popover
     $(document).ready(function () {
         $('[data-toggle="popover"]').popover();
     });
+
+    // this code handling back browser button to result page
+    window.onload = function () {
+        if (typeof history.pushState === "function") {
+            history.pushState("jibberish", null, null);
+            window.onpopstate = function () {
+                history.pushState('newjibberish', null, null);
+            };
+        } else {
+            var ignoreHashChange = true;
+            window.onhashchange = function () {
+                if (!ignoreHashChange) {
+                    ignoreHashChange = true;
+                    window.location.hash = Math.random();
+                } else {
+                    ignoreHashChange = false;
+                }
+            };
+        }
+    }
 </script>
-<!-- ./Script to popover -->
+<!-- ./Scripts -->
 
 </body>
 </html>