From d21e4227a61bdcb5668e5f0869a3f89033f413ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Bresson?= <dev@jmini.fr>
Date: Fri, 20 Apr 2018 15:52:22 +0200
Subject: [PATCH] Update finch Petstore OAS2 (#126)

* Update finch sample

* Udpate 'finch' samples

* update finch with oas3 petstore (no diff)
---
 bin/openapi3/finch-petstore-server.sh         | 31 +++++++++++++++++++
 .../finch/src/main/scala/DataAccessor.scala   |  4 +--
 .../main/scala/io/swagger/apis/UserApi.scala  |  8 ++---
 3 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100755 bin/openapi3/finch-petstore-server.sh

diff --git a/bin/openapi3/finch-petstore-server.sh b/bin/openapi3/finch-petstore-server.sh
new file mode 100755
index 00000000000..ab609b4ceb0
--- /dev/null
+++ b/bin/openapi3/finch-petstore-server.sh
@@ -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/openapi-generator-cli/target/openapi-generator-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 $@ -t modules/openapi-generator/src/main/resources/finch -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -l finch -o samples/server/petstore/finch"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/samples/server/petstore/finch/src/main/scala/DataAccessor.scala b/samples/server/petstore/finch/src/main/scala/DataAccessor.scala
index 3b07e157576..e8f40642825 100644
--- a/samples/server/petstore/finch/src/main/scala/DataAccessor.scala
+++ b/samples/server/petstore/finch/src/main/scala/DataAccessor.scala
@@ -94,13 +94,13 @@ trait DataAccessor {
         * 
         * @return A Unit
         */
-        def User_createUsersWithArrayInput(seq: Seq[User]): Either[CommonError,Unit] = ???
+        def User_createUsersWithArrayInput(user: Seq[User]): Either[CommonError,Unit] = ???
 
         /**
         * 
         * @return A Unit
         */
-        def User_createUsersWithListInput(seq: Seq[User]): Either[CommonError,Unit] = ???
+        def User_createUsersWithListInput(user: Seq[User]): Either[CommonError,Unit] = ???
 
         /**
         * 
diff --git a/samples/server/petstore/finch/src/main/scala/io/swagger/apis/UserApi.scala b/samples/server/petstore/finch/src/main/scala/io/swagger/apis/UserApi.scala
index 8928ad2cf54..0e640c270e5 100644
--- a/samples/server/petstore/finch/src/main/scala/io/swagger/apis/UserApi.scala
+++ b/samples/server/petstore/finch/src/main/scala/io/swagger/apis/UserApi.scala
@@ -73,8 +73,8 @@ object UserApi {
         * @return An endpoint representing a Unit
         */
         private def createUsersWithArrayInput(da: DataAccessor): Endpoint[Unit] =
-        post("user" :: "createWithArray" :: jsonBody[Seq[User]]) { (seq: Seq[User]) => 
-          da.User_createUsersWithArrayInput(seq) match {
+        post("user" :: "createWithArray" :: jsonBody[Seq[User]]) { (user: Seq[User]) => 
+          da.User_createUsersWithArrayInput(user) match {
             case Left(error) => checkError(error)
             case Right(data) => Ok(data)
           }
@@ -87,8 +87,8 @@ object UserApi {
         * @return An endpoint representing a Unit
         */
         private def createUsersWithListInput(da: DataAccessor): Endpoint[Unit] =
-        post("user" :: "createWithList" :: jsonBody[Seq[User]]) { (seq: Seq[User]) => 
-          da.User_createUsersWithListInput(seq) match {
+        post("user" :: "createWithList" :: jsonBody[Seq[User]]) { (user: Seq[User]) => 
+          da.User_createUsersWithListInput(user) match {
             case Left(error) => checkError(error)
             case Right(data) => Ok(data)
           }