Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
simonharrer committed Apr 12, 2016
1 parent 56ad6b3 commit 34de85c
Show file tree
Hide file tree
Showing 19 changed files with 30 additions and 610 deletions.
8 changes: 2 additions & 6 deletions src/main/groovy/betsy/bpel/BPELBetsy.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ public class BPELBetsy {
public void execute() {
Objects.requireNonNull(testFolderName, "test folder must be set");

validate();

Collections.sort(processes);

BPELTestSuite testSuite = BPELTestSuite.createTests(engines, processes, testFolderName);
Expand All @@ -32,10 +30,6 @@ public void execute() {
composite.execute();
}

private void validate() {
new BPELValidator(processes).validate();
}

public List<AbstractBPELEngine> getEngines() {
return engines;
}
Expand All @@ -49,6 +43,8 @@ public List<BPELProcess> getProcesses() {
}

public void setProcesses(List<EngineIndependentProcess> processes) {
new BPELValidator(Objects.requireNonNull(processes)).validate();

List<BPELProcess> processList = new ArrayList<>();
for(EngineIndependentProcess engineIndependentProcess : processes) {
processList.add(new BPELProcess(engineIndependentProcess));
Expand Down
9 changes: 5 additions & 4 deletions src/main/groovy/betsy/bpel/validation/BPELValidator.groovy
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package betsy.bpel.validation

import betsy.bpel.model.BPELProcess
import betsy.common.model.EngineIndependentProcess
import betsy.common.util.FileTypes

import java.nio.file.Files
import java.nio.file.Path
Expand All @@ -10,9 +12,9 @@ import java.nio.file.Path
*/
class BPELValidator {

private final List<BPELProcess> processes
private final List<EngineIndependentProcess> processes

BPELValidator(List<BPELProcess> processes) {
BPELValidator(List<EngineIndependentProcess> processes) {
this.processes = processes
}

Expand Down Expand Up @@ -57,8 +59,7 @@ class BPELValidator {
processes.each { process ->
List<Path> paths = new LinkedList<>()
paths.add(process.process)
paths.addAll(process.wsdlPaths)
paths.addAll(process.additionalFilePaths)
paths.addAll(process.getFiles());

paths.each { path ->
if (!Files.isRegularFile(path)) {
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit 34de85c

Please sign in to comment.