Merge pull request #48 from open-simulation-platform/develop

mrindar · web-flow · commit dbc8bd332067 · 2019-10-10T16:08:34.000+02:00
Develop
diff --git a/osp-model-description-cli/pom.xml b/osp-model-description-cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>msmi-validator</artifactId>
     <groupId>com.opensimulationplatform</groupId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   
diff --git a/osp-model-description/pom.xml b/osp-model-description/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>msmi-validator</artifactId>
     <groupId>com.opensimulationplatform</groupId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   
diff --git a/osp-system-structure-cli/pom.xml b/osp-system-structure-cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>msmi-validator</artifactId>
     <groupId>com.opensimulationplatform</groupId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   
diff --git a/osp-system-structure-cli/src/main/java/com/opensimulationplatform/systemstructure/cli/CommandLineInterface.java b/osp-system-structure-cli/src/main/java/com/opensimulationplatform/systemstructure/cli/CommandLineInterface.java
@@ -10,6 +10,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.util.List;
 
 import static java.util.Objects.nonNull;
 
@@ -36,7 +37,10 @@ public static void main(String[] args) {
       }
       
       LOG.error("--- Message ---");
-      String[] lines = result.getDiagnostics().getMessage().split("\n");
+      StringBuilder messageBuilder = new StringBuilder();
+      List<SystemStructureValidator.Diagnostic> diagnostics = result.getDiagnostics();
+      diagnostics.forEach(d -> messageBuilder.append(d.getMessage()).append("\n"));
+      String[] lines = messageBuilder.toString().split("\n");
       for (String line : lines) {
         LOG.error(line);
       }
diff --git a/osp-system-structure-http/pom.xml b/osp-system-structure-http/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>msmi-validator</artifactId>
     <groupId>com.opensimulationplatform</groupId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/osp-system-structure-http/src/main/java/com/opensimulationplatform/systemstructure/http/ValidationServlet.java b/osp-system-structure-http/src/main/java/com/opensimulationplatform/systemstructure/http/ValidationServlet.java
@@ -15,6 +15,7 @@
 import java.io.PrintWriter;
 import java.net.URI;
 import java.net.URL;
+import java.util.List;
 
 import static java.util.Objects.nonNull;
 
@@ -96,13 +97,21 @@ private ValidationServletResponse getServletResponse(SystemStructureValidator.Re
       response.setValid("true");
     } else {
       response.setValid("false");
-      
-      response.setMessage(result.getDiagnostics().getMessage());
+      response.setMessage(getResponseMessage(result));
     }
     
     return response;
   }
   
+  private String getResponseMessage(SystemStructureValidator.Result result) {
+    StringBuilder messageBuilder = new StringBuilder();
+    List<SystemStructureValidator.Diagnostic> diagnostics = result.getDiagnostics();
+    diagnostics.forEach(d -> {
+      messageBuilder.append(d.getMessage()).append("\n");
+    });
+    return messageBuilder.toString().trim();
+  }
+  
   private URI getURI(String value) {
     try {
       LOG.debug("Attempting to parse: '" + value + "' as a URI...");
diff --git a/osp-system-structure-http/src/test/java/com/opensimulationplatform/systemstructure/http/ValidationServerTest.java b/osp-system-structure-http/src/test/java/com/opensimulationplatform/systemstructure/http/ValidationServerTest.java
@@ -73,7 +73,7 @@ public void canHandleGetRequestWithInvalidConfiguration() throws Exception {
         "simulator_CraneController_velocity_socket_velocity has_plug_mate simulator_KnuckleBoomCrane_velocity_plug_velocity\n" +
         "simulator_CraneController_velocity_socket_velocity has_plug_mate simulator_KnuckleBoomCrane_generic_plug_actuatorLimits\n" +
         "simulator_CraneController_velocity_socket_velocity Type socket\n" +
-        "simulator_KnuckleBoomCrane_velocity_plug_velocity Type velocity\n", response.getMessage());
+        "simulator_KnuckleBoomCrane_velocity_plug_velocity Type velocity", response.getMessage());
   }
   
   @Test
@@ -123,7 +123,7 @@ public void canHandleMultiPartPostRequestWithInvalidConfiguration() throws Excep
         "simulator_CraneController_velocity_socket_velocity has_plug_mate simulator_KnuckleBoomCrane_velocity_plug_velocity\n" +
         "simulator_CraneController_velocity_socket_velocity has_plug_mate simulator_KnuckleBoomCrane_generic_plug_actuatorLimits\n" +
         "simulator_CraneController_velocity_socket_velocity Type socket\n" +
-        "simulator_KnuckleBoomCrane_velocity_plug_velocity Type velocity\n", response.getMessage());
+        "simulator_KnuckleBoomCrane_velocity_plug_velocity Type velocity", response.getMessage());
   }
   
   @Test
diff --git a/osp-system-structure-http/src/test/java/com/opensimulationplatform/systemstructure/http/ValidationServletTest.java b/osp-system-structure-http/src/test/java/com/opensimulationplatform/systemstructure/http/ValidationServletTest.java
@@ -78,7 +78,7 @@ public void canCallDoGetOnInvalidConfiguration() {
         "simulator_CraneController_velocity_socket_velocity has_plug_mate simulator_KnuckleBoomCrane_velocity_plug_velocity\n" +
         "simulator_CraneController_velocity_socket_velocity has_plug_mate simulator_KnuckleBoomCrane_generic_plug_actuatorLimits\n" +
         "simulator_CraneController_velocity_socket_velocity Type socket\n" +
-        "simulator_KnuckleBoomCrane_velocity_plug_velocity Type velocity\n", response.getMessage());
+        "simulator_KnuckleBoomCrane_velocity_plug_velocity Type velocity", response.getMessage());
   }
   
   @Test
@@ -117,6 +117,6 @@ public void canCallDoPostOnInvalidConfiguration() {
         "simulator_CraneController_velocity_socket_velocity has_plug_mate simulator_KnuckleBoomCrane_velocity_plug_velocity\n" +
         "simulator_CraneController_velocity_socket_velocity has_plug_mate simulator_KnuckleBoomCrane_generic_plug_actuatorLimits\n" +
         "simulator_CraneController_velocity_socket_velocity Type socket\n" +
-        "simulator_KnuckleBoomCrane_velocity_plug_velocity Type velocity\n", response.getMessage());
+        "simulator_KnuckleBoomCrane_velocity_plug_velocity Type velocity", response.getMessage());
   }
 }
diff --git a/osp-system-structure/pom.xml b/osp-system-structure/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>msmi-validator</artifactId>
     <groupId>com.opensimulationplatform</groupId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   
diff --git a/osp-validator-api/pom.xml b/osp-validator-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>msmi-validator</artifactId>
     <groupId>com.opensimulationplatform</groupId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   
diff --git a/osp-validator-api/src/main/java/Main.java b/osp-validator-api/src/main/java/Main.java
@@ -0,0 +1,29 @@
+import com.opensimulationplatform.core.model.OspObject;
+import com.opensimulationplatform.core.validator.systemstructure.SystemStructureValidator;
+import com.opensimulationplatform.systemstructure.xml.validator.XmlValidator;
+
+import java.io.File;
+import java.util.List;
+
+class Main {
+  public static void main(String[] args) {
+    File file = new File("./src/test/resources/validator/xml/OspSystemStructure-invalid.xml");
+  
+    SystemStructureValidator.Result result = XmlValidator.validate(file);
+  
+    if (result.isSuccess()) {
+      System.out.println("WOHO!");
+    } else {
+      List<SystemStructureValidator.Diagnostic> diagnostics = result.getDiagnostics();
+      for (SystemStructureValidator.Diagnostic diagnostic : diagnostics) {
+        System.out.println("Message:");
+        String message = diagnostic.getMessage();
+        System.out.println(message);
+        List<OspObject> invalidObjects = diagnostic.getOspObjects();
+        for (OspObject ospObject : invalidObjects) {
+          System.out.println(ospObject);
+        }
+      }
+    }
+  }
+}
diff --git a/osp-validator-core/pom.xml b/osp-validator-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>msmi-validator</artifactId>
     <groupId>com.opensimulationplatform</groupId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   
diff --git a/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/OspObject.java b/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/OspObject.java
@@ -0,0 +1,4 @@
+package com.opensimulationplatform.core.model;
+
+public interface OspObject {
+}
diff --git a/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/modeldescription/ModelDescription.java b/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/modeldescription/ModelDescription.java
@@ -1,12 +1,13 @@
 package com.opensimulationplatform.core.model.modeldescription;
 
+import com.opensimulationplatform.core.model.OspObject;
 import no.ntnu.ihb.fmi4j.modeldescription.fmi1.FmiModelDescription;
 
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-public class ModelDescription {
+public class ModelDescription implements OspObject {
   private String name;
   private Map<String, OspPlug> ospPlugs = new TreeMap<>();
   private Map<String, OspSocket> ospSockets = new TreeMap<>();
diff --git a/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/modeldescription/OspBond.java b/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/modeldescription/OspBond.java
@@ -1,5 +1,6 @@
 package com.opensimulationplatform.core.model.modeldescription;
 
+import com.opensimulationplatform.core.model.OspObject;
 import com.opensimulationplatform.core.model.systemstructure.OspSimulator;
 
 import java.util.ArrayList;
@@ -8,7 +9,7 @@
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
 
-public class OspBond {
+public class OspBond implements OspObject {
   private final String name;
   private OspSimulator ospSimulator;
   private final List<OspPlug> ospPlugs = new ArrayList<>();
diff --git a/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/modeldescription/OspPlug.java b/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/modeldescription/OspPlug.java
@@ -1,5 +1,6 @@
 package com.opensimulationplatform.core.model.modeldescription;
 
+import com.opensimulationplatform.core.model.OspObject;
 import com.opensimulationplatform.core.model.systemstructure.OspSimulator;
 
 import java.util.HashMap;
@@ -8,7 +9,7 @@
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
 
-public class OspPlug {
+public class OspPlug implements OspObject {
   private final String name;
   private final String type;
   private OspSimulator ospSimulator;
diff --git a/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/modeldescription/OspSocket.java b/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/modeldescription/OspSocket.java
@@ -1,5 +1,6 @@
 package com.opensimulationplatform.core.model.modeldescription;
 
+import com.opensimulationplatform.core.model.OspObject;
 import com.opensimulationplatform.core.model.systemstructure.OspSimulator;
 
 import java.util.HashMap;
@@ -8,7 +9,7 @@
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
 
-public class OspSocket {
+public class OspSocket implements OspObject {
   private final String name;
   private final String type;
   private OspSimulator ospSimulator;
diff --git a/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/modeldescription/OspVariable.java b/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/modeldescription/OspVariable.java
@@ -1,5 +1,6 @@
 package com.opensimulationplatform.core.model.modeldescription;
 
+import com.opensimulationplatform.core.model.OspObject;
 import com.opensimulationplatform.core.model.systemstructure.OspSimulator;
 
 import java.util.HashMap;
@@ -8,7 +9,7 @@
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
 
-public class OspVariable {
+public class OspVariable implements OspObject {
   
   private final String name;
   private OspSimulator ospSimulator;
diff --git a/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/systemstructure/OspBondConnection.java b/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/systemstructure/OspBondConnection.java
@@ -1,8 +1,9 @@
 package com.opensimulationplatform.core.model.systemstructure;
 
+import com.opensimulationplatform.core.model.OspObject;
 import com.opensimulationplatform.core.model.modeldescription.OspBond;
 
-public class OspBondConnection {
+public class OspBondConnection implements OspObject {
   private final OspSimulator ospSimulatorA;
   private final OspBond ospBondA;
   private final OspSimulator ospSimulatorB;
diff --git a/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/systemstructure/OspPlugSocketConnection.java b/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/systemstructure/OspPlugSocketConnection.java
@@ -1,9 +1,10 @@
 package com.opensimulationplatform.core.model.systemstructure;
 
+import com.opensimulationplatform.core.model.OspObject;
 import com.opensimulationplatform.core.model.modeldescription.OspPlug;
 import com.opensimulationplatform.core.model.modeldescription.OspSocket;
 
-public class OspPlugSocketConnection {
+public class OspPlugSocketConnection implements OspObject {
   private final OspSimulator sourceOspSimulator;
   private final OspPlug ospPlug;
   private final OspSimulator targetOspSimulator;
diff --git a/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/systemstructure/OspSimulator.java b/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/systemstructure/OspSimulator.java
@@ -1,5 +1,6 @@
 package com.opensimulationplatform.core.model.systemstructure;
 
+import com.opensimulationplatform.core.model.OspObject;
 import com.opensimulationplatform.core.model.modeldescription.OspBond;
 import com.opensimulationplatform.core.model.modeldescription.OspPlug;
 import com.opensimulationplatform.core.model.modeldescription.OspSocket;
@@ -10,7 +11,7 @@
 
 import static java.util.Objects.nonNull;
 
-public class OspSimulator {
+public class OspSimulator implements OspObject {
   private final String name;
   private final String source;
   private final Map<String, OspVariable> variables = new HashMap<>();
diff --git a/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/systemstructure/OspVariableConnection.java b/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/systemstructure/OspVariableConnection.java
@@ -1,8 +1,9 @@
 package com.opensimulationplatform.core.model.systemstructure;
 
+import com.opensimulationplatform.core.model.OspObject;
 import com.opensimulationplatform.core.model.modeldescription.OspVariable;
 
-public class OspVariableConnection {
+public class OspVariableConnection implements OspObject {
   private final OspSimulator sourceOspSimulator;
   private final OspVariable sourceOspVariable;
   private final OspSimulator targetOspSimulator;
diff --git a/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/systemstructure/SystemStructure.java b/osp-validator-core/src/main/java/com/opensimulationplatform/core/model/systemstructure/SystemStructure.java
@@ -1,10 +1,12 @@
 package com.opensimulationplatform.core.model.systemstructure;
 
+import com.opensimulationplatform.core.model.OspObject;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-public class SystemStructure {
+public class SystemStructure implements OspObject {
   private List<OspSimulator> ospSimulators = new ArrayList<>();
   private List<OspBondConnection> ospBondConnections = new ArrayList<>();
   private List<OspPlugSocketConnection> ospPlugSocketConnections = new ArrayList<>();
diff --git a/osp-validator-core/src/main/java/com/opensimulationplatform/core/validator/systemstructure/SystemStructureValidator.java b/osp-validator-core/src/main/java/com/opensimulationplatform/core/validator/systemstructure/SystemStructureValidator.java
diff --git a/osp-validator-core/src/test/java/com/opensimulationplatform/core/validator/systemstructure/SystemStructureValidatorTest.java b/osp-validator-core/src/test/java/com/opensimulationplatform/core/validator/systemstructure/SystemStructureValidatorTest.java
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public void canCallDoGetOnInvalidConfiguration() {`
`78`	`78`	`"simulator_CraneController_velocity_socket_velocity has_plug_mate simulator_KnuckleBoomCrane_velocity_plug_velocity\n" +`
`79`	`79`	`"simulator_CraneController_velocity_socket_velocity has_plug_mate simulator_KnuckleBoomCrane_generic_plug_actuatorLimits\n" +`
`80`	`80`	`"simulator_CraneController_velocity_socket_velocity Type socket\n" +`
`81`		`- "simulator_KnuckleBoomCrane_velocity_plug_velocity Type velocity\n", response.getMessage());`
	`81`	`+ "simulator_KnuckleBoomCrane_velocity_plug_velocity Type velocity", response.getMessage());`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`@Test`
`@@ -117,6 +117,6 @@ public void canCallDoPostOnInvalidConfiguration() {`
`117`	`117`	`"simulator_CraneController_velocity_socket_velocity has_plug_mate simulator_KnuckleBoomCrane_velocity_plug_velocity\n" +`
`118`	`118`	`"simulator_CraneController_velocity_socket_velocity has_plug_mate simulator_KnuckleBoomCrane_generic_plug_actuatorLimits\n" +`
`119`	`119`	`"simulator_CraneController_velocity_socket_velocity Type socket\n" +`
`120`		`- "simulator_KnuckleBoomCrane_velocity_plug_velocity Type velocity\n", response.getMessage());`
	`120`	`+ "simulator_KnuckleBoomCrane_velocity_plug_velocity Type velocity", response.getMessage());`
`121`	`121`	`}`
`122`	`122`	`}`