Revize 20a4d17d

Description from cataloque get function moved

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

@@ -103 +103 @@
     @GetMapping("/anti-patterns/{id}")
     public String getAntiPatternById(@PathVariable Long id, Model model) {
         model.addAttribute("antiPattern", antiPatternService.getAntiPatternById(id).getAntiPatternModel());
+        model.addAttribute("description", antiPatternService.getDescriptionFromCatalogue(id));
         return "anti-pattern";
     }
 

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

@@ -101 +101 @@
         return Constants.ANTI_PATTERN_CATALOGUE_URL + this.catalogueFileName;
     }
 
-    public String getDescriptionFromCatalogue() {
-        String descriptionHeader = "## Summary ";
-        String url = Constants.ANTI_PATTERN_CATALOGUE_URL_RAW + this.getCatalogueFileName();
-        String html;
-
-        try {
-            html = Jsoup.connect(url).get().html();
-        }
-        catch (Exception e){
-            /* If html from catalogue is not extracted, the description from anti-pattern configuration is returned */
-            return this.getDescription();
-        }
-
-        String body = Jsoup.parse(html).body().text();
-
-        /* Description parsing */
-        int startIndex = body.indexOf(descriptionHeader);
-        String resultDescription = "";
-
-        if(startIndex == 0)
-            return this.getDescription();
-
-        int tmpIndex = startIndex + descriptionHeader.length(); // starting index position
-
-        do {
-            resultDescription += body.charAt(tmpIndex);
-            tmpIndex ++;
-
-            /* If the next headline is reached, the loop is exited */
-            if(body.substring(tmpIndex, tmpIndex + 2).equals("##"))
-                break;
-        } while(tmpIndex < body.length() - 1);
-
-        return resultDescription.trim();
-    }
-
     public String getOperationalizationText() {
         String myPath = new FileSystemResource("").getFile().getAbsolutePath() + "\\src\\main\\webapp\\operationalizations\\" + this.getName() + ".html";
         String content = null;

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

@@ -39 +39 @@
     AntiPattern setErrorMessages(AntiPattern antiPattern, List<String> wrongParameters);
 
     AntiPattern getAntiPatternFromJsonFile(String fileName);
+
+    String getDescriptionFromCatalogue(long id);
 }

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

@@ -1 +1 @@
 package cz.zcu.fav.kiv.antipatterndetectionapp.service;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import cz.zcu.fav.kiv.antipatterndetectionapp.Constants;
 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;
@@ -12 +13 @@
 import cz.zcu.fav.kiv.antipatterndetectionapp.repository.AntiPatternRepository;
 import cz.zcu.fav.kiv.antipatterndetectionapp.utils.JsonParser;
 import cz.zcu.fav.kiv.antipatterndetectionapp.utils.Utils;
+import org.jsoup.Jsoup;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.stereotype.Service;
@@ -267 +269 @@
         return null;
     }
 
+    @Override
+    public String getDescriptionFromCatalogue(long id) {
+        AntiPattern ap = this.getAntiPatternById(id).getAntiPatternModel();
+
+        String descriptionHeader = "## Summary ";
+        String url = Constants.ANTI_PATTERN_CATALOGUE_URL_RAW + ap.getCatalogueFileName();
+        String html;
+
+        try {
+            html = Jsoup.connect(url).get().html();
+        }
+        catch (Exception e){
+            /* If html from catalogue is not extracted, the description from anti-pattern configuration is returned */
+            return ap.getDescription();
+        }
+
+        String body = Jsoup.parse(html).body().text();
+
+        /* Description parsing */
+        int startIndex = body.indexOf(descriptionHeader);
+        String resultDescription = "";
+
+        if(startIndex == 0)
+            return ap.getDescription();
+
+        int tmpIndex = startIndex + descriptionHeader.length(); // starting index position
+
+        do {
+            resultDescription += body.charAt(tmpIndex);
+            tmpIndex ++;
+
+            /* If the next headline is reached, the loop is exited */
+            if(body.substring(tmpIndex, tmpIndex + 2).equals("##"))
+                break;
+        } while(tmpIndex < body.length() - 1);
+
+        return resultDescription.trim();
+    }
 }

src/main/webapp/WEB-INF/templates/anti-pattern.html

@@ -69 +69 @@
         <div class="form-group">
             <h5 for="antiPatternDescription">Anti Pattern Description</h5>
             <textarea disabled class="form-control" id="antiPatternDescription" rows="5"
-                      th:text="${antiPattern.getDescriptionFromCatalogue()}"></textarea>
+                      th:text="${description}"></textarea>
         </div>
         <!-- ./Anti pattern description -->