fix build (#734)

tg123 · web-flow · commit ae591580b6d9 · 2021-10-24T08:14:22.000-07:00
* fix build

* eliminate warnings
diff --git a/gen/KubernetesGenerator/ApiGenerator.cs b/gen/KubernetesGenerator/ApiGenerator.cs
@@ -6,7 +6,7 @@
 
 namespace KubernetesGenerator
 {
-    public class ApiGenerator
+    internal class ApiGenerator
     {
         public void Generate(OpenApiDocument swagger, string outputDirectory)
         {
diff --git a/gen/KubernetesGenerator/ClassNameHelper.cs b/gen/KubernetesGenerator/ClassNameHelper.cs
@@ -7,7 +7,7 @@
 
 namespace KubernetesGenerator
 {
-    public class ClassNameHelper : INustacheHelper
+    internal class ClassNameHelper : INustacheHelper
     {
         private readonly Dictionary<string, string> classNameMap;
         private readonly HashSet<string> schemaDefinitionsInMultipleGroups;
diff --git a/gen/KubernetesGenerator/GeneralNameHelper.cs b/gen/KubernetesGenerator/GeneralNameHelper.cs
@@ -8,7 +8,7 @@
 
 namespace KubernetesGenerator
 {
-    public class GeneralNameHelper : INustacheHelper
+    internal class GeneralNameHelper : INustacheHelper
     {
         private readonly ClassNameHelper classNameHelper;
 
diff --git a/gen/KubernetesGenerator/KubernetesGenerator.csproj b/gen/KubernetesGenerator/KubernetesGenerator.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net5</TargetFramework>
+        <NoWarn>CA1812</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/gen/KubernetesGenerator/MetaHelper.cs b/gen/KubernetesGenerator/MetaHelper.cs
@@ -6,7 +6,7 @@
 
 namespace KubernetesGenerator
 {
-    public class MetaHelper : INustacheHelper
+    internal class MetaHelper : INustacheHelper
     {
         public void RegisterHelper()
         {
diff --git a/gen/KubernetesGenerator/ModelExtGenerator.cs b/gen/KubernetesGenerator/ModelExtGenerator.cs
@@ -6,7 +6,7 @@
 
 namespace KubernetesGenerator
 {
-    public class ModelExtGenerator
+    internal class ModelExtGenerator
     {
         private readonly ClassNameHelper classNameHelper;
 
diff --git a/gen/KubernetesGenerator/ModelGenerator.cs b/gen/KubernetesGenerator/ModelGenerator.cs
@@ -4,7 +4,7 @@
 
 namespace KubernetesGenerator
 {
-    public class ModelGenerator
+    internal class ModelGenerator
     {
         private readonly ClassNameHelper classNameHelper;
 
@@ -20,7 +20,8 @@ public void Generate(OpenApiDocument swaggercooked, string outputDirectory)
             foreach (var (_, def) in swaggercooked.Definitions)
             {
                 var clz = classNameHelper.GetClassNameForSchemaDefinition(def);
-                Render.FileToFile(Path.Combine("templates", "Model.cs.template"),
+                Render.FileToFile(
+                    Path.Combine("templates", "Model.cs.template"),
                     new { clz, def, properties = def.Properties.Values },
                     Path.Combine(outputDirectory, "Models", $"{clz}.cs"));
             }
diff --git a/gen/KubernetesGenerator/ParamHelper.cs b/gen/KubernetesGenerator/ParamHelper.cs
@@ -6,7 +6,7 @@
 
 namespace KubernetesGenerator
 {
-    public class ParamHelper : INustacheHelper
+    internal class ParamHelper : INustacheHelper
     {
         private readonly GeneralNameHelper generalNameHelper;
         private readonly TypeHelper typeHelper;
@@ -59,7 +59,7 @@ public static void IfParamDoesNotContain(RenderContext context, IList<object> ar
             IDictionary<string, object> options,
             RenderBlock fn, RenderBlock inverse)
         {
-            var operation = arguments?.FirstOrDefault() as SwaggerOperation;
+            var operation = arguments?.FirstOrDefault() as OpenApiOperation;
             if (operation != null)
             {
                 string name = null;
diff --git a/gen/KubernetesGenerator/PluralHelper.cs b/gen/KubernetesGenerator/PluralHelper.cs
@@ -7,7 +7,7 @@
 
 namespace KubernetesGenerator
 {
-    public class PluralHelper : INustacheHelper
+    internal class PluralHelper : INustacheHelper
     {
         private readonly Dictionary<string, string> _classNameToPluralMap;
         private readonly ClassNameHelper classNameHelper;
diff --git a/gen/KubernetesGenerator/StringHelpers.cs b/gen/KubernetesGenerator/StringHelpers.cs
@@ -8,7 +8,7 @@
 
 namespace KubernetesGenerator
 {
-    public class StringHelpers : INustacheHelper
+    internal class StringHelpers : INustacheHelper
     {
         private readonly GeneralNameHelper generalNameHelper;
 
diff --git a/gen/KubernetesGenerator/TypeHelper.cs b/gen/KubernetesGenerator/TypeHelper.cs
@@ -7,7 +7,7 @@
 
 namespace KubernetesGenerator
 {
-    public class TypeHelper : INustacheHelper
+    internal class TypeHelper : INustacheHelper
     {
         private readonly ClassNameHelper classNameHelper;
 
diff --git a/gen/KubernetesGenerator/UtilHelper.cs b/gen/KubernetesGenerator/UtilHelper.cs
@@ -6,7 +6,7 @@
 
 namespace KubernetesGenerator
 {
-    public class UtilHelper : INustacheHelper
+    internal class UtilHelper : INustacheHelper
     {
         public void RegisterHelper()
         {
diff --git a/gen/KubernetesGenerator/VersionConverterGenerator.cs b/gen/KubernetesGenerator/VersionConverterGenerator.cs
@@ -7,7 +7,7 @@
 
 namespace KubernetesGenerator
 {
-    public class VersionConverterGenerator
+    internal class VersionConverterGenerator
     {
         public void GenerateFromModels(string outputDirectory)
         {
diff --git a/gen/KubernetesGenerator/WatchGenerator.cs b/gen/KubernetesGenerator/WatchGenerator.cs
@@ -5,7 +5,7 @@
 
 namespace KubernetesGenerator
 {
-    public class WatchGenerator
+    internal class WatchGenerator
     {
         public void Generate(OpenApiDocument swagger, string outputDirectory)
         {

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace KubernetesGenerator`
`8`	`8`	`{`
`9`		`- public class ApiGenerator`
	`9`	`+ internal class ApiGenerator`
`10`	`10`	`{`
`11`	`11`	`public void Generate(OpenApiDocument swagger, string outputDirectory)`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace KubernetesGenerator`
`9`	`9`	`{`
`10`		`- public class ClassNameHelper : INustacheHelper`
	`10`	`+ internal class ClassNameHelper : INustacheHelper`
`11`	`11`	`{`
`12`	`12`	`private readonly Dictionary<string, string> classNameMap;`
`13`	`13`	`private readonly HashSet<string> schemaDefinitionsInMultipleGroups;`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace KubernetesGenerator`
`10`	`10`	`{`
`11`		`- public class GeneralNameHelper : INustacheHelper`
	`11`	`+ internal class GeneralNameHelper : INustacheHelper`
`12`	`12`	`{`
`13`	`13`	`private readonly ClassNameHelper classNameHelper;`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace KubernetesGenerator`
`8`	`8`	`{`
`9`		`- public class MetaHelper : INustacheHelper`
	`9`	`+ internal class MetaHelper : INustacheHelper`
`10`	`10`	`{`
`11`	`11`	`public void RegisterHelper()`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace KubernetesGenerator`
`8`	`8`	`{`
`9`		`- public class ModelExtGenerator`
	`9`	`+ internal class ModelExtGenerator`
`10`	`10`	`{`
`11`	`11`	`private readonly ClassNameHelper classNameHelper;`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace KubernetesGenerator`
`6`	`6`	`{`
`7`		`- public class ModelGenerator`
	`7`	`+ internal class ModelGenerator`
`8`	`8`	`{`
`9`	`9`	`private readonly ClassNameHelper classNameHelper;`
`10`	`10`
`@@ -20,7 +20,8 @@ public void Generate(OpenApiDocument swaggercooked, string outputDirectory)`
`20`	`20`	`foreach (var (_, def) in swaggercooked.Definitions)`
`21`	`21`	`{`
`22`	`22`	`var clz = classNameHelper.GetClassNameForSchemaDefinition(def);`
`23`		`- Render.FileToFile(Path.Combine("templates", "Model.cs.template"),`
	`23`	`+ Render.FileToFile(`
	`24`	`+ Path.Combine("templates", "Model.cs.template"),`
`24`	`25`	`new { clz, def, properties = def.Properties.Values },`
`25`	`26`	`Path.Combine(outputDirectory, "Models", $"{clz}.cs"));`
`26`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace KubernetesGenerator`
`8`	`8`	`{`
`9`		`- public class ParamHelper : INustacheHelper`
	`9`	`+ internal class ParamHelper : INustacheHelper`
`10`	`10`	`{`
`11`	`11`	`private readonly GeneralNameHelper generalNameHelper;`
`12`	`12`	`private readonly TypeHelper typeHelper;`
`@@ -59,7 +59,7 @@ public static void IfParamDoesNotContain(RenderContext context, IList<object> ar`
`59`	`59`	`IDictionary<string, object> options,`
`60`	`60`	`RenderBlock fn, RenderBlock inverse)`
`61`	`61`	`{`
`62`		`- var operation = arguments?.FirstOrDefault() as SwaggerOperation;`
	`62`	`+ var operation = arguments?.FirstOrDefault() as OpenApiOperation;`
`63`	`63`	`if (operation != null)`
`64`	`64`	`{`
`65`	`65`	`string name = null;`