fix(Sdk): Hide OneOf properties from users, and instead add propertie…

…s for its the type alternatives it encapsulates Signed-off-by: Charles d'Avernas <charles.davernas@neuroglia.io>
serverlessworkflow · Aug 21, 2024 · d5196bd · d5196bd
1 parent 6eab8a1
commit d5196bd
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 10 deletions.
diff --git a/src/ServerlessWorkflow.Sdk.Builders/ScriptProcessDefinitionBuilder.cs b/src/ServerlessWorkflow.Sdk.Builders/ScriptProcessDefinitionBuilder.cs
@@ -133,8 +133,8 @@ public override ScriptProcessDefinition Build()
             Arguments = this.Arguments,
             Environment = this.Environment
         };
-        if(this.Source != null) process.Source = this.Source;
-        else if(this.SourceUri != null) process.Source = new() { Endpoint = this.SourceUri };
+        if (this.Source != null) process.Source = this.Source;
+        else if (this.SourceUri != null) process.Source = new() { EndpointUri = this.SourceUri };
         return process;
     }
 

diff --git a/src/ServerlessWorkflow.Sdk.Builders/ServerlessWorkflow.Sdk.Builders.csproj b/src/ServerlessWorkflow.Sdk.Builders/ServerlessWorkflow.Sdk.Builders.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<VersionPrefix>1.0.0</VersionPrefix>
-	<VersionSuffix>alpha2.10</VersionSuffix>
+	<VersionSuffix>alpha2.11</VersionSuffix>
 	<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
 	<FileVersion>$(VersionPrefix)</FileVersion>
 	<NeutralLanguage>en</NeutralLanguage>

diff --git a/src/ServerlessWorkflow.Sdk.IO/ServerlessWorkflow.Sdk.IO.csproj b/src/ServerlessWorkflow.Sdk.IO/ServerlessWorkflow.Sdk.IO.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<VersionPrefix>1.0.0</VersionPrefix>
-	<VersionSuffix>alpha2.10</VersionSuffix>
+	<VersionSuffix>alpha2.11</VersionSuffix>
 	<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
 	<FileVersion>$(VersionPrefix)</FileVersion>
 	<NeutralLanguage>en</NeutralLanguage>

diff --git a/src/ServerlessWorkflow.Sdk/Models/Calls/HttpCallDefinition.cs b/src/ServerlessWorkflow.Sdk/Models/Calls/HttpCallDefinition.cs
@@ -29,11 +29,31 @@ public record HttpCallDefinition
     public required virtual string Method { get; set; }
 
     /// <summary>
-    /// Gets/sets the definition of the endpoint to request
+    /// Gets/sets the endpoint at which to get the defined resource
+    /// </summary>
+    [IgnoreDataMember, JsonIgnore, YamlIgnore]
+    public virtual EndpointDefinition Endpoint
+    {
+        get => this.EndpointValue.T1Value ?? new() { Uri = this.EndpointUri };
+        set => this.EndpointValue = value;
+    }
+
+    /// <summary>
+    /// Gets/sets the endpoint at which to get the defined resource
+    /// </summary>
+    [IgnoreDataMember, JsonIgnore, YamlIgnore]
+    public virtual Uri EndpointUri
+    {
+        get => this.EndpointValue.T1Value?.Uri ?? this.EndpointValue.T2Value!;
+        set => this.EndpointValue = value;
+    }
+
+    /// <summary>
+    /// Gets/sets the endpoint at which to get the defined resource
     /// </summary>
     [Required]
-    [DataMember(Name = "endpoint", Order = 2), JsonPropertyName("endpoint"), JsonPropertyOrder(2), YamlMember(Alias = "endpoint", Order = 2)]
-    public required virtual OneOf<EndpointDefinition, Uri> Endpoint { get; set; }
+    [DataMember(Name = "endpoint", Order = 2), JsonInclude, JsonPropertyName("endpoint"), JsonPropertyOrder(2), YamlMember(Alias = "endpoint", Order = 2)]
+    protected virtual OneOf<EndpointDefinition, Uri> EndpointValue { get; set; } = null!;
 
     /// <summary>
     /// Gets/sets a name/value mapping of the headers, if any, of the HTTP request to perform

diff --git a/src/ServerlessWorkflow.Sdk/Models/ExternalResourceDefinition.cs b/src/ServerlessWorkflow.Sdk/Models/ExternalResourceDefinition.cs
@@ -26,11 +26,31 @@ public record ExternalResourceDefinition
     [DataMember(Name = "name", Order = 1), JsonPropertyName("name"), JsonPropertyOrder(1), YamlMember(Alias = "name", Order = 1)]
     public virtual string? Name { get; set; }
 
+    /// <summary>
+    /// Gets/sets the endpoint at which to get the defined resource
+    /// </summary>
+    [IgnoreDataMember, JsonIgnore, YamlIgnore]
+    public virtual EndpointDefinition Endpoint
+    {
+        get => this.EndpointValue.T1Value ?? new() { Uri = this.EndpointUri };
+        set => this.EndpointValue = value;
+    }
+
+    /// <summary>
+    /// Gets/sets the endpoint at which to get the defined resource
+    /// </summary>
+    [IgnoreDataMember, JsonIgnore, YamlIgnore]
+    public virtual Uri EndpointUri
+    {
+        get => this.EndpointValue.T1Value?.Uri ?? this.EndpointValue.T2Value!;
+        set => this.EndpointValue = value;
+    }
+
     /// <summary>
     /// Gets/sets the endpoint at which to get the defined resource
     /// </summary>
     [Required]
-    [DataMember(Name = "endpoint", Order = 2), JsonPropertyName("endpoint"), JsonPropertyOrder(2), YamlMember(Alias = "endpoint", Order = 2)]
-    public virtual OneOf<EndpointDefinition, Uri> Endpoint { get; set; } = null!;
+    [DataMember(Name = "endpoint", Order = 2), JsonInclude, JsonPropertyName("endpoint"), JsonPropertyOrder(2), YamlMember(Alias = "endpoint", Order = 2)]
+    protected virtual OneOf<EndpointDefinition, Uri> EndpointValue { get; set; } = null!;
 
 }
diff --git a/src/ServerlessWorkflow.Sdk/ServerlessWorkflow.Sdk.csproj b/src/ServerlessWorkflow.Sdk/ServerlessWorkflow.Sdk.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<VersionPrefix>1.0.0</VersionPrefix>
-	<VersionSuffix>alpha2.10</VersionSuffix>
+	<VersionSuffix>alpha2.11</VersionSuffix>
 	<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
 	<FileVersion>$(VersionPrefix)</FileVersion>
 	<NeutralLanguage>en</NeutralLanguage>