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

Merge branch '2.3.0' of https://github.com/swagger-api/swagger-codegen into 2.3.0

Browse Source
This commit is contained in:
wing328
2016-10-02 17:24:37 +08:00
parent 62b6cf4609 9f75f8d3cb
commit a6287bed1d
32 changed files with 111 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
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));

14
modules/swagger-codegen/src/main/resources/php/ApiException.mustache
View File

@@ -43,7 +43,7 @@ class ApiException extends Exception
/** /**
* The HTTP header of the server response. * The HTTP header of the server response.
* *
* @var string[] * @var string[]|null
*/ */
protected $responseHeaders; protected $responseHeaders;
@@ -57,12 +57,12 @@ class ApiException extends Exception
/** /**
* Constructor * Constructor
* *
* @param string $message Error message * @param string $message Error message
* @param int $code HTTP status code * @param int $code HTTP status code
* @param string $responseHeaders HTTP response header * @param string[]|null $responseHeaders HTTP response header
* @param mixed $responseBody HTTP body of the server response either as Json or string * @param mixed $responseBody HTTP body of the server response either as Json or string
*/ */
public function __construct($message = "", $code = 0, $responseHeaders = null, $responseBody = null) public function __construct($message = "", $code = 0, array $responseHeaders = null, $responseBody = null)
{ {
parent::__construct($message, $code); parent::__construct($message, $code);
$this->responseHeaders = $responseHeaders; $this->responseHeaders = $responseHeaders;
@@ -72,7 +72,7 @@ class ApiException extends Exception
/** /**
* Gets the HTTP response header * Gets the HTTP response header
* *
* @return string HTTP response header * @return string[]|null HTTP response header
*/ */
public function getResponseHeaders() public function getResponseHeaders()
{ {

6
modules/swagger-codegen/src/main/resources/swift/model.mustache
View File

@@ -33,10 +33,10 @@ public class {{classname}}: JSONEncodable {
public init() {} public init() {}
{{/unwrapRequired}} {{/unwrapRequired}}
{{#unwrapRequired}} {{#unwrapRequired}}
public init({{#requiredVars}}{{^-first}}, {{/-first}}{{name}}: {{#isEnum}}{{datatypeWithEnum}}{{/isEnum}}{{^isEnum}}{{datatype}}{{/isEnum}}{{/requiredVars}}) { public init({{#allVars}}{{^-first}}, {{/-first}}{{name}}: {{#isEnum}}{{datatypeWithEnum}}{{/isEnum}}{{^isEnum}}{{datatype}}{{/isEnum}}{{^required}}?=nil{{/required}}{{/allVars}}) {
{{#requiredVars}} {{#allVars}}
self.{{name}} = {{name}} self.{{name}} = {{name}}
{{/requiredVars}} {{/allVars}}
} }
{{/unwrapRequired}} {{/unwrapRequired}}

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;
} }

14
samples/client/petstore/php/SwaggerClient-php/lib/ApiException.php
View File

@@ -64,7 +64,7 @@ class ApiException extends Exception
/** /**
* The HTTP header of the server response. * The HTTP header of the server response.
* *
* @var string[] * @var string[]|null
*/ */
protected $responseHeaders; protected $responseHeaders;
@@ -78,12 +78,12 @@ class ApiException extends Exception
/** /**
* Constructor * Constructor
* *
* @param string $message Error message * @param string $message Error message
* @param int $code HTTP status code * @param int $code HTTP status code
* @param string $responseHeaders HTTP response header * @param string[]|null $responseHeaders HTTP response header
* @param mixed $responseBody HTTP body of the server response either as Json or string * @param mixed $responseBody HTTP body of the server response either as Json or string
*/ */
public function __construct($message = "", $code = 0, $responseHeaders = null, $responseBody = null) public function __construct($message = "", $code = 0, array $responseHeaders = null, $responseBody = null)
{ {
parent::__construct($message, $code); parent::__construct($message, $code);
$this->responseHeaders = $responseHeaders; $this->responseHeaders = $responseHeaders;
@@ -93,7 +93,7 @@ class ApiException extends Exception
/** /**
* Gets the HTTP response header * Gets the HTTP response header
* *
* @return string HTTP response header * @return string[]|null HTTP response header
*/ */
public function getResponseHeaders() public function getResponseHeaders()
{ {