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

Merge remote-tracking branch 'upstream/master' into fix-no-content

Browse Source 
Conflicts:
	samples/client/petstore/java/src/main/java/com/wordnik/client/ApiInvoker.java
This commit is contained in:
Andrew Young 2013-12-02 13:42:15 -08:00
commit bfb5b721c5
17 changed files with 91 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
bin/all-petstore.sh Executable file
View File

@ -0,0 +1,37 @@
#!/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
cd $APP_DIR
./bin/java-wordnik-api.sh
./bin/php-wordnik-api.sh
./bin/python3-wordnik-api.sh
./bin/objc-wordnik-api.sh
./bin/python-wordnik-api.sh
./bin/scala-wordnik-api.sh
./bin/android-java-petstore.sh
./bin/csharp-petstore.sh
./bin/flash-petstore.sh
./bin/java-petstore.sh
./bin/objc-petstore.sh
./bin/php-petstore.sh
./bin/python-petstore.sh
./bin/python3-petstore.sh
./bin/ruby-petstore.sh
./bin/scala-petstore.sh

2
build.sbt
View File

@ -7,7 +7,7 @@ name := "swagger-codegen"
version := "2.0.11"
scalaVersion := "2.9.1"
scalaVersion := "2.10.0"
javacOptions ++= Seq("-target", "1.6", "-source", "1.6", "-Xlint:unchecked", "-Xlint:deprecation")

1
samples/client/petstore/java/src/main/java/com/wordnik/client/ApiInvoker.java
View File

@ -146,4 +146,3 @@ public class ApiInvoker {
return hostMap.get(host);
}
}

1
samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Order.java
View File

@ -10,6 +10,7 @@ public class Order {
private Integer quantity = null;
/* Status of the order */
private String status = null;
//public enum statusEnum { placed, approved, delivered, };
/* Date shipped, only if it has been */
private Date shipDate = null;
public Long getId() {

1
samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Pet.java
View File

@ -16,6 +16,7 @@ public class Pet {
private List<Tag> tags = new ArrayList<Tag>();
/* pet status in the store */
private String status = null;
//public enum statusEnum { available, pending, sold, };
public Long getId() {
return id;
}

1
samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/User.java
View File

@ -17,6 +17,7 @@ public class User {
private String phone = null;
/* User Status */
private Integer userStatus = null;
//public enum userStatusEnum { 1-registered, 2-active, 3-closed, };
public Long getId() {
return id;
}

3
samples/client/wordnik-api/java/src/main/java/com/wordnik/client/common/ApiInvoker.java
View File

@ -12,6 +12,7 @@ import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.api.client.filter.LoggingFilter;
import com.sun.jersey.api.client.WebResource.Builder;
import javax.ws.rs.core.Response.Status.Family;
import javax.ws.rs.core.MediaType;
import java.util.Map;
@ -123,7 +124,7 @@ public class ApiInvoker {
else {
throw new ApiException(500, "unknown method type " + method);
}
if(response.getClientResponseStatus() == ClientResponse.Status.OK) {
if(response.getClientResponseStatus().getFamily() == Family.SUCCESSFUL) {
return (String) response.getEntity(String.class);
}
else {

4
samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/AccountApi.scala
View File

@ -1,8 +1,8 @@
package com.wordnik.client.api
import com.wordnik.client.model.ApiTokenStatus
import com.wordnik.client.model.WordList
import com.wordnik.client.model.User
import com.wordnik.client.model.WordList
import com.wordnik.client.model.ApiTokenStatus
import com.wordnik.client.model.AuthenticationToken
import com.wordnik.client.common.ApiInvoker
import com.wordnik.client.common.ApiException

14
samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordApi.scala
View File

@ -1,16 +1,16 @@
package com.wordnik.client.api
import com.wordnik.client.model.Definition
import com.wordnik.client.model.FrequencySummary
import com.wordnik.client.model.Bigram
import com.wordnik.client.model.WordObject
import com.wordnik.client.model.ExampleSearchResults
import com.wordnik.client.model.Example
import com.wordnik.client.model.ScrabbleScoreResult
import com.wordnik.client.model.TextPron
import com.wordnik.client.model.Example
import com.wordnik.client.model.Syllable
import com.wordnik.client.model.AudioFile
import com.wordnik.client.model.ExampleSearchResults
import com.wordnik.client.model.WordObject
import com.wordnik.client.model.Bigram
import com.wordnik.client.model.Related
import com.wordnik.client.model.FrequencySummary
import com.wordnik.client.model.Definition
import com.wordnik.client.model.AudioFile
import com.wordnik.client.common.ApiInvoker
import com.wordnik.client.common.ApiException

2
samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordListApi.scala
View File

@ -1,8 +1,8 @@
package com.wordnik.client.api
import com.wordnik.client.model.WordListWord
import com.wordnik.client.model.WordList
import com.wordnik.client.model.StringValue
import com.wordnik.client.model.WordListWord
import com.wordnik.client.common.ApiInvoker
import com.wordnik.client.common.ApiException

2
samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordsApi.scala
View File

@ -1,7 +1,7 @@
package com.wordnik.client.api
import com.wordnik.client.model.WordObject
import com.wordnik.client.model.DefinitionSearchResults
import com.wordnik.client.model.WordObject
import com.wordnik.client.model.WordOfTheDay
import com.wordnik.client.model.WordSearchResults
import com.wordnik.client.common.ApiInvoker

8
samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Definition.scala
View File

@ -1,11 +1,11 @@
package com.wordnik.client.model
import com.wordnik.client.model.ExampleUsage
import com.wordnik.client.model.Note
import com.wordnik.client.model.Citation
import com.wordnik.client.model.TextPron
import com.wordnik.client.model.Label
import com.wordnik.client.model.ExampleUsage
import com.wordnik.client.model.TextPron
import com.wordnik.client.model.Citation
import com.wordnik.client.model.Related
import com.wordnik.client.model.Note
case class Definition (
extendedText: String,
text: String,

2
samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/Example.scala
View File

@ -1,8 +1,8 @@
package com.wordnik.client.model
import com.wordnik.client.model.Sentence
import com.wordnik.client.model.ScoredWord
import com.wordnik.client.model.ContentProvider
import com.wordnik.client.model.ScoredWord
case class Example (
id: Long,
exampleId: Long,

2
samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/model/WordOfTheDay.scala
View File

@ -1,8 +1,8 @@
package com.wordnik.client.model
import java.util.Date
import com.wordnik.client.model.SimpleDefinition
import com.wordnik.client.model.SimpleExample
import com.wordnik.client.model.SimpleDefinition
import com.wordnik.client.model.ContentProvider
case class WordOfTheDay (
id: Long,

6
src/main/resources/Java/model.mustache
View File

@ -10,6 +10,12 @@ public class {{classname}} {
{{#description}}/* {{{description}}} */
{{/description}}
private {{{datatype}}} {{name}} = {{{defaultValue}}};
{{#allowableValues}}{{#min}} // range from {{min}} to {{max}}
{{/min}}
//{{^min}}public enum {{name}}Enum { {{#values}} {{.}}, {{/values}} };
{{/min}}
{{/allowableValues}}
{{/vars}}
{{#vars}}

19
src/main/scala/com/wordnik/swagger/codegen/Codegen.scala
View File

@ -188,6 +188,19 @@ class Codegen(config: CodegenConfig) {
(srcName, engine -> template)
}
def rawAllowableValuesToString(v: AllowableValues) = {
v match {
case av: AllowableListValues => {
av
}
case av: AllowableRangeValues => {
av
}
case _ => None
}
}
def allowableValuesToString(v: AllowableValues) = {
v match {
case av: AllowableListValues => {
@ -306,6 +319,11 @@ class Codegen(config: CodegenConfig) {
case _ => requiredParams.last.asInstanceOf[HashMap[String, String]] -= "hasMore"
}
headerParams.size match {
case 0 =>
case _ => headerParams.last.asInstanceOf[HashMap[String, String]] -= "hasMore"
}
queryParams.size match {
case 0 =>
case _ => queryParams.last.asInstanceOf[HashMap[String, String]] -= "hasMore"
@ -466,6 +484,7 @@ class Codegen(config: CodegenConfig) {
"defaultValue" -> config.toDeclaration(propertyDocSchema)._2,
"description" -> propertyDocSchema.description,
"notes" -> propertyDocSchema.description,
"allowableValues" -> rawAllowableValuesToString(propertyDocSchema.allowableValues),
(if(propertyDocSchema.required) "required" else "isNotRequired") -> "true",
"getter" -> config.toGetter(prop._1, config.toDeclaration(propertyDocSchema)._1),
"setter" -> config.toSetter(prop._1, config.toDeclaration(propertyDocSchema)._1),

6
src/main/scala/com/wordnik/swagger/model/SwaggerModelSerializer.scala
View File

@ -347,10 +347,16 @@ object SwaggerSerializers {
else {
val min = (json \ "min") match {
case e: JObject => e.extract[String]
case e: JString => e.s
case e: JInt => e.num.toString
case e: JDouble => e.num.toString
case _ => ""
}
val max = (json \ "max") match {
case e: JObject => e.extract[String]
case e: JString => e.s
case e: JInt => e.num.toString
case e: JDouble => e.num.toString
case _ => ""
}
if(min != "" && max != "")