Merge branch 'master' into issues-10307

Author: frantuma

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)

run-in-docker.sh

@@ -15,4 +15,4 @@ docker run --rm -it \
         -v "${PWD}:/gen" \
         -v "${maven_cache_repo}:/var/maven/.m2/repository" \
         --entrypoint /gen/docker-entrypoint.sh \
-        maven:3-jdk-7 "$@"
+        maven:3-jdk-8 "$@"

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`,