From e9c6d65f2d24c46d09b90d6332cc4e4ce29e59b7 Mon Sep 17 00:00:00 2001 From: henryh-force <63081838+henryh-force@users.noreply.github.com> Date: Mon, 5 Oct 2020 09:00:23 -0400 Subject: [PATCH] =?UTF-8?q?Updated=20keywords=20to=20be=20aligned=20with?= =?UTF-8?q?=20website=20https://developer.salesfo=E2=80=A6=20(#7522)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Updated keywords to be aligned with website https://developer.salesforce.com/docs/atlas.en-us.apexcode.meta/apexcode/apex_reserved_words.htm * [samples] Regenerate Co-authored-by: Jim Schubert --- docs/generators/apex.md | 27 +++++-------------- .../codegen/languages/ApexClientCodegen.java | 25 ++++++++--------- .../main/default/classes/OASApiResponse.cls | 22 +++++---------- 3 files changed, 24 insertions(+), 50 deletions(-) diff --git a/docs/generators/apex.md b/docs/generators/apex.md index 00f25f255ca..396de3ec409 100644 --- a/docs/generators/apex.md +++ b/docs/generators/apex.md @@ -64,6 +64,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • begin
  • bigdecimal
  • blob
    • +
  • boolean
  • break
  • bulk
  • by
    • @@ -77,7 +78,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • commit
  • const
  • continue
    • -
  • convertcurrency
  • currency
  • date
  • datetime
    • @@ -86,6 +86,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • delete
  • desc
  • do
    • +
  • double
  • else
  • end
  • enum
    • @@ -99,7 +100,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • float
  • for
  • from
    • -
  • future
  • global
  • goto
  • group
    • @@ -113,13 +113,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • insert
  • instanceof
  • int
    • +
  • integer
  • interface
  • into
  • join
    • -
  • last_90_days
    • -
  • last_month
    • -
  • last_n_days
    • -
  • last_week
  • like
  • limit
  • list
    • @@ -128,10 +125,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • map
  • merge
  • new
    • -
  • next_90_days
    • -
  • next_month
    • -
  • next_n_days
    • -
  • next_week
  • not
  • null
  • nulls
    • @@ -150,16 +143,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • public
  • retrieve
  • return
    • -
  • returning
  • rollback
    • -
  • savepoint
    • -
  • search
  • select
  • set
  • short
    • +
  • sobject
  • sort
    • -
  • stat
  • static
    • +
  • string
  • super
  • switch
  • synchronized
    • @@ -167,28 +158,22 @@ These options may be applied as additional-properties (cli) or configOptions (pl
  • testmethod
  • then
  • this
    • -
  • this_month
    • -
  • this_week
  • throw
  • time
    • -
  • today
    • -
  • tolabel
    • -
  • tomorrow
  • transaction
  • trigger
  • true
  • try
    • -
  • type
  • undelete
  • update
  • upsert
  • using
  • virtual
    • +
  • void
  • webservice
  • when
  • where
  • while
    • -
  • yesterday
    • ## FEATURE SET diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java index d7e5889c173..fe7cdcfb59d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java @@ -98,22 +98,19 @@ public class ApexClientCodegen extends AbstractApexCodegen { // https://developer.salesforce.com/docs/atlas.en-us.apexcode.meta/apexcode/apex_reserved_words.htm setReservedWordsLowerCase( Arrays.asList("abstract", "activate", "and", "any", "array", "as", "asc", "autonomous", - "begin", "bigdecimal", "blob", "break", "bulk", "by", "byte", "case", "cast", + "begin", "bigdecimal", "blob", "boolean", "break", "bulk", "by", "byte", "case", "cast", "catch", "char", "class", "collect", "commit", "const", "continue", - "convertcurrency", "currency", "date", "datetime", "decimal", "default", "delete", "desc", "do", "else", + "currency", "date", "datetime", "decimal", "default", "delete", "desc", "do", "double", "else", "end", "enum", "exception", "exit", "export", "extends", "false", "final", - "finally", "float", "for", "from", "future", "global", "goto", "group", "having", - "hint", "if", "implements", "import", "in", "inner", "insert", "instanceof", "int", - "interface", "into", "join", "last_90_days", "last_month", "last_n_days", - "last_week", "like", "limit", "list", "long", "loop", "map", "merge", "new", - "next_90_days", "next_month", "next_n_days", "next_week", "not", "null", "nulls", - "number", "object", "of", "on", "or", "outer", "override", "package", "parallel", - "pragma", "private", "protected", "public", "retrieve", "return", "returning", - "rollback", "savepoint", "search", "select", "set", "short", "sort", "stat", - "static", "super", "switch", "synchronized", "system", "testmethod", "then", "this", - "this_month", "this_week", "throw", "time", "today", "tolabel", "tomorrow", "transaction", - "trigger", "true", "try", "type", "undelete", "update", "upsert", "using", - "virtual", "webservice", "when", "where", "while", "yesterday" + "finally", "float", "for", "from", "global", "goto", "group", "having", + "hint", "if", "implements", "import", "in", "inner", "insert", "instanceof", "int", "integer", + "interface", "into", "join", "like", "limit", "list", "long", "loop", "map", "merge", "new", + "not", "null", "nulls", "number", "object", "of", "on", "or", "outer", "override", "package", "parallel", + "pragma", "private", "protected", "public", "retrieve", "return", + "rollback", "select", "set", "short", "sObject", "sort", "static", "string", + "super", "switch", "synchronized", "system", "testmethod", "then", "this", + "throw", "time", "transaction", "trigger", "true", "try", "undelete", "update", "upsert", "using", + "virtual", "void", "webservice", "when", "where", "while" )); languageSpecificPrimitives = new HashSet( diff --git a/samples/client/petstore/apex/force-app/main/default/classes/OASApiResponse.cls b/samples/client/petstore/apex/force-app/main/default/classes/OASApiResponse.cls index f9a93bbd3ca..9d89735ce2b 100644 --- a/samples/client/petstore/apex/force-app/main/default/classes/OASApiResponse.cls +++ b/samples/client/petstore/apex/force-app/main/default/classes/OASApiResponse.cls @@ -13,7 +13,7 @@ /** * Describes the result of uploading an image resource */ -public class OASApiResponse implements OAS.MappedProperties { +public class OASApiResponse { /** * Get code * @return code @@ -21,10 +21,10 @@ public class OASApiResponse implements OAS.MappedProperties { public Integer code { get; set; } /** - * Get r_type - * @return r_type + * Get type + * @return type */ - public String r_type { get; set; } + public String type { get; set; } /** * Get message @@ -32,18 +32,10 @@ public class OASApiResponse implements OAS.MappedProperties { */ public String message { get; set; } - private static final Map propertyMappings = new Map{ - 'type' => 'r_type' - }; - - public Map getPropertyMappings() { - return propertyMappings; - } - public static OASApiResponse getExample() { OASApiResponse apiResponse = new OASApiResponse(); apiResponse.code = 0; - apiResponse.r_type = ''; + apiResponse.type = ''; apiResponse.message = ''; return apiResponse; } @@ -52,7 +44,7 @@ public class OASApiResponse implements OAS.MappedProperties { if (obj instanceof OASApiResponse) { OASApiResponse apiResponse = (OASApiResponse) obj; return this.code == apiResponse.code - && this.r_type == apiResponse.r_type + && this.type == apiResponse.type && this.message == apiResponse.message; } return false; @@ -61,7 +53,7 @@ public class OASApiResponse implements OAS.MappedProperties { public Integer hashCode() { Integer hashCode = 43; hashCode = (17 * hashCode) + (code == null ? 0 : System.hashCode(code)); - hashCode = (17 * hashCode) + (r_type == null ? 0 : System.hashCode(r_type)); + hashCode = (17 * hashCode) + (type == null ? 0 : System.hashCode(type)); hashCode = (17 * hashCode) + (message == null ? 0 : System.hashCode(message)); return hashCode; }