Revize 5129e35c

Paths to external files edited

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

@@ -14 +14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -330 +329 @@
 
         AntiPattern antiPattern = antiPatternService.antiPatternToModel(antiPatternService.getAntiPatternById(id));
 
-        String thePath = new FileSystemResource("").getFile().getAbsolutePath() + "\\src\\main\\webapp\\operationalizations\\" + antiPattern.getName() + ".html";
-
+        String thePath = antiPatternService.getOperationalizationFilePath(antiPattern.getName());
         try {
             Jsoup.clean(innerText, Safelist.basic()); // xss attack prevention
             BufferedWriter writer = new BufferedWriter(new FileWriter(thePath));
@@ -352 +350 @@
      */
     @GetMapping("/operationalizations/images/{imageName}")
     public @ResponseBody byte[] imageGet(@PathVariable String imageName) throws Exception {
-        File f = new File(new FileSystemResource("").getFile().getAbsolutePath() + "\\src\\main\\webapp\\operationalizations\\images\\" + imageName);
+        File f = new File(antiPatternService.getOperationalizationImageFilePath(imageName));
         return Files.readAllBytes(f.toPath());
     }
 
@@ -367 +365 @@
 
         String fileName = file.getOriginalFilename();
 
-        if(new File(new FileSystemResource("").getFile().getAbsolutePath() + "\\src\\main\\webapp\\operationalizations\\images\\" + fileName).isFile()){
+        if(new File(antiPatternService.getOperationalizationImageFilePath(fileName)).isFile()){
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
         }
 
         try {
-            file.transferTo( new File(new FileSystemResource("").getFile().getAbsolutePath() + "\\src\\main\\webapp\\operationalizations\\images\\" + fileName));
+            file.transferTo(new File(antiPatternService.getOperationalizationImageFilePath(fileName)));
         } catch (Exception e) {
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
         }

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

@@ -16 +16 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.*;
 
@@ -27 +28 @@
 
     private static final String QUERY_DIR = "/queries/";
     private static final String AP_DIR = "/antipatterns/";
+    private static final String OPERATIONALIZATION_DIR = "/operationalizations/";
+    private static final String OPERATIONALIZATION_IMG_DIR = "/operationalizations/images/";
     private final Logger LOGGER = LoggerFactory.getLogger(AntiPatternRepository.class);
     private ServletContext servletContext;
     private Map<Long, AntiPatternDetector> antiPatternDetectors;
@@ -229 +232 @@
         return null;
     }
 
+    public String getOperationalizationDirPathName(){
+        try {
+            return servletContext.getResource(OPERATIONALIZATION_DIR).getFile();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public String getOperationalizationImgDirFileName(){
+        try {
+            return servletContext.getResource(OPERATIONALIZATION_IMG_DIR).getFile();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
 }

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

@@ -43 +43 @@
      * @return Description of the anti-pattern
      */
     String getDescriptionFromCatalogue(long id);
+
+    String getOperationalizationFilePath(String antiPatternName);
+
+    String getOperationalizationImageFilePath(String imageName);
 }

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

@@ -7 +7 @@
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.CacheablesValues;
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.Threshold;
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.QueryResult;
-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.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;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.*;
 
 
@@ -173 +164 @@
 
         return resultDescription.trim();
     }
+
+    @Override
+    public String getOperationalizationFilePath(String antiPatternName){
+        return antiPatternRepository.getOperationalizationDirPathName() + antiPatternName + ".html";
+    }
+
+    @Override
+    public String getOperationalizationImageFilePath(String imageName){
+        return antiPatternRepository.getOperationalizationImgDirFileName() + imageName;
+    }
 }