Revert "Fixed type assignment for referenced enums (#3186 )"

This reverts commit c4d61af20b.
Fixed type assignment for referenced enums (#3186 )
2019-07-09 08:20:03 +02:00 · 2019-07-09 08:07:56 +02:00 · 2019-07-08 22:49:49 +08:00 · 2019-07-08 22:20:35 +08:00
13 changed files with 58 additions and 13 deletions
--- a/docs/customization.md
+++ b/docs/customization.md
@@ -248,7 +248,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.3.0. JSON processing: Gson 2.8.5. Only for Java8
+        rest-assured - HTTP client: rest-assured : 4.0.0. JSON processing: Gson 2.8.5. Only for Java8
 ```

 Your config file for Java can look like
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
@@ -138,7 +138,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
        supportedLibraries.put(RESTEASY, "HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.8.x");
        supportedLibraries.put(VERTX, "HTTP client: VertX client 3.x. JSON processing: Jackson 2.8.x");
        supportedLibraries.put(GOOGLE_API_CLIENT, "HTTP client: Google API client 1.x. JSON processing: Jackson 2.8.x");
-        supportedLibraries.put(REST_ASSURED, "HTTP client: rest-assured : 3.x. JSON processing: Gson 2.x. Only for Java8");
+        supportedLibraries.put(REST_ASSURED, "HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x. Only for Java8");

        CliOption libraryOption = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use");
        libraryOption.setEnum(supportedLibraries);
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache
@@ -96,7 +96,7 @@ if(hasProperty('target') && target == 'android') {

 ext {
    swagger_annotations_version = "1.5.21"
-    rest_assured_version = "3.3.0"
+    rest_assured_version = "4.0.0"
    junit_version = "4.12"
    gson_version = "2.8.5"
    gson_fire_version = "1.8.3"
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache
@@ -10,7 +10,7 @@ lazy val root = (project in file(".")).
    resolvers += Resolver.mavenLocal,
    libraryDependencies ++= Seq(
      "io.swagger" % "swagger-annotations" % "1.5.21",
-      "io.rest-assured" % "scala-support" % "3.3.0",
+      "io.rest-assured" % "scala-support" % "4.0.0",
      "com.google.code.gson" % "gson" % "2.8.5",
      "io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
 {{#joda}}
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
@@ -251,7 +251,7 @@
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <swagger-annotations-version>1.5.21</swagger-annotations-version>
-        <rest-assured.version>3.3.0</rest-assured.version>
+        <rest-assured.version>4.0.0</rest-assured.version>
        <gson-version>2.8.5</gson-version>
        <gson-fire-version>1.8.3</gson-fire-version>
        <maven-plugin-version>1.0.0</maven-plugin-version>
--- a/samples/client/petstore/java/rest-assured/build.gradle
+++ b/samples/client/petstore/java/rest-assured/build.gradle
@@ -96,7 +96,7 @@ if(hasProperty('target') && target == 'android') {

 ext {
    swagger_annotations_version = "1.5.21"
-    rest_assured_version = "3.3.0"
+    rest_assured_version = "4.0.0"
    junit_version = "4.12"
    gson_version = "2.8.5"
    gson_fire_version = "1.8.3"
--- a/samples/client/petstore/java/rest-assured/build.sbt
+++ b/samples/client/petstore/java/rest-assured/build.sbt
@@ -10,7 +10,7 @@ lazy val root = (project in file(".")).
    resolvers += Resolver.mavenLocal,
    libraryDependencies ++= Seq(
      "io.swagger" % "swagger-annotations" % "1.5.21",
-      "io.rest-assured" % "scala-support" % "3.3.0",
+      "io.rest-assured" % "scala-support" % "4.0.0",
      "com.google.code.gson" % "gson" % "2.8.5",
      "io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
      "org.threeten" % "threetenbp" % "1.3.8" % "compile",
--- a/samples/client/petstore/java/rest-assured/pom.xml
+++ b/samples/client/petstore/java/rest-assured/pom.xml
@@ -235,7 +235,7 @@
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <swagger-annotations-version>1.5.21</swagger-annotations-version>
-        <rest-assured.version>3.3.0</rest-assured.version>
+        <rest-assured.version>4.0.0</rest-assured.version>
        <gson-version>2.8.5</gson-version>
        <gson-fire-version>1.8.3</gson-fire-version>
        <maven-plugin-version>1.0.0</maven-plugin-version>
--- a/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/CatAllOfTest.java
+++ b/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/CatAllOfTest.java
@@ -2,7 +2,7 @@
 * OpenAPI Petstore
 * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/DogAllOfTest.java
+++ b/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/model/DogAllOfTest.java
@@ -2,7 +2,7 @@
 * OpenAPI Petstore
 * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
 * 
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
--- a/samples/client/petstore/typescript-jquery/default/.openapi-generator-ignore
+++ b/samples/client/petstore/typescript-jquery/default/.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 (*):
--- a/samples/client/petstore/typescript-jquery/default/model/Amount.ts
+++ b/samples/client/petstore/typescript-jquery/default/model/Amount.ts
@@ -0,0 +1,26 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * 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.
+ */
+
+import * as models from './models';
+
+/**
+ * some description 
+ */
+export interface Amount {
+    /**
+     * some description 
+     */
+    value: number;
+
+    currency: models.Currency;
+
+}
--- a/samples/client/petstore/typescript-jquery/default/model/Currency.ts
+++ b/samples/client/petstore/typescript-jquery/default/model/Currency.ts
@@ -0,0 +1,19 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * 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.
+ */
+
+import * as models from './models';
+
+/**
+ * some description 
+ */
+export interface Currency {
+}
Author	SHA1	Message	Date
Jérémie Bresson	5b3e9eb72f	Revert "Fixed type assignment for referenced enums (#3186 )" This reverts commit `c4d61af20b`.	2019-07-09 08:20:03 +02:00
DonDi94	c4d61af20b	Fixed type assignment for referenced enums (#3186 ) Change-Id: Ie33e298bd3164499c717971c98d0c8fe807c6a71	2019-07-09 08:07:56 +02:00
William Cheng	7cef5ed8ab	update java rest assured sample	2019-07-08 22:49:49 +08:00
Victor Orlovsky	0e37719162	[Java][Rest-assured] Bump rest-assured version (#3282 ) * Update rest-assured version to 4.0.0 * Added rest-assured version 4.0.0 to documentation * Remove CatAllOfTest and DogAllOfTest	2019-07-08 22:20:35 +08:00