Merge branch 'master' into issue-10283

Author: frantuma

modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache

@@ -83,7 +83,7 @@
     {{#hasHeaderParams}}
     <h3 class="field-label">Request headers</h3>
     <div class="field-items">
-      {{#headerParam}}{{>headerParam}}{{/headerParam}}
+      {{#headerParams}}{{>headerParam}}{{/headerParams}}
     </div>  <!-- field-items -->
     {{/hasHeaderParams}}
 

modules/swagger-codegen/src/main/resources/r/NAMESPACE.mustache

@@ -6,3 +6,9 @@
 export({{{classname}}})
 {{/model}}
 {{/models}}
+{{#apiInfo}}
+{{#apis}}
+export({{{classname}}})
+{{/apis}}
+{{/apiInfo}}
+export(ApiClient)

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

@@ -1 +1 @@
-2.4.3-SNAPSHOT
+2.4.15-SNAPSHOT

samples/client/petstore/r_test/NAMESPACE

@@ -9,3 +9,6 @@ export(Order)
 export(Pet)
 export(Tag)
 export(User)
+export(PetApi)
+export(StoreApi)
+export(UserApi)

samples/client/petstore/r_test/R/ApiResponse.r

@@ -65,7 +65,7 @@ ApiResponse <- R6::R6Class(
     toJSONString = function() {
        sprintf(
         '{
-           "code": %s,
+           "code": %d,
            "type": %s,
            "message": %s
         }',

samples/client/petstore/r_test/R/Order.r

@@ -102,7 +102,7 @@ Order <- R6::R6Class(
         '{
            "id": %d,
            "petId": %d,
-           "quantity": %s,
+           "quantity": %d,
            "shipDate": %s,
            "status": %s,
            "complete": %s

samples/client/petstore/r_test/R/User.r

@@ -132,7 +132,7 @@ User <- R6::R6Class(
            "email": %s,
            "password": %s,
            "phone": %s,
-           "userStatus": %s
+           "userStatus": %d
         }',
         self$`id`,
         self$`username`,

samples/html/index.html

@@ -291,7 +291,9 @@ <h3 class="field-label">Path parameters</h3>
 
     <h3 class="field-label">Request headers</h3>
     <div class="field-items">
-      
+      <div class="param">api_key (optional)</div>
+
+      <div class="param-desc"><span class="param-type">Header Parameter</span> &mdash;  </div>
     </div>  <!-- field-items -->