Simpler model, fully automated xsd generation.

uniba-dsg · Jan 5, 2017 · c559e00 · c559e00
1 parent 214d3ec
commit c559e00
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 23 deletions.
diff --git a/loader/src/main/java/loader/PEBLMergerMain.java b/loader/src/main/java/loader/PEBLMergerMain.java
@@ -119,9 +119,9 @@ private static void merge(PEBL peblSource, PEBL peblTarget, Path newRelativeData
             e.getFiles().clear();
             e.getFiles().addAll(files);
 
-            final List<Path> logFiles = e.getLogFiles().stream().map(newRelativeDataFolder::relativize).collect(Collectors.toList());
-            e.getLogFiles().clear();
-            e.getLogFiles().addAll(logFiles);
+            final List<Path> logFiles = e.getLogs().stream().map(newRelativeDataFolder::relativize).collect(Collectors.toList());
+            e.getLogs().clear();
+            e.getLogs().addAll(logFiles);
 
             final Optional<TestResult> testResultOptional = peblTarget.result.testResults.stream().filter(tr -> tr.getId().equals(e.getId())).findAny();
             if(testResultOptional.isPresent()) {

diff --git a/loader/src/main/java/loader/PEBLStoreFilesAlongMain.java b/loader/src/main/java/loader/PEBLStoreFilesAlongMain.java
@@ -55,15 +55,15 @@ static void copyFilesRelative(PEBL pebl, Path path) {
             t.getFiles().clear();
             t.getFiles().addAll(files);
 
-            final List<Path> logFiles = t.getLogFiles()
+            final List<Path> logFiles = t.getLogs()
                     .stream()
                     .map(file -> copyAndGetRelativePath(id, file, s -> "testResults/" + s + "/logFiles", parent))
                     .collect(Collectors.toList());
 
             assertNoDuplicates(id, files);
 
-            t.getLogFiles().clear();
-            t.getLogFiles().addAll(logFiles);
+            t.getLogs().clear();
+            t.getLogs().addAll(logFiles);
         });
     }
 

diff --git a/pebl/doc/result-test-result.puml b/pebl/doc/result-test-result.puml
@@ -18,7 +18,7 @@ package "" {
 
 	class TestResult {
 	     files : List<String>
-	     logFiles : List<String>
+	     logs : List<String>
 	     deploymentPackage : String
 		extensions : Map<String, String>
 	}

diff --git a/pebl/src/main/java/pebl/result/test/TestResult.java b/pebl/src/main/java/pebl/result/test/TestResult.java
@@ -39,9 +39,9 @@ public class TestResult implements HasExtensions, HasId {
     @XmlAttribute(required = true)
     private final String tool;
 
-    @XmlElement(name = "logFiles")
+    @XmlElement(name = "logs")
     @XmlList
-    private final List<Path> logFiles;
+    private final List<Path> logs;
 
     @XmlElement(required = true)
     private final Path deploymentPackage;
@@ -72,7 +72,7 @@ public class TestResult implements HasExtensions, HasId {
     public TestResult(Test test,
             Engine engine,
             String tool,
-            List<Path> logFiles,
+            List<Path> logs,
             Path deploymentPackage,
             List<Path> files,
             List<Measurement> measurements,
@@ -81,7 +81,7 @@ public TestResult(Test test,
         this.test = test;
         this.engine = engine;
         this.tool = tool;
-        this.logFiles = new ArrayList<>(logFiles);
+        this.logs = new ArrayList<>(logs);
         this.deploymentPackage = deploymentPackage;
         this.files = new ArrayList<>(files);
         this.measurements = new LinkedList<>(measurements);
@@ -101,8 +101,8 @@ public String getTool() {
         return tool;
     }
 
-    public List<Path> getLogFiles() {
-        return logFiles;
+    public List<Path> getLogs() {
+        return logs;
     }
 
     public Path getDeploymentPackage() {

diff --git a/pebl/src/main/java/pebl/xsd/PEBL.java b/pebl/src/main/java/pebl/xsd/PEBL.java
@@ -73,7 +73,7 @@ public void assertLinksWork() {
         });
         result.testResults.forEach(e -> {
             e.getFiles().stream().filter(missing.or(relative)).forEach(unlinked::add);
-            e.getLogFiles().stream().filter(missing.or(relative)).forEach(unlinked::add);
+            e.getLogs().stream().filter(missing.or(relative)).forEach(unlinked::add);
         });
 
         if(unlinked.size() > 0) {
@@ -120,13 +120,13 @@ private void makeFilesAbsolute(Path workingDirectory) {
             e.getFiles().clear();
             e.getFiles().addAll(files);
 
-            final List<Path> logFiles = e.getLogFiles()
+            final List<Path> logFiles = e.getLogs()
                     .stream()
                     .map(workingDirectory::resolve)
                     .map(Path::toAbsolutePath)
                     .collect(Collectors.toList());
-            e.getLogFiles().clear();
-            e.getLogFiles().addAll(logFiles);
+            e.getLogs().clear();
+            e.getLogs().addAll(logFiles);
         });
     }
 
@@ -155,13 +155,13 @@ public void makeFilesRelative(Path workingDirectory) {
             e.getFiles().clear();
             e.getFiles().addAll(files);
 
-            final List<Path> logFiles = e.getLogFiles()
+            final List<Path> logFiles = e.getLogs()
                     .stream()
                     .map(Path::toAbsolutePath)
                     .map(workingDirectory::relativize)
                     .collect(Collectors.toList());
-            e.getLogFiles().clear();
-            e.getLogFiles().addAll(logFiles);
+            e.getLogs().clear();
+            e.getLogs().addAll(logFiles);
         });
     }
 

diff --git a/pebl/src/main/java/pebl/xsd/SchemaGenerator.java b/pebl/src/main/java/pebl/xsd/SchemaGenerator.java
@@ -2,7 +2,11 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -54,7 +58,12 @@ public Result createOutput(String uri, String suggestedFileName) throws IOExcept
 
         };
         jc.generateSchema(sor);
-        return xsd.toPath();
+        final Path xsdPath = xsd.toPath();
+
+        final List<String> lines = Files.readAllLines(xsdPath, StandardCharsets.UTF_8);
+        Files.write(xsdPath, lines.stream().map(s -> s.replace("##other", "##any")).collect(Collectors.toList()), StandardCharsets.UTF_8);
+
+        return xsdPath;
     }
 
 }
diff --git a/pebl/src/main/resources/pebl/pebl.json b/pebl/src/main/resources/pebl/pebl.json
@@ -1611,7 +1611,7 @@
             "tool" : {
                "type" : "string"
             },
-            "logFiles" : {
+            "logs" : {
                "type" : "array",
                "items" : {
                   "type" : "string"

diff --git a/pebl/src/main/resources/pebl/pebl.xsd b/pebl/src/main/resources/pebl/pebl.xsd
@@ -500,7 +500,7 @@
    </xsd:complexType>
    <xsd:complexType name="testResult">
       <xsd:sequence>
-         <xsd:element name="logFiles" minOccurs="0">
+         <xsd:element name="logs" minOccurs="0">
             <xsd:simpleType>
                <xsd:list itemType="xsd:string"/>
             </xsd:simpleType>