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

Merge branch 'issue-7044' of https://github.com/joeboyscout04/swagger-codegen into joeboyscout04-issue-7044

Browse Source
This commit is contained in:
wing328 2018-01-14 23:41:46 +08:00
commit 15e7255154
29 changed files with 674 additions and 537 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,7 +142,9 @@ dependencies {
compile "io.reactivex.rxjava2:rxjava:$rx_java_version" compile "io.reactivex.rxjava2:rxjava:$rx_java_version"
{{/useRxJava2}} {{/useRxJava2}}
compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
}
compile "io.gsonfire:gson-fire:$json_fire_version" compile "io.gsonfire:gson-fire:$json_fire_version"
{{#joda}} {{#joda}}
compile "joda-time:joda-time:$jodatime_version" compile "joda-time:joda-time:$jodatime_version"

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

@ -212,6 +212,12 @@
<groupId>org.apache.oltu.oauth2</groupId> <groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId> <artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${oltu-version}</version> <version>${oltu-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>common</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.gsonfire</groupId> <groupId>io.gsonfire</groupId>

2
samples/client/petstore/java/retrofit2-play24/.swagger-codegen/VERSION
View File

@ -1 +1 @@
2.3.1-SNAPSHOT 2.4.0-SNAPSHOT

4
samples/client/petstore/java/retrofit2-play24/build.gradle
View File

@ -108,7 +108,9 @@ dependencies {
compile "com.squareup.retrofit2:converter-scalars:$retrofit_version" compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
compile "com.squareup.retrofit2:converter-gson:$retrofit_version" compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
}
compile "io.gsonfire:gson-fire:$json_fire_version" compile "io.gsonfire:gson-fire:$json_fire_version"
compile "com.typesafe.play:play-java-ws_2.11:$play_version" compile "com.typesafe.play:play-java-ws_2.11:$play_version"
compile "com.squareup.retrofit2:converter-jackson:$retrofit_version" compile "com.squareup.retrofit2:converter-jackson:$retrofit_version"

517
samples/client/petstore/java/retrofit2-play24/pom.xml
View File

@ -1,257 +1,282 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-java-client</artifactId> <artifactId>swagger-java-client</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>swagger-java-client</name> <name>swagger-java-client</name>
<version>1.0.0</version> <version>1.0.0</version>
<url>https://github.com/swagger-api/swagger-codegen</url>
<description>Swagger Java</description>
<scm>
<connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
<developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url> <url>https://github.com/swagger-api/swagger-codegen</url>
</scm> <description>Swagger Java</description>
<prerequisites> <scm>
<maven>2.2.0</maven> <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
</prerequisites> <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url>
</scm>
<licenses> <licenses>
<license> <license>
<name>Unlicense</name> <name>Unlicense</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url> <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>
</licenses> </licenses>
<developers> <developers>
<developer> <developer>
<name>Swagger</name> <name>Swagger</name>
<email>apiteam@swagger.io</email> <email>apiteam@swagger.io</email>
<organization>Swagger</organization> <organization>Swagger</organization>
<organizationUrl>http://swagger.io</organizationUrl> <organizationUrl>http://swagger.io</organizationUrl>
</developer> </developer>
</developers> </developers>
<build> <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version>
<configuration>
<systemProperties>
<property>
<name>loggerPath</name>
<value>conf/log4j.properties</value>
</property>
</systemProperties>
<argLine>-Xms512m -Xmx1500m</argLine>
<parallel>methods</parallel>
<forkMode>pertest</forkMode>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- attach test jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<executions>
<execution>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.10</version>
<executions>
<execution>
<id>add_sources</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>src/main/java</source>
</sources>
</configuration>
</execution>
<execution>
<id>add_test_sources</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>src/test/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>sign-artifacts</id>
<build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>1.5</version> <version>3.0.0-M1</version>
<executions> <executions>
<execution> <execution>
<id>sign-artifacts</id> <id>enforce-maven</id>
<phase>verify</phase> <goals>
<goals> <goal>enforce</goal>
<goal>sign</goal> </goals>
</goals> <configuration>
</execution> <rules>
</executions> <requireMavenVersion>
</plugin> <version>2.2.0</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version>
<configuration>
<systemProperties>
<property>
<name>loggerPath</name>
<value>conf/log4j.properties</value>
</property>
</systemProperties>
<argLine>-Xms512m -Xmx1500m</argLine>
<parallel>methods</parallel>
<forkMode>pertest</forkMode>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- attach test jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<executions>
<execution>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.10</version>
<executions>
<execution>
<id>add_sources</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>
src/main/java</source>
</sources>
</configuration>
</execution>
<execution>
<id>add_test_sources</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>
src/test/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</profile>
</profiles>
<dependencies> <profiles>
<dependency> <profile>
<groupId>io.swagger</groupId> <id>sign-artifacts</id>
<artifactId>swagger-annotations</artifactId> <build>
<version>${swagger-core-version}</version> <plugins>
</dependency> <plugin>
<dependency> <groupId>org.apache.maven.plugins</groupId>
<groupId>com.squareup.retrofit2</groupId> <artifactId>maven-gpg-plugin</artifactId>
<artifactId>converter-gson</artifactId> <version>1.5</version>
<version>${retrofit-version}</version> <executions>
</dependency> <execution>
<dependency> <id>sign-artifacts</id>
<groupId>com.squareup.retrofit2</groupId> <phase>verify</phase>
<artifactId>retrofit</artifactId> <goals>
<version>${retrofit-version}</version> <goal>sign</goal>
</dependency> </goals>
<dependency> </execution>
<groupId>com.squareup.retrofit2</groupId> </executions>
<artifactId>converter-scalars</artifactId> </plugin>
<version>${retrofit-version}</version> </plugins>
</dependency> </build>
<dependency> </profile>
<groupId>org.apache.oltu.oauth2</groupId> </profiles>
<artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${oltu-version}</version>
</dependency>
<dependency>
<groupId>io.gsonfire</groupId>
<artifactId>gson-fire</artifactId>
<version>${gson-fire-version}</version>
</dependency>
<!-- JSON processing: jackson --> <dependencies>
<dependency> <dependency>
<groupId>com.squareup.retrofit2</groupId> <groupId>io.swagger</groupId>
<artifactId>converter-jackson</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${retrofit-version}</version> <version>${swagger-core-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.squareup.retrofit2</groupId>
<artifactId>jackson-core</artifactId> <artifactId>converter-gson</artifactId>
<version>${jackson-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.squareup.retrofit2</groupId>
<artifactId>jackson-annotations</artifactId> <artifactId>retrofit</artifactId>
<version>${jackson-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.squareup.retrofit2</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>converter-scalars</artifactId>
<version>${jackson-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.datatype</groupId> <groupId>org.apache.oltu.oauth2</groupId>
<artifactId>jackson-datatype-jsr310</artifactId> <artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${jackson-version}</version> <version>${oltu-version}</version>
</dependency> <exclusions>
<dependency> <exclusion>
<groupId>com.typesafe.play</groupId> <groupId>org.apache.oltu.oauth2</groupId>
<artifactId>play-java-ws_2.11</artifactId> <artifactId>common</artifactId>
<version>${play-version}</version> </exclusion>
</dependency> </exclusions>
</dependency>
<dependency>
<groupId>io.gsonfire</groupId>
<artifactId>gson-fire</artifactId>
<version>${gson-fire-version}</version>
</dependency>
<!-- test dependencies --> <!-- JSON processing: jackson -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>com.squareup.retrofit2</groupId>
<artifactId>junit</artifactId> <artifactId>converter-jackson</artifactId>
<version>${junit-version}</version> <version>${retrofit-version}</version>
<scope>test</scope> </dependency>
</dependency> <dependency>
</dependencies> <groupId>com.fasterxml.jackson.core</groupId>
<properties> <artifactId>jackson-core</artifactId>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <version>${jackson-version}</version>
<java.version>1.8</java.version> </dependency>
<maven.compiler.source>${java.version}</maven.compiler.source> <dependency>
<maven.compiler.target>${java.version}</maven.compiler.target> <groupId>com.fasterxml.jackson.core</groupId>
<gson-fire-version>1.8.0</gson-fire-version> <artifactId>jackson-annotations</artifactId>
<swagger-core-version>1.5.15</swagger-core-version> <version>${jackson-version}</version>
<jackson-version>2.6.6</jackson-version> </dependency>
<play-version>2.4.11</play-version> <dependency>
<retrofit-version>2.3.0</retrofit-version> <groupId>com.fasterxml.jackson.core</groupId>
<oltu-version>1.0.1</oltu-version> <artifactId>jackson-databind</artifactId>
<junit-version>4.12</junit-version> <version>${jackson-version}</version>
</properties> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.play</groupId>
<artifactId>play-java-ws_2.11</artifactId>
<version>${play-version}</version>
</dependency>
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version>
<swagger-core-version>1.5.15</swagger-core-version>
<jackson-version>2.6.6</jackson-version>
<play-version>2.4.11</play-version>
<retrofit-version>2.3.0</retrofit-version>
<oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version>
</properties>
</project> </project>

8
samples/client/petstore/java/retrofit2-play24/src/main/gen/io/swagger/client/BuildConfig.java
View File

@ -1,8 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
public final class BuildConfig {
public final static boolean DEBUG = Boolean.parseBoolean(null);
}

7
samples/client/petstore/java/retrofit2-play24/src/main/gen/io/swagger/client/Manifest.java
View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
public final class Manifest {
}

7
samples/client/petstore/java/retrofit2-play24/src/main/gen/io/swagger/client/R.java
View File

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package io.swagger.client;
/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
public final class R {
}

2
samples/client/petstore/java/retrofit2-play25/.swagger-codegen/VERSION
View File

@ -1 +1 @@
2.3.0-SNAPSHOT 2.3.1-SNAPSHOT

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

@ -101,6 +101,7 @@ ext {
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.15"
junit_version = "4.12" junit_version = "4.12"
threetenbp_version = "1.3.5" threetenbp_version = "1.3.5"
json_fire_version = "1.8.0"
} }
dependencies { dependencies {
@ -108,7 +109,10 @@ dependencies {
compile "com.squareup.retrofit2:converter-scalars:$retrofit_version" compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
compile "com.squareup.retrofit2:converter-gson:$retrofit_version" compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
}
compile "io.gsonfire:gson-fire:$json_fire_version"
compile "org.threeten:threetenbp:$threetenbp_version" compile "org.threeten:threetenbp:$threetenbp_version"
compile "com.typesafe.play:play-java-ws_2.11:$play_version" compile "com.typesafe.play:play-java-ws_2.11:$play_version"
compile "com.squareup.retrofit2:converter-jackson:$retrofit_version" compile "com.squareup.retrofit2:converter-jackson:$retrofit_version"

1
samples/client/petstore/java/retrofit2-play25/build.sbt
View File

@ -19,6 +19,7 @@ lazy val root = (project in file(".")).
"io.swagger" % "swagger-annotations" % "1.5.15" % "compile", "io.swagger" % "swagger-annotations" % "1.5.15" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile", "org.threeten" % "threetenbp" % "1.3.5" % "compile",
"io.gsonfire" % "gson-fire" % "1.8.0" % "compile",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",
"com.novocode" % "junit-interface" % "0.11" % "test" "com.novocode" % "junit-interface" % "0.11" % "test"
) )

48
samples/client/petstore/java/retrofit2-play25/docs/FakeApi.md
View File

@ -11,6 +11,7 @@ Method | HTTP request | Description
[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** fake | To test \&quot;client\&quot; model [**testClientModel**](FakeApi.md#testClientModel) | **PATCH** fake | To test \&quot;client\&quot; model
[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 [**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** fake | To test enum parameters [**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** fake | To test enum parameters
[**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** fake/inline-additionalProperties | test inline additionalProperties
[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** fake/jsonFormData | test json serialization of form data [**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** fake/jsonFormData | test json serialization of form data
@ -267,7 +268,7 @@ FakeApi apiInstance = new FakeApi();
BigDecimal number = new BigDecimal(); // BigDecimal | None BigDecimal number = new BigDecimal(); // BigDecimal | None
Double _double = 3.4D; // Double | None Double _double = 3.4D; // Double | None
String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
byte[] _byte = _byte_example; // byte[] | None byte[] _byte = B; // byte[] | None
Integer integer = 56; // Integer | None Integer integer = 56; // Integer | None
Integer int32 = 56; // Integer | None Integer int32 = 56; // Integer | None
Long int64 = 789L; // Long | None Long int64 = 789L; // Long | None
@ -378,6 +379,51 @@ No authorization required
- **Content-Type**: */* - **Content-Type**: */*
- **Accept**: */* - **Accept**: */*
<a name="testInlineAdditionalProperties"></a>
# **testInlineAdditionalProperties**
> Void testInlineAdditionalProperties(param)
test inline additionalProperties
### Example
```java
// Import classes:
//import io.swagger.client.ApiException;
//import io.swagger.client.api.FakeApi;
FakeApi apiInstance = new FakeApi();
Object param = null; // Object | request body
try {
Void result = apiInstance.testInlineAdditionalProperties(param);
System.out.println(result);
} catch (ApiException e) {
System.err.println("Exception when calling FakeApi#testInlineAdditionalProperties");
e.printStackTrace();
}
```
### Parameters
Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**param** | **Object**| request body |
### Return type
[**Void**](.md)
### Authorization
No authorization required
### HTTP request headers
- **Content-Type**: application/json
- **Accept**: Not defined
<a name="testJsonFormData"></a> <a name="testJsonFormData"></a>
# **testJsonFormData** # **testJsonFormData**
> Void testJsonFormData(param, param2) > Void testJsonFormData(param, param2)

2
samples/client/petstore/java/retrofit2-play25/git_push.sh
View File

@ -36,7 +36,7 @@ git_remote=`git remote`
if [ "$git_remote" = "" ]; then # git remote not defined if [ "$git_remote" = "" ]; then # git remote not defined
if [ "$GIT_TOKEN" = "" ]; then if [ "$GIT_TOKEN" = "" ]; then
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment." echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
else else
git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git

524
samples/client/petstore/java/retrofit2-play25/pom.xml
View File

@ -1,257 +1,289 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-java-client</artifactId> <artifactId>swagger-java-client</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>swagger-java-client</name> <name>swagger-java-client</name>
<version>1.0.0</version> <version>1.0.0</version>
<url>https://github.com/swagger-api/swagger-codegen</url>
<description>Swagger Java</description>
<scm>
<connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
<developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url> <url>https://github.com/swagger-api/swagger-codegen</url>
</scm> <description>Swagger Java</description>
<prerequisites> <scm>
<maven>2.2.0</maven> <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
</prerequisites> <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
<url>https://github.com/swagger-api/swagger-codegen</url>
</scm>
<licenses> <licenses>
<license> <license>
<name>Unlicense</name> <name>Unlicense</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url> <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>
</licenses> </licenses>
<developers> <developers>
<developer> <developer>
<name>Swagger</name> <name>Swagger</name>
<email>apiteam@swagger.io</email> <email>apiteam@swagger.io</email>
<organization>Swagger</organization> <organization>Swagger</organization>
<organizationUrl>http://swagger.io</organizationUrl> <organizationUrl>http://swagger.io</organizationUrl>
</developer> </developer>
</developers> </developers>
<build> <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version>
<configuration>
<systemProperties>
<property>
<name>loggerPath</name>
<value>conf/log4j.properties</value>
</property>
</systemProperties>
<argLine>-Xms512m -Xmx1500m</argLine>
<parallel>methods</parallel>
<forkMode>pertest</forkMode>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- attach test jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<executions>
<execution>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.10</version>
<executions>
<execution>
<id>add_sources</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>src/main/java</source>
</sources>
</configuration>
</execution>
<execution>
<id>add_test_sources</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>src/test/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>sign-artifacts</id>
<build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>1.5</version> <version>3.0.0-M1</version>
<executions> <executions>
<execution> <execution>
<id>sign-artifacts</id> <id>enforce-maven</id>
<phase>verify</phase> <goals>
<goals> <goal>enforce</goal>
<goal>sign</goal> </goals>
</goals> <configuration>
</execution> <rules>
</executions> <requireMavenVersion>
</plugin> <version>2.2.0</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version>
<configuration>
<systemProperties>
<property>
<name>loggerPath</name>
<value>conf/log4j.properties</value>
</property>
</systemProperties>
<argLine>-Xms512m -Xmx1500m</argLine>
<parallel>methods</parallel>
<forkMode>pertest</forkMode>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- attach test jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<executions>
<execution>
<goals>
<goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.10</version>
<executions>
<execution>
<id>add_sources</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>
src/main/java</source>
</sources>
</configuration>
</execution>
<execution>
<id>add_test_sources</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>
src/test/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</profile>
</profiles>
<dependencies> <profiles>
<dependency> <profile>
<groupId>io.swagger</groupId> <id>sign-artifacts</id>
<artifactId>swagger-annotations</artifactId> <build>
<version>${swagger-core-version}</version> <plugins>
</dependency> <plugin>
<dependency> <groupId>org.apache.maven.plugins</groupId>
<groupId>com.squareup.retrofit2</groupId> <artifactId>maven-gpg-plugin</artifactId>
<artifactId>converter-gson</artifactId> <version>1.5</version>
<version>${retrofit-version}</version> <executions>
</dependency> <execution>
<dependency> <id>sign-artifacts</id>
<groupId>com.squareup.retrofit2</groupId> <phase>verify</phase>
<artifactId>retrofit</artifactId> <goals>
<version>${retrofit-version}</version> <goal>sign</goal>
</dependency> </goals>
<dependency> </execution>
<groupId>com.squareup.retrofit2</groupId> </executions>
<artifactId>converter-scalars</artifactId> </plugin>
<version>${retrofit-version}</version> </plugins>
</dependency> </build>
<dependency> </profile>
<groupId>org.apache.oltu.oauth2</groupId> </profiles>
<artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${oltu-version}</version>
</dependency>
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
<version>${threetenbp-version}</version>
</dependency>
<!-- JSON processing: jackson --> <dependencies>
<dependency> <dependency>
<groupId>com.squareup.retrofit2</groupId> <groupId>io.swagger</groupId>
<artifactId>converter-jackson</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${retrofit-version}</version> <version>${swagger-core-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.squareup.retrofit2</groupId>
<artifactId>jackson-core</artifactId> <artifactId>converter-gson</artifactId>
<version>${jackson-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.squareup.retrofit2</groupId>
<artifactId>jackson-annotations</artifactId> <artifactId>retrofit</artifactId>
<version>${jackson-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.squareup.retrofit2</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>converter-scalars</artifactId>
<version>${jackson-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.play</groupId>
<artifactId>play-java-ws_2.11</artifactId>
<version>${play-version}</version>
</dependency>
<!-- test dependencies --> <dependency>
<dependency> <groupId>org.apache.oltu.oauth2</groupId>
<groupId>junit</groupId> <artifactId>org.apache.oltu.oauth2.client</artifactId>
<artifactId>junit</artifactId> <version>${oltu-version}</version>
<version>${junit-version}</version> <exclusions>
<scope>test</scope> <exclusion>
</dependency> <groupId>org.apache.oltu.oauth2</groupId>
</dependencies> <artifactId>common</artifactId>
<properties> </exclusion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </exclusions>
<java.version>1.8</java.version> </dependency>
<maven.compiler.source>${java.version}</maven.compiler.source> <dependency>
<maven.compiler.target>${java.version}</maven.compiler.target> <groupId>io.gsonfire</groupId>
<swagger-core-version>1.5.15</swagger-core-version> <artifactId>gson-fire</artifactId>
<jackson-version>2.7.8</jackson-version> <version>${gson-fire-version}</version>
<play-version>2.5.15</play-version> </dependency>
<retrofit-version>2.3.0</retrofit-version> <dependency>
<threetenbp-version>1.3.5</threetenbp-version> <groupId>org.threeten</groupId>
<oltu-version>1.0.1</oltu-version> <artifactId>threetenbp</artifactId>
<junit-version>4.12</junit-version> <version>${threetenbp-version}</version>
</properties> </dependency>
<!-- JSON processing: jackson -->
<dependency>
<groupId>com.squareup.retrofit2</groupId>
<artifactId>converter-jackson</artifactId>
<version>${retrofit-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.play</groupId>
<artifactId>play-java-ws_2.11</artifactId>
<version>${play-version}</version>
</dependency>
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version>
<swagger-core-version>1.5.15</swagger-core-version>
<jackson-version>2.7.8</jackson-version>
<play-version>2.5.15</play-version>
<retrofit-version>2.3.0</retrofit-version>
<threetenbp-version>1.3.5</threetenbp-version>
<oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version>
</properties>
</project> </project>

14
samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/api/FakeApi.java
View File

@ -126,6 +126,20 @@ public interface FakeApi {
@retrofit2.http.Field("enum_form_string_array") List<String> enumFormStringArray, @retrofit2.http.Field("enum_form_string") String enumFormString, @retrofit2.http.Header("enum_header_string_array") List<String> enumHeaderStringArray, @retrofit2.http.Header("enum_header_string") String enumHeaderString, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray, @retrofit2.http.Query("enum_query_string") String enumQueryString, @retrofit2.http.Query("enum_query_integer") Integer enumQueryInteger, @retrofit2.http.Field("enum_query_double") Double enumQueryDouble @retrofit2.http.Field("enum_form_string_array") List<String> enumFormStringArray, @retrofit2.http.Field("enum_form_string") String enumFormString, @retrofit2.http.Header("enum_header_string_array") List<String> enumHeaderStringArray, @retrofit2.http.Header("enum_header_string") String enumHeaderString, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray, @retrofit2.http.Query("enum_query_string") String enumQueryString, @retrofit2.http.Query("enum_query_integer") Integer enumQueryInteger, @retrofit2.http.Field("enum_query_double") Double enumQueryDouble
); );
/**
* test inline additionalProperties
*
* @param param request body (required)
* @return Call&lt;Void&gt;
*/
@Headers({
"Content-Type:application/json"
})
@POST("fake/inline-additionalProperties")
CompletionStage<Response<Void>> testInlineAdditionalProperties(
@retrofit2.http.Body Object param
);
/** /**
* test json serialization of form data * test json serialization of form data
* *

4
samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
View File

@ -43,7 +43,7 @@ public class AdditionalPropertiesClass {
public AdditionalPropertiesClass putMapPropertyItem(String key, String mapPropertyItem) { public AdditionalPropertiesClass putMapPropertyItem(String key, String mapPropertyItem) {
if (this.mapProperty == null) { if (this.mapProperty == null) {
this.mapProperty = new HashMap<String, String>(); this.mapProperty = new HashMap<>();
} }
this.mapProperty.put(key, mapPropertyItem); this.mapProperty.put(key, mapPropertyItem);
return this; return this;
@ -69,7 +69,7 @@ public class AdditionalPropertiesClass {
public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String, String> mapOfMapPropertyItem) { public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String, String> mapOfMapPropertyItem) {
if (this.mapOfMapProperty == null) { if (this.mapOfMapProperty == null) {
this.mapOfMapProperty = new HashMap<String, Map<String, String>>(); this.mapOfMapProperty = new HashMap<>();
} }
this.mapOfMapProperty.put(key, mapOfMapPropertyItem); this.mapOfMapProperty.put(key, mapOfMapPropertyItem);
return this; return this;

2
samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
View File

@ -40,7 +40,7 @@ public class ArrayOfArrayOfNumberOnly {
public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) { public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) {
if (this.arrayArrayNumber == null) { if (this.arrayArrayNumber == null) {
this.arrayArrayNumber = new ArrayList<List<BigDecimal>>(); this.arrayArrayNumber = new ArrayList<>();
} }
this.arrayArrayNumber.add(arrayArrayNumberItem); this.arrayArrayNumber.add(arrayArrayNumberItem);
return this; return this;

2
samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
View File

@ -40,7 +40,7 @@ public class ArrayOfNumberOnly {
public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
if (this.arrayNumber == null) { if (this.arrayNumber == null) {
this.arrayNumber = new ArrayList<BigDecimal>(); this.arrayNumber = new ArrayList<>();
} }
this.arrayNumber.add(arrayNumberItem); this.arrayNumber.add(arrayNumberItem);
return this; return this;

6
samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/model/ArrayTest.java
View File

@ -46,7 +46,7 @@ public class ArrayTest {
public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
if (this.arrayOfString == null) { if (this.arrayOfString == null) {
this.arrayOfString = new ArrayList<String>(); this.arrayOfString = new ArrayList<>();
} }
this.arrayOfString.add(arrayOfStringItem); this.arrayOfString.add(arrayOfStringItem);
return this; return this;
@ -72,7 +72,7 @@ public class ArrayTest {
public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem) { public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem) {
if (this.arrayArrayOfInteger == null) { if (this.arrayArrayOfInteger == null) {
this.arrayArrayOfInteger = new ArrayList<List<Long>>(); this.arrayArrayOfInteger = new ArrayList<>();
} }
this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem); this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem);
return this; return this;
@ -99,7 +99,7 @@ public class ArrayTest {
public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelItem) { public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelItem) {
if (this.arrayArrayOfModel == null) { if (this.arrayArrayOfModel == null) {
this.arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>(); this.arrayArrayOfModel = new ArrayList<>();
} }
this.arrayArrayOfModel.add(arrayArrayOfModelItem); this.arrayArrayOfModel.add(arrayArrayOfModelItem);
return this; return this;

2
samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/model/EnumArrays.java
View File

@ -130,7 +130,7 @@ public class EnumArrays {
public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
if (this.arrayEnum == null) { if (this.arrayEnum == null) {
this.arrayEnum = new ArrayList<ArrayEnumEnum>(); this.arrayEnum = new ArrayList<>();
} }
this.arrayEnum.add(arrayEnumItem); this.arrayEnum.add(arrayEnumItem);
return this; return this;

4
samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/model/MapTest.java
View File

@ -78,7 +78,7 @@ public class MapTest {
public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStringItem) { public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStringItem) {
if (this.mapMapOfString == null) { if (this.mapMapOfString == null) {
this.mapMapOfString = new HashMap<String, Map<String, String>>(); this.mapMapOfString = new HashMap<>();
} }
this.mapMapOfString.put(key, mapMapOfStringItem); this.mapMapOfString.put(key, mapMapOfStringItem);
return this; return this;
@ -105,7 +105,7 @@ public class MapTest {
public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) { public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) {
if (this.mapOfEnumString == null) { if (this.mapOfEnumString == null) {
this.mapOfEnumString = new HashMap<String, InnerEnum>(); this.mapOfEnumString = new HashMap<>();
} }
this.mapOfEnumString.put(key, mapOfEnumStringItem); this.mapOfEnumString.put(key, mapOfEnumStringItem);
return this; return this;

2
samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
View File

@ -87,7 +87,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
if (this.map == null) { if (this.map == null) {
this.map = new HashMap<String, Animal>(); this.map = new HashMap<>();
} }
this.map.put(key, mapItem); this.map.put(key, mapItem);
return this; return this;

4
samples/client/petstore/java/retrofit2-play25/src/main/java/io/swagger/client/model/Pet.java
View File

@ -41,7 +41,7 @@ public class Pet {
private String name = null; private String name = null;
@JsonProperty("photoUrls") @JsonProperty("photoUrls")
private List<String> photoUrls = new ArrayList<String>(); private List<String> photoUrls = new ArrayList<>();
@JsonProperty("tags") @JsonProperty("tags")
private List<Tag> tags = null; private List<Tag> tags = null;
@ -173,7 +173,7 @@ public class Pet {
public Pet addTagsItem(Tag tagsItem) { public Pet addTagsItem(Tag tagsItem) {
if (this.tags == null) { if (this.tags == null) {
this.tags = new ArrayList<Tag>(); this.tags = new ArrayList<>();
} }
this.tags.add(tagsItem); this.tags.add(tagsItem);
return this; return this;

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

@ -107,7 +107,9 @@ dependencies {
compile "com.squareup.retrofit2:converter-scalars:$retrofit_version" compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
compile "com.squareup.retrofit2:converter-gson:$retrofit_version" compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
}
compile "io.gsonfire:gson-fire:$json_fire_version" compile "io.gsonfire:gson-fire:$json_fire_version"
compile "org.threeten:threetenbp:$threetenbp_version" compile "org.threeten:threetenbp:$threetenbp_version"

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

@ -208,10 +208,17 @@
<artifactId>converter-scalars</artifactId> <artifactId>converter-scalars</artifactId>
<version>${retrofit-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.oltu.oauth2</groupId> <groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId> <artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${oltu-version}</version> <version>${oltu-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>common</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.gsonfire</groupId> <groupId>io.gsonfire</groupId>

4
samples/client/petstore/java/retrofit2rx/build.gradle
View File

@ -110,7 +110,9 @@ dependencies {
compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version" compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
compile "io.reactivex:rxjava:$rx_java_version" compile "io.reactivex:rxjava:$rx_java_version"
compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
}
compile "io.gsonfire:gson-fire:$json_fire_version" compile "io.gsonfire:gson-fire:$json_fire_version"
compile "org.threeten:threetenbp:$threetenbp_version" compile "org.threeten:threetenbp:$threetenbp_version"

7
samples/client/petstore/java/retrofit2rx/pom.xml
View File

@ -208,10 +208,17 @@
<artifactId>converter-scalars</artifactId> <artifactId>converter-scalars</artifactId>
<version>${retrofit-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.oltu.oauth2</groupId> <groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId> <artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${oltu-version}</version> <version>${oltu-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>common</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.gsonfire</groupId> <groupId>io.gsonfire</groupId>

4
samples/client/petstore/java/retrofit2rx2/build.gradle
View File

@ -110,7 +110,9 @@ dependencies {
compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0' compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
compile "io.reactivex.rxjava2:rxjava:$rx_java_version" compile "io.reactivex.rxjava2:rxjava:$rx_java_version"
compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
}
compile "io.gsonfire:gson-fire:$json_fire_version" compile "io.gsonfire:gson-fire:$json_fire_version"
compile "org.threeten:threetenbp:$threetenbp_version" compile "org.threeten:threetenbp:$threetenbp_version"

7
samples/client/petstore/java/retrofit2rx2/pom.xml
View File

@ -208,10 +208,17 @@
<artifactId>converter-scalars</artifactId> <artifactId>converter-scalars</artifactId>
<version>${retrofit-version}</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.oltu.oauth2</groupId> <groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId> <artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${oltu-version}</version> <version>${oltu-version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>common</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.gsonfire</groupId> <groupId>io.gsonfire</groupId>