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

more refactoring to support 1.2 spec

Browse Source
This commit is contained in:
Tony Tam
2013-08-08 15:32:37 -07:00
parent 558a9cbf64
commit 17b63b2be8
33 changed files with 77 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/logback.xml
View File

@@ -5,7 +5,7 @@
<Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
</layout>
</appender>
<logger name="com.wordnik" level="ERROR"/>
<logger name="com.wordnik" level="DEBUG"/>
<root level="error">
<appender-ref ref="STDOUT" />
</root>

2
src/main/scala/com/wordnik/swagger/codegen/BasicCSharpGenerator.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/scala/com/wordnik/swagger/codegen/BasicFlashCodegen.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

3
src/main/scala/com/wordnik/swagger/codegen/BasicGenerator.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -61,6 +61,7 @@ abstract class BasicGenerator extends CodegenConfig with PathUtil {
}
implicit val basePath = getBasePath(host, doc.basePath)
println("base path is " + basePath)
val apiReferences = doc.apis
if (apiReferences == null)

2
src/main/scala/com/wordnik/swagger/codegen/BasicGroovyGenerator.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

5
src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -50,7 +50,8 @@ class BasicJavaGenerator extends BasicGenerator {
"float" -> "Float",
"long" -> "Long",
"double" -> "Double",
"object" -> "Object")
"object" -> "Object",
"integer" -> "Integer")
// location of templates
override def templateDir = "Java"

2
src/main/scala/com/wordnik/swagger/codegen/BasicObjcGenerator.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/scala/com/wordnik/swagger/codegen/BasicPHPGenerator.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/scala/com/wordnik/swagger/codegen/BasicPython3Generator.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/scala/com/wordnik/swagger/codegen/BasicPythonGenerator.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/scala/com/wordnik/swagger/codegen/BasicRubyGenerator.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/scala/com/wordnik/swagger/codegen/BasicScalaGenerator.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

6
src/main/scala/com/wordnik/swagger/codegen/PathUtil.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -35,7 +35,9 @@ trait PathUtil {
}
def toModelName(name: String) = {
name(0).toUpper + name.substring(1)
if(name.length > 0)
name(0).toUpper + name.substring(1)
else "MISSING MODEL NAME"
}
def toApiName(name: String) = {

2
src/main/scala/com/wordnik/swagger/codegen/SwaggerDocGenerator.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/scala/com/wordnik/swagger/codegen/language/CodegenConfig.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/scala/com/wordnik/swagger/codegen/spec/SwaggerSpec.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/scala/com/wordnik/swagger/codegen/spec/SwaggerSpecValidator.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/scala/com/wordnik/swagger/codegen/spec/Validator.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

9
src/main/scala/com/wordnik/swagger/codegen/util/ApiExtractor.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,13 +31,14 @@ object ApiExtractor extends RemoteUrl {
implicit val formats = SwaggerSerializers.formats
def fetchApiListings(basePath: String, apis: List[ApiListingReference], apiKey: Option[String] = None): List[ApiListing] = {
println("looking at base path " + basePath)
(for (api <- apis) yield {
try{
val json = (basePath.startsWith("http")) match {
case true => {
println("calling: " + ((basePath + api.path + apiKey.getOrElse("")).replaceAll(".\\{format\\}", ".json")))
urlToString((basePath + api.path + apiKey.getOrElse("")).replaceAll(".\\{format\\}", ".json"))
val path = if(api.path.startsWith("http")) api.path
else basePath + api.path
println("calling: " + ((path + apiKey.getOrElse("")).replaceAll(".\\{format\\}", ".json")))
urlToString((path + apiKey.getOrElse("")).replaceAll(".\\{format\\}", ".json"))
}
case false => Source.fromFile((basePath + api.path).replaceAll(".\\{format\\}", ".json")).mkString
}

2
src/main/scala/com/wordnik/swagger/codegen/util/CoreUtils.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/main/scala/com/wordnik/swagger/codegen/util/ResourceExtractor.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

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

@@ -12,6 +12,20 @@ import scala.collection.mutable.{ListBuffer, LinkedHashMap}
object SwaggerSerializers {
import ValidationMessage._
val swaggerTypeMap = Map(
// simple types
("integer", "int32") -> "int",
("integer", "int64") -> "long",
("number", "float") -> "float",
("number", "double") -> "double",
("string", "byte") -> "byte",
("string", "date") -> "Date",
("string", "date-time") -> "Date",
// containers
("array", "") -> "Array"
)
implicit val formats = DefaultFormats +
new ModelSerializer +
new ModelPropertySerializer +
@@ -326,9 +340,20 @@ object SwaggerSerializers {
class ModelPropertySerializer extends CustomSerializer[ModelProperty] (formats => ({
case json =>
implicit val fmts: Formats = formats
val `type` = (json \ "$ref") match {
case e: JString => e.s
case _ => {
// convert the jsonschema types into swagger types. Note, this logic will move elsewhere soon
SwaggerSerializers.swaggerTypeMap.getOrElse(
((json \ "type").extractOrElse(""), (json \ "format").extractOrElse(""))
, (json \ "type").extractOrElse(""))
}
}
ModelProperty(
`type` = (json \ "type").extractOrElse(""),
`qualifiedType` = (json \ "type").extractOrElse(""),
`type` = `type`,
`qualifiedType` = `type`,
required = (json \ "required") match {
case e:JString => e.s.toBoolean
case e:JBool => e.value

2
src/main/scala/com/wordnik/swagger/model/SwaggerModels.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/test/scala/BasicCSharpGeneratorTest.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/test/scala/BasicGeneratorTest.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/test/scala/BasicJavaGeneratorTest.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/test/scala/BasicObjcGeneratorTest.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/test/scala/BasicScalaGeneratorTest.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/test/scala/CodegenConfigTest.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

14
src/test/scala/PathUtilTest.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
*/
import com.wordnik.swagger.codegen.BasicScalaGenerator
import com.wordnik.swagger.codegen.PathUtil
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@@ -45,7 +46,10 @@ class PathUtilTest extends FlatSpec with ShouldMatchers {
* since swagger-spec 1.2 doesn't support `basePath` in the Resource Listing,
* ensure the base path is extracted from the input host
**/
it should "get determine the basePath implicitly" in {
config.getBasePath("http://foo.com/api-docs", "") should be ("http://foo.com/api-docs")
}
}
it should "get determine the basePath implicitly" in {
sys.props -= "fileMap"
new PathUtilImpl().getBasePath("http://foo.com/api-docs", "") should be ("http://foo.com/api-docs")
}
}
class PathUtilImpl extends PathUtil

2
src/test/scala/swaggerSpec1_1/SwaggerModelTest.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
src/test/scala/swaggerSpec1_1/UtilsTest.scala
View File

@@ -1,5 +1,5 @@
/**
* Copyright 2012 Wordnik, Inc.
* Copyright 2013 Wordnik, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.