From ae591580b6d9fa5ec425d3bc76bf595484de872a Mon Sep 17 00:00:00 2001 From: Boshi Lian Date: Sun, 24 Oct 2021 08:14:22 -0700 Subject: [PATCH] fix build (#734) * fix build * eliminate warnings --- gen/KubernetesGenerator/ApiGenerator.cs | 2 +- gen/KubernetesGenerator/ClassNameHelper.cs | 2 +- gen/KubernetesGenerator/GeneralNameHelper.cs | 2 +- gen/KubernetesGenerator/KubernetesGenerator.csproj | 1 + gen/KubernetesGenerator/MetaHelper.cs | 2 +- gen/KubernetesGenerator/ModelExtGenerator.cs | 2 +- gen/KubernetesGenerator/ModelGenerator.cs | 5 +++-- gen/KubernetesGenerator/ParamHelper.cs | 4 ++-- gen/KubernetesGenerator/PluralHelper.cs | 2 +- gen/KubernetesGenerator/StringHelpers.cs | 2 +- gen/KubernetesGenerator/TypeHelper.cs | 2 +- gen/KubernetesGenerator/UtilHelper.cs | 2 +- gen/KubernetesGenerator/VersionConverterGenerator.cs | 2 +- gen/KubernetesGenerator/WatchGenerator.cs | 2 +- 14 files changed, 17 insertions(+), 15 deletions(-) diff --git a/gen/KubernetesGenerator/ApiGenerator.cs b/gen/KubernetesGenerator/ApiGenerator.cs index 47a70b2..4603ad0 100644 --- a/gen/KubernetesGenerator/ApiGenerator.cs +++ b/gen/KubernetesGenerator/ApiGenerator.cs @@ -6,7 +6,7 @@ using Nustache.Core; 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 index 815513e..9ed87cb 100644 --- a/gen/KubernetesGenerator/ClassNameHelper.cs +++ b/gen/KubernetesGenerator/ClassNameHelper.cs @@ -7,7 +7,7 @@ using Nustache.Core; namespace KubernetesGenerator { - public class ClassNameHelper : INustacheHelper + internal class ClassNameHelper : INustacheHelper { private readonly Dictionary classNameMap; private readonly HashSet schemaDefinitionsInMultipleGroups; diff --git a/gen/KubernetesGenerator/GeneralNameHelper.cs b/gen/KubernetesGenerator/GeneralNameHelper.cs index e498865..1ce4284 100644 --- a/gen/KubernetesGenerator/GeneralNameHelper.cs +++ b/gen/KubernetesGenerator/GeneralNameHelper.cs @@ -8,7 +8,7 @@ using Nustache.Core; 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 index 9834647..80f42a3 100644 --- a/gen/KubernetesGenerator/KubernetesGenerator.csproj +++ b/gen/KubernetesGenerator/KubernetesGenerator.csproj @@ -3,6 +3,7 @@ Exe net5 + CA1812 diff --git a/gen/KubernetesGenerator/MetaHelper.cs b/gen/KubernetesGenerator/MetaHelper.cs index c9ca95c..9509dbb 100644 --- a/gen/KubernetesGenerator/MetaHelper.cs +++ b/gen/KubernetesGenerator/MetaHelper.cs @@ -6,7 +6,7 @@ using Nustache.Core; 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 index 32ea51c..90c4cdf 100644 --- a/gen/KubernetesGenerator/ModelExtGenerator.cs +++ b/gen/KubernetesGenerator/ModelExtGenerator.cs @@ -6,7 +6,7 @@ using Nustache.Core; namespace KubernetesGenerator { - public class ModelExtGenerator + internal class ModelExtGenerator { private readonly ClassNameHelper classNameHelper; diff --git a/gen/KubernetesGenerator/ModelGenerator.cs b/gen/KubernetesGenerator/ModelGenerator.cs index 7da09a4..d939c12 100644 --- a/gen/KubernetesGenerator/ModelGenerator.cs +++ b/gen/KubernetesGenerator/ModelGenerator.cs @@ -4,7 +4,7 @@ using Nustache.Core; namespace KubernetesGenerator { - public class ModelGenerator + internal class ModelGenerator { private readonly ClassNameHelper classNameHelper; @@ -20,7 +20,8 @@ namespace KubernetesGenerator 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 index 3f361e0..ea0491a 100644 --- a/gen/KubernetesGenerator/ParamHelper.cs +++ b/gen/KubernetesGenerator/ParamHelper.cs @@ -6,7 +6,7 @@ using Nustache.Core; namespace KubernetesGenerator { - public class ParamHelper : INustacheHelper + internal class ParamHelper : INustacheHelper { private readonly GeneralNameHelper generalNameHelper; private readonly TypeHelper typeHelper; @@ -59,7 +59,7 @@ namespace KubernetesGenerator IDictionary 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 index 45e2eab..7a2d1cb 100644 --- a/gen/KubernetesGenerator/PluralHelper.cs +++ b/gen/KubernetesGenerator/PluralHelper.cs @@ -7,7 +7,7 @@ using Nustache.Core; namespace KubernetesGenerator { - public class PluralHelper : INustacheHelper + internal class PluralHelper : INustacheHelper { private readonly Dictionary _classNameToPluralMap; private readonly ClassNameHelper classNameHelper; diff --git a/gen/KubernetesGenerator/StringHelpers.cs b/gen/KubernetesGenerator/StringHelpers.cs index 44adb3a..f2ff87b 100644 --- a/gen/KubernetesGenerator/StringHelpers.cs +++ b/gen/KubernetesGenerator/StringHelpers.cs @@ -8,7 +8,7 @@ using Nustache.Core; 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 index eb7ca07..1da4e5d 100644 --- a/gen/KubernetesGenerator/TypeHelper.cs +++ b/gen/KubernetesGenerator/TypeHelper.cs @@ -7,7 +7,7 @@ using Nustache.Core; 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 index 444f835..536dc8c 100644 --- a/gen/KubernetesGenerator/UtilHelper.cs +++ b/gen/KubernetesGenerator/UtilHelper.cs @@ -6,7 +6,7 @@ using Nustache.Core; 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 index 44cbd7d..d7d940b 100644 --- a/gen/KubernetesGenerator/VersionConverterGenerator.cs +++ b/gen/KubernetesGenerator/VersionConverterGenerator.cs @@ -7,7 +7,7 @@ using Nustache.Core; 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 index 58b4255..f7065d4 100644 --- a/gen/KubernetesGenerator/WatchGenerator.cs +++ b/gen/KubernetesGenerator/WatchGenerator.cs @@ -5,7 +5,7 @@ using Nustache.Core; namespace KubernetesGenerator { - public class WatchGenerator + internal class WatchGenerator { public void Generate(OpenApiDocument swagger, string outputDirectory) {