Merge remote-tracking branch 'xhh2/davidkiss-master'

Conflicts:
	samples/client/petstore/java/feign/README.md
	samples/client/petstore/java/feign/build.gradle
	samples/client/petstore/java/feign/pom.xml
	samples/client/petstore/java/feign/settings.gradle
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
This commit is contained in:
David Kiss
2015-12-07 21:29:14 -05:00
8 changed files with 44 additions and 8 deletions

View File

@@ -0,0 +1,3 @@
<manifest package="io.swagger.client" xmlns:android="http://schemas.android.com/apk/res/android">
<application />
</manifest>

View File

@@ -1,6 +1,6 @@
package io.swagger.client;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-07T01:11:21.159-05:00")
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-01T16:10:23.565+08:00")
public class StringUtil {
/**
* Check if the given array contains the given value (with case-insensitive comparison).

View File

@@ -10,9 +10,7 @@ import io.swagger.client.model.Pet;
import java.io.File;
import io.swagger.client.model.ApiResponse;
import java.util.*;
import feign.*;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-12-07T01:11:21.159-05:00")