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

Re-apply fix after major conflicts upstream

Browse Source
This commit is contained in:
Brent Ryan
2016-09-17 16:06:23 -04:00
parent d5e4b24416
commit d334524adc
29 changed files with 94 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/client/petstore/java/jersey2-java8/docs/FormatTest.md
View File

@@ -15,7 +15,7 @@ Name | Type | Description | Notes
**binary** | **byte[]** | | [optional]
**date** | [**LocalDate**](LocalDate.md) | |
**dateTime** | [**OffsetDateTime**](OffsetDateTime.md) | | [optional]
**uuid** | **String** | | [optional]
**uuid** | [**UUID**](UUID.md) | | [optional]
**password** | **String** | |

2
samples/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md
View File

@@ -4,7 +4,7 @@
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**uuid** | **String** | | [optional]
**uuid** | [**UUID**](UUID.md) | | [optional]
**dateTime** | [**OffsetDateTime**](OffsetDateTime.md) | | [optional]
**map** | [**Map<String, Animal>**](Animal.md) | | [optional]

9
samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/FormatTest.java
View File

@@ -33,6 +33,7 @@ import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.OffsetDateTime;
import java.util.UUID;
/**
@@ -74,7 +75,7 @@ public class FormatTest {
private OffsetDateTime dateTime = null;
@JsonProperty("uuid")
private String uuid = null;
private UUID uuid = null;
@JsonProperty("password")
private String password = null;
@@ -287,7 +288,7 @@ public class FormatTest {
this.dateTime = dateTime;
}
public FormatTest uuid(String uuid) {
public FormatTest uuid(UUID uuid) {
this.uuid = uuid;
return this;
}
@@ -297,11 +298,11 @@ public class FormatTest {
* @return uuid
**/
@ApiModelProperty(example = "null", value = "")
public String getUuid() {
public UUID getUuid() {
return uuid;
}
public void setUuid(String uuid) {
public void setUuid(UUID uuid) {
this.uuid = uuid;
}

9
samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
View File

@@ -35,6 +35,7 @@ import java.time.OffsetDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
/**
@@ -43,7 +44,7 @@ import java.util.Map;
public class MixedPropertiesAndAdditionalPropertiesClass {
@JsonProperty("uuid")
private String uuid = null;
private UUID uuid = null;
@JsonProperty("dateTime")
private OffsetDateTime dateTime = null;
@@ -51,7 +52,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
@JsonProperty("map")
private Map<String, Animal> map = new HashMap<String, Animal>();
public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) {
public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
this.uuid = uuid;
return this;
}
@@ -61,11 +62,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
* @return uuid
**/
@ApiModelProperty(example = "null", value = "")
public String getUuid() {
public UUID getUuid() {
return uuid;
}
public void setUuid(String uuid) {
public void setUuid(UUID uuid) {
this.uuid = uuid;
}