feat(r): saving changes for reference

OpenAPITools · Jun 10, 2019 · 0d091b5 · 0d091b5
1 parent 75189aa
commit 0d091b5
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/bin/windows/r-petstore.bat b/bin/windows/r-petstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g r -o samples\client\petstore\R --additional-properties packageName=petstore
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g r -o samples\client\petstore\R --additional-properties=packageName=petstore,backwardCompatible=true
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/...es/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java b/...es/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java
@@ -43,6 +43,9 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig {
     protected String modelDocPath = "docs/";
     protected String testFolder = "tests/testthat";
 
+	protected boolean backwardCompatible = Boolean.TRUE;
+	public static final String BACKWARD_COMPATIBLE = "backwardCompatible";
+
     public CodegenType getTag() {
         return CodegenType.CLIENT;
     }
@@ -115,6 +118,9 @@ public RClientCodegen() {
         cliOptions.add(new CliOption(CodegenConstants.HIDE_GENERATION_TIMESTAMP, CodegenConstants.HIDE_GENERATION_TIMESTAMP_DESC)
                 .defaultValue(Boolean.TRUE.toString()));
 
+		cliOptions.add(new CliOption(BACKWARD_COMPATIBLE, "Set to true if backward compatibility is required, which doesn't provide some new features.")
+                .defaultValue(Boolean.TRUE.toString()));
+
     }
 
     @Override
@@ -132,9 +138,16 @@ public void processOpts() {
         } else {
             setPackageVersion("1.0.0");
         }
+
+		if (additionalProperties.containsKey(BACKWARD_COMPATIBLE)) {
+            this.backwardCompatible = convertPropertyToBooleanAndWriteBack(BACKWARD_COMPATIBLE);
+        } else {
+            additionalProperties.put(BACKWARD_COMPATIBLE, backwardCompatible);
+        }
 
         additionalProperties.put(CodegenConstants.PACKAGE_NAME, packageName);
         additionalProperties.put(CodegenConstants.PACKAGE_VERSION, packageVersion);
+
 
         additionalProperties.put("apiDocPath", apiDocPath);
         additionalProperties.put("modelDocPath", modelDocPath);
@@ -159,6 +172,7 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("api_client.mustache", File.separator + "R", "api_client.R"));
         supportingFiles.add(new SupportingFile("NAMESPACE.mustache", "", "NAMESPACE"));
         supportingFiles.add(new SupportingFile("testthat.mustache", File.separator + "tests", "testthat.R"));
+		supportingFiles.add(new SupportingFile("test.mustache","","test.R"));
     }
 
     @Override

diff --git a/modules/openapi-generator/src/main/resources/r/api.mustache b/modules/openapi-generator/src/main/resources/r/api.mustache
@@ -141,14 +141,19 @@
      
     {{{operationId}}} = function({{#requiredParams}}{{paramName}}, {{/requiredParams}}{{#optionalParams}}{{paramName}}={{^defaultValue}}NULL{{/defaultValue}}{{#defaultValue}}{{{.}}}{{/defaultValue}}, {{/optionalParams}}...){
       apiResponse <- self${{{operationId}}}WithHttpInfo({{#requiredParams}}{{paramName}}, {{/requiredParams}}{{#optionalParams}}{{paramName}}={{^defaultValue}}NULL{{/defaultValue}}{{#defaultValue}}{{{.}}}{{/defaultValue}}, {{/optionalParams}}...)
-      resp <- apiResponse$response
+      {{#backwardCompatible}}
+	  resp <- apiResponse$response
       if (httr::status_code(resp) >= 200 && httr::status_code(resp) <= 299) {
         apiResponse$content
       } else if (httr::status_code(resp) >= 400 && httr::status_code(resp) <= 499) {
         apiResponse
       } else if (httr::status_code(resp) >= 500 && httr::status_code(resp) <= 599) {
         apiResponse
       }
+	  {{/backwardCompatible}}
+	  {{^backwardCompatible}}
+	  apiResponse
+	  {{/backwardCompatible}}
     }{{#hasMore}},{{/hasMore}}
     {{/operation}}
   )

diff --git a/modules/openapi-generator/src/main/resources/r/test.mustache b/modules/openapi-generator/src/main/resources/r/test.mustache
@@ -0,0 +1 @@
+{{backwardCompatible}}
diff --git a/samples/client/petstore/R/test.R b/samples/client/petstore/R/test.R