[Apex] migrating to OpenAPI Generator project

modules/openapi-generator/src/main/resources/apex/README_sfdx.mustache

@@ -100,7 +100,7 @@ Class | Method | HTTP request | Description
 {{/isBasic}}
 {{#isOAuth}}- **Type**: OAuth
 - **Flow**: {{flow}}
-- **Authorizatoin URL**: {{authorizationUrl}}
+- **Authorization URL**: {{authorizationUrl}}
 - **Scopes**: {{^scopes}}N/A{{/scopes}}
 {{#scopes}}  - {{scope}}: {{description}}
 {{/scopes}}

modules/openapi-generator/src/main/resources/apex/Swagger.cls

@@ -271,9 +271,7 @@ public class Swagger {
         @TestVisible
         protected virtual void applyAuthentication(List<String> names, Map<String, Object> headers,
                                                    List<Param> query) {
-            for (Authentication auth : getAuthMethods(names)) {
-                auth.apply(headers, query);
-            }
+            // TODO Check auth methods
         }
 
         @TestVisible
@@ -298,7 +296,7 @@ public class Swagger {
         protected virtual String toEndpoint(String path, Map<String, Object> params,
                                             List<Param> queryParams) {
             String query = '?' + paramsToString(queryParams);
-            return '"callout:' + calloutName + toPath(path, params) + query.removeEnd('?') + '""';
+            return 'callout:' + calloutName + toPath(path, params) + query.removeEnd('?');
         }
 
         @TestVisible

modules/openapi-generator/src/main/resources/apex/SwaggerTest.cls

@@ -292,7 +292,7 @@ private class SwaggerTest {
             new Swagger.Param('foo', 'bar'),
             new Swagger.Param('bat', '123')
         };
-        String expected = 'https://www.mccombs.utexas.edu/departments/finance?foo=bar&bat=123';
+        String expected = 'callout:Winkelmeyer/departments/finance?foo=bar&bat=123';
         String actual = client.toEndpoint(path, params, queryParams);
         System.assertEquals(expected, actual);
     }
@@ -360,7 +360,8 @@ private class SwaggerTest {
 
     private class MockApiClient extends Swagger.ApiClient {
         public MockApiClient() {
-            basePath = 'https://www.mccombs.utexas.edu';
+            basePath = 'https://blog.winkelmeyer.com';
+            calloutName = 'Winkelmeyer';
         }
     }
 }

modules/openapi-generator/src/main/resources/apex/api.mustache

@@ -88,13 +88,13 @@ public class {{classname}} {
               {{/headerParams}}
             }{{/hasHeaderParams}}{{^hasHeaderParams}}(){{/hasHeaderParams}},
           {{#hasProduces}}
-            new List<String>{ {{#produces}}'{{{mediaType}}}'{{#hasMore}}, {{/hasMore}}{{/produces}} },
+            new List<String>{ {{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}} },
           {{/hasProduces}}
           {{^hasProduces}}
             new List<String>(),
           {{/hasProduces}}
           {{#hasConsumes}}
-            new List<String>{ {{#consumes}}'{{{mediaType}}}'{{#hasMore}}, {{/hasMore}}{{/consumes}} },
+            new List<String>{ {{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}} },
           {{/hasConsumes}}
           {{^hasConsumes}}
             new List<String>(),

modules/openapi-generator/src/main/resources/apex/api_test.mustache

@@ -34,18 +34,19 @@ private class {{classname}}Test {
         {{{returnType}}} response;
         {{{returnType}}} expectedResponse;
       {{/returnType}}
+        String js = '';
 
     {{#authMethods}}
         client = new {{classPrefix}}Client();
         api = new {{classname}}(client);{{#isApiKey}}
-        ((Swagger.ApiKeyAuth){{/isApiKey}} client.getAuthentication('{{name}}');
-      {{#isApiKey}}
-            client.setApiKey('foo-bar-api-key');
+        ((Swagger.ApiKeyAuth)client.getAuthentication('{{name}}')).setApiKey('foo-bar-api-key');
       {{/isApiKey}}
       {{#examples}}
 
+
+        js = JSON.serialize({{{deserializedExample}}});
         res.setHeader('Content-Type', '{{contentType}}');
-        res.setBody('{{{example}}}');
+        res.setBody(js);
         expectedResponse = {{{deserializedExample}}};
         response = ({{{returnType}}}) api.{{operationId}}({{#hasParams}}params{{/hasParams}});
         System.assertEquals(expectedResponse, response);
@@ -59,8 +60,9 @@ private class {{classname}}Test {
         api = new {{classname}}(new {{classPrefix}}Client());
       {{#examples}}
 
+        js = JSON.serialize({{{deserializedExample}}});
         res.setHeader('Content-Type', '{{contentType}}');
-        res.setBody('{{{example}}}');
+        res.setBody(js);
         expectedResponse = {{{deserializedExample}}};
         response = ({{{returnType}}}) api.{{operationId}}({{#hasParams}}params{{/hasParams}});
         System.assertEquals(expectedResponse, response);

modules/openapi-generator/src/main/resources/apex/git_push.sh.mustache

@@ -1,7 +1,7 @@
 #!/bin/sh
 # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
 #
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
+# Usage example: /bin/sh ./git_push.sh wing328 swagger-petstore-perl "minor update"
 
 git_user_id=$1
 git_repo_id=$2
@@ -36,7 +36,7 @@ git_remote=`git remote`
 if [ "$git_remote" = "" ]; then # git remote not defined
 
     if [ "$GIT_TOKEN" = "" ]; then
-        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
         git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
     else
         git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git

modules/openapi-generator/src/main/resources/apex/licenseInfo.mustache

@@ -5,7 +5,7 @@
  * {{#version}}OpenAPI spec version: {{{version}}}{{/version}}
  * {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
  *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */

modules/openapi-generator/src/main/resources/apex/model_test.mustache

@@ -45,15 +45,6 @@ private class {{classname}}Test {
         System.assert({{classVarName}}4.equals({{classVarName}}3));
     }
 
-    @isTest
-    private static void notEqualsUnlikeInstance() {
-        {{classname}} {{classVarName}}1 = {{classname}}.getExample();
-        {{classname}} {{classVarName}}2 = new {{classname}}();
-
-        System.assertEquals(false, {{classVarName}}1.equals({{classVarName}}2));
-        System.assertEquals(false, {{classVarName}}2.equals({{classVarName}}1));
-    }
-
     @isTest
     private static void notEqualsDifferentType() {
         {{classname}} {{classVarName}}1 = {{classname}}.getExample();

modules/openapi-generator/src/main/resources/apex/package.mustache

@@ -3,7 +3,7 @@
     <fullName>{{appName}} API Client</fullName>
     <description>Client library for calling the {{appName}} API.{{#appDescription}}
 {{{appDescription}}}{{/appDescription}}
-Generated with OpenAPI Generator (https://openapi-generator.tech)</description>
+Generated with Swagger Codegen (github.com/swagger-api/swagger-codegen)</description>
     <types>
     {{#apiInfo}}
       {{#apis}}

modules/openapi-generator/src/main/resources/apex/pojo.mustache

@@ -6,13 +6,15 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{#interfac
     {{#isEnum}}
     {{^isContainer}}
 {{>modelInnerEnum}}
-    {{/isContainer}}
-    {{#isContainer}}
-    {{#mostInnerItems}}
-{{>modelInnerEnum}} 
-    {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
+    {{#items.isEnum}}
+      {{#items}}
+      {{^isContainer}}
+{{>modelInnerEnum}}
+      {{/isContainer}}
+      {{/items}}
+    {{/items.isEnum}}
     /**
     {{#description}}
      * {{{description}}}
@@ -58,16 +60,17 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{#interfac
     public static {{classname}} getExample() {
         {{classname}} {{classVarName}} = new {{classname}}();
       {{#vars}}
-        {{classVarName}}.{{name}} = {{{example}}};
+          {{#example}}{{classVarName}}.{{name}} = {{{example}}};{{/example}}
       {{/vars}}
         return {{classVarName}};
     }
 
     public Boolean equals(Object obj) {
-        if (obj instanceof {{classname}}) {
+        if (obj instanceof {{classname}}) {           {{#hasVars}}
             {{classname}} {{classVarName}} = ({{classname}}) obj;
             return {{#vars}}this.{{name}} == {{classVarName}}.{{name}}{{#hasMore}}
-                && {{/hasMore}}{{/vars}};
+                && {{/hasMore}}{{/vars}};{{/hasVars}}{{^hasVars}}
+                return true;{{/hasVars}}
         }
         return false;
     }

modules/openapi-generator/src/main/resources/apex/pojo_doc.mustache

@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | {{#isEnum}}[**{{datatypeWithEnum}}**](#{{datatypeWithEnum}}){{/isEnum}}{{^isEnum}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}}{{/isEnum}} | {{description}} | {{^required}} [optional]{{/required}}{{#readOnly}} [readonly]{{/readOnly}}
+{{#vars}}**{{name}}** | {{#isEnum}}[**{{datatypeWithEnum}}**](#{{datatypeWithEnum}}){{/isEnum}}{{^isEnum}}{{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}}{{/isEnum}} | {{description}} | {{^required}} [optional]{{/required}}{{#readOnly}} [readonly]{{/readOnly}}
 {{/vars}}
 {{#vars}}{{#isEnum}}
 

modules/openapi-generator/src/main/resources/apex/sfdx-project-scratch-def.json

@@ -0,0 +1,8 @@
+{
+  "orgName": "muenzpraeger - René Winkelmeyer",
+  "edition": "Developer",
+  "orgPreferences": {
+    "enabled": ["S1DesktopEnabled"],
+    "disabled": ["S1EncryptedStoragePref2"]
+  }
+}

modules/openapi-generator/src/main/resources/apex/sfdx-project.json.mustache

@@ -0,0 +1,11 @@
+{
+  "packageDirectories": [
+    {
+      "path": "force-app",
+      "default": true
+    }
+  ],
+  "namespace": "",
+  "sfdcLoginUrl": "https://login.salesforce.com",
+  "sourceApiVersion": "{{apiVersion}}"
+}

samples/client/petstore/apex/.openapi-generator-ignore

@@ -1,11 +1,11 @@
-# OpenAPI Generator Ignore
-# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
 
 # Use this file to prevent files from being overwritten by the generator.
 # The patterns follow closely to .gitignore or .dockerignore.
 
 # As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
 #ApiClient.cs
 
 # You can match any string of characters against a directory, file or extension with a single asterisk (*):

samples/client/petstore/apex/.openapi-generator/VERSION

@@ -1 +1 @@
-3.0.0-SNAPSHOT
+3.2.0-SNAPSHOT

samples/client/petstore/apex/.swagger-codegen/VERSION

@@ -0,0 +1 @@
+2.4.0-SNAPSHOT