migrate to record

tg123 · tg123 · commit 0dfabb7d89b3 · 2025-09-10T01:49:41.000-07:00
diff --git a/src/KubernetesClient.Aot/KubernetesClient.Aot.csproj b/src/KubernetesClient.Aot/KubernetesClient.Aot.csproj
@@ -25,10 +25,9 @@
     <Compile Include="..\KubernetesClient\IMetadata.cs" />
     <Compile Include="..\KubernetesClient\Models\IntOrStringJsonConverter.cs" />
     <Compile Include="..\KubernetesClient\Models\IntOrStringYamlConverter.cs" />
-    <Compile Include="..\KubernetesClient\Models\IntstrIntOrString.cs" />
+    <Compile Include="..\KubernetesClient\Models\IntOrString.cs" />
     <Compile Include="..\KubernetesClient\ISpec.cs" />
     <Compile Include="..\KubernetesClient\IStatus.cs" />
-    <Compile Include="..\KubernetesClient\IValidate.cs" />
     <Compile Include="..\KubernetesClient\Models\KubernetesEntityAttribute.cs" />
     <Compile Include="..\KubernetesClient\Models\KubernetesList.cs" />
     <Compile Include="..\KubernetesClient\KubernetesObject.cs" />
diff --git a/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj b/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj
@@ -27,10 +27,9 @@
     <Compile Include="..\KubernetesClient\IMetadata.cs" />
     <Compile Include="..\KubernetesClient\Models\IntOrStringJsonConverter.cs" />
     <Compile Include="..\KubernetesClient\Models\IntOrStringYamlConverter.cs" />
-    <Compile Include="..\KubernetesClient\Models\IntstrIntOrString.cs" />
+    <Compile Include="..\KubernetesClient\Models\IntOrString.cs" />
     <Compile Include="..\KubernetesClient\ISpec.cs" />
     <Compile Include="..\KubernetesClient\IStatus.cs" />
-    <Compile Include="..\KubernetesClient\IValidate.cs" />
     <Compile Include="..\KubernetesClient\Models\KubernetesEntityAttribute.cs" />
     <Compile Include="..\KubernetesClient\KubernetesJson.cs" />
     <Compile Include="..\KubernetesClient\Models\KubernetesList.cs" />
diff --git a/src/KubernetesClient/IValidate.cs b/src/KubernetesClient/IValidate.cs
diff --git a/src/KubernetesClient/Models/IntOrString.cs b/src/KubernetesClient/Models/IntOrString.cs
@@ -1,29 +1,29 @@
 namespace k8s.Models
 {
     [JsonConverter(typeof(IntOrStringJsonConverter))]
-    public partial class IntstrIntOrString
+    public partial class IntOrString
     {
-        public static implicit operator IntstrIntOrString(int v)
+        public static implicit operator IntOrString(int v)
         {
-            return new IntstrIntOrString(Convert.ToString(v));
+            return new IntOrString { Value = Convert.ToString(v) };
         }
 
-        public static implicit operator IntstrIntOrString(long v)
+        public static implicit operator IntOrString(long v)
         {
-            return new IntstrIntOrString(Convert.ToString(v));
+            return new IntOrString { Value = Convert.ToString(v) };
         }
 
-        public static implicit operator string(IntstrIntOrString v)
+        public static implicit operator string(IntOrString v)
         {
             return v?.Value;
         }
 
-        public static implicit operator IntstrIntOrString(string v)
+        public static implicit operator IntOrString(string v)
         {
-            return new IntstrIntOrString(v);
+            return new IntOrString { Value = v };
         }
 
-        protected bool Equals(IntstrIntOrString other)
+        protected bool Equals(IntOrString other)
         {
             return string.Equals(Value, other?.Value);
         }
@@ -45,7 +45,7 @@ public override bool Equals(object obj)
                 return false;
             }
 
-            return Equals((IntstrIntOrString)obj);
+            return Equals((IntOrString)obj);
         }
 
         public override int GetHashCode()
diff --git a/src/KubernetesClient/Models/IntOrStringJsonConverter.cs b/src/KubernetesClient/Models/IntOrStringJsonConverter.cs
@@ -1,8 +1,8 @@
 namespace k8s.Models
 {
-    internal sealed class IntOrStringJsonConverter : JsonConverter<IntstrIntOrString>
+    internal sealed class IntOrStringJsonConverter : JsonConverter<IntOrString>
     {
-        public override IntstrIntOrString Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override IntOrString Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             switch (reader.TokenType)
             {
@@ -17,7 +17,7 @@ public override IntstrIntOrString Read(ref Utf8JsonReader reader, Type typeToCon
             throw new NotSupportedException();
         }
 
-        public override void Write(Utf8JsonWriter writer, IntstrIntOrString value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, IntOrString value, JsonSerializerOptions options)
         {
             if (writer == null)
             {
diff --git a/src/KubernetesClient/Models/IntOrStringYamlConverter.cs b/src/KubernetesClient/Models/IntOrStringYamlConverter.cs
@@ -7,7 +7,7 @@ public class IntOrStringYamlConverter : IYamlTypeConverter
     {
         public bool Accepts(Type type)
         {
-            return type == typeof(IntstrIntOrString);
+            return type == typeof(IntOrString);
         }
 
         public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer)
@@ -21,7 +21,7 @@ public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeseria
                         return null;
                     }
 
-                    return new IntstrIntOrString(scalar?.Value);
+                    return new IntOrString { Value = scalar?.Value };
                 }
                 finally
                 {
@@ -34,7 +34,7 @@ public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeseria
 
         public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerializer serializer)
         {
-            var obj = (IntstrIntOrString)value;
+            var obj = (IntOrString)value;
             emitter?.Emit(new YamlDotNet.Core.Events.Scalar(obj?.Value));
         }
     }
diff --git a/src/KubernetesClient/Models/KubernetesList.cs b/src/KubernetesClient/Models/KubernetesList.cs
@@ -40,24 +40,5 @@ public KubernetesList(IList<T> items, string apiVersion = default, string kind =
         /// </summary>
         [JsonPropertyName("metadata")]
         public V1ListMeta Metadata { get; set; }
-
-        /// <summary>
-        /// Validate the object.
-        /// </summary>
-        public void Validate()
-        {
-            if (Items == null)
-            {
-                throw new ArgumentNullException("Items");
-            }
-
-            if (Items != null)
-            {
-                foreach (var element in Items.OfType<IValidate>())
-                {
-                    element.Validate();
-                }
-            }
-        }
     }
 }
diff --git a/src/KubernetesClient/Models/ModelVersionConverter.cs b/src/KubernetesClient/Models/ModelVersionConverter.cs
diff --git a/src/KubernetesClient/Models/ResourceQuantityJsonConverter.cs b/src/KubernetesClient/Models/ResourceQuantityJsonConverter.cs
@@ -8,16 +8,16 @@ public override ResourceQuantity Read(ref Utf8JsonReader reader, Type typeToConv
             switch (reader.TokenType)
             {
                 case JsonTokenType.Null:
-                    return new ResourceQuantity(null);
+                    return new ResourceQuantity { Value = null };
                 case JsonTokenType.Number:
                     if (reader.TryGetDouble(out var val))
                     {
-                        return new ResourceQuantity(Convert.ToString(val));
+                        return new ResourceQuantity { Value = Convert.ToString(val) };
                     }
 
                     return reader.GetDecimal();
                 default:
-                    return new ResourceQuantity(reader.GetString());
+                    return new ResourceQuantity { Value = reader.GetString() };
             }
         }
 
diff --git a/src/KubernetesClient/Models/ResourceQuantityYamlConverter.cs b/src/KubernetesClient/Models/ResourceQuantityYamlConverter.cs
@@ -21,7 +21,7 @@ public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeseria
                         return null;
                     }
 
-                    return new ResourceQuantity(scalar?.Value);
+                    return new ResourceQuantity { Value = scalar?.Value };
                 }
                 finally
                 {
diff --git a/src/KubernetesClient/Models/V1Patch.cs b/src/KubernetesClient/Models/V1Patch.cs
@@ -1,7 +1,7 @@
 namespace k8s.Models
 {
     [JsonConverter(typeof(V1PatchJsonConverter))]
-    public partial class V1Patch
+    public partial record class V1Patch
     {
         public enum PatchType
         {
diff --git a/src/KubernetesClient/Models/V1PodTemplateSpec.cs b/src/KubernetesClient/Models/V1PodTemplateSpec.cs
@@ -4,7 +4,7 @@ namespace k8s.Models
     /// Partial implementation of the IMetadata interface
     /// to open this class up to ModelExtensions methods
     /// </summary>
-    public partial class V1PodTemplateSpec : IMetadata<V1ObjectMeta>
+    public partial record V1PodTemplateSpec : IMetadata<V1ObjectMeta>
     {
     }
 }
diff --git a/src/KubernetesClient/Models/V1Status.ObjectView.cs b/src/KubernetesClient/Models/V1Status.ObjectView.cs
@@ -1,6 +1,6 @@
 namespace k8s.Models
 {
-    public partial class V1Status
+    public partial record V1Status
     {
         internal sealed class V1StatusObjectViewConverter : JsonConverter<V1Status>
         {
diff --git a/src/KubernetesClient/Models/V1Status.cs b/src/KubernetesClient/Models/V1Status.cs
@@ -2,7 +2,7 @@
 
 namespace k8s.Models
 {
-    public partial class V1Status
+    public partial record class V1Status
     {
         /// <summary>Converts a <see cref="V1Status"/> object into a short description of the status.</summary>
         /// <returns>string description of the status</returns>
diff --git a/src/LibKubernetesGenerator/ClassNameHelper.cs b/src/LibKubernetesGenerator/ClassNameHelper.cs
@@ -78,6 +78,12 @@ public string GetClassNameForSchemaDefinition(JsonSchema definition)
             }
 
 
+            if (definition.Format == "int-or-string")
+            {
+                return "IntOrString";
+            }
+
+
             return schemaToNameMapCooked[definition];
         }
     }
diff --git a/src/LibKubernetesGenerator/GeneralNameHelper.cs b/src/LibKubernetesGenerator/GeneralNameHelper.cs
@@ -57,8 +57,6 @@ private string GetInterfaceName(JsonSchema definition)
                 }
             }
 
-            interfaces.Add("IValidate");
-
             return string.Join(", ", interfaces);
         }
 
@@ -68,7 +66,7 @@ public string GetDotNetNameOpenApiParameter(OpenApiParameter parameter, string i
 
             if (init == "true" && !parameter.IsRequired)
             {
-                name += " = null";
+                name += " = default";
             }
 
             return name;
diff --git a/src/LibKubernetesGenerator/KubernetesClientSourceGenerator.cs b/src/LibKubernetesGenerator/KubernetesClientSourceGenerator.cs
@@ -58,12 +58,10 @@ private static IContainer BuildContainer(OpenApiDocument swagger)
             builder.RegisterType<ScriptObjectFactory>()
                 ;
 
-            builder.RegisterType<ModelExtGenerator>();
             builder.RegisterType<SourceGenerationContextGenerator>();
             builder.RegisterType<ModelGenerator>();
             builder.RegisterType<ApiGenerator>();
             builder.RegisterType<ClientSetGenerator>();
-            builder.RegisterType<VersionConverterStubGenerator>();
             builder.RegisterType<VersionGenerator>();
 
             return builder.Build();
@@ -79,9 +77,7 @@ public void Initialize(IncrementalGeneratorInitializationContext generatorContex
                 container.Resolve<VersionGenerator>().Generate(swagger, ctx);
 
                 container.Resolve<ModelGenerator>().Generate(swagger, ctx);
-                container.Resolve<ModelExtGenerator>().Generate(swagger, ctx);
                 container.Resolve<SourceGenerationContextGenerator>().Generate(swagger, ctx);
-                container.Resolve<VersionConverterStubGenerator>().Generate(swagger, ctx);
                 container.Resolve<ApiGenerator>().Generate(swagger, ctx);
                 container.Resolve<ClientSetGenerator>().Generate(swagger, ctx);
             });
diff --git a/src/LibKubernetesGenerator/ModelExtGenerator.cs b/src/LibKubernetesGenerator/ModelExtGenerator.cs
diff --git a/src/LibKubernetesGenerator/ModelGenerator.cs b/src/LibKubernetesGenerator/ModelGenerator.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Microsoft.CodeAnalysis;
 using NSwag;
 
@@ -18,15 +19,40 @@ public void Generate(OpenApiDocument swagger, IncrementalGeneratorPostInitializa
         {
             var sc = scriptObjectFactory.CreateScriptObject();
 
+            var extSkippedTypes = new HashSet<string>
+            {
+                "V1WatchEvent",
+                "V1Status",
+                "V1Patch",
+            };
+
+            var typeOverrides = new Dictionary<string, string>
+            {
+                { "IntOrString", "class" },
+                { "ResourceQuantity", "class" },
+            };
 
             foreach (var kv in swagger.Definitions)
             {
                 var def = kv.Value;
                 var clz = classNameHelper.GetClassNameForSchemaDefinition(def);
+                var hasExt = def.ExtensionData != null
+                     && def.ExtensionData.ContainsKey("x-kubernetes-group-version-kind")
+                     && !extSkippedTypes.Contains(classNameHelper.GetClassName(def));
+
+
+                var typ = "record";
+                if (typeOverrides.TryGetValue(clz, out var to))
+                {
+                    typ = to;
+                }
 
                 sc.SetValue("clz", clz, true);
                 sc.SetValue("def", def, true);
                 sc.SetValue("properties", def.Properties.Values, true);
+                sc.SetValue("typ", typ, true);
+                sc.SetValue("hasExt", hasExt, true);
+
 
                 context.RenderToContext("Model.cs.template", sc, $"Models_{clz}.g.cs");
             }
diff --git a/src/LibKubernetesGenerator/VersionConverterStubGenerator.cs b/src/LibKubernetesGenerator/VersionConverterStubGenerator.cs
diff --git a/src/LibKubernetesGenerator/templates/Model.cs.template b/src/LibKubernetesGenerator/templates/Model.cs.template
diff --git a/src/LibKubernetesGenerator/templates/ModelExtensions.cs.template b/src/LibKubernetesGenerator/templates/ModelExtensions.cs.template
diff --git a/tests/KubernetesClient.Tests/IntOrStringTests.cs b/tests/KubernetesClient.Tests/IntOrStringTests.cs

Original file line number	Diff line number	Diff line change
`@@ -1,29 +1,29 @@`
`1`	`1`	`namespace k8s.Models`
`2`	`2`	`{`
`3`	`3`	`[JsonConverter(typeof(IntOrStringJsonConverter))]`
`4`		`- public partial class IntstrIntOrString`
	`4`	`+ public partial class IntOrString`
`5`	`5`	`{`
`6`		`- public static implicit operator IntstrIntOrString(int v)`
	`6`	`+ public static implicit operator IntOrString(int v)`
`7`	`7`	`{`
`8`		`- return new IntstrIntOrString(Convert.ToString(v));`
	`8`	`+ return new IntOrString { Value = Convert.ToString(v) };`
`9`	`9`	`}`
`10`	`10`
`11`		`- public static implicit operator IntstrIntOrString(long v)`
	`11`	`+ public static implicit operator IntOrString(long v)`
`12`	`12`	`{`
`13`		`- return new IntstrIntOrString(Convert.ToString(v));`
	`13`	`+ return new IntOrString { Value = Convert.ToString(v) };`
`14`	`14`	`}`
`15`	`15`
`16`		`- public static implicit operator string(IntstrIntOrString v)`
	`16`	`+ public static implicit operator string(IntOrString v)`
`17`	`17`	`{`
`18`	`18`	`return v?.Value;`
`19`	`19`	`}`
`20`	`20`
`21`		`- public static implicit operator IntstrIntOrString(string v)`
	`21`	`+ public static implicit operator IntOrString(string v)`
`22`	`22`	`{`
`23`		`- return new IntstrIntOrString(v);`
	`23`	`+ return new IntOrString { Value = v };`
`24`	`24`	`}`
`25`	`25`
`26`		`- protected bool Equals(IntstrIntOrString other)`
	`26`	`+ protected bool Equals(IntOrString other)`
`27`	`27`	`{`
`28`	`28`	`return string.Equals(Value, other?.Value);`
`29`	`29`	`}`
`@@ -45,7 +45,7 @@ public override bool Equals(object obj)`
`45`	`45`	`return false;`
`46`	`46`	`}`
`47`	`47`
`48`		`- return Equals((IntstrIntOrString)obj);`
	`48`	`+ return Equals((IntOrString)obj);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public override int GetHashCode()`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`namespace k8s.Models`
`2`	`2`	`{`
`3`		`- internal sealed class IntOrStringJsonConverter : JsonConverter<IntstrIntOrString>`
	`3`	`+ internal sealed class IntOrStringJsonConverter : JsonConverter<IntOrString>`
`4`	`4`	`{`
`5`		`- public override IntstrIntOrString Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)`
	`5`	`+ public override IntOrString Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)`
`6`	`6`	`{`
`7`	`7`	`switch (reader.TokenType)`
`8`	`8`	`{`
`@@ -17,7 +17,7 @@ public override IntstrIntOrString Read(ref Utf8JsonReader reader, Type typeToCon`
`17`	`17`	`throw new NotSupportedException();`
`18`	`18`	`}`
`19`	`19`
`20`		`- public override void Write(Utf8JsonWriter writer, IntstrIntOrString value, JsonSerializerOptions options)`
	`20`	`+ public override void Write(Utf8JsonWriter writer, IntOrString value, JsonSerializerOptions options)`
`21`	`21`	`{`
`22`	`22`	`if (writer == null)`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class IntOrStringYamlConverter : IYamlTypeConverter`
`7`	`7`	`{`
`8`	`8`	`public bool Accepts(Type type)`
`9`	`9`	`{`
`10`		`- return type == typeof(IntstrIntOrString);`
	`10`	`+ return type == typeof(IntOrString);`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer)`
`@@ -21,7 +21,7 @@ public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeseria`
`21`	`21`	`return null;`
`22`	`22`	`}`
`23`	`23`
`24`		`- return new IntstrIntOrString(scalar?.Value);`
	`24`	`+ return new IntOrString { Value = scalar?.Value };`
`25`	`25`	`}`
`26`	`26`	`finally`
`27`	`27`	`{`
`@@ -34,7 +34,7 @@ public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeseria`
`34`	`34`
`35`	`35`	`public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerializer serializer)`
`36`	`36`	`{`
`37`		`- var obj = (IntstrIntOrString)value;`
	`37`	`+ var obj = (IntOrString)value;`
`38`	`38`	`emitter?.Emit(new YamlDotNet.Core.Events.Scalar(obj?.Value));`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,16 +8,16 @@ public override ResourceQuantity Read(ref Utf8JsonReader reader, Type typeToConv`
`8`	`8`	`switch (reader.TokenType)`
`9`	`9`	`{`
`10`	`10`	`case JsonTokenType.Null:`
`11`		`- return new ResourceQuantity(null);`
	`11`	`+ return new ResourceQuantity { Value = null };`
`12`	`12`	`case JsonTokenType.Number:`
`13`	`13`	`if (reader.TryGetDouble(out var val))`
`14`	`14`	`{`
`15`		`- return new ResourceQuantity(Convert.ToString(val));`
	`15`	`+ return new ResourceQuantity { Value = Convert.ToString(val) };`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`return reader.GetDecimal();`
`19`	`19`	`default:`
`20`		`- return new ResourceQuantity(reader.GetString());`
	`20`	`+ return new ResourceQuantity { Value = reader.GetString() };`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`