loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-11 03:22:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
William Cheng
2020-01-20 15:46:13 +08:00
parent 8ab39a28d2 04af5e0445
commit 82e2448bf2
3307 changed files with 122702 additions and 15514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/client/petstore/java/google-api-client/build.gradle
View File

@@ -6,7 +6,7 @@ version = '1.0.0'
buildscript {
repositories {
mavenCentral()
maven { url "https://repo1.maven.org/maven2" }
jcenter()
}
dependencies {
@@ -96,13 +96,13 @@ if(hasProperty('target') && target == 'android') {
ext {
swagger_annotations_version = "1.5.22"
jackson_version = "2.9.10"
jackson_databind_version = "2.9.10.1"
jackson_version = "2.10.1"
jackson_databind_version = "2.10.1"
jackson_databind_nullable_version = "0.2.1"
google_api_client_version = "1.23.0"
jersey_common_version = "2.25.1"
jodatime_version = "2.9.9"
junit_version = "4.12"
junit_version = "4.13"
jackson_threeten_version = "2.9.10"
}

8
samples/client/petstore/java/google-api-client/build.sbt
View File

@@ -12,11 +12,11 @@ lazy val root = (project in file(".")).
"io.swagger" % "swagger-annotations" % "1.5.22",
"com.google.api-client" % "google-api-client" % "1.23.0",
"org.glassfish.jersey.core" % "jersey-common" % "2.25.1",
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.10.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
"junit" % "junit" % "4.12" % "test",
"junit" % "junit" % "4.13" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test"
)
)

6
samples/client/petstore/java/google-api-client/docs/FakeApi.md
View File

@@ -12,7 +12,7 @@ Method | HTTP request | Description
[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema |
[**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params |
[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" model
[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
[**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
[**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
@@ -542,9 +542,9 @@ No authorization required
> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
### Example

8
samples/client/petstore/java/google-api-client/pom.xml
View File

@@ -17,7 +17,7 @@
<licenses>
<license>
<name>Unlicense</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
<url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
<distribution>repo</distribution>
</license>
</licenses>
@@ -258,11 +258,11 @@
<swagger-annotations-version>1.5.22</swagger-annotations-version>
<google-api-client-version>1.30.2</google-api-client-version>
<jersey-common-version>2.25.1</jersey-common-version>
<jackson-version>2.9.10</jackson-version>
<jackson-databind-version>2.9.10.1</jackson-databind-version>
<jackson-version>2.10.1</jackson-version>
<jackson-databind-version>2.10.1</jackson-databind-version>
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
<jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
<junit-version>4.13</junit-version>
</properties>
</project>

4
samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
View File

@@ -51,7 +51,7 @@ public class AnotherFakeApi {
**/
public Client call123testSpecialTags(Client body) throws IOException {
HttpResponse response = call123testSpecialTagsForHttpResponse(body);
TypeReference typeRef = new TypeReference<Client>() {};
TypeReference<Client> typeRef = new TypeReference<Client>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -66,7 +66,7 @@ public class AnotherFakeApi {
**/
public Client call123testSpecialTags(Client body, Map<String, Object> params) throws IOException {
HttpResponse response = call123testSpecialTagsForHttpResponse(body, params);
TypeReference typeRef = new TypeReference<Client>() {};
TypeReference<Client> typeRef = new TypeReference<Client>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}

28
samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java
View File

@@ -144,7 +144,7 @@ public class FakeApi {
**/
public Boolean fakeOuterBooleanSerialize(Boolean body) throws IOException {
HttpResponse response = fakeOuterBooleanSerializeForHttpResponse(body);
TypeReference typeRef = new TypeReference<Boolean>() {};
TypeReference<Boolean> typeRef = new TypeReference<Boolean>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -157,7 +157,7 @@ public class FakeApi {
**/
public Boolean fakeOuterBooleanSerialize(Boolean body, Map<String, Object> params) throws IOException {
HttpResponse response = fakeOuterBooleanSerializeForHttpResponse(body, params);
TypeReference typeRef = new TypeReference<Boolean>() {};
TypeReference<Boolean> typeRef = new TypeReference<Boolean>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -224,7 +224,7 @@ public class FakeApi {
**/
public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws IOException {
HttpResponse response = fakeOuterCompositeSerializeForHttpResponse(body);
TypeReference typeRef = new TypeReference<OuterComposite>() {};
TypeReference<OuterComposite> typeRef = new TypeReference<OuterComposite>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -237,7 +237,7 @@ public class FakeApi {
**/
public OuterComposite fakeOuterCompositeSerialize(OuterComposite body, Map<String, Object> params) throws IOException {
HttpResponse response = fakeOuterCompositeSerializeForHttpResponse(body, params);
TypeReference typeRef = new TypeReference<OuterComposite>() {};
TypeReference<OuterComposite> typeRef = new TypeReference<OuterComposite>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -304,7 +304,7 @@ public class FakeApi {
**/
public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws IOException {
HttpResponse response = fakeOuterNumberSerializeForHttpResponse(body);
TypeReference typeRef = new TypeReference<BigDecimal>() {};
TypeReference<BigDecimal> typeRef = new TypeReference<BigDecimal>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -317,7 +317,7 @@ public class FakeApi {
**/
public BigDecimal fakeOuterNumberSerialize(BigDecimal body, Map<String, Object> params) throws IOException {
HttpResponse response = fakeOuterNumberSerializeForHttpResponse(body, params);
TypeReference typeRef = new TypeReference<BigDecimal>() {};
TypeReference<BigDecimal> typeRef = new TypeReference<BigDecimal>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -384,7 +384,7 @@ public class FakeApi {
**/
public String fakeOuterStringSerialize(String body) throws IOException {
HttpResponse response = fakeOuterStringSerializeForHttpResponse(body);
TypeReference typeRef = new TypeReference<String>() {};
TypeReference<String> typeRef = new TypeReference<String>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -397,7 +397,7 @@ public class FakeApi {
**/
public String fakeOuterStringSerialize(String body, Map<String, Object> params) throws IOException {
HttpResponse response = fakeOuterStringSerializeForHttpResponse(body, params);
TypeReference typeRef = new TypeReference<String>() {};
TypeReference<String> typeRef = new TypeReference<String>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -666,7 +666,7 @@ public class FakeApi {
**/
public Client testClientModel(Client body) throws IOException {
HttpResponse response = testClientModelForHttpResponse(body);
TypeReference typeRef = new TypeReference<Client>() {};
TypeReference<Client> typeRef = new TypeReference<Client>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -681,7 +681,7 @@ public class FakeApi {
**/
public Client testClientModel(Client body, Map<String, Object> params) throws IOException {
HttpResponse response = testClientModelForHttpResponse(body, params);
TypeReference typeRef = new TypeReference<Client>() {};
TypeReference<Client> typeRef = new TypeReference<Client>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -749,8 +749,8 @@ public class FakeApi {
/**
* Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
* Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
* Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
* Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
* <p><b>400</b> - Invalid username supplied
* <p><b>404</b> - User not found
* @param number None
@@ -774,8 +774,8 @@ public class FakeApi {
}
/**
* Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
* Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
* Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
* Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
* <p><b>400</b> - Invalid username supplied
* <p><b>404</b> - User not found
* @param number None

4
samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
View File

@@ -51,7 +51,7 @@ public class FakeClassnameTags123Api {
**/
public Client testClassname(Client body) throws IOException {
HttpResponse response = testClassnameForHttpResponse(body);
TypeReference typeRef = new TypeReference<Client>() {};
TypeReference<Client> typeRef = new TypeReference<Client>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -66,7 +66,7 @@ public class FakeClassnameTags123Api {
**/
public Client testClassname(Client body, Map<String, Object> params) throws IOException {
HttpResponse response = testClassnameForHttpResponse(body, params);
TypeReference typeRef = new TypeReference<Client>() {};
TypeReference<Client> typeRef = new TypeReference<Client>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}

20
samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java
View File

@@ -217,7 +217,7 @@ public class PetApi {
**/
public List<Pet> findPetsByStatus(List<String> status) throws IOException {
HttpResponse response = findPetsByStatusForHttpResponse(status);
TypeReference typeRef = new TypeReference<List<Pet>>() {};
TypeReference<List<Pet>> typeRef = new TypeReference<List<Pet>>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -233,7 +233,7 @@ public class PetApi {
**/
public List<Pet> findPetsByStatus(List<String> status, Map<String, Object> params) throws IOException {
HttpResponse response = findPetsByStatusForHttpResponse(status, params);
TypeReference typeRef = new TypeReference<List<Pet>>() {};
TypeReference<List<Pet>> typeRef = new TypeReference<List<Pet>>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -308,7 +308,7 @@ public class PetApi {
**/
public List<Pet> findPetsByTags(List<String> tags) throws IOException {
HttpResponse response = findPetsByTagsForHttpResponse(tags);
TypeReference typeRef = new TypeReference<List<Pet>>() {};
TypeReference<List<Pet>> typeRef = new TypeReference<List<Pet>>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -324,7 +324,7 @@ public class PetApi {
**/
public List<Pet> findPetsByTags(List<String> tags, Map<String, Object> params) throws IOException {
HttpResponse response = findPetsByTagsForHttpResponse(tags, params);
TypeReference typeRef = new TypeReference<List<Pet>>() {};
TypeReference<List<Pet>> typeRef = new TypeReference<List<Pet>>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -400,7 +400,7 @@ public class PetApi {
**/
public Pet getPetById(Long petId) throws IOException {
HttpResponse response = getPetByIdForHttpResponse(petId);
TypeReference typeRef = new TypeReference<Pet>() {};
TypeReference<Pet> typeRef = new TypeReference<Pet>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -417,7 +417,7 @@ public class PetApi {
**/
public Pet getPetById(Long petId, Map<String, Object> params) throws IOException {
HttpResponse response = getPetByIdForHttpResponse(petId, params);
TypeReference typeRef = new TypeReference<Pet>() {};
TypeReference<Pet> typeRef = new TypeReference<Pet>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -651,7 +651,7 @@ public class PetApi {
**/
public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File file) throws IOException {
HttpResponse response = uploadFileForHttpResponse(petId, additionalMetadata, file);
TypeReference typeRef = new TypeReference<ModelApiResponse>() {};
TypeReference<ModelApiResponse> typeRef = new TypeReference<ModelApiResponse>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -665,7 +665,7 @@ public class PetApi {
**/
public ModelApiResponse uploadFile(Long petId, Map<String, Object> params) throws IOException {
HttpResponse response = uploadFileForHttpResponse(petId, params);
TypeReference typeRef = new TypeReference<ModelApiResponse>() {};
TypeReference<ModelApiResponse> typeRef = new TypeReference<ModelApiResponse>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -733,7 +733,7 @@ public class PetApi {
**/
public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile, String additionalMetadata) throws IOException {
HttpResponse response = uploadFileWithRequiredFileForHttpResponse(petId, requiredFile, additionalMetadata);
TypeReference typeRef = new TypeReference<ModelApiResponse>() {};
TypeReference<ModelApiResponse> typeRef = new TypeReference<ModelApiResponse>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -748,7 +748,7 @@ public class PetApi {
**/
public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile, Map<String, Object> params) throws IOException {
HttpResponse response = uploadFileWithRequiredFileForHttpResponse(petId, requiredFile, params);
TypeReference typeRef = new TypeReference<ModelApiResponse>() {};
TypeReference<ModelApiResponse> typeRef = new TypeReference<ModelApiResponse>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}

12
samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/StoreApi.java
View File

@@ -128,7 +128,7 @@ public class StoreApi {
**/
public Map<String, Integer> getInventory() throws IOException {
HttpResponse response = getInventoryForHttpResponse();
TypeReference typeRef = new TypeReference<Map<String, Integer>>() {};
TypeReference<Map<String, Integer>> typeRef = new TypeReference<Map<String, Integer>>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -142,7 +142,7 @@ public class StoreApi {
**/
public Map<String, Integer> getInventory(Map<String, Object> params) throws IOException {
HttpResponse response = getInventoryForHttpResponse(params);
TypeReference typeRef = new TypeReference<Map<String, Integer>>() {};
TypeReference<Map<String, Integer>> typeRef = new TypeReference<Map<String, Integer>>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -199,7 +199,7 @@ public class StoreApi {
**/
public Order getOrderById(Long orderId) throws IOException {
HttpResponse response = getOrderByIdForHttpResponse(orderId);
TypeReference typeRef = new TypeReference<Order>() {};
TypeReference<Order> typeRef = new TypeReference<Order>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -216,7 +216,7 @@ public class StoreApi {
**/
public Order getOrderById(Long orderId, Map<String, Object> params) throws IOException {
HttpResponse response = getOrderByIdForHttpResponse(orderId, params);
TypeReference typeRef = new TypeReference<Order>() {};
TypeReference<Order> typeRef = new TypeReference<Order>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -283,7 +283,7 @@ public class StoreApi {
**/
public Order placeOrder(Order body) throws IOException {
HttpResponse response = placeOrderForHttpResponse(body);
TypeReference typeRef = new TypeReference<Order>() {};
TypeReference<Order> typeRef = new TypeReference<Order>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -298,7 +298,7 @@ public class StoreApi {
**/
public Order placeOrder(Order body, Map<String, Object> params) throws IOException {
HttpResponse response = placeOrderForHttpResponse(body, params);
TypeReference typeRef = new TypeReference<Order>() {};
TypeReference<Order> typeRef = new TypeReference<Order>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}

8
samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/UserApi.java
View File

@@ -384,7 +384,7 @@ public class UserApi {
**/
public User getUserByName(String username) throws IOException {
HttpResponse response = getUserByNameForHttpResponse(username);
TypeReference typeRef = new TypeReference<User>() {};
TypeReference<User> typeRef = new TypeReference<User>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -400,7 +400,7 @@ public class UserApi {
**/
public User getUserByName(String username, Map<String, Object> params) throws IOException {
HttpResponse response = getUserByNameForHttpResponse(username, params);
TypeReference typeRef = new TypeReference<User>() {};
TypeReference<User> typeRef = new TypeReference<User>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -468,7 +468,7 @@ public class UserApi {
**/
public String loginUser(String username, String password) throws IOException {
HttpResponse response = loginUserForHttpResponse(username, password);
TypeReference typeRef = new TypeReference<String>() {};
TypeReference<String> typeRef = new TypeReference<String>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}
@@ -484,7 +484,7 @@ public class UserApi {
**/
public String loginUser(String username, String password, Map<String, Object> params) throws IOException {
HttpResponse response = loginUserForHttpResponse(username, password, params);
TypeReference typeRef = new TypeReference<String>() {};
TypeReference<String> typeRef = new TypeReference<String>() {};
return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
}