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

Merge pull request #3741 from cvent/cvent-2.3.0

Browse Source 
Java: Fix UUID mapping to a UUID instead of a string
This commit is contained in:
wing328 2016-09-18 16:42:24 +08:00 committed by GitHub
commit d5c88ae64b
29 changed files with 94 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
View File

@ -107,7 +107,6 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
instantiationTypes.put("map", "HashMap"); instantiationTypes.put("map", "HashMap");
typeMapping.put("date", "Date"); typeMapping.put("date", "Date");
typeMapping.put("file", "File"); typeMapping.put("file", "File");
typeMapping.put("UUID", "String");
cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC));
cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC));
@ -790,10 +789,10 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
CodegenOperation op = super.fromOperation(path, httpMethod, operation, definitions, swagger); CodegenOperation op = super.fromOperation(path, httpMethod, operation, definitions, swagger);
op.path = sanitizePath(op.path); op.path = sanitizePath(op.path);
return op; return op;
} }
private static CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) { private static CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) {
// This generator uses inline classes to define enums, which breaks when // This generator uses inline classes to define enums, which breaks when
// dealing with models that have subTypes. To clean this up, we will analyze // dealing with models that have subTypes. To clean this up, we will analyze

9
samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FormatTest.java
View File

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

9
samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
View File

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

2
samples/client/petstore/java/jersey1/docs/FormatTest.md
View File

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

2
samples/client/petstore/java/jersey1/docs/MixedPropertiesAndAdditionalPropertiesClass.md
View File

@ -4,7 +4,7 @@
## Properties ## Properties
Name | Type | Description | Notes Name | Type | Description | Notes
------------ | ------------- | ------------- | ------------- ------------ | ------------- | ------------- | -------------
**uuid** | **String** | | [optional] **uuid** | [**UUID**](UUID.md) | | [optional]
**dateTime** | [**DateTime**](DateTime.md) | | [optional] **dateTime** | [**DateTime**](DateTime.md) | | [optional]
**map** | [**Map&lt;String, Animal&gt;**](Animal.md) | | [optional] **map** | [**Map&lt;String, Animal&gt;**](Animal.md) | | [optional]

9
samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/FormatTest.java
View File

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

9
samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
View File

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

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

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

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

@ -4,7 +4,7 @@
## Properties ## Properties
Name | Type | Description | Notes Name | Type | Description | Notes
------------ | ------------- | ------------- | ------------- ------------ | ------------- | ------------- | -------------
**uuid** | **String** | | [optional] **uuid** | [**UUID**](UUID.md) | | [optional]
**dateTime** | [**OffsetDateTime**](OffsetDateTime.md) | | [optional] **dateTime** | [**OffsetDateTime**](OffsetDateTime.md) | | [optional]
**map** | [**Map&lt;String, Animal&gt;**](Animal.md) | | [optional] **map** | [**Map&lt;String, Animal&gt;**](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.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import java.util.UUID;
/** /**
@ -74,7 +75,7 @@ public class FormatTest {
private OffsetDateTime dateTime = null; private OffsetDateTime dateTime = null;
@JsonProperty("uuid") @JsonProperty("uuid")
private String uuid = null; private UUID uuid = null;
@JsonProperty("password") @JsonProperty("password")
private String password = null; private String password = null;
@ -287,7 +288,7 @@ public class FormatTest {
this.dateTime = dateTime; this.dateTime = dateTime;
} }
public FormatTest uuid(String uuid) { public FormatTest uuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
return this; return this;
} }
@ -297,11 +298,11 @@ public class FormatTest {
* @return uuid * @return uuid
**/ **/
@ApiModelProperty(example = "null", value = "") @ApiModelProperty(example = "null", value = "")
public String getUuid() { public UUID getUuid() {
return uuid; return uuid;
} }
public void setUuid(String uuid) { public void setUuid(UUID uuid) {
this.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.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID;
/** /**
@ -43,7 +44,7 @@ import java.util.Map;
public class MixedPropertiesAndAdditionalPropertiesClass { public class MixedPropertiesAndAdditionalPropertiesClass {
@JsonProperty("uuid") @JsonProperty("uuid")
private String uuid = null; private UUID uuid = null;
@JsonProperty("dateTime") @JsonProperty("dateTime")
private OffsetDateTime dateTime = null; private OffsetDateTime dateTime = null;
@ -51,7 +52,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
@JsonProperty("map") @JsonProperty("map")
private Map<String, Animal> map = new HashMap<String, Animal>(); private Map<String, Animal> map = new HashMap<String, Animal>();
public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) { public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
return this; return this;
} }
@ -61,11 +62,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
* @return uuid * @return uuid
**/ **/
@ApiModelProperty(example = "null", value = "") @ApiModelProperty(example = "null", value = "")
public String getUuid() { public UUID getUuid() {
return uuid; return uuid;
} }
public void setUuid(String uuid) { public void setUuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
} }

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

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

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

@ -4,7 +4,7 @@
## Properties ## Properties
Name | Type | Description | Notes Name | Type | Description | Notes
------------ | ------------- | ------------- | ------------- ------------ | ------------- | ------------- | -------------
**uuid** | **String** | | [optional] **uuid** | [**UUID**](UUID.md) | | [optional]
**dateTime** | [**DateTime**](DateTime.md) | | [optional] **dateTime** | [**DateTime**](DateTime.md) | | [optional]
**map** | [**Map&lt;String, Animal&gt;**](Animal.md) | | [optional] **map** | [**Map&lt;String, Animal&gt;**](Animal.md) | | [optional]

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

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

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

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

2
samples/client/petstore/java/okhttp-gson/docs/FormatTest.md
View File

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

2
samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
View File

@ -4,7 +4,7 @@
## Properties ## Properties
Name | Type | Description | Notes Name | Type | Description | Notes
------------ | ------------- | ------------- | ------------- ------------ | ------------- | ------------- | -------------
**uuid** | **String** | | [optional] **uuid** | [**UUID**](UUID.md) | | [optional]
**dateTime** | [**DateTime**](DateTime.md) | | [optional] **dateTime** | [**DateTime**](DateTime.md) | | [optional]
**map** | [**Map&lt;String, Animal&gt;**](Animal.md) | | [optional] **map** | [**Map&lt;String, Animal&gt;**](Animal.md) | | [optional]

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

@ -30,6 +30,7 @@ import com.google.gson.annotations.SerializedName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.UUID;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.LocalDate; import org.joda.time.LocalDate;
@ -73,7 +74,7 @@ public class FormatTest {
private DateTime dateTime = null; private DateTime dateTime = null;
@SerializedName("uuid") @SerializedName("uuid")
private String uuid = null; private UUID uuid = null;
@SerializedName("password") @SerializedName("password")
private String password = null; private String password = null;
@ -286,7 +287,7 @@ public class FormatTest {
this.dateTime = dateTime; this.dateTime = dateTime;
} }
public FormatTest uuid(String uuid) { public FormatTest uuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
return this; return this;
} }
@ -296,11 +297,11 @@ public class FormatTest {
* @return uuid * @return uuid
**/ **/
@ApiModelProperty(example = "null", value = "") @ApiModelProperty(example = "null", value = "")
public String getUuid() { public UUID getUuid() {
return uuid; return uuid;
} }
public void setUuid(String uuid) { public void setUuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
} }

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

@ -33,6 +33,7 @@ import io.swagger.client.model.Animal;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID;
import org.joda.time.DateTime; import org.joda.time.DateTime;
@ -42,7 +43,7 @@ import org.joda.time.DateTime;
public class MixedPropertiesAndAdditionalPropertiesClass { public class MixedPropertiesAndAdditionalPropertiesClass {
@SerializedName("uuid") @SerializedName("uuid")
private String uuid = null; private UUID uuid = null;
@SerializedName("dateTime") @SerializedName("dateTime")
private DateTime dateTime = null; private DateTime dateTime = null;
@ -50,7 +51,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
@SerializedName("map") @SerializedName("map")
private Map<String, Animal> map = new HashMap<String, Animal>(); private Map<String, Animal> map = new HashMap<String, Animal>();
public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) { public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
return this; return this;
} }
@ -60,11 +61,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
* @return uuid * @return uuid
**/ **/
@ApiModelProperty(example = "null", value = "") @ApiModelProperty(example = "null", value = "")
public String getUuid() { public UUID getUuid() {
return uuid; return uuid;
} }
public void setUuid(String uuid) { public void setUuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
} }

9
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/FormatTest.java
View File

@ -30,6 +30,7 @@ import com.google.gson.annotations.SerializedName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.UUID;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.LocalDate; import org.joda.time.LocalDate;
@ -73,7 +74,7 @@ public class FormatTest {
private DateTime dateTime = null; private DateTime dateTime = null;
@SerializedName("uuid") @SerializedName("uuid")
private String uuid = null; private UUID uuid = null;
@SerializedName("password") @SerializedName("password")
private String password = null; private String password = null;
@ -286,7 +287,7 @@ public class FormatTest {
this.dateTime = dateTime; this.dateTime = dateTime;
} }
public FormatTest uuid(String uuid) { public FormatTest uuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
return this; return this;
} }
@ -296,11 +297,11 @@ public class FormatTest {
* @return uuid * @return uuid
**/ **/
@ApiModelProperty(example = "null", value = "") @ApiModelProperty(example = "null", value = "")
public String getUuid() { public UUID getUuid() {
return uuid; return uuid;
} }
public void setUuid(String uuid) { public void setUuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
} }

9
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
View File

@ -33,6 +33,7 @@ import io.swagger.client.model.Animal;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID;
import org.joda.time.DateTime; import org.joda.time.DateTime;
@ -42,7 +43,7 @@ import org.joda.time.DateTime;
public class MixedPropertiesAndAdditionalPropertiesClass { public class MixedPropertiesAndAdditionalPropertiesClass {
@SerializedName("uuid") @SerializedName("uuid")
private String uuid = null; private UUID uuid = null;
@SerializedName("dateTime") @SerializedName("dateTime")
private DateTime dateTime = null; private DateTime dateTime = null;
@ -50,7 +51,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
@SerializedName("map") @SerializedName("map")
private Map<String, Animal> map = new HashMap<String, Animal>(); private Map<String, Animal> map = new HashMap<String, Animal>();
public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) { public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
return this; return this;
} }
@ -60,11 +61,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
* @return uuid * @return uuid
**/ **/
@ApiModelProperty(example = "null", value = "") @ApiModelProperty(example = "null", value = "")
public String getUuid() { public UUID getUuid() {
return uuid; return uuid;
} }
public void setUuid(String uuid) { public void setUuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
} }

2
samples/client/petstore/java/retrofit2/docs/FormatTest.md
View File

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

2
samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
View File

@ -4,7 +4,7 @@
## Properties ## Properties
Name | Type | Description | Notes Name | Type | Description | Notes
------------ | ------------- | ------------- | ------------- ------------ | ------------- | ------------- | -------------
**uuid** | **String** | | [optional] **uuid** | [**UUID**](UUID.md) | | [optional]
**dateTime** | [**DateTime**](DateTime.md) | | [optional] **dateTime** | [**DateTime**](DateTime.md) | | [optional]
**map** | [**Map&lt;String, Animal&gt;**](Animal.md) | | [optional] **map** | [**Map&lt;String, Animal&gt;**](Animal.md) | | [optional]

9
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/FormatTest.java
View File

@ -30,6 +30,7 @@ import com.google.gson.annotations.SerializedName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.UUID;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.LocalDate; import org.joda.time.LocalDate;
@ -73,7 +74,7 @@ public class FormatTest {
private DateTime dateTime = null; private DateTime dateTime = null;
@SerializedName("uuid") @SerializedName("uuid")
private String uuid = null; private UUID uuid = null;
@SerializedName("password") @SerializedName("password")
private String password = null; private String password = null;
@ -286,7 +287,7 @@ public class FormatTest {
this.dateTime = dateTime; this.dateTime = dateTime;
} }
public FormatTest uuid(String uuid) { public FormatTest uuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
return this; return this;
} }
@ -296,11 +297,11 @@ public class FormatTest {
* @return uuid * @return uuid
**/ **/
@ApiModelProperty(example = "null", value = "") @ApiModelProperty(example = "null", value = "")
public String getUuid() { public UUID getUuid() {
return uuid; return uuid;
} }
public void setUuid(String uuid) { public void setUuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
} }

9
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
View File

@ -33,6 +33,7 @@ import io.swagger.client.model.Animal;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID;
import org.joda.time.DateTime; import org.joda.time.DateTime;
@ -42,7 +43,7 @@ import org.joda.time.DateTime;
public class MixedPropertiesAndAdditionalPropertiesClass { public class MixedPropertiesAndAdditionalPropertiesClass {
@SerializedName("uuid") @SerializedName("uuid")
private String uuid = null; private UUID uuid = null;
@SerializedName("dateTime") @SerializedName("dateTime")
private DateTime dateTime = null; private DateTime dateTime = null;
@ -50,7 +51,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
@SerializedName("map") @SerializedName("map")
private Map<String, Animal> map = new HashMap<String, Animal>(); private Map<String, Animal> map = new HashMap<String, Animal>();
public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) { public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
return this; return this;
} }
@ -60,11 +61,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
* @return uuid * @return uuid
**/ **/
@ApiModelProperty(example = "null", value = "") @ApiModelProperty(example = "null", value = "")
public String getUuid() { public UUID getUuid() {
return uuid; return uuid;
} }
public void setUuid(String uuid) { public void setUuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
} }

2
samples/client/petstore/java/retrofit2rx/docs/FormatTest.md
View File

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

2
samples/client/petstore/java/retrofit2rx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
View File

@ -4,7 +4,7 @@
## Properties ## Properties
Name | Type | Description | Notes Name | Type | Description | Notes
------------ | ------------- | ------------- | ------------- ------------ | ------------- | ------------- | -------------
**uuid** | **String** | | [optional] **uuid** | [**UUID**](UUID.md) | | [optional]
**dateTime** | [**DateTime**](DateTime.md) | | [optional] **dateTime** | [**DateTime**](DateTime.md) | | [optional]
**map** | [**Map&lt;String, Animal&gt;**](Animal.md) | | [optional] **map** | [**Map&lt;String, Animal&gt;**](Animal.md) | | [optional]

9
samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/FormatTest.java
View File

@ -30,6 +30,7 @@ import com.google.gson.annotations.SerializedName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.UUID;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.LocalDate; import org.joda.time.LocalDate;
@ -73,7 +74,7 @@ public class FormatTest {
private DateTime dateTime = null; private DateTime dateTime = null;
@SerializedName("uuid") @SerializedName("uuid")
private String uuid = null; private UUID uuid = null;
@SerializedName("password") @SerializedName("password")
private String password = null; private String password = null;
@ -286,7 +287,7 @@ public class FormatTest {
this.dateTime = dateTime; this.dateTime = dateTime;
} }
public FormatTest uuid(String uuid) { public FormatTest uuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
return this; return this;
} }
@ -296,11 +297,11 @@ public class FormatTest {
* @return uuid * @return uuid
**/ **/
@ApiModelProperty(example = "null", value = "") @ApiModelProperty(example = "null", value = "")
public String getUuid() { public UUID getUuid() {
return uuid; return uuid;
} }
public void setUuid(String uuid) { public void setUuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
} }

9
samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
View File

@ -33,6 +33,7 @@ import io.swagger.client.model.Animal;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID;
import org.joda.time.DateTime; import org.joda.time.DateTime;
@ -42,7 +43,7 @@ import org.joda.time.DateTime;
public class MixedPropertiesAndAdditionalPropertiesClass { public class MixedPropertiesAndAdditionalPropertiesClass {
@SerializedName("uuid") @SerializedName("uuid")
private String uuid = null; private UUID uuid = null;
@SerializedName("dateTime") @SerializedName("dateTime")
private DateTime dateTime = null; private DateTime dateTime = null;
@ -50,7 +51,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
@SerializedName("map") @SerializedName("map")
private Map<String, Animal> map = new HashMap<String, Animal>(); private Map<String, Animal> map = new HashMap<String, Animal>();
public MixedPropertiesAndAdditionalPropertiesClass uuid(String uuid) { public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
return this; return this;
} }
@ -60,11 +61,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
* @return uuid * @return uuid
**/ **/
@ApiModelProperty(example = "null", value = "") @ApiModelProperty(example = "null", value = "")
public String getUuid() { public UUID getUuid() {
return uuid; return uuid;
} }
public void setUuid(String uuid) { public void setUuid(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
} }