fix(Sdk): Added missing validation pass for SwitchState's default condition property

fix(Sdk): Renamed the ConditionType enum into SwitchCaseOutputType
fix(Sdk): Fixed the DefaultCaseDefinition to inherit the SwitchCaseDefinition class

Author: cdavernas

src/ServerlessWorkflow.Sdk.UnitTests/Cases/Services/WorkflowValidatorTests.cs

@@ -34,8 +34,8 @@ public async Task Validate_Yaml_ShouldWork()
         public async Task Validate_Json_ShouldWork()
         {
             //arrange
-            var yaml = File.ReadAllText(Path.Combine("Resources", "Workflows", "operation.json"));
-            var workflow = await this.Reader.ParseAsync(yaml);
+            var json = File.ReadAllText(Path.Combine("Resources", "Workflows", "operation.json"));
+            var workflow = await this.Reader.ParseAsync(json);
 
             //act
             var validationResult = await this.Validator.ValidateAsync(workflow);
@@ -45,6 +45,21 @@ public async Task Validate_Json_ShouldWork()
             validationResult.IsValid.Should().BeTrue();
         }
 
+        [Fact]
+        public async Task Validate_Invalid_Json_ShouldFail()
+        {
+            //arrange
+            var json = File.ReadAllText(Path.Combine("Resources", "Workflows", "missing-transition.json"));
+            var workflow = await this.Reader.ParseAsync(json);
+            //act
+            var validationResult = await this.Validator.ValidateAsync(workflow);
+
+            //assert
+            validationResult.Should().NotBeNull();
+            validationResult.IsValid.Should().BeFalse();
+            validationResult.DslValidationErrors.Should().NotBeEmpty();
+        }
+
     }
 
 }

src/ServerlessWorkflow.Sdk.UnitTests/Resources/workflows/missing-transition.json

@@ -0,0 +1,57 @@
+{
+  "id": "compensation-test",
+  "name": "Compensation Test",
+  "version": "0.1.0",
+  "specVersion": "0.8",
+  "functions": [
+    {
+      "name": "is-odd",
+      "type": "expression",
+      "operation": ".number % 2 == 1"
+    },
+    {
+      "name": "i-fail",
+      "type": "rest",
+      "operation": "http://somefail.com/fails#fake"
+    }
+  ],
+  "states": [
+    {
+      "name": "Good odds",
+      "type": "switch",
+      "dataConditions": [
+        {
+          "name": "Is Odd",
+          "condition": "${ fn:is-odd }",
+          "end": true
+        }
+      ],
+      "defaultCondition": {
+        "transition": "Non existing state, should not be valid"
+      }
+    },
+    {
+      "name": "I have something to compensate...",
+      "type": "operation",
+      "actions": [
+        {
+          "name": "Call i-fail",
+          "functionRef": {
+            "refName": "i-fail"
+          }
+        }
+      ],
+      "compensatedBy": "Compensate",
+      "end": true
+    },
+    {
+      "name": "Compensate",
+      "type": "inject",
+      "data": {
+        "status": "compensated"
+      },
+      "usedForCompensation": true,
+      "end": true
+    }
+  ]
+}

src/ServerlessWorkflow.Sdk.UnitTests/ServerlessWorkflow.Sdk.UnitTests.csproj

@@ -65,6 +65,9 @@
     <None Update="Resources\workflows\externalref.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="Resources\workflows\missing-transition.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="Resources\workflows\operation.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ServerlessWorkflow.Sdk/Models/DefaultCaseDefinition.cs

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021-Present The Serverless Workflow Specification Authors
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+namespace ServerlessWorkflow.Sdk.Models
+{
+
+    /// <summary>
+    /// Represents an object used to define the transition of the workflow if there is no matching cases or event timeout is reached
+    /// </summary>
+    [ProtoContract]
+    [DataContract]
+    public class DefaultCaseDefinition
+        : SwitchCaseDefinition
+    {
+
+
+
+    }
+
+}

src/ServerlessWorkflow.Sdk/Models/DefaultConditionDefinition.cs

@@ -38,14 +38,14 @@ public abstract class SwitchCaseDefinition
         [YamlIgnore]
         [ProtoIgnore]
         [IgnoreDataMember]
-        public ConditionType Type
+        public SwitchCaseOutcomeType OutcomeType
         {
             get
             {
                 if (this.Transition != null)
-                    return ConditionType.Transition;
+                    return SwitchCaseOutcomeType.Transition;
                 else
-                    return ConditionType.End;
+                    return SwitchCaseOutcomeType.End;
             }
         }
 

src/ServerlessWorkflow.Sdk/Models/SwitchCaseDefinition.cs

@@ -87,7 +87,7 @@ public virtual SwitchStateType SwitchType
         [Newtonsoft.Json.JsonRequired]
         [ProtoMember(3, IsRequired = true)]
         [DataMember(Order = 3, IsRequired = true)]
-        public virtual DefaultConditionDefinition DefaultCondition { get; set; } = null!;
+        public virtual DefaultCaseDefinition DefaultCondition { get; set; } = null!;
 
         /// <summary>
         /// Gets the <see cref="SwitchCaseDefinition"/> with the specified name

src/ServerlessWorkflow.Sdk/Models/SwitchStateDefinition.cs

@@ -4,9 +4,9 @@
     <TargetFramework>net6.0</TargetFramework>
 	<Nullable>enable</Nullable>
     <NeutralLanguage>en</NeutralLanguage>
-    <AssemblyVersion>0.8.1.13</AssemblyVersion>
-    <FileVersion>0.8.1.13</FileVersion>
-    <Version>0.8.1.13</Version>
+    <AssemblyVersion>0.8.1.14</AssemblyVersion>
+    <FileVersion>0.8.1.14</FileVersion>
+    <Version>0.8.1.14</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>