loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.2.x' into 5.0.x

Browse Source
This commit is contained in:
William Cheng
2019-09-22 21:00:38 +08:00
parent a8fe5d355c 3019b5a5e1
commit 5eb67d471b
2432 changed files with 40079 additions and 14159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
samples/client/petstore/java/rest-assured/build.gradle
View File

@@ -109,6 +109,7 @@ dependencies {
compile "com.google.code.findbugs:jsr305:3.0.2"
compile "io.rest-assured:scala-support:$rest_assured_version"
compile "io.gsonfire:gson-fire:$gson_fire_version"
compile 'com.google.code.gson:gson:$gson_version'
compile "org.threeten:threetenbp:$threetenbp_version"
compile "com.squareup.okio:okio:$okio_version"
testCompile "junit:junit:$junit_version"

1
samples/client/petstore/java/rest-assured/docs/TypeHolderExample.md
View File

@@ -8,6 +8,7 @@ Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**stringItem** | **String** | |
**numberItem** | [**BigDecimal**](BigDecimal.md) | |
**floatItem** | **Float** | |
**integerItem** | **Integer** | |
**boolItem** | **Boolean** | |
**arrayItem** | **List<Integer>** | |

16
samples/client/petstore/java/rest-assured/git_push.sh
View File

@@ -1,11 +1,17 @@
#!/bin/sh
# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
#
# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
git_user_id=$1
git_repo_id=$2
release_note=$3
git_host=$4
if [ "$git_host" = "" ]; then
git_host="github.com"
echo "[INFO] No command line input provided. Set \$git_host to $git_host"
fi
if [ "$git_user_id" = "" ]; then
git_user_id="GIT_USER_ID"
@@ -28,7 +34,7 @@ git init
# Adds the files in the local repository and stages them for commit.
git add .
# Commits the tracked changes and prepares them to be pushed to a remote repository.
# Commits the tracked changes and prepares them to be pushed to a remote repository.
git commit -m "$release_note"
# Sets the new remote
@@ -37,9 +43,9 @@ if [ "$git_remote" = "" ]; then # git remote not defined
if [ "$GIT_TOKEN" = "" ]; then
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
else
git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
fi
fi
@@ -47,6 +53,6 @@ fi
git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

10
samples/client/petstore/java/rest-assured/pom.xml
View File

@@ -225,11 +225,11 @@
<artifactId>gson-fire</artifactId>
<version>${gson-fire-version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>${okio-version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>${okio-version}</version>
</dependency>
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>

1
samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/ApiClient.java
View File

@@ -23,6 +23,7 @@ import static io.restassured.config.ObjectMapperConfig.objectMapperConfig;
import static io.restassured.config.RestAssuredConfig.config;
import static org.openapitools.client.GsonObjectMapper.gson;
public class ApiClient {
public static final String BASE_URI = "http://petstore.swagger.io:80/v2";

1
samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
View File

@@ -33,7 +33,6 @@ import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
import org.openapitools.client.JSON;
import static io.restassured.http.Method.*;
@Api(value = "AnotherFake")

1
samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java
View File

@@ -41,7 +41,6 @@ import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
import org.openapitools.client.JSON;
import static io.restassured.http.Method.*;
@Api(value = "Fake")

1
samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
View File

@@ -33,7 +33,6 @@ import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
import org.openapitools.client.JSON;
import static io.restassured.http.Method.*;
@Api(value = "FakeClassnameTags123")

1
samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java
View File

@@ -35,7 +35,6 @@ import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
import org.openapitools.client.JSON;
import static io.restassured.http.Method.*;
@Api(value = "Pet")

1
samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java
View File

@@ -33,7 +33,6 @@ import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
import org.openapitools.client.JSON;
import static io.restassured.http.Method.*;
@Api(value = "Store")

1
samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/UserApi.java
View File

@@ -33,7 +33,6 @@ import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
import org.openapitools.client.JSON;
import static io.restassured.http.Method.*;
@Api(value = "User")

4
samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java
View File

@@ -72,7 +72,7 @@ public class EnumArrays {
@Override
public JustSymbolEnum read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
String value = jsonReader.nextString();
return JustSymbolEnum.fromValue(value);
}
}
@@ -123,7 +123,7 @@ public class EnumArrays {
@Override
public ArrayEnumEnum read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
String value = jsonReader.nextString();
return ArrayEnumEnum.fromValue(value);
}
}

8
samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java
View File

@@ -73,7 +73,7 @@ public class EnumTest {
@Override
public EnumStringEnum read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
String value = jsonReader.nextString();
return EnumStringEnum.fromValue(value);
}
}
@@ -126,7 +126,7 @@ public class EnumTest {
@Override
public EnumStringRequiredEnum read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
String value = jsonReader.nextString();
return EnumStringRequiredEnum.fromValue(value);
}
}
@@ -177,7 +177,7 @@ public class EnumTest {
@Override
public EnumIntegerEnum read(final JsonReader jsonReader) throws IOException {
Integer value = jsonReader.nextInt();
Integer value = jsonReader.nextInt();
return EnumIntegerEnum.fromValue(value);
}
}
@@ -228,7 +228,7 @@ public class EnumTest {
@Override
public EnumNumberEnum read(final JsonReader jsonReader) throws IOException {
Double value = jsonReader.nextDouble();
Double value = jsonReader.nextDouble();
return EnumNumberEnum.fromValue(value);
}
}

2
samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java
View File

@@ -77,7 +77,7 @@ public class MapTest {
@Override
public InnerEnum read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
String value = jsonReader.nextString();
return InnerEnum.fromValue(value);
}
}

2
samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java
View File

@@ -89,7 +89,7 @@ public class Order {
@Override
public StatusEnum read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
String value = jsonReader.nextString();
return StatusEnum.fromValue(value);
}
}

2
samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java
View File

@@ -96,7 +96,7 @@ public class Pet {
@Override
public StatusEnum read(final JsonReader jsonReader) throws IOException {
String value = jsonReader.nextString();
String value = jsonReader.nextString();
return StatusEnum.fromValue(value);
}
}

31
samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java
View File

@@ -40,6 +40,10 @@ public class TypeHolderExample {
@SerializedName(SERIALIZED_NAME_NUMBER_ITEM)
private BigDecimal numberItem;
public static final String SERIALIZED_NAME_FLOAT_ITEM = "float_item";
@SerializedName(SERIALIZED_NAME_FLOAT_ITEM)
private Float floatItem;
public static final String SERIALIZED_NAME_INTEGER_ITEM = "integer_item";
@SerializedName(SERIALIZED_NAME_INTEGER_ITEM)
private Integer integerItem;
@@ -99,6 +103,29 @@ public class TypeHolderExample {
}
public TypeHolderExample floatItem(Float floatItem) {
this.floatItem = floatItem;
return this;
}
/**
* Get floatItem
* @return floatItem
**/
@ApiModelProperty(example = "1.234", required = true, value = "")
public Float getFloatItem() {
return floatItem;
}
public void setFloatItem(Float floatItem) {
this.floatItem = floatItem;
}
public TypeHolderExample integerItem(Integer integerItem) {
this.integerItem = integerItem;
@@ -184,6 +211,7 @@ public class TypeHolderExample {
TypeHolderExample typeHolderExample = (TypeHolderExample) o;
return Objects.equals(this.stringItem, typeHolderExample.stringItem) &&
Objects.equals(this.numberItem, typeHolderExample.numberItem) &&
Objects.equals(this.floatItem, typeHolderExample.floatItem) &&
Objects.equals(this.integerItem, typeHolderExample.integerItem) &&
Objects.equals(this.boolItem, typeHolderExample.boolItem) &&
Objects.equals(this.arrayItem, typeHolderExample.arrayItem);
@@ -191,7 +219,7 @@ public class TypeHolderExample {
@Override
public int hashCode() {
return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem);
return Objects.hash(stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem);
}
@@ -201,6 +229,7 @@ public class TypeHolderExample {
sb.append("class TypeHolderExample {\n");
sb.append(" stringItem: ").append(toIndentedString(stringItem)).append("\n");
sb.append(" numberItem: ").append(toIndentedString(numberItem)).append("\n");
sb.append(" floatItem: ").append(toIndentedString(floatItem)).append("\n");
sb.append(" integerItem: ").append(toIndentedString(integerItem)).append("\n");
sb.append(" boolItem: ").append(toIndentedString(boolItem)).append("\n");
sb.append(" arrayItem: ").append(toIndentedString(arrayItem)).append("\n");