added scala client support for #393

This commit is contained in:
Tony Tam 2015-01-25 20:20:27 -08:00
parent a15eb6f905
commit 34a61e1256
6 changed files with 222 additions and 187 deletions

View File

@ -0,0 +1,182 @@
package com.wordnik.swagger.codegen.languages;
import com.wordnik.swagger.codegen.*;
import com.wordnik.swagger.models.properties.*;
import java.util.*;
import java.io.File;
public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig {
protected String invokerPackage = "io.swagger.client";
protected String groupId = "com.wordnik";
protected String artifactId = "swagger-client";
protected String artifactVersion = "1.0.0";
protected String sourceFolder = "src/main/java";
public String getName() {
return "scala";
}
public String getHelp() {
return "Generates a Scala client library.";
}
public ScalaClientCodegen() {
super();
outputFolder = "generated-code/scala";
modelTemplateFiles.put("model.mustache", ".scala");
apiTemplateFiles.put("api.mustache", ".scala");
templateDir = "scala";
apiPackage = "io.swagger.client.api";
modelPackage = "io.swagger.client.model";
reservedWords = new HashSet<String> (
Arrays.asList(
"abstract", "case", "catch", "class", "def", "do", "else", "extends",
"false", "final", "finally", "for", "forSome", "if", "implicit",
"import", "lazy", "match", "new", "null", "object", "override", "package",
"private", "protected", "return", "sealed", "super", "this", "throw",
"trait", "try", "true", "type", "val", "var", "while", "with", "yield")
);
additionalProperties.put("invokerPackage", invokerPackage);
additionalProperties.put("groupId", groupId);
additionalProperties.put("artifactId", artifactId);
additionalProperties.put("artifactVersion", artifactVersion);
supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
supportingFiles.add(new SupportingFile("apiInvoker.mustache",
(sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.scala"));
importMapping.remove("List");
importMapping.remove("Set");
importMapping.remove("Map");
importMapping.put("DateTime", "org.joda.time.DateTime");
importMapping.put("ListBuffer", "scala.collections.mutable.ListBuffer");
typeMapping = new HashMap<String, String>();
typeMapping.put("enum", "NSString");
typeMapping.put("array", "List");
typeMapping.put("set", "Set");
typeMapping.put("boolean", "Boolean");
typeMapping.put("string", "String");
typeMapping.put("int", "Int");
typeMapping.put("long", "Long");
typeMapping.put("float", "Float");
typeMapping.put("byte", "Byte");
typeMapping.put("short", "Short");
typeMapping.put("char", "Char");
typeMapping.put("long", "Long");
typeMapping.put("double", "Double");
typeMapping.put("object", "Any");
typeMapping.put("file", "File");
languageSpecificPrimitives = new HashSet<String>(
Arrays.asList(
"String",
"boolean",
"Boolean",
"Double",
"Int",
"Long",
"Float",
"Object",
"List",
"Map")
);
instantiationTypes.put("array", "ListBuffer");
instantiationTypes.put("map", "HashMap");
}
@Override
public String escapeReservedWord(String name) {
return "_" + name;
}
@Override
public String apiFileFolder() {
return outputFolder + "/" + sourceFolder + "/" + apiPackage().replaceAll("\\.", "/");
}
public String modelFileFolder() {
return outputFolder + "/" + sourceFolder + "/" + modelPackage().replaceAll("\\.", "/");
}
@Override
public String getTypeDeclaration(Property p) {
if(p instanceof ArrayProperty) {
ArrayProperty ap = (ArrayProperty) p;
Property inner = ap.getItems();
return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
}
else if (p instanceof MapProperty) {
MapProperty mp = (MapProperty) p;
Property inner = mp.getAdditionalProperties();
return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]";
}
return super.getTypeDeclaration(p);
}
@Override
public String getSwaggerType(Property p) {
String swaggerType = super.getSwaggerType(p);
String type = null;
if(typeMapping.containsKey(swaggerType)) {
type = typeMapping.get(swaggerType);
if(languageSpecificPrimitives.contains(type))
return toModelName(type);
}
else
type = swaggerType;
return toModelName(type);
}
@Override
public String toInstantiationType(Property p) {
if (p instanceof MapProperty) {
MapProperty ap = (MapProperty) p;
String inner = getSwaggerType(ap.getAdditionalProperties());
return instantiationTypes.get("map") + "[String, " + inner + "]";
}
else if (p instanceof ArrayProperty) {
ArrayProperty ap = (ArrayProperty) p;
String inner = getSwaggerType(ap.getItems());
return instantiationTypes.get("array") + "[" + inner + "]";
}
else
return null;
}
public String toDefaultValue(Property p) {
if(p instanceof StringProperty)
return "null";
else if (p instanceof BooleanProperty)
return "null";
else if(p instanceof DateProperty)
return "null";
else if(p instanceof DateTimeProperty)
return "null";
else if (p instanceof DoubleProperty)
return "null";
else if (p instanceof FloatProperty)
return "null";
else if (p instanceof IntegerProperty)
return "null";
else if (p instanceof LongProperty)
return "null";
else if (p instanceof MapProperty) {
MapProperty ap = (MapProperty) p;
String inner = getSwaggerType(ap.getAdditionalProperties());
return "new HashMap[String, " + inner + "]() ";
}
else if (p instanceof ArrayProperty) {
ArrayProperty ap = (ArrayProperty) p;
String inner = getSwaggerType(ap.getItems());
return "new ListBuffer[" + inner + "]() ";
}
else
return "null";
}
}

View File

@ -4,6 +4,7 @@ com.wordnik.swagger.codegen.languages.JaxRSServerCodegen
com.wordnik.swagger.codegen.languages.NodeJSServerCodegen
com.wordnik.swagger.codegen.languages.ObjcClientCodegen
com.wordnik.swagger.codegen.languages.ScalatraServerCodegen
com.wordnik.swagger.codegen.languages.ScalaClientCodegen
com.wordnik.swagger.codegen.languages.StaticDocCodegen
com.wordnik.swagger.codegen.languages.StaticHtmlGenerator
com.wordnik.swagger.codegen.languages.SwaggerGenerator

View File

@ -26,7 +26,7 @@ class {{classname}} {
{{newline}}
val contentType = {
{{#bodyParam}}if({{bodyParam}} != null && {{bodyParam}}.isInstanceOf[File] )
{{#bodyParam}}if({{paramName}} != null && {{paramName}}.isInstanceOf[File] )
"multipart/form-data"
else "application/json"
{{/bodyParam}}
@ -52,7 +52,7 @@ class {{classname}} {
{{/headerParams}}
try {
apiInvoker.invokeApi(basePath, path, "{{httpMethod}}", queryParams.toMap, {{#bodyParam}}{{bodyParam}}{{/bodyParam}}{{^bodyParam}}None{{/bodyParam}}, headerParams.toMap, contentType) match {
apiInvoker.invokeApi(basePath, path, "{{httpMethod}}", queryParams.toMap, {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}None{{/bodyParam}}, headerParams.toMap, contentType) match {
case s: String =>
{{#returnType}} Some(ApiInvoker.deserialize(s, "{{returnContainer}}", classOf[{{returnBaseType}}]).asInstanceOf[{{returnType}}])
{{/returnType}}

View File

@ -8,11 +8,8 @@ package {{package}}
{{#model}}
case class {{classname}} (
{{#vars}}
{{#description}}/* {{{description}}} */
{{/description}}
{{name}}: {{datatype}}{{#hasMore}},{{newline}} {{/hasMore}}
{{/vars}})
{{#vars}}{{#description}}/* {{{description}}} */
{{/description}}{{name}}: {{{datatype}}}{{#hasMore}},{{/hasMore}}{{^hasMore}}){{/hasMore}}
{{/vars}}
{{/model}}
{{/models}}

View File

@ -5,7 +5,7 @@
<artifactId>{{artifactId}}</artifactId>
<packaging>jar</packaging>
<name>{{artifactId}}</name>
<version>{{apiVersion}}</version>
<version>{{artifactVersion}}</version>
<prerequisites>
<maven>2.2.0</maven>
</prerequisites>
@ -186,31 +186,43 @@
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda-time-version}</version>
</dependency>
<dependency>
<groupId>org.joda</groupId>
<artifactId>joda-convert</artifactId>
<version>${joda-version}</version>
</dependency>
</dependencies>
<profiles>
<profile>
<id>scala_2.10</id>
<properties>
<scala-version>2.10.3</scala-version>
<scala-short-version>2.10</scala-short-version>
<swagger-core-version>1.3.2</swagger-core-version>
<scala-test-version>2.1.2</scala-test-version>
</properties>
</profile>
<profile>
<id>scala_2.9.1</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<scala-version>2.9.1-1</scala-version>
<scala-short-version>2.9.1</scala-short-version>
<swagger-core-version>1.1.0</swagger-core-version>
<scala-test-version>1.6.1</scala-test-version>
</properties>
</profile>
<profile>
<id>scala_2.10</id>
<properties>
<scala-version>2.10.3</scala-version>
<scala-short-version>2.10</scala-short-version>
<swagger-core-version>1.3.2</swagger-core-version>
<scala-test-version>2.1.2</scala-test-version>
</properties>
</profile>
<profile>
<id>scala_2.9.1</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<scala-version>2.9.1-1</scala-version>
<scala-short-version>2.9.1</scala-short-version>
<swagger-core-version>1.1.0</swagger-core-version>
<scala-test-version>1.6.1</scala-test-version>
</properties>
</profile>
</profiles>
<properties>
<joda-version>1.2</joda-version>
<joda-time-version>2.2</joda-time-version>
<jersey-version>1.7</jersey-version>
<junit-version>4.8.1</junit-version>
<maven-plugin.version>1.0.0</maven-plugin.version>

View File

@ -1,157 +0,0 @@
{
"swagger": "2.0",
"info": {
"title": "HR API",
"description": "A way to manage people in our organization",
"version": "1.0.0"
},
"host": "my.api.com",
"basePath": "/v2",
"paths": {
"/": {
"get": {
"tags": [
"users are awesome"
],
"parameters": [
{
"in": "query",
"description": "number of records to skip",
"name": "char",
"type": "integer",
"format": "int32"
}
],
"responses": {
"200": {
"description": "successful response",
"schema": {
"type": "array",
"items": {
"$ref": "User"
}
}
},
"400": {
"description": "bad input",
"schema": {
"$ref": "ErrorModel"
}
},
"default": {
"description": "got a response"
}
}
}
},
"/users/{id}": {
"get": {
"tags": [
"users"
],
"operationId": "getUserById",
"parameters": [
{
"in": "path",
"name": "id",
"type": "integer",
"format": "int64",
"description": "user id to look up by"
}
],
"responses": {
"default": {
"description": "got a response"
}
}
}
},
"/places": {
"get": {
"tags": [
"locations"
],
"operationId": "getPlaces",
"responses": {
"default": {
"description": "got a response"
}
}
}
},
"/photos": {
"get": {
"tags": [
"users"
],
"operationId": "getPhotos",
"responses": {
"default": {
"description": "got a response"
}
}
}
}
},
"definitions": {
"ErrorModel": {
"required": [
"code",
"message"
],
"properties": {
"code": {
"type": "integer",
"format": "int64"
},
"message": {
"type": "string"
}
}
},
"User": {
"properties": {
"id": {
"type": "integer",
"format": "int64"
},
"firstName": {
"type": "string"
},
"lastName": {
"type": "string"
},
"age": {
"type": "integer",
"format": "int32"
},
"lastUpdated": {
"type": "string",
"format": "date-time"
}
}
},
"User2": {
"properties": {
"id": {
"type": "integer",
"format": "int64"
},
"firstName": {
"type": "string"
},
"lastName": {
"type": "string"
},
"age": {
"type": "integer",
"format": "int32"
},
"lastUpdated": {
"type": "string",
"format": "date-time"
}
}
}
}
}