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
commit 538ccb3f12
8 changed files with 44 additions and 8 deletions

View File

@ -0,0 +1,4 @@
{
"library": "feign",
"artifactId": "swagger-petstore-feign"
}

31
bin/java-petstore-feign.sh Executable file
View File

@ -0,0 +1,31 @@
#!/bin/sh
SCRIPT="$0"
while [ -h "$SCRIPT" ] ; do
ls=`ls -ld "$SCRIPT"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
SCRIPT="$link"
else
SCRIPT=`dirname "$SCRIPT"`/"$link"
fi
done
if [ ! -d "${APP_DIR}" ]; then
APP_DIR=`dirname "$SCRIPT"`/..
APP_DIR=`cd "${APP_DIR}"; pwd`
fi
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
if [ ! -f "$executable" ]
then
mvn clean package
fi
# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l java -c bin/java-petstore-feign.json -o samples/client/petstore/java/feign"
java $JAVA_OPTS -jar $executable $ags

View File

@ -1,4 +1,4 @@
# swagger-java-client
# swagger-petstore-feign
## Requirements
@ -25,7 +25,7 @@ After the client libarary is installed/deployed, you can use it in your Maven pr
```xml
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-java-client</artifactId>
<artifactId>swagger-petstore-feign</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>

View File

@ -2,9 +2,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>io.swagger</groupId>
<artifactId>swagger-java-client</artifactId>
<artifactId>swagger-petstore-feign</artifactId>
<packaging>jar</packaging>
<name>swagger-java-client</name>
<name>swagger-petstore-feign</name>
<version>1.0.0</version>
<scm>
<connection>scm:git:git@github.com:swagger-api/swagger-mustache.git</connection>

View File

@ -1 +1 @@
rootProject.name = "swagger-java-client"
rootProject.name = "swagger-petstore-feign"

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")