diff --git a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/file/FileController.java b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/file/FileController.java index 20ec66ca68353068dfcbbc407ac76c500e34eec1..008626e432f2e17f303f30d2c34458f23a7610f8 100644 --- a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/file/FileController.java +++ b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/file/FileController.java @@ -52,9 +52,14 @@ public class FileController { String rootPath = projectForId.getProjectDirectories().getProjectRootPath(); // D:\Eclipse orkspace\bpmn-testgenerator-tool-master\OnlineSchuhDemo // Hardcoded, die Funktion getBpmnFiles() findet nicht mehrere bpmn dateien sonder nur eine - String bpmnPath = "src\\main\\resources\\backup\\diagram.bpmn"; - Path bpmn = Paths.get(rootPath, bpmnPath); - File bpmnFile = new File(bpmn.toString()); + //String bpmnPath = "src\\main\\resources\\backup\\diagram.bpmn"; + Path pathToBpmnFile = Paths.get(projectForId.getBpmnFiles().get(0).getPath()); + + Path bpmnPath = Paths.get(rootPath, + projectForId.getProjectDirectories().getModelPath(), this.projectService.getBackupFolderName(), + pathToBpmnFile.getFileName().toString()); + //Path bpmn = Paths.get(rootPath, bpmnPath); + File bpmnFile = new File(bpmnPath.toString()); String bpmnContent = readFile(bpmnFile); return bpmnContent; diff --git a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/project/ProjectService.java b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/project/ProjectService.java index d69b87500c49e4ef84add4ebce45cacf5f59ad9f..cbf95f7e2c4f5b356e4f4a3260289a70c049076f 100644 --- a/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/project/ProjectService.java +++ b/Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/project/ProjectService.java @@ -42,6 +42,8 @@ public class ProjectService { @Value("${testgenerator.projects}") private String projectsPath; + + private String backupFolderName = "backup"; private Path projectConfigPath; @@ -321,7 +323,8 @@ public class ProjectService { LOGGER.info("starting copy process to backup folder"); Project project = getProjectForId(projectId); //project.getProjectDirectories().getProjectRootPath().conc - Path p = Paths.get(project.getProjectDirectories().getProjectRootPath().toString(), project.getProjectDirectories().getModelPath(), "backup"); + Path p = Paths.get(project.getProjectDirectories().getProjectRootPath().toString(), + project.getProjectDirectories().getModelPath(), this.backupFolderName); File directory = new File(p.toUri()); if(!directory.exists()) { directory.mkdir(); @@ -405,4 +408,8 @@ public class ProjectService { } */ } + + public String getBackupFolderName() { + return this.backupFolderName; + } }