diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
index 91a88c5476c..ad5f02c49e4 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
@@ -12,8 +12,9 @@ import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuil
import retrofit2.Converter;
import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
{{#useRxJava}}import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;{{/useRxJava}}
+import retrofit2.converter.gson.GsonConverterFactory;
+import retrofit2.converter.scalars.ScalarsConverterFactory;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -120,6 +121,7 @@ public class ApiClient {
.baseUrl(baseUrl)
.client(okClient)
{{#useRxJava}}.addCallAdapterFactory(RxJavaCallAdapterFactory.create()){{/useRxJava}}
+ .addConverterFactory(ScalarsConverterFactory.create())
.addConverterFactory(GsonCustomConverterFactory.create(gson));
}
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
index 17dfef0f2d9..a5cfd0ebef2 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
@@ -103,6 +103,7 @@ ext {
dependencies {
compile "com.squareup.retrofit2:retrofit:$retrofit_version"
+ compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
{{#useRxJava}}
compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
index 0cb14c49304..cdeca371b6d 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
@@ -118,38 +118,31 @@
retrofit
${retrofit-version}
+
+ com.squareup.retrofit2
+ converter-scalars
+ ${retrofit-version}
+
com.squareup.retrofit2
converter-gson
${retrofit-version}
-
- com.google.code.gson
- gson
- ${gson-version}
-
org.apache.oltu.oauth2
org.apache.oltu.oauth2.client
${oltu-version}
+ {{#useRxJava}}
+
+ io.reactivex
+ rxjava
+ ${rxjava-version}
-
- com.squareup.okhttp3
- okhttp
- ${okhttp-version}
-
- {{#useRxJava}}
-
- io.reactivex
- rxjava
- ${rxjava-version}
-
-
- com.squareup.retrofit2
- adapter-rxjava
- ${retrofit-version}
-
- {{/useRxJava}}
+
+ com.squareup.retrofit2
+ adapter-rxjava
+ ${retrofit-version}
+ {{/useRxJava}}
@@ -161,10 +154,8 @@
1.5.0
- 2.0.0-beta4
- {{#useRxJava}}1.0.16{{/useRxJava}}
- 3.0.1
- 2.4
+ 2.0.0-beta4{{#useRxJava}}
+ 1.0.16{{/useRxJava}}
1.0.0
1.0.0
4.12
diff --git a/samples/client/petstore/java/retrofit2/README.md b/samples/client/petstore/java/retrofit2/README.md
index 1a6255eb563..d5f7ec9f1ce 100644
--- a/samples/client/petstore/java/retrofit2/README.md
+++ b/samples/client/petstore/java/retrofit2/README.md
@@ -20,7 +20,7 @@ mvn deploy
Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
-After the client libarary is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
+After the client library is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
```xml
diff --git a/samples/client/petstore/java/retrofit2/build.gradle b/samples/client/petstore/java/retrofit2/build.gradle
index 5f5ff488f18..ae27a595eb5 100644
--- a/samples/client/petstore/java/retrofit2/build.gradle
+++ b/samples/client/petstore/java/retrofit2/build.gradle
@@ -100,6 +100,7 @@ ext {
dependencies {
compile "com.squareup.retrofit2:retrofit:$retrofit_version"
+ compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml
index 07c24f98116..2d8f0440161 100644
--- a/samples/client/petstore/java/retrofit2/pom.xml
+++ b/samples/client/petstore/java/retrofit2/pom.xml
@@ -118,6 +118,11 @@
retrofit
${retrofit-version}
+
+ com.squareup.retrofit2
+ converter-scalars
+ ${retrofit-version}
+
com.squareup.retrofit2
converter-gson
@@ -128,7 +133,6 @@
org.apache.oltu.oauth2.client
${oltu-version}
-
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
index 398a1014c71..ffff8c26d4f 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
@@ -12,8 +12,9 @@ import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuil
import retrofit2.Converter;
import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
+import retrofit2.converter.scalars.ScalarsConverterFactory;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -46,10 +47,18 @@ public class ApiClient {
this();
for(String authName : authNames) {
Interceptor auth;
- if (authName == "api_key") {
- auth = new ApiKeyAuth("header", "api_key");
- } else if (authName == "petstore_auth") {
+ if (authName == "petstore_auth") {
auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
+ } else if (authName == "test_api_client_id") {
+ auth = new ApiKeyAuth("header", "x-test_api_client_id");
+ } else if (authName == "test_api_client_secret") {
+ auth = new ApiKeyAuth("header", "x-test_api_client_secret");
+ } else if (authName == "api_key") {
+ auth = new ApiKeyAuth("header", "api_key");
+ } else if (authName == "test_api_key_query") {
+ auth = new ApiKeyAuth("query", "test_api_key_query");
+ } else if (authName == "test_api_key_header") {
+ auth = new ApiKeyAuth("header", "test_api_key_header");
} else {
throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
}
@@ -119,6 +128,7 @@ public class ApiClient {
.baseUrl(baseUrl)
.client(okClient)
+ .addConverterFactory(ScalarsConverterFactory.create())
.addConverterFactory(GsonCustomConverterFactory.create(gson));
}
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
index 22e010034b2..02507269968 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
package io.swagger.client;
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-26T13:30:07.836+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-07T09:02:50.804Z")
public class StringUtil {
/**
* Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/InlineResponse200.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/InlineResponse200.java
index 41e49b9cd3c..d687ab7d83c 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/InlineResponse200.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/InlineResponse200.java
@@ -3,6 +3,9 @@ package io.swagger.client.model;
import java.util.Objects;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import io.swagger.client.model.Tag;
+import java.util.ArrayList;
+import java.util.List;
import com.google.gson.annotations.SerializedName;
@@ -12,6 +15,9 @@ import com.google.gson.annotations.SerializedName;
@ApiModel(description = "")
public class InlineResponse200 {
+ @SerializedName("photoUrls")
+ private List photoUrls = new ArrayList();
+
@SerializedName("name")
private String name = null;
@@ -21,6 +27,46 @@ public class InlineResponse200 {
@SerializedName("category")
private Object category = null;
+ @SerializedName("tags")
+ private List tags = new ArrayList();
+
+
+public enum StatusEnum {
+ @SerializedName("available")
+ AVAILABLE("available"),
+
+ @SerializedName("pending")
+ PENDING("pending"),
+
+ @SerializedName("sold")
+ SOLD("sold");
+
+ private String value;
+
+ StatusEnum(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public String toString() {
+ return value;
+ }
+}
+
+ @SerializedName("status")
+ private StatusEnum status = null;
+
+
+
+ /**
+ **/
+ @ApiModelProperty(value = "")
+ public List getPhotoUrls() {
+ return photoUrls;
+ }
+ public void setPhotoUrls(List photoUrls) {
+ this.photoUrls = photoUrls;
+ }
/**
@@ -56,6 +102,29 @@ public class InlineResponse200 {
}
+ /**
+ **/
+ @ApiModelProperty(value = "")
+ public List getTags() {
+ return tags;
+ }
+ public void setTags(List tags) {
+ this.tags = tags;
+ }
+
+
+ /**
+ * pet status in the store
+ **/
+ @ApiModelProperty(value = "pet status in the store")
+ public StatusEnum getStatus() {
+ return status;
+ }
+ public void setStatus(StatusEnum status) {
+ this.status = status;
+ }
+
+
@Override
public boolean equals(Object o) {
@@ -66,14 +135,17 @@ public class InlineResponse200 {
return false;
}
InlineResponse200 inlineResponse200 = (InlineResponse200) o;
- return Objects.equals(name, inlineResponse200.name) &&
+ return Objects.equals(photoUrls, inlineResponse200.photoUrls) &&
+ Objects.equals(name, inlineResponse200.name) &&
Objects.equals(id, inlineResponse200.id) &&
- Objects.equals(category, inlineResponse200.category);
+ Objects.equals(category, inlineResponse200.category) &&
+ Objects.equals(tags, inlineResponse200.tags) &&
+ Objects.equals(status, inlineResponse200.status);
}
@Override
public int hashCode() {
- return Objects.hash(name, id, category);
+ return Objects.hash(photoUrls, name, id, category, tags, status);
}
@Override
@@ -81,9 +153,12 @@ public class InlineResponse200 {
StringBuilder sb = new StringBuilder();
sb.append("class InlineResponse200 {\n");
+ sb.append(" photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
sb.append(" name: ").append(toIndentedString(name)).append("\n");
sb.append(" id: ").append(toIndentedString(id)).append("\n");
sb.append(" category: ").append(toIndentedString(category)).append("\n");
+ sb.append(" tags: ").append(toIndentedString(tags)).append("\n");
+ sb.append(" status: ").append(toIndentedString(status)).append("\n");
sb.append("}");
return sb.toString();
}
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ObjectReturn.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ObjectReturn.java
new file mode 100644
index 00000000000..920640ad2cb
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ObjectReturn.java
@@ -0,0 +1,69 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+@ApiModel(description = "")
+public class ObjectReturn {
+
+ @SerializedName("return")
+ private Integer _return = null;
+
+
+
+ /**
+ **/
+ @ApiModelProperty(value = "")
+ public Integer getReturn() {
+ return _return;
+ }
+ public void setReturn(Integer _return) {
+ this._return = _return;
+ }
+
+
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ ObjectReturn _return = (ObjectReturn) o;
+ return Objects.equals(_return, _return._return);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(_return);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("class ObjectReturn {\n");
+
+ sb.append(" _return: ").append(toIndentedString(_return)).append("\n");
+ sb.append("}");
+ return sb.toString();
+ }
+
+ /**
+ * Convert the given object to string with each line indented by 4 spaces
+ * (except the first line).
+ */
+ private String toIndentedString(Object o) {
+ if (o == null) {
+ return "null";
+ }
+ return o.toString().replace("\n", "\n ");
+ }
+}
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java
new file mode 100644
index 00000000000..1174ba6092c
--- /dev/null
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -0,0 +1,69 @@
+package io.swagger.client.model;
+
+import java.util.Objects;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.google.gson.annotations.SerializedName;
+
+
+
+
+@ApiModel(description = "")
+public class SpecialModelName {
+
+ @SerializedName("$special[property.name]")
+ private Long specialPropertyName = null;
+
+
+
+ /**
+ **/
+ @ApiModelProperty(value = "")
+ public Long getSpecialPropertyName() {
+ return specialPropertyName;
+ }
+ public void setSpecialPropertyName(Long specialPropertyName) {
+ this.specialPropertyName = specialPropertyName;
+ }
+
+
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ SpecialModelName specialModelName = (SpecialModelName) o;
+ return Objects.equals(specialPropertyName, specialModelName.specialPropertyName);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(specialPropertyName);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("class SpecialModelName {\n");
+
+ sb.append(" specialPropertyName: ").append(toIndentedString(specialPropertyName)).append("\n");
+ sb.append("}");
+ return sb.toString();
+ }
+
+ /**
+ * Convert the given object to string with each line indented by 4 spaces
+ * (except the first line).
+ */
+ private String toIndentedString(Object o) {
+ if (o == null) {
+ return "null";
+ }
+ return o.toString().replace("\n", "\n ");
+ }
+}
diff --git a/samples/client/petstore/java/retrofit2rx/README.md b/samples/client/petstore/java/retrofit2rx/README.md
index 7673712f5a5..a1f0b3468be 100644
--- a/samples/client/petstore/java/retrofit2rx/README.md
+++ b/samples/client/petstore/java/retrofit2rx/README.md
@@ -20,7 +20,7 @@ mvn deploy
Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
-After the client libarary is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
+After the client library is installed/deployed, you can use it in your Maven project by adding the following to your *pom.xml*:
```xml
diff --git a/samples/client/petstore/java/retrofit2rx/build.gradle b/samples/client/petstore/java/retrofit2rx/build.gradle
index 1ab839078a4..c7139267298 100644
--- a/samples/client/petstore/java/retrofit2rx/build.gradle
+++ b/samples/client/petstore/java/retrofit2rx/build.gradle
@@ -101,6 +101,7 @@ ext {
dependencies {
compile "com.squareup.retrofit2:retrofit:$retrofit_version"
+ compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
compile "io.reactivex:rxjava:$rx_java_version"
diff --git a/samples/client/petstore/java/retrofit2rx/hello.txt b/samples/client/petstore/java/retrofit2rx/hello.txt
deleted file mode 100644
index 6769dd60bdf..00000000000
--- a/samples/client/petstore/java/retrofit2rx/hello.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello world!
\ No newline at end of file
diff --git a/samples/client/petstore/java/retrofit2rx/pom.xml b/samples/client/petstore/java/retrofit2rx/pom.xml
index e5c4e687511..b2cf9949578 100644
--- a/samples/client/petstore/java/retrofit2rx/pom.xml
+++ b/samples/client/petstore/java/retrofit2rx/pom.xml
@@ -118,6 +118,11 @@
retrofit
${retrofit-version}
+
+ com.squareup.retrofit2
+ converter-scalars
+ ${retrofit-version}
+
com.squareup.retrofit2
converter-gson
@@ -128,18 +133,16 @@
org.apache.oltu.oauth2.client
${oltu-version}
-
-
- io.reactivex
- rxjava
- ${rxjava-version}
-
-
- com.squareup.retrofit2
- adapter-rxjava
- ${retrofit-version}
-
-
+
+ io.reactivex
+ rxjava
+ ${rxjava-version}
+
+
+ com.squareup.retrofit2
+ adapter-rxjava
+ ${retrofit-version}
+
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java
index 800e4db8bd8..5582509be76 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java
@@ -12,8 +12,9 @@ import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuil
import retrofit2.Converter;
import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
+import retrofit2.converter.scalars.ScalarsConverterFactory;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -46,10 +47,18 @@ public class ApiClient {
this();
for(String authName : authNames) {
Interceptor auth;
- if (authName == "api_key") {
- auth = new ApiKeyAuth("header", "api_key");
- } else if (authName == "petstore_auth") {
+ if (authName == "petstore_auth") {
auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
+ } else if (authName == "test_api_client_id") {
+ auth = new ApiKeyAuth("header", "x-test_api_client_id");
+ } else if (authName == "test_api_client_secret") {
+ auth = new ApiKeyAuth("header", "x-test_api_client_secret");
+ } else if (authName == "api_key") {
+ auth = new ApiKeyAuth("header", "api_key");
+ } else if (authName == "test_api_key_query") {
+ auth = new ApiKeyAuth("query", "test_api_key_query");
+ } else if (authName == "test_api_key_header") {
+ auth = new ApiKeyAuth("header", "test_api_key_header");
} else {
throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
}
@@ -119,6 +128,7 @@ public class ApiClient {
.baseUrl(baseUrl)
.client(okClient)
.addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+ .addConverterFactory(ScalarsConverterFactory.create())
.addConverterFactory(GsonCustomConverterFactory.create(gson));
}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java
index 1e7e09a6aa9..e8c0dc4d062 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
package io.swagger.client;
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-26T13:30:13.630+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-03-07T09:11:59.834Z")
public class StringUtil {
/**
* Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java
index 3068b6be265..220f4b91da0 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java
@@ -10,6 +10,7 @@ import okhttp3.RequestBody;
import io.swagger.client.model.Pet;
import java.io.File;
+import io.swagger.client.model.InlineResponse200;
import java.util.ArrayList;
import java.util.HashMap;
@@ -46,8 +47,8 @@ public interface PetApi {
/**
* Finds Pets by status
- * Multiple status values can be provided with comma seperated strings
- * @param status Status values that need to be considered for filter
+ * Multiple status values can be provided with comma separated strings
+ * @param status Status values that need to be considered for query
* @return Call>
*/
@@ -129,6 +130,19 @@ public interface PetApi {
);
+ /**
+ * Fake endpoint to test inline arbitrary object return by 'Find pet by ID'
+ * Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions
+ * @param petId ID of pet that needs to be fetched
+ * @return Call
+ */
+
+ @GET("pet/{petId}?response=inline_arbitrary_object")
+ Observable getPetByIdInObject(
+ @Path("petId") Long petId
+ );
+
+
/**
* Fake endpoint to test byte array return by 'Find pet by ID'
* Returns a pet when ID < 10. ID > 10 or nonintegers will simulate API error conditions
@@ -137,7 +151,7 @@ public interface PetApi {
*/
@GET("pet/{petId}?testing_byte_array=true")
- Observable getPetByIdWithByteArray(
+ Observable petPetIdtestingByteArraytrueGet(
@Path("petId") Long petId
);
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java
index e1761527bf5..622ed81f15b 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java
@@ -17,6 +17,19 @@ import java.util.Map;
public interface StoreApi {
+ /**
+ * Finds orders by status
+ * A single status value can be provided as a string
+ * @param status Status value that needs to be considered for query
+ * @return Call>
+ */
+
+ @GET("store/findByStatus")
+ Observable> findOrdersByStatus(
+ @Query("status") String status
+ );
+
+
/**
* Returns pet inventories by status
* Returns a map of status codes to quantities
@@ -28,6 +41,17 @@ public interface StoreApi {
+ /**
+ * Fake endpoint to test arbitrary object return by 'Get inventory'
+ * Returns an arbitrary object which is actually a map of status codes to quantities
+ * @return Call