fix(*): add "override" for "Type"

pollination · May 10, 2023 · d91bc3b · d91bc3b
1 parent 4b1e7b4
commit d91bc3b
Show file tree

Hide file tree

Showing 267 changed files with 374 additions and 653 deletions.
diff --git a/.openapi-generator/post_gen_script.py b/.openapi-generator/post_gen_script.py
@@ -190,6 +190,16 @@ def replace_decimal(read_data):
     return data
 
 
+def add_override_to_type_property(read_data):
+    data = read_data
+    replace_source = "public string Type { get; protected set; }"
+    replace_new = "public override string Type { get; protected set; }"
+    rex = replace_source
+    if re.findall(rex, data) != []:
+        data = re.sub(rex, replace_new, data)
+    return data
+
+
 def replace_AnyType(read_data):
     data = read_data
     replace_source = ['AnyType']
@@ -234,6 +244,7 @@ def check_csfiles(source_folder, anyof_types):
         # replace decimal/number to double
         # data = replace_decimal(data)
         data = fix_constructor(data)
+        data = add_override_to_type_property(data)
 
         # remove spec parameter in DAG inputs's Equals
         data = remove_spec_in_equals(data)

diff --git a/src/PollinationSDK.Tests/TestInit.cs b/src/PollinationSDK.Tests/TestInit.cs
@@ -10,7 +10,7 @@ public class TestInit
         [OneTimeSetUp]
         public void Init()
         {
-            var useDevelopmentServer = true;
+            var useDevelopmentServer = false;
             var key = string.Empty;
 
             // for local development tests, you must add Api key to ApiKey.txt

diff --git a/src/PollinationSDK/ManuallyAdded/BaseClass/PollinationObject.cs b/src/PollinationSDK/ManuallyAdded/BaseClass/PollinationObject.cs
@@ -3,7 +3,7 @@
 
 namespace PollinationSDK
 {
-    public abstract class PollinationObject 
+    public abstract class PollinationObject : IPollinationObject
     {
          /// <summary>
         /// Gets or Sets Type
@@ -24,10 +24,44 @@ protected internal PollinationObject()
         public abstract string ToString(bool detailed);
 
         public abstract OpenAPIGenBaseModel Duplicate();
-        public string ToJson()
+
+        public string ToJson(bool indented = false)
         {
-            return JsonConvert.SerializeObject(this, Formatting.Indented, JsonSetting.AnyOfConvertSetting);
+            var format = indented ? Formatting.Indented : Formatting.None;
+            return JsonConvert.SerializeObject(this, format, JsonSetting.AnyOfConvertSetting);
         }
+
+        public static bool operator == (PollinationObject left, PollinationObject right)
+        {
+            if (left is null)
+            {
+                if (right is null)
+                {
+                    return true;
+                }
+
+                // Only the left side is null.
+                return false;
+            }
+            // Equals handles case of null on right side.
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(PollinationObject left, PollinationObject right)
+        {
+            return !(left == right);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+                return false;
+            if (obj is PollinationObject input)
+                return Extension.Equals(this.Type, input.Type);
+            return false;
+        }
+
+
     }
 }
 
diff --git a/src/PollinationSDK/ManuallyAdded/Interface/IPollinationObject.cs b/src/PollinationSDK/ManuallyAdded/Interface/IPollinationObject.cs
@@ -0,0 +1,13 @@
+
+namespace PollinationSDK
+{
+    public interface IPollinationObject
+    {
+        string ToString(bool detailed);
+        string ToJson(bool indented = false);
+        OpenAPIGenBaseModel Duplicate();
+    } 
+
+
+}
+
diff --git a/src/PollinationSDK/ManuallyAdded/Model/Extensions.cs b/src/PollinationSDK/ManuallyAdded/Model/Extensions.cs
@@ -1,11 +1,62 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections;
 
 namespace PollinationSDK
 {
     public static class ModelExtensions
     {
+        public static bool AllEquals(IList x, IList y)
+        {
+            if (x != null && y != null)
+            {
+                if (x.Count <= 0 || y.Count <= 0)
+                    return x.Count == y.Count;
+
+                if (x[0] is IList listX && y[0] is IList listY)
+                {
+                    return AllEquals(listX, listY);
+                }
+                else
+                {
+                    var xo = x.Cast<object>();
+                    var yo = y.Cast<object>();
+                    return xo.SequenceEqual(yo);
+                }
+            }
+            else if (x == null)
+            {
+                return y == null || y.Count == 0;
+            }
+            else if (y == null)
+            {
+                return x == null || x.Count == 0;
+            }
+            else
+            {
+                return x == y;
+            }
+        }
+
+        public static bool Equals(object x, object y)
+        {
+
+            if (x == y)
+                return true;
+
+            if (x == null)
+                return y == null;
+
+            if (x is JObject j)
+                return JToken.DeepEquals(j, y as JObject);
+            else
+                return x.Equals(y);
+
+        }
+
         public static List<Interface.Io.Outputs.IDag> GetOutputs(this RecipeInterface recipe)
         {
             var outputs = recipe.Outputs

diff --git a/src/PollinationSDK/Model/APIToken.cs b/src/PollinationSDK/Model/APIToken.cs
@@ -66,7 +66,7 @@ public APIToken
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "APIToken";
+        public override string Type { get; protected internal set; }  = "APIToken";
 
         /// <summary>
         /// The unique ID of this API token

diff --git a/src/PollinationSDK/Model/APITokenCreate.cs b/src/PollinationSDK/Model/APITokenCreate.cs
@@ -61,7 +61,7 @@ public APITokenCreate
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "APITokenCreate";
+        public override string Type { get; protected internal set; }  = "APITokenCreate";
 
 
         /// <summary>

diff --git a/src/PollinationSDK/Model/APITokenList.cs b/src/PollinationSDK/Model/APITokenList.cs
@@ -71,7 +71,7 @@ public APITokenList
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "APITokenList";
+        public override string Type { get; protected internal set; }  = "APITokenList";
 
         /// <summary>
         /// The current page the pagination request is on

diff --git a/src/PollinationSDK/Model/APITokenPrivate.cs b/src/PollinationSDK/Model/APITokenPrivate.cs
@@ -64,7 +64,7 @@ public APITokenPrivate
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "APITokenPrivate";
+        public override string Type { get; protected internal set; }  = "APITokenPrivate";
 
         /// <summary>
         /// The decoded API token

diff --git a/src/PollinationSDK/Model/AccessPolicy.cs b/src/PollinationSDK/Model/AccessPolicy.cs
@@ -69,7 +69,7 @@ public AccessPolicy
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "AccessPolicy";
+        public override string Type { get; protected internal set; }  = "AccessPolicy";
 
         /// <summary>
         /// The subject of the access policy

diff --git a/src/PollinationSDK/Model/AccessPolicyList.cs b/src/PollinationSDK/Model/AccessPolicyList.cs
@@ -71,7 +71,7 @@ public AccessPolicyList
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "AccessPolicyList";
+        public override string Type { get; protected internal set; }  = "AccessPolicyList";
 
         /// <summary>
         /// The current page the pagination request is on

diff --git a/src/PollinationSDK/Model/Accessor.cs b/src/PollinationSDK/Model/Accessor.cs
@@ -68,7 +68,7 @@ public Accessor
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "Accessor";
+        public override string Type { get; protected internal set; }  = "Accessor";
 
         /// <summary>
         /// Gets or Sets Subject

diff --git a/src/PollinationSDK/Model/AccountPublic.cs b/src/PollinationSDK/Model/AccountPublic.cs
@@ -73,7 +73,7 @@ public AccountPublic
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "AccountPublic";
+        public override string Type { get; protected internal set; }  = "AccountPublic";
 
         /// <summary>
         /// Gets or Sets Id

diff --git a/src/PollinationSDK/Model/Activation.cs b/src/PollinationSDK/Model/Activation.cs
@@ -86,7 +86,7 @@ public Activation
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "Activation";
+        public override string Type { get; protected internal set; }  = "Activation";
 
         /// <summary>
         /// Gets or Sets Id

diff --git a/src/PollinationSDK/Model/ActivationList.cs b/src/PollinationSDK/Model/ActivationList.cs
@@ -61,7 +61,7 @@ public ActivationList
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "ActivationList";
+        public override string Type { get; protected internal set; }  = "ActivationList";
 
         /// <summary>
         /// Gets or Sets Resources

diff --git a/src/PollinationSDK/Model/ArtifactSource.cs b/src/PollinationSDK/Model/ArtifactSource.cs
@@ -50,7 +50,7 @@ public ArtifactSource
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "_ArtifactSource";
+        public override string Type { get; protected internal set; }  = "_ArtifactSource";
 
         /// <summary>
         /// An optional dictionary to add annotations to inputs. These annotations will be used by the client side libraries.

diff --git a/src/PollinationSDK/Model/BakedRecipe.cs b/src/PollinationSDK/Model/BakedRecipe.cs
@@ -81,7 +81,7 @@ public BakedRecipe
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "BakedRecipe";
+        public override string Type { get; protected internal set; }  = "BakedRecipe";
 
         /// <summary>
         /// A list of tasks to create a DAG recipe.

diff --git a/src/PollinationSDK/Model/BaseList.cs b/src/PollinationSDK/Model/BaseList.cs
@@ -63,7 +63,7 @@ public BaseList
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "BaseList";
+        public override string Type { get; protected internal set; }  = "BaseList";
 
         /// <summary>
         /// Gets or Sets HasMore

diff --git a/src/PollinationSDK/Model/BaseReference.cs b/src/PollinationSDK/Model/BaseReference.cs
@@ -50,7 +50,7 @@ public BaseReference
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "_BaseReference";
+        public override string Type { get; protected internal set; }  = "_BaseReference";
 
         /// <summary>
         /// An optional dictionary to add annotations to inputs. These annotations will be used by the client side libraries.

diff --git a/src/PollinationSDK/Model/BaseStatus.cs b/src/PollinationSDK/Model/BaseStatus.cs
@@ -69,7 +69,7 @@ public BaseStatus
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "BaseStatus";
+        public override string Type { get; protected internal set; }  = "BaseStatus";
 
         /// <summary>
         /// The time at which the task was started

diff --git a/src/PollinationSDK/Model/BodyPostPluginOwnerPluginsPost.cs b/src/PollinationSDK/Model/BodyPostPluginOwnerPluginsPost.cs
@@ -61,7 +61,7 @@ public BodyPostPluginOwnerPluginsPost
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "Body_post_plugin__owner__plugins_post";
+        public override string Type { get; protected internal set; }  = "Body_post_plugin__owner__plugins_post";
 
         /// <summary>
         /// Gets or Sets Package

diff --git a/src/PollinationSDK/Model/BodyPostRecipeOwnerRecipesPost.cs b/src/PollinationSDK/Model/BodyPostRecipeOwnerRecipesPost.cs
@@ -61,7 +61,7 @@ public BodyPostRecipeOwnerRecipesPost
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "Body_post_recipe__owner__recipes_post";
+        public override string Type { get; protected internal set; }  = "Body_post_recipe__owner__recipes_post";
 
         /// <summary>
         /// Gets or Sets Package

diff --git a/src/PollinationSDK/Model/CardPublic.cs b/src/PollinationSDK/Model/CardPublic.cs
@@ -65,7 +65,7 @@ public CardPublic
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "CardPublic";
+        public override string Type { get; protected internal set; }  = "CardPublic";
 
         /// <summary>
         /// The last four digits of the card

diff --git a/src/PollinationSDK/Model/CloudJob.cs b/src/PollinationSDK/Model/CloudJob.cs
@@ -72,7 +72,7 @@ public CloudJob
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "CloudJob";
+        public override string Type { get; protected internal set; }  = "CloudJob";
 
         /// <summary>
         /// The unique ID for this run

diff --git a/src/PollinationSDK/Model/CloudJobList.cs b/src/PollinationSDK/Model/CloudJobList.cs
@@ -71,7 +71,7 @@ public CloudJobList
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "CloudJobList";
+        public override string Type { get; protected internal set; }  = "CloudJobList";
 
         /// <summary>
         /// The current page the pagination request is on

diff --git a/src/PollinationSDK/Model/Coupon.cs b/src/PollinationSDK/Model/Coupon.cs
@@ -78,7 +78,7 @@ public Coupon
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "Coupon";
+        public override string Type { get; protected internal set; }  = "Coupon";
 
         /// <summary>
         /// Gets or Sets Name

diff --git a/src/PollinationSDK/Model/CreatedContent.cs b/src/PollinationSDK/Model/CreatedContent.cs
@@ -62,7 +62,7 @@ public CreatedContent
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "CreatedContent";
+        public override string Type { get; protected internal set; }  = "CreatedContent";
 
         /// <summary>
         /// Id for the newly created resource.

diff --git a/src/PollinationSDK/Model/CryptlexBase.cs b/src/PollinationSDK/Model/CryptlexBase.cs
@@ -49,7 +49,7 @@ public CryptlexBase
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "CryptlexBase";
+        public override string Type { get; protected internal set; }  = "CryptlexBase";
 
 
         /// <summary>

diff --git a/src/PollinationSDK/Model/DAG.cs b/src/PollinationSDK/Model/DAG.cs
@@ -72,7 +72,7 @@ public DAG
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "DAG";
+        public override string Type { get; protected internal set; }  = "DAG";
 
         /// <summary>
         /// A unique name for this dag.

diff --git a/src/PollinationSDK/Model/DAGArrayInput.cs b/src/PollinationSDK/Model/DAGArrayInput.cs
@@ -77,7 +77,7 @@ public DAGArrayInput
         /// Gets or Sets Type
         /// </summary>
         [DataMember(Name = "type", EmitDefaultValue = true)]
-        public string Type { get; protected internal set; }  = "DAGArrayInput";
+        public override string Type { get; protected internal set; }  = "DAGArrayInput";
 
         /// <summary>
         /// Default value to use for an input if a value was not supplied.