Merge remote-tracking branch 'origin/master' into 230_merge_master

This commit is contained in:
wing328
2017-06-05 23:27:11 +08:00
1289 changed files with 22425 additions and 48047 deletions

View File

@@ -11,6 +11,7 @@ Method | HTTP request | Description
[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" model
[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
<a name="fakeOuterBooleanSerialize"></a>
@@ -375,3 +376,49 @@ No authorization required
- **Content-Type**: */*
- **Accept**: */*
<a name="testJsonFormData"></a>
# **testJsonFormData**
> testJsonFormData(param, param2)
test json serialization of form data
### Example
```java
// Import classes:
//import io.swagger.client.ApiException;
//import io.swagger.client.api.FakeApi;
FakeApi apiInstance = new FakeApi();
String param = "param_example"; // String | field1
String param2 = "param2_example"; // String | field2
try {
apiInstance.testJsonFormData(param, param2);
} catch (ApiException e) {
System.err.println("Exception when calling FakeApi#testJsonFormData");
e.printStackTrace();
}
```
### Parameters
Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**param** | **String**| field1 |
**param2** | **String**| field2 |
### Return type
null (empty response body)
### Authorization
No authorization required
### HTTP request headers
- **Content-Type**: application/json
- **Accept**: Not defined

View File

@@ -337,6 +337,50 @@ public class FakeApi {
String[] authNames = new String[] { };
ParameterizedTypeReference<Void> returnType = new ParameterizedTypeReference<Void>() {};
apiClient.invokeAPI(path, HttpMethod.GET, queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
}
/**
* test json serialization of form data
*
* <p><b>200</b> - successful operation
* @param param field1
* @param param2 field2
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public void testJsonFormData(String param, String param2) throws RestClientException {
Object postBody = null;
// verify the required parameter 'param' is set
if (param == null) {
throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param' when calling testJsonFormData");
}
// verify the required parameter 'param2' is set
if (param2 == null) {
throw new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Missing the required parameter 'param2' when calling testJsonFormData");
}
String path = UriComponentsBuilder.fromPath("/fake/jsonFormData").build().toUriString();
final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
final HttpHeaders headerParams = new HttpHeaders();
final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
if (param != null)
formParams.add("param", param);
if (param2 != null)
formParams.add("param2", param2);
final String[] accepts = { };
final List<MediaType> accept = apiClient.selectHeaderAccept(accepts);
final String[] contentTypes = {
"application/json"
};
final MediaType contentType = apiClient.selectHeaderContentType(contentTypes);
String[] authNames = new String[] { };
ParameterizedTypeReference<Void> returnType = new ParameterizedTypeReference<Void>() {};
apiClient.invokeAPI(path, HttpMethod.GET, queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);
}

View File

@@ -41,12 +41,12 @@ public class EnumArrays {
this.value = value;
}
@JsonValue
public String getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}
@@ -79,12 +79,12 @@ public class EnumArrays {
this.value = value;
}
@JsonValue
public String getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}

View File

@@ -35,12 +35,12 @@ public enum EnumClass {
this.value = value;
}
@JsonValue
public String getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}

View File

@@ -42,12 +42,12 @@ public class EnumTest {
this.value = value;
}
@JsonValue
public String getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}
@@ -80,12 +80,12 @@ public class EnumTest {
this.value = value;
}
@JsonValue
public Integer getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}
@@ -118,12 +118,12 @@ public class EnumTest {
this.value = value;
}
@JsonValue
public Double getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}

View File

@@ -45,12 +45,12 @@ public class MapTest {
this.value = value;
}
@JsonValue
public String getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}

View File

@@ -54,12 +54,12 @@ public class Order {
this.value = value;
}
@JsonValue
public String getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}

View File

@@ -35,12 +35,12 @@ public enum OuterEnum {
this.value = value;
}
@JsonValue
public String getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}

View File

@@ -60,12 +60,12 @@ public class Pet {
this.value = value;
}
@JsonValue
public String getValue() {
return value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}

View File

@@ -1,19 +1,17 @@
package io.swagger.client.model;
import java.io.StringWriter;
import java.io.PrintWriter;
import java.util.HashMap;
import java.util.ArrayList;
import java.util.Map;
import java.util.List;
import org.junit.Test;
import org.junit.*;
import static org.junit.Assert.*;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.SerializationFeature.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class EnumValueTest {
@Test
public void testEnumClass() {
assertEquals(EnumClass._ABC.toString(), "_abc");
@@ -30,13 +28,19 @@ public class EnumValueTest {
enumTest.setEnumNumber(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1);
assertEquals(EnumTest.EnumStringEnum.UPPER.toString(), "UPPER");
assertEquals(EnumTest.EnumStringEnum.UPPER.getValue(), "UPPER");
assertEquals(EnumTest.EnumStringEnum.LOWER.toString(), "lower");
assertEquals(EnumTest.EnumStringEnum.LOWER.getValue(), "lower");
assertEquals(EnumTest.EnumIntegerEnum.NUMBER_1.toString(), "1");
assertTrue(EnumTest.EnumIntegerEnum.NUMBER_1.getValue() == 1);
assertEquals(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.toString(), "-1");
assertTrue(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.getValue() == -1);
assertEquals(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.toString(), "1.1");
assertTrue(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.getValue() == 1.1);
assertEquals(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.toString(), "-1.2");
assertTrue(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.getValue() == -1.2);
try {
// test serialization (object => json)
@@ -44,7 +48,7 @@ public class EnumValueTest {
mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
ObjectWriter ow = mapper.writer();
String json = ow.writeValueAsString(enumTest);
assertEquals(json, "{\"enum_string\":\"lower\",\"enum_integer\":\"1\",\"enum_number\":\"1.1\",\"outerEnum\":null}");
assertEquals(json, "{\"enum_string\":\"lower\",\"enum_integer\":1,\"enum_number\":1.1,\"outerEnum\":null}");
// test deserialization (json => object)
EnumTest fromString = mapper.readValue(json, EnumTest.class);
@@ -55,7 +59,5 @@ public class EnumValueTest {
} catch (Exception e) {
fail("Exception thrown during serialization/deserialzation of JSON: " + e.getMessage());
}
}
}