Merge branch 'feat/verifier' into 'develop'

Feat/verifier

See merge request jonasblatt/ma-jonasblatt-dmn-verifier!7

dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/domain/vdmn/parser/SimpleVDmnParser.java

@@ -99,7 +99,7 @@ public class SimpleVDmnParser implements DmnModelInstanceWrapper {
       VDmnDecisionImpl.Builder decisionBuilder = VDmnDecisionImpl.getBuilder().withDecisionId(id);
       decisionBuilderMap.put(id, decisionBuilder);
       // Add name, if present
-      if (decision.getName() != null) {
+      if (decision.getName() != null && !decision.getName().isEmpty()) {
         decisionBuilder.withName(decision.getName());
       }
       // Add DmnDecisionBuilder to definitionBuilder
@@ -132,11 +132,12 @@ public class SimpleVDmnParser implements DmnModelInstanceWrapper {
               .withInputExpressionId(new InputExpressionId(inputCol.getInputExpression().getId()))
               .withTypeRef(type);
       // name
-      if (inputCol.getInputExpression().getText() != null) {
+      if (inputCol.getInputExpression().getText() != null
+          && !inputCol.getInputExpression().getText().getTextContent().isEmpty()) {
         builder.withName(inputCol.getInputExpression().getText().getTextContent());
       }
       // label
-      if (inputCol.getLabel() != null) {
+      if (inputCol.getLabel() != null && !inputCol.getLabel().isEmpty()) {
         builder.withLabel(inputCol.getLabel());
       }
       // Add Builder to builder list
@@ -162,11 +163,11 @@ public class SimpleVDmnParser implements DmnModelInstanceWrapper {
               .withOutputId(new OutputId(outputCol.getId()))
               .withTypeRef(VTypeRef.getTypeRefFromName(outputCol.getTypeRef()));
       // name
-      if (outputCol.getName() != null) {
+      if (outputCol.getName() != null && !outputCol.getName().isEmpty()) {
         builder.withName(outputCol.getName());
       }
       // label
-      if (outputCol.getLabel() != null) {
+      if (outputCol.getLabel() != null && !outputCol.getLabel().isEmpty()) {
         builder.withLabel(outputCol.getLabel());
       }
       // Add Builder to builder list

dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/metrics/Metric.java

@@ -55,14 +55,22 @@ public class Metric implements Serializable {
         / NANO_SECONDS_PER_SECOND;
   }
 
-  /**
-   * Get the total execution time in ns.
-   */
+  /** Get the total execution time in ns. */
   @JsonProperty("totalExecutionTime")
   public long getTotalExecutionTime() {
     return executionTimes.stream().mapToLong(Long::longValue).sum();
   }
 
+  /**
+   * Get the {@link VerificationType}.
+   *
+   * @return the {@link VerificationType}
+   */
+  @JsonProperty("type")
+  public VerificationType getType() {
+    return type;
+  }
+
   /**
    * Get the total execution time in ms.
    *

dmnverifierapi/src/main/resources/application.properties

 # Configuration file
 # Quarkus cors settings
 quarkus.http.cors=true
-quarkus.http.cors.origins=http://localhost:8081
-quarkus.http.cors.headers=accept, authorization, content-type, x-requested-with
+quarkus.http.cors.origins=http://localhost:8081,http://localhost:80
+quarkus.http.cors.headers=accept,authorization,content-type,x-requested-with
 quarkus.http.cors.methods=GET, POST, OPTIONS
 # Amount of threads for calculating the verifications
 verifier.threads=8