From d9001b8a6f93b5ca16be8bccce796d2ebff7aa48 Mon Sep 17 00:00:00 2001 From: Jonathan Wenger Date: Tue, 8 Aug 2023 23:30:22 -0700 Subject: [PATCH] Add additional reserved words for java and csharp (#16276) Co-authored-by: Jonathan Wenger --- docs/generators/csharp.md | 1 + docs/generators/java.md | 3 +++ .../openapitools/codegen/languages/AbstractCSharpCodegen.java | 2 +- .../openapitools/codegen/languages/AbstractJavaCodegen.java | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/generators/csharp.md b/docs/generators/csharp.md index c3b17808dc7..102af5dbb07 100644 --- a/docs/generators/csharp.md +++ b/docs/generators/csharp.md @@ -88,6 +88,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • List
  • Object
  • String
    • +
  • System
  • System.IO.Stream
  • bool
  • bool?
    • diff --git a/docs/generators/java.md b/docs/generators/java.md index 941e1c4e2ea..db3cb37efc1 100644 --- a/docs/generators/java.md +++ b/docs/generators/java.md @@ -197,7 +197,9 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • int
  • interface
  • list
    • +
  • localdate
  • localreturntype
    • +
  • localtime
  • localvaraccept
  • localvaraccepts
  • localvarauthnames
    • @@ -215,6 +217,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • new
  • null
  • object
    • +
  • offsetdatetime
  • package
  • private
  • protected
    • diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index fac84740841..aa8dda7151c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -146,7 +146,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co "foreach", "goto", "if", "implicit", "in", "int", "interface", "internal", "is", "lock", "long", "namespace", "new", "null", "object", "operator", "out", "override", "params", "private", "protected", "public", "readonly", "ref", "return", "sbyte", "sealed", - "short", "sizeof", "stackalloc", "static", "string", "struct", "switch", "this", "throw", + "short", "sizeof", "stackalloc", "static", "string", "struct", "switch", "system", "this", "throw", "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe", "ushort", "using", "virtual", "void", "volatile", "while") ); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 9dae2c164ba..fa9a016d1d3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -196,7 +196,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code "import", "public", "throws", "case", "enum", "instanceof", "return", "transient", "catch", "extends", "int", "short", "try", "char", "final", "interface", "static", "void", "class", "finally", "long", "strictfp", "volatile", "const", "float", - "native", "super", "while", "null") + "native", "super", "while", "null", "offsetdatetime", "localdate", "localtime") ); languageSpecificPrimitives = Sets.newHashSet("String",