Rest-assured http client has been added

ApiClient has been added

@deprecated has been added for operation

{{{returnType}}} has been fixed

build.gradle.mustache, build.sbt.mustache, api_doc_mustache has been added

Samples has been added for rest-assured

Useless supporting files has been removed for rest-assured

Sample has been added for rest-assured

Author: viclovsky

README.md

@@ -530,6 +530,7 @@ CONFIG OPTIONS
 	    retrofit - HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1 (Retrofit 1.9.0)
         retrofit2 - HTTP client: OkHttp 2.5.0. JSON processing: Gson 2.4 (Retrofit 2.0.0-beta2)
         google-api-client - HTTP client: google-api-client 1.23.0. JSON processing: Jackson 2.8.9
+        rest-assured", "HTTP client: rest-assured : 3.0.6. JSON processing: JSON processing: Gson 2.6.1
 ```
 
 Your config file for Java can look like

bin/java-petstore-all.sh

@@ -17,3 +17,4 @@
 ./bin/java-petstore-resttemplate-withxml.sh
 ./bin/java-petstore-resteasy.sh
 ./bin/java-petstore-google-api-client.sh
+./bin/java-petstore-rest-assured.sh

bin/java-petstore-rest-assured.json

@@ -0,0 +1,4 @@
+{
+  "library": "rest-assured",
+  "artifactId": "swagger-petstore-rest-assured"
+}

bin/java-petstore-rest-assured.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/Java/libraries/rest-assured -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-rest-assured.json -o samples/client/petstore/java/rest-assured -DhideGenerationTimestamp=true"
+
+echo "Removing files and folders under samples/client/petstore/java/rest-assured/src/main"
+rm -rf samples/client/petstore/java/rest-assured/src/main
+find samples/client/petstore/java/rest-assured -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
+java $JAVA_OPTS -jar $executable $ags
+

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java

@@ -39,6 +39,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
 
     public static final String RETROFIT_1 = "retrofit";
     public static final String RETROFIT_2 = "retrofit2";
+    public static final String REST_ASSURED = "rest-assured";
 
     protected String gradleWrapperPackage = "gradle.wrapper";
     protected boolean useRxJava = false;
@@ -83,6 +84,7 @@ public JavaClientCodegen() {
         supportedLibraries.put("resteasy", "HTTP client: Resteasy client 3.1.3.Final. JSON processing: Jackson 2.8.9");
         supportedLibraries.put("vertx", "HTTP client: VertX client 3.2.4. JSON processing: Jackson 2.8.9");
         supportedLibraries.put("google-api-client", "HTTP client: Google API client 1.23.0. JSON processing: Jackson 2.8.9");
+        supportedLibraries.put("rest-assured", "HTTP client: rest-assured : 3.0.6. JSON processing: JSON processing: Gson 2.6.1");
 
         CliOption libraryOption = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use");
         libraryOption.setEnum(supportedLibraries);
@@ -169,12 +171,12 @@ public void processOpts() {
         writeOptional(outputFolder, new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml"));
         supportingFiles.add(new SupportingFile("travis.mustache", "", ".travis.yml"));
         supportingFiles.add(new SupportingFile("ApiClient.mustache", invokerFolder, "ApiClient.java"));
-        if(!"resttemplate".equals(getLibrary())) {
+        if(!("resttemplate".equals(getLibrary()) || REST_ASSURED.equals(getLibrary()))) {
             supportingFiles.add(new SupportingFile("StringUtil.mustache", invokerFolder, "StringUtil.java"));
         }
 
         // google-api-client doesn't use the Swagger auth, because it uses Google Credential directly (HttpRequestInitializer)
-        if (!"google-api-client".equals(getLibrary())) {
+        if (!("google-api-client".equals(getLibrary()) || REST_ASSURED.equals(getLibrary()))) {
             supportingFiles.add(new SupportingFile("auth/HttpBasicAuth.mustache", authFolder, "HttpBasicAuth.java"));
             supportingFiles.add(new SupportingFile("auth/ApiKeyAuth.mustache", authFolder, "ApiKeyAuth.java"));
             supportingFiles.add(new SupportingFile("auth/OAuth.mustache", authFolder, "OAuth.java"));
@@ -200,7 +202,7 @@ public void processOpts() {
             apiDocTemplateFiles.remove("api_doc.mustache");
         }
 
-        if (!("feign".equals(getLibrary()) || "resttemplate".equals(getLibrary()) || usesAnyRetrofitLibrary() || "google-api-client".equals(getLibrary()))) {
+        if (!("feign".equals(getLibrary()) || "resttemplate".equals(getLibrary()) || usesAnyRetrofitLibrary() || "google-api-client".equals(getLibrary()) || REST_ASSURED.equals(getLibrary()))) {
             supportingFiles.add(new SupportingFile("apiException.mustache", invokerFolder, "ApiException.java"));
             supportingFiles.add(new SupportingFile("Configuration.mustache", invokerFolder, "Configuration.java"));
             supportingFiles.add(new SupportingFile("Pair.mustache", invokerFolder, "Pair.java"));
@@ -246,6 +248,11 @@ public void processOpts() {
             supportingFiles.remove(new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml"));
         } else if ("google-api-client".equals(getLibrary())) {
             additionalProperties.put("jackson", "true");
+
+        } else if (REST_ASSURED.equals(getLibrary()))  {
+            additionalProperties.put("java8", "true");
+            additionalProperties.put("gson", "true");
+            apiTemplateFiles.put("api.mustache", ".java");
         } else {
             LOGGER.error("Unknown library option (-l/--library): " + getLibrary());
         }

modules/swagger-codegen/src/main/resources/Java/libraries/rest-assured/ApiClient.mustache

@@ -0,0 +1,57 @@
+package {{invokerPackage}};
+
+import {{apiPackage}}.*;
+
+{{#imports}}import {{import}};
+{{/imports}}
+
+{{^fullJavaUtil}}
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import io.restassured.RestAssured;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.builder.ResponseSpecBuilder;
+import io.restassured.response.Response;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+{{/fullJavaUtil}}
+
+public class ApiClient {
+
+    private final Config config;
+
+    private ApiClient(Config config) {
+        this.config = config;
+    }
+
+    public static ApiClient api(Config config) {
+        return new ApiClient(config);
+    }
+
+     {{#apiInfo}}
+     {{#apis}}
+    public {{classname}} {{classVarName}}() {
+        return {{classname}}.{{classVarName}}(config.baseReqSpec.get());
+    }
+     {{/apis}}
+     {{/apiInfo}}
+
+    public static class Config {
+        private Supplier<RequestSpecBuilder> baseReqSpec;
+
+        /**
+         * Use common specification for all operations
+         */
+        public Config reqSpecSupplier(Supplier<RequestSpecBuilder> supplier) {
+            this.baseReqSpec = supplier;
+            return this;
+        }
+
+        public static Config apiConfig() {
+            return new Config();
+        }
+    }
+}

modules/swagger-codegen/src/main/resources/Java/libraries/rest-assured/README.mustache

@@ -0,0 +1,43 @@
+# {{artifactId}}
+
+## Requirements
+
+Building the API client library requires [Maven](https://maven.apache.org/) to be installed.
+
+## Installation & Usage
+
+To install the API client library to your local Maven repository, simply execute:
+
+```shell
+mvn install
+```
+
+To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
+
+```shell
+mvn deploy
+```
+
+Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
+
+After the client library is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
+
+```xml
+<dependency>
+    <groupId>{{groupId}}</groupId>
+    <artifactId>{{artifactId}}</artifactId>
+    <version>{{artifactVersion}}</version>
+    <scope>compile</scope>
+</dependency>
+
+```
+
+## Recommendation
+
+It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issues.
+
+## Author
+
+{{#apiInfo}}{{#apis}}{{^hasMore}}{{infoEmail}}
+{{/hasMore}}{{/apis}}{{/apiInfo}}
+

modules/swagger-codegen/src/main/resources/Java/libraries/rest-assured/api.mustache

@@ -0,0 +1,188 @@
+package {{package}};
+
+{{#imports}}import {{import}};
+{{/imports}}
+
+{{^fullJavaUtil}}
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import io.restassured.RestAssured;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.builder.ResponseSpecBuilder;
+import io.restassured.response.Response;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+{{/fullJavaUtil}}
+
+import static io.restassured.http.Method.*;
+import static io.restassured.mapper.ObjectMapperType.GSON;
+
+public class {{classname}} {
+
+    private RequestSpecBuilder reqSpec;
+
+    private {{classname}}(RequestSpecBuilder reqSpec) {
+        this.reqSpec = reqSpec;
+    }
+
+    public static {{classname}} {{classVarName}}(RequestSpecBuilder reqSpec) {
+        return new {{classname}}(reqSpec);
+    }
+
+{{#operations}}
+{{#operation}}
+    {{#isDeprecated}}
+    @Deprecated
+    {{/isDeprecated}}
+    public {{operationIdCamelCase}}Oper {{operationId}}() {
+        return new {{operationIdCamelCase}}Oper(reqSpec);
+    }
+
+{{/operation}}
+{{/operations}}
+
+    {{#operations}}
+    {{#operation}}
+    /**
+     * {{summary}}
+     * {{notes}}
+     *
+     {{#allParams}}
+     * @see #{{#isPathParam}}{{paramName}}Path{{/isPathParam}}{{#isQueryParam}}{{paramName}}Query{{/isQueryParam}}{{#isFormParam}}{{paramName}}Form{{/isFormParam}}{{#isHeaderParam}}{{paramName}}Header{{/isHeaderParam}}{{#isBodyParam}}body{{/isBodyParam}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
+     {{/allParams}}
+     {{#returnType}}
+     * return {{{returnType}}}
+     {{/returnType}}
+     {{#isDeprecated}}
+     * @deprecated
+     {{/isDeprecated}}
+     {{#externalDocs}}
+     * {{description}}
+     * @see <a href="{{url}}">{{summary}} Documentation</a>
+    {{/externalDocs}}
+     */
+    {{#isDeprecated}}
+    @Deprecated
+    {{/isDeprecated}}
+    public class {{operationIdCamelCase}}Oper {
+
+        public static final String REQ_URI = "{{path}}";
+
+        private RequestSpecBuilder reqSpec;
+
+        private ResponseSpecBuilder respSpec;
+
+        public {{operationIdCamelCase}}Oper() {
+            this.reqSpec = new RequestSpecBuilder();
+            this.respSpec = new ResponseSpecBuilder();
+        }
+
+        public {{operationIdCamelCase}}Oper(RequestSpecBuilder reqSpec) {
+            this.reqSpec = reqSpec;
+            this.respSpec = new ResponseSpecBuilder();
+        }
+
+        /**
+         * {{httpMethod}} {{path}}
+         */
+        public <T> T execute(Function<Response, T> handler) {
+            return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request({{httpMethod}}, REQ_URI));
+        }
+
+        {{#returnType}}
+        {{#returnSimpleType}}
+        /**
+         * {{httpMethod}} {{path}}
+         * @return {{{returnType}}}
+         */
+        public {{{returnType}}} executeAs(Function<Response, Response> handler) {
+            return execute(handler).as({{{returnType}}}.class, GSON);
+        }
+        {{/returnSimpleType}}
+
+        {{^returnSimpleType}}
+        {{#isListContainer}}
+        /**
+         * {{httpMethod}} {{path}}
+         * @return {{{returnType}}}
+         */
+        public {{{returnType}}} executeAs(Function<Response, Response> handler) {
+            return Arrays.asList(execute(handler).as({{{returnBaseType}}}[].class, GSON));
+        }
+        {{/isListContainer}}
+        {{/returnSimpleType}}
+        {{/returnType}}
+
+        {{#bodyParams}}
+         /**
+         * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
+         */
+        public {{operationIdCamelCase}}Oper body({{{dataType}}} {{paramName}}) {
+            reqSpec.setBody({{paramName}}, GSON);
+            return this;
+        }
+        {{/bodyParams}}
+
+        {{#headerParams}}
+        /**
+         * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
+         */
+        public {{operationIdCamelCase}}Oper {{paramName}}Header(String {{paramName}}) {
+            reqSpec.addHeader("{{baseName}}", {{paramName}});
+            return this;
+        }
+        {{/headerParams}}
+
+        {{#pathParams}}
+        /**
+         * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
+         */
+        public {{operationIdCamelCase}}Oper {{paramName}}Path({{{dataType}}} {{paramName}}) {
+            reqSpec.addPathParam("{{baseName}}", {{paramName}});
+            return this;
+        }
+        {{/pathParams}}
+
+        {{#queryParams}}
+        /**
+         * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
+         */
+        public {{operationIdCamelCase}}Oper {{paramName}}Query({{{dataType}}} {{paramName}}) {
+            reqSpec.addQueryParam("{{baseName}}", {{paramName}});
+            return this;
+        }
+        {{/queryParams}}
+
+        {{#formParams}}
+         /**
+         * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
+         */
+         public {{operationIdCamelCase}}Oper {{paramName}}Form({{{dataType}}} {{paramName}}) {
+            reqSpec.addFormParam("{{baseName}}", {{paramName}});
+            return this;
+         }
+        {{/formParams}}
+
+        /**
+         * Customise request specification
+         */
+        public {{operationIdCamelCase}}Oper reqSpec(Consumer<RequestSpecBuilder> consumer) {
+            consumer.accept(reqSpec);
+            return this;
+        }
+
+        /**
+         * Customise response specification
+         */
+        public {{operationIdCamelCase}}Oper respSpec(Consumer<ResponseSpecBuilder> consumer) {
+            consumer.accept(respSpec);
+            return this;
+        }
+    }
+{{/operation}}
+{{/operations}}
+}