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

Merge pull request #2685 from wing328/java_client_update

Browse Source 
[Java] update maven and gradle version for Java api client
This commit is contained in:
wing328 2016-04-23 13:51:49 +08:00
commit f127bbe891
92 changed files with 309 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache
View File

@ -94,10 +94,10 @@ if(hasProperty('target') && target == 'android') {
}
ext {
swagger_annotations_version = "1.5.0"
jackson_version = "2.4.2"
jersey_version = "1.18"
jodatime_version = "2.3"
swagger_annotations_version = "1.5.8"
jackson_version = "2.7.0"
jersey_version = "1.19.1"
jodatime_version = "2.9.3"
junit_version = "4.12"
}

10
modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache
View File

@ -94,11 +94,12 @@ if(hasProperty('target') && target == 'android') {
}
ext {
swagger_annotations_version = "1.5.0"
jackson_version = "2.6.3"
feign_version = "8.1.1"
jodatime_version = "2.5"
swagger_annotations_version = "1.5.8"
jackson_version = "2.7.0"
feign_version = "8.16.0"
jodatime_version = "2.9.3"
junit_version = "4.12"
oltu_version = "1.0.1"
}
dependencies {
@ -111,6 +112,7 @@ dependencies {
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.1.5"
compile "joda-time:joda-time:$jodatime_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
compile "com.brsanthu:migbase64:2.2"
testCompile "junit:junit:$junit_version"
}

12
modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
View File

@ -100,8 +100,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
@ -180,11 +180,11 @@
</dependencies>
<properties>
<swagger-core-version>1.5.8</swagger-core-version>
<feign-version>8.1.1</feign-version>
<jackson-version>2.6.3</jackson-version>
<jodatime-version>2.5</jodatime-version>
<feign-version>8.16.0</feign-version>
<jackson-version>2.7.0</jackson-version>
<jodatime-version>2.9.3</jodatime-version>
<junit-version>4.12</junit-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<oltu-version>1.0.0</oltu-version>
<oltu-version>1.0.1</oltu-version>
</properties>
</project>

8
modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
View File

@ -94,10 +94,10 @@ if(hasProperty('target') && target == 'android') {
}
ext {
swagger_annotations_version = "1.5.0"
jackson_version = "2.4.2"
jersey_version = "2.22"
jodatime_version = "2.3"
swagger_annotations_version = "1.5.8"
jackson_version = "2.7.0"
jersey_version = "2.22.2"
jodatime_version = "2.9.3"
junit_version = "4.12"
}

10
modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache
View File

@ -100,8 +100,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<!-- For testing build.gradle -->
@ -195,9 +195,9 @@
</dependencies>
<properties>
<swagger-core-version>1.5.8</swagger-core-version>
<jersey-version>2.22</jersey-version>
<jackson-version>2.4.2</jackson-version>
<jodatime-version>2.3</jodatime-version>
<jersey-version>2.22.2</jersey-version>
<jackson-version>2.7.0</jackson-version>
<jodatime-version>2.9.3</jodatime-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
</properties>

8
modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
View File

@ -94,9 +94,9 @@ if(hasProperty('target') && target == 'android') {
}
dependencies {
compile 'io.swagger:swagger-annotations:1.5.0'
compile 'com.squareup.okhttp:okhttp:2.7.2'
compile 'com.squareup.okhttp:logging-interceptor:2.7.2'
compile 'com.google.code.gson:gson:2.3.1'
compile 'io.swagger:swagger-annotations:1.5.8'
compile 'com.squareup.okhttp:okhttp:2.7.5'
compile 'com.squareup.okhttp:logging-interceptor:2.7.5'
compile 'com.google.code.gson:gson:2.6.2'
testCompile 'junit:junit:4.12'
}

10
modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache
View File

@ -9,10 +9,10 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.0",
"com.squareup.okhttp" % "okhttp" % "2.7.2",
"com.squareup.okhttp" % "logging-interceptor" % "2.7.2",
"com.google.code.gson" % "gson" % "2.3.1",
"junit" % "junit" % "4.8.1" % "test"
"io.swagger" % "swagger-annotations" % "1.5.8",
"com.squareup.okhttp" % "okhttp" % "2.7.5",
"com.squareup.okhttp" % "logging-interceptor" % "2.7.5",
"com.google.code.gson" % "gson" % "2.6.2",
"junit" % "junit" % "4.12.0" % "test"
)
)

8
modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
View File

@ -100,8 +100,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<!-- For testing build.gradle -->
@ -160,8 +160,8 @@
</dependencies>
<properties>
<swagger-core-version>1.5.8</swagger-core-version>
<okhttp-version>2.7.2</okhttp-version>
<gson-version>2.3.1</gson-version>
<okhttp-version>2.7.5</okhttp-version>
<gson-version>2.6.2</gson-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
</properties>

6
modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
View File

@ -94,10 +94,10 @@ if(hasProperty('target') && target == 'android') {
}
ext {
okhttp_version = "2.3.0"
oltu_version = "1.0.0"
okhttp_version = "2.7.5"
oltu_version = "1.0.1"
retrofit_version = "1.9.0"
swagger_annotations_version = "1.5.0"
swagger_annotations_version = "1.5.8"
junit_version = "4.12"
}

8
modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache
View File

@ -100,8 +100,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
@ -139,8 +139,8 @@
<properties>
<swagger-core-version>1.5.8</swagger-core-version>
<retrofit-version>1.9.0</retrofit-version>
<okhttp-version>2.4.0</okhttp-version>
<oltu-version>1.0.0</oltu-version>
<okhttp-version>2.7.5</okhttp-version>
<oltu-version>1.0.1</oltu-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
</properties>

8
modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
View File

@ -94,13 +94,13 @@ if(hasProperty('target') && target == 'android') {
}
ext {
oltu_version = "1.0.0"
oltu_version = "1.0.1"
retrofit_version = "2.0.0-beta4"
gson_version = "2.4"
swagger_annotations_version = "1.5.0"
gson_version = "2.6.2"
swagger_annotations_version = "1.5.8"
junit_version = "4.12"
{{#useRxJava}}
rx_java_version = "1.0.16"
rx_java_version = "1.1.3"
{{/useRxJava}}
{{^useRxJava}}{{/useRxJava}}
}

7
modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
View File

@ -100,8 +100,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>
1.7</source>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
@ -155,8 +154,8 @@
<properties>
<swagger-core-version>1.5.8</swagger-core-version>
<retrofit-version>2.0.0-beta4</retrofit-version>{{#useRxJava}}
<rxjava-version>1.0.16</rxjava-version>{{/useRxJava}}
<oltu-version>1.0.0</oltu-version>
<rxjava-version>1.1.3</rxjava-version>{{/useRxJava}}
<oltu-version>1.0.1</oltu-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
</properties>

6
modules/swagger-codegen/src/main/resources/Java/pom.mustache
View File

@ -172,9 +172,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.8</swagger-annotations-version>
<jersey-version>1.18</jersey-version>
<jackson-version>2.4.2</jackson-version>
<jodatime-version>2.3</jodatime-version>
<jersey-version>1.19.1</jersey-version>
<jackson-version>2.7.0</jackson-version>
<jodatime-version>2.9.3</jodatime-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
</properties>

8
samples/client/petstore/java/default/build.gradle
View File

@ -94,10 +94,10 @@ if(hasProperty('target') && target == 'android') {
}
ext {
swagger_annotations_version = "1.5.0"
jackson_version = "2.4.2"
jersey_version = "1.18"
jodatime_version = "2.3"
swagger_annotations_version = "1.5.8"
jackson_version = "2.7.0"
jersey_version = "1.19.1"
jodatime_version = "2.9.3"
junit_version = "4.12"
}

1
samples/client/petstore/java/default/docs/Name.md
View File

@ -6,6 +6,7 @@ Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**name** | **Integer** | |
**snakeCase** | **Integer** | | [optional]
**property** | **String** | | [optional]

6
samples/client/petstore/java/default/pom.xml
View File

@ -172,9 +172,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.8</swagger-annotations-version>
<jersey-version>1.18</jersey-version>
<jackson-version>2.4.2</jackson-version>
<jodatime-version>2.3</jodatime-version>
<jersey-version>1.19.1</jersey-version>
<jackson-version>2.7.0</jackson-version>
<jodatime-version>2.9.3</jodatime-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
</properties>

2
samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java
View File

@ -8,8 +8,8 @@ import io.swagger.client.Configuration;
import io.swagger.client.Pair;
import io.swagger.client.model.Pet;
import io.swagger.client.model.ModelApiResponse;
import java.io.File;
import io.swagger.client.model.ModelApiResponse;
import java.util.ArrayList;
import java.util.HashMap;

24
samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java
View File

@ -17,6 +17,7 @@ public class Name {
private Integer name = null;
private Integer snakeCase = null;
private String property = null;
/**
@ -43,6 +44,23 @@ public class Name {
}
/**
**/
public Name property(String property) {
this.property = property;
return this;
}
@ApiModelProperty(example = "null", value = "")
@JsonProperty("property")
public String getProperty() {
return property;
}
public void setProperty(String property) {
this.property = property;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
@ -53,12 +71,13 @@ public class Name {
}
Name name = (Name) o;
return Objects.equals(this.name, name.name) &&
Objects.equals(this.snakeCase, name.snakeCase);
Objects.equals(this.snakeCase, name.snakeCase) &&
Objects.equals(this.property, name.property);
}
@Override
public int hashCode() {
return Objects.hash(name, snakeCase);
return Objects.hash(name, snakeCase, property);
}
@Override
@ -68,6 +87,7 @@ public class Name {
sb.append(" name: ").append(toIndentedString(name)).append("\n");
sb.append(" snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
sb.append(" property: ").append(toIndentedString(property)).append("\n");
sb.append("}");
return sb.toString();
}

10
samples/client/petstore/java/feign/build.gradle
View File

@ -94,11 +94,12 @@ if(hasProperty('target') && target == 'android') {
}
ext {
swagger_annotations_version = "1.5.0"
jackson_version = "2.6.3"
feign_version = "8.1.1"
jodatime_version = "2.5"
swagger_annotations_version = "1.5.8"
jackson_version = "2.7.0"
feign_version = "8.16.0"
jodatime_version = "2.9.3"
junit_version = "4.12"
oltu_version = "1.0.1"
}
dependencies {
@ -111,6 +112,7 @@ dependencies {
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.1.5"
compile "joda-time:joda-time:$jodatime_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
compile "com.brsanthu:migbase64:2.2"
testCompile "junit:junit:$junit_version"
}

12
samples/client/petstore/java/feign/pom.xml
View File

@ -110,7 +110,7 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger-annotations-version}</version>
<version>${swagger-core-version}</version>
</dependency>
<!-- HTTP client: Netflix Feign -->
@ -179,12 +179,12 @@
</dependency>
</dependencies>
<properties>
<swagger-annotations-version>1.5.0</swagger-annotations-version>
<feign-version>8.1.1</feign-version>
<jackson-version>2.6.3</jackson-version>
<jodatime-version>2.5</jodatime-version>
<swagger-core-version>1.5.8</swagger-core-version>
<feign-version>8.16.0</feign-version>
<jackson-version>2.7.0</jackson-version>
<jodatime-version>2.9.3</jodatime-version>
<junit-version>4.12</junit-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<oltu-version>1.0.0</oltu-version>
<oltu-version>1.0.1</oltu-version>
</properties>
</project>

2
samples/client/petstore/java/feign/src/main/java/io/swagger/client/FormAwareEncoder.java
View File

@ -14,7 +14,7 @@ import feign.codec.EncodeException;
import feign.codec.Encoder;
import feign.RequestTemplate;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:57.731+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public class FormAwareEncoder implements Encoder {
public static final String UTF_8 = "utf-8";
private static final String LINE_FEED = "\r\n";

2
samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java
View File

@ -1,6 +1,6 @@
package io.swagger.client;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:57.731+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public class StringUtil {
/**
* Check if the given array contains the given value (with case-insensitive comparison).

4
samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
View File

@ -3,8 +3,8 @@ package io.swagger.client.api;
import io.swagger.client.ApiClient;
import io.swagger.client.model.Pet;
import io.swagger.client.model.ModelApiResponse;
import java.io.File;
import io.swagger.client.model.ModelApiResponse;
import java.util.ArrayList;
import java.util.HashMap;
@ -12,7 +12,7 @@ import java.util.List;
import java.util.Map;
import feign.*;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-21T18:26:32.462+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public interface PetApi extends ApiClient.Api {

2
samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java
View File

@ -10,7 +10,7 @@ import java.util.List;
import java.util.Map;
import feign.*;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:57.731+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public interface StoreApi extends ApiClient.Api {

2
samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java
View File

@ -10,7 +10,7 @@ import java.util.List;
import java.util.Map;
import feign.*;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:57.731+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public interface UserApi extends ApiClient.Api {

2
samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Animal.java
View File

@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:57.731+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public class Animal {
private String className = null;

2
samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Cat.java
View File

@ -10,7 +10,7 @@ import io.swagger.client.model.Animal;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:57.731+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public class Cat extends Animal {
private String className = null;

2
samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java
View File

@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:57.731+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public class Category {
private Long id = null;

2
samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Dog.java
View File

@ -10,7 +10,7 @@ import io.swagger.client.model.Animal;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:57.731+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public class Dog extends Animal {
private String className = null;

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

@ -11,7 +11,7 @@ import java.util.Date;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:57.731+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public class FormatTest {
private Integer integer = null;

2
samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java
View File

@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
**/
@ApiModel(description = "Model for testing model name starting with number")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:57.731+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public class Model200Response {
private Integer name = null;

2
samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
View File

@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-21T18:26:32.462+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public class ModelApiResponse {
private Integer code = null;

2
samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java
View File

@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
**/
@ApiModel(description = "Model for testing reserved words")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:57.731+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public class ModelReturn {
private Integer _return = null;

26
samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java
View File

@ -12,11 +12,12 @@ import io.swagger.annotations.ApiModelProperty;
**/
@ApiModel(description = "Model for testing model name same as property name")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:57.731+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public class Name {
private Integer name = null;
private Integer snakeCase = null;
private String property = null;
/**
@ -43,6 +44,23 @@ public class Name {
}
/**
**/
public Name property(String property) {
this.property = property;
return this;
}
@ApiModelProperty(example = "null", value = "")
@JsonProperty("property")
public String getProperty() {
return property;
}
public void setProperty(String property) {
this.property = property;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
@ -53,12 +71,13 @@ public class Name {
}
Name name = (Name) o;
return Objects.equals(this.name, name.name) &&
Objects.equals(this.snakeCase, name.snakeCase);
Objects.equals(this.snakeCase, name.snakeCase) &&
Objects.equals(this.property, name.property);
}
@Override
public int hashCode() {
return Objects.hash(name, snakeCase);
return Objects.hash(name, snakeCase, property);
}
@Override
@ -68,6 +87,7 @@ public class Name {
sb.append(" name: ").append(toIndentedString(name)).append("\n");
sb.append(" snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
sb.append(" property: ").append(toIndentedString(property)).append("\n");
sb.append("}");
return sb.toString();
}

2
samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
View File

@ -11,7 +11,7 @@ import java.util.Date;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:57.731+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public class Order {
private Long id = null;

2
samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
View File

@ -14,7 +14,7 @@ import java.util.List;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:57.731+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public class Pet {
private Long id = null;

2
samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
View File

@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:57.731+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public class SpecialModelName {
private Long specialPropertyName = null;

2
samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java
View File

@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:57.731+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public class Tag {
private Long id = null;

2
samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
View File

@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:57.731+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:48:24.088+08:00")
public class User {
private Long id = null;

6
samples/client/petstore/java/jersey2/build.gradle
View File

@ -95,9 +95,9 @@ if(hasProperty('target') && target == 'android') {
ext {
swagger_annotations_version = "1.5.0"
jackson_version = "2.4.2"
jersey_version = "2.22"
jodatime_version = "2.3"
jackson_version = "2.7.0"
jersey_version = "2.22.2"
jodatime_version = "2.9.3"
junit_version = "4.12"
}

1
samples/client/petstore/java/jersey2/docs/Name.md
View File

@ -6,6 +6,7 @@ Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**name** | **Integer** | |
**snakeCase** | **Integer** | | [optional]
**property** | **String** | | [optional]

14
samples/client/petstore/java/jersey2/pom.xml
View File

@ -100,8 +100,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<!-- For testing build.gradle -->
@ -131,7 +131,7 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger-annotations-version}</version>
<version>${swagger-core-version}</version>
</dependency>
<!-- HTTP client: jersey-client -->
@ -194,10 +194,10 @@
</dependency>
</dependencies>
<properties>
<swagger-annotations-version>1.5.0</swagger-annotations-version>
<jersey-version>2.22</jersey-version>
<jackson-version>2.4.2</jackson-version>
<jodatime-version>2.3</jodatime-version>
<swagger-core-version>1.5.8</swagger-core-version>
<jersey-version>2.22.2</jersey-version>
<jackson-version>2.7.0</jackson-version>
<jodatime-version>2.9.3</jodatime-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
</properties>

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiException.java
View File

@ -3,7 +3,7 @@ package io.swagger.client;
import java.util.Map;
import java.util.List;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class ApiException extends Exception {
private int code = 0;
private Map<String, List<String>> responseHeaders = null;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Configuration.java
View File

@ -1,6 +1,6 @@
package io.swagger.client;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class Configuration {
private static ApiClient defaultApiClient = new ApiClient();

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/JSON.java
View File

@ -8,7 +8,7 @@ import java.text.DateFormat;
import javax.ws.rs.ext.ContextResolver;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class JSON implements ContextResolver<ObjectMapper> {
private ObjectMapper mapper;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/Pair.java
View File

@ -1,6 +1,6 @@
package io.swagger.client;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class Pair {
private String name = "";
private String value = "";

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/StringUtil.java
View File

@ -1,6 +1,6 @@
package io.swagger.client;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class StringUtil {
/**
* Check if the given array contains the given value (with case-insensitive comparison).

4
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/PetApi.java
View File

@ -8,15 +8,15 @@ import io.swagger.client.Pair;
import javax.ws.rs.core.GenericType;
import io.swagger.client.model.Pet;
import io.swagger.client.model.ModelApiResponse;
import java.io.File;
import io.swagger.client.model.ModelApiResponse;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-21T18:26:21.396+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class PetApi {
private ApiClient apiClient;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/StoreApi.java
View File

@ -14,7 +14,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class StoreApi {
private ApiClient apiClient;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/UserApi.java
View File

@ -14,7 +14,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class UserApi {
private ApiClient apiClient;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
View File

@ -5,7 +5,7 @@ import io.swagger.client.Pair;
import java.util.Map;
import java.util.List;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class ApiKeyAuth implements Authentication {
private final String location;
private final String paramName;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
View File

@ -9,7 +9,7 @@ import java.util.List;
import java.io.UnsupportedEncodingException;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class HttpBasicAuth implements Authentication {
private String username;
private String password;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/auth/OAuth.java
View File

@ -5,7 +5,7 @@ import io.swagger.client.Pair;
import java.util.Map;
import java.util.List;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class OAuth implements Authentication {
private String accessToken;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Animal.java
View File

@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class Animal {
private String className = null;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Cat.java
View File

@ -10,7 +10,7 @@ import io.swagger.client.model.Animal;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class Cat extends Animal {
private String className = null;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Category.java
View File

@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class Category {
private Long id = null;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Dog.java
View File

@ -10,7 +10,7 @@ import io.swagger.client.model.Animal;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class Dog extends Animal {
private String className = null;

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

@ -11,7 +11,7 @@ import java.util.Date;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class FormatTest {
private Integer integer = null;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Model200Response.java
View File

@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
**/
@ApiModel(description = "Model for testing model name starting with number")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class Model200Response {
private Integer name = null;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelApiResponse.java
View File

@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-21T18:26:21.396+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class ModelApiResponse {
private Integer code = null;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/ModelReturn.java
View File

@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
**/
@ApiModel(description = "Model for testing reserved words")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class ModelReturn {
private Integer _return = null;

26
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java
View File

@ -12,11 +12,12 @@ import io.swagger.annotations.ApiModelProperty;
**/
@ApiModel(description = "Model for testing model name same as property name")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class Name {
private Integer name = null;
private Integer snakeCase = null;
private String property = null;
/**
@ -43,6 +44,23 @@ public class Name {
}
/**
**/
public Name property(String property) {
this.property = property;
return this;
}
@ApiModelProperty(example = "null", value = "")
@JsonProperty("property")
public String getProperty() {
return property;
}
public void setProperty(String property) {
this.property = property;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
@ -53,12 +71,13 @@ public class Name {
}
Name name = (Name) o;
return Objects.equals(this.name, name.name) &&
Objects.equals(this.snakeCase, name.snakeCase);
Objects.equals(this.snakeCase, name.snakeCase) &&
Objects.equals(this.property, name.property);
}
@Override
public int hashCode() {
return Objects.hash(name, snakeCase);
return Objects.hash(name, snakeCase, property);
}
@Override
@ -68,6 +87,7 @@ public class Name {
sb.append(" name: ").append(toIndentedString(name)).append("\n");
sb.append(" snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
sb.append(" property: ").append(toIndentedString(property)).append("\n");
sb.append("}");
return sb.toString();
}

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Order.java
View File

@ -11,7 +11,7 @@ import java.util.Date;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class Order {
private Long id = null;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Pet.java
View File

@ -14,7 +14,7 @@ import java.util.List;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class Pet {
private Long id = null;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/SpecialModelName.java
View File

@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class SpecialModelName {
private Long specialPropertyName = null;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Tag.java
View File

@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class Tag {
private Long id = null;

2
samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/User.java
View File

@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:29:55.995+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:58:40.273+08:00")
public class User {
private Long id = null;

8
samples/client/petstore/java/okhttp-gson/build.gradle
View File

@ -94,9 +94,9 @@ if(hasProperty('target') && target == 'android') {
}
dependencies {
compile 'io.swagger:swagger-annotations:1.5.0'
compile 'com.squareup.okhttp:okhttp:2.7.2'
compile 'com.squareup.okhttp:logging-interceptor:2.7.2'
compile 'com.google.code.gson:gson:2.3.1'
compile 'io.swagger:swagger-annotations:1.5.8'
compile 'com.squareup.okhttp:okhttp:2.7.5'
compile 'com.squareup.okhttp:logging-interceptor:2.7.5'
compile 'com.google.code.gson:gson:2.6.2'
testCompile 'junit:junit:4.12'
}

10
samples/client/petstore/java/okhttp-gson/build.sbt
View File

@ -9,10 +9,10 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.0",
"com.squareup.okhttp" % "okhttp" % "2.7.2",
"com.squareup.okhttp" % "logging-interceptor" % "2.7.2",
"com.google.code.gson" % "gson" % "2.3.1",
"junit" % "junit" % "4.8.1" % "test"
"io.swagger" % "swagger-annotations" % "1.5.8",
"com.squareup.okhttp" % "okhttp" % "2.7.5",
"com.squareup.okhttp" % "logging-interceptor" % "2.7.5",
"com.google.code.gson" % "gson" % "2.6.2",
"junit" % "junit" % "4.12.0" % "test"
)
)

1
samples/client/petstore/java/okhttp-gson/docs/Name.md
View File

@ -6,6 +6,7 @@ Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**name** | **Integer** | |
**snakeCase** | **Integer** | | [optional]
**property** | **String** | | [optional]

8
samples/client/petstore/java/okhttp-gson/pom.xml
View File

@ -100,8 +100,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<!-- For testing build.gradle -->
@ -160,8 +160,8 @@
</dependencies>
<properties>
<swagger-core-version>1.5.8</swagger-core-version>
<okhttp-version>2.7.2</okhttp-version>
<gson-version>2.3.1</gson-version>
<okhttp-version>2.7.5</okhttp-version>
<gson-version>2.6.2</gson-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
</properties>

2
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java
View File

@ -3,7 +3,7 @@ package io.swagger.client;
import java.util.Map;
import java.util.List;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T20:27:24.514+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:54:48.271+08:00")
public class ApiException extends Exception {
private int code = 0;
private Map<String, List<String>> responseHeaders = null;

2
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java
View File

@ -1,6 +1,6 @@
package io.swagger.client;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T20:27:24.514+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:54:48.271+08:00")
public class Configuration {
private static ApiClient defaultApiClient = new ApiClient();

2
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java
View File

@ -1,6 +1,6 @@
package io.swagger.client;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T20:27:24.514+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:54:48.271+08:00")
public class Pair {
private String name = "";
private String value = "";

2
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java
View File

@ -1,6 +1,6 @@
package io.swagger.client;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T20:27:24.514+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:54:48.271+08:00")
public class StringUtil {
/**
* Check if the given array contains the given value (with case-insensitive comparison).

2
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
View File

@ -18,8 +18,8 @@ import com.squareup.okhttp.Response;
import java.io.IOException;
import io.swagger.client.model.Pet;
import io.swagger.client.model.ModelApiResponse;
import java.io.File;
import io.swagger.client.model.ModelApiResponse;
import java.lang.reflect.Type;
import java.util.ArrayList;

2
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
View File

@ -5,7 +5,7 @@ import io.swagger.client.Pair;
import java.util.Map;
import java.util.List;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T20:27:24.514+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:54:48.271+08:00")
public class ApiKeyAuth implements Authentication {
private final String location;
private final String paramName;

2
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java
View File

@ -5,7 +5,7 @@ import io.swagger.client.Pair;
import java.util.Map;
import java.util.List;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T20:27:24.514+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:54:48.271+08:00")
public class OAuth implements Authentication {
private String accessToken;

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

@ -21,6 +21,9 @@ public class Name {
@SerializedName("snake_case")
private Integer snakeCase = null;
@SerializedName("property")
private String property = null;
/**
**/
@ApiModelProperty(required = true, value = "")
@ -38,6 +41,16 @@ public class Name {
return snakeCase;
}
/**
**/
@ApiModelProperty(value = "")
public String getProperty() {
return property;
}
public void setProperty(String property) {
this.property = property;
}
@Override
public boolean equals(Object o) {
@ -49,12 +62,13 @@ public class Name {
}
Name name = (Name) o;
return Objects.equals(this.name, name.name) &&
Objects.equals(this.snakeCase, name.snakeCase);
Objects.equals(this.snakeCase, name.snakeCase) &&
Objects.equals(this.property, name.property);
}
@Override
public int hashCode() {
return Objects.hash(name, snakeCase);
return Objects.hash(name, snakeCase, property);
}
@Override
@ -64,6 +78,7 @@ public class Name {
sb.append(" name: ").append(toIndentedString(name)).append("\n");
sb.append(" snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
sb.append(" property: ").append(toIndentedString(property)).append("\n");
sb.append("}");
return sb.toString();
}

6
samples/client/petstore/java/retrofit/build.gradle
View File

@ -94,10 +94,10 @@ if(hasProperty('target') && target == 'android') {
}
ext {
okhttp_version = "2.3.0"
oltu_version = "1.0.0"
okhttp_version = "2.7.5"
oltu_version = "1.0.1"
retrofit_version = "1.9.0"
swagger_annotations_version = "1.5.0"
swagger_annotations_version = "1.5.8"
junit_version = "4.12"
}

12
samples/client/petstore/java/retrofit/pom.xml
View File

@ -100,8 +100,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
@ -110,7 +110,7 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger-annotations-version}</version>
<version>${swagger-core-version}</version>
</dependency>
<dependency>
<groupId>com.squareup.retrofit</groupId>
@ -137,10 +137,10 @@
</dependency>
</dependencies>
<properties>
<swagger-annotations-version>1.5.0</swagger-annotations-version>
<swagger-core-version>1.5.8</swagger-core-version>
<retrofit-version>1.9.0</retrofit-version>
<okhttp-version>2.4.0</okhttp-version>
<oltu-version>1.0.0</oltu-version>
<okhttp-version>2.7.5</okhttp-version>
<oltu-version>1.0.1</oltu-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
</properties>

2
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/StringUtil.java
View File

@ -1,6 +1,6 @@
package io.swagger.client;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:30:01.525+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-23T12:55:47.640+08:00")
public class StringUtil {
/**
* Check if the given array contains the given value (with case-insensitive comparison).

2
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java
View File

@ -7,8 +7,8 @@ import retrofit.http.*;
import retrofit.mime.*;
import io.swagger.client.model.Pet;
import io.swagger.client.model.ModelApiResponse;
import java.io.File;
import io.swagger.client.model.ModelApiResponse;
import java.util.ArrayList;
import java.util.HashMap;

19
samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java
View File

@ -21,6 +21,9 @@ public class Name {
@SerializedName("snake_case")
private Integer snakeCase = null;
@SerializedName("property")
private String property = null;
/**
**/
@ApiModelProperty(required = true, value = "")
@ -38,6 +41,16 @@ public class Name {
return snakeCase;
}
/**
**/
@ApiModelProperty(value = "")
public String getProperty() {
return property;
}
public void setProperty(String property) {
this.property = property;
}
@Override
public boolean equals(Object o) {
@ -49,12 +62,13 @@ public class Name {
}
Name name = (Name) o;
return Objects.equals(name, name.name) &&
Objects.equals(snakeCase, name.snakeCase);
Objects.equals(snakeCase, name.snakeCase) &&
Objects.equals(property, name.property);
}
@Override
public int hashCode() {
return Objects.hash(name, snakeCase);
return Objects.hash(name, snakeCase, property);
}
@Override
@ -64,6 +78,7 @@ public class Name {
sb.append(" name: ").append(toIndentedString(name)).append("\n");
sb.append(" snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
sb.append(" property: ").append(toIndentedString(property)).append("\n");
sb.append("}");
return sb.toString();
}

6
samples/client/petstore/java/retrofit2/build.gradle
View File

@ -94,10 +94,10 @@ if(hasProperty('target') && target == 'android') {
}
ext {
oltu_version = "1.0.0"
oltu_version = "1.0.1"
retrofit_version = "2.0.0-beta4"
gson_version = "2.4"
swagger_annotations_version = "1.5.0"
gson_version = "2.6.2"
swagger_annotations_version = "1.5.8"
junit_version = "4.12"
}

6
samples/client/petstore/java/retrofit2/pom.xml
View File

@ -111,7 +111,7 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger-annotations-version}</version>
<version>${swagger-core-version}</version>
</dependency>
<dependency>
<groupId>com.squareup.retrofit2</groupId>
@ -143,9 +143,9 @@
</dependency>
</dependencies>
<properties>
<swagger-annotations-version>1.5.0</swagger-annotations-version>
<swagger-core-version>1.5.8</swagger-core-version>
<retrofit-version>2.0.0-beta4</retrofit-version>
<oltu-version>1.0.0</oltu-version>
<oltu-version>1.0.1</oltu-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
</properties>

2
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
View File

@ -1,6 +1,6 @@
package io.swagger.client;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:30:03.337+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-22T23:08:50.551+08:00")
public class StringUtil {
/**
* Check if the given array contains the given value (with case-insensitive comparison).

2
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java
View File

@ -9,8 +9,8 @@ import retrofit2.http.*;
import okhttp3.RequestBody;
import io.swagger.client.model.Pet;
import io.swagger.client.model.ModelApiResponse;
import java.io.File;
import io.swagger.client.model.ModelApiResponse;
import java.util.ArrayList;
import java.util.HashMap;

19
samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java
View File

@ -21,6 +21,9 @@ public class Name {
@SerializedName("snake_case")
private Integer snakeCase = null;
@SerializedName("property")
private String property = null;
/**
**/
@ApiModelProperty(required = true, value = "")
@ -38,6 +41,16 @@ public class Name {
return snakeCase;
}
/**
**/
@ApiModelProperty(value = "")
public String getProperty() {
return property;
}
public void setProperty(String property) {
this.property = property;
}
@Override
public boolean equals(Object o) {
@ -49,12 +62,13 @@ public class Name {
}
Name name = (Name) o;
return Objects.equals(name, name.name) &&
Objects.equals(snakeCase, name.snakeCase);
Objects.equals(snakeCase, name.snakeCase) &&
Objects.equals(property, name.property);
}
@Override
public int hashCode() {
return Objects.hash(name, snakeCase);
return Objects.hash(name, snakeCase, property);
}
@Override
@ -64,6 +78,7 @@ public class Name {
sb.append(" name: ").append(toIndentedString(name)).append("\n");
sb.append(" snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
sb.append(" property: ").append(toIndentedString(property)).append("\n");
sb.append("}");
return sb.toString();
}

2
samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java
View File

@ -1,6 +1,6 @@
package io.swagger.client;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-19T19:30:05.103+08:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-22T23:10:58.658+08:00")
public class StringUtil {
/**
* Check if the given array contains the given value (with case-insensitive comparison).

2
samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java
View File

@ -9,8 +9,8 @@ import retrofit2.http.*;
import okhttp3.RequestBody;
import io.swagger.client.model.Pet;
import io.swagger.client.model.ModelApiResponse;
import java.io.File;
import io.swagger.client.model.ModelApiResponse;
import java.util.ArrayList;
import java.util.HashMap;

19
samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java
View File

@ -21,6 +21,9 @@ public class Name {
@SerializedName("snake_case")
private Integer snakeCase = null;
@SerializedName("property")
private String property = null;
/**
**/
@ApiModelProperty(required = true, value = "")
@ -38,6 +41,16 @@ public class Name {
return snakeCase;
}
/**
**/
@ApiModelProperty(value = "")
public String getProperty() {
return property;
}
public void setProperty(String property) {
this.property = property;
}
@Override
public boolean equals(Object o) {
@ -49,12 +62,13 @@ public class Name {
}
Name name = (Name) o;
return Objects.equals(name, name.name) &&
Objects.equals(snakeCase, name.snakeCase);
Objects.equals(snakeCase, name.snakeCase) &&
Objects.equals(property, name.property);
}
@Override
public int hashCode() {
return Objects.hash(name, snakeCase);
return Objects.hash(name, snakeCase, property);
}
@Override
@ -64,6 +78,7 @@ public class Name {
sb.append(" name: ").append(toIndentedString(name)).append("\n");
sb.append(" snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
sb.append(" property: ").append(toIndentedString(property)).append("\n");
sb.append("}");
return sb.toString();
}