valitydev/openapi-generator
14
0
Fork 0
mirror of https://github.com/valitydev/openapi-generator.git synced 2024-11-07 10:58:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated to support raw swagger types

Browse Source
This commit is contained in:
Tony Tam 2012-08-29 16:54:14 -07:00
parent 6113826180
commit 5482cb7822
5 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ abstract class BasicGenerator extends CodegenConfig with PathUtil {
override def apiPackage: Option[String] = Some("com.wordnik.client.api")
var codegen = new Codegen(this)
def m = JsonUtil.getJsonMapper
def json = ScalaJsonUtil.getJsonMapper
def generateClient(args: Array[String]) = {
if (args.length == 0) {
@ -54,8 +54,8 @@ abstract class BasicGenerator extends CodegenConfig with PathUtil {
}
val doc = {
try {
val json = ResourceExtractor.extractListing(getResourcePath(host), apiKey)
m.readValue(json, classOf[Documentation])
val jsonString = ResourceExtractor.extractListing(getResourcePath(host), apiKey)
json.readValue(jsonString, classOf[Documentation])
} catch {
case e: Exception => throw new Exception("unable to read from " + host, e)
}
@ -91,12 +91,14 @@ abstract class BasicGenerator extends CodegenConfig with PathUtil {
})
val apiMap = groupApisToFiles(operations.toList)
for ((identifier, operationList) <- apiMap) {
val basePath = identifier._1
val className = identifier._2
val name = identifier._2
val className = toApiName(name)
val m = new HashMap[String, AnyRef]
m += "name" -> className
m += "name" -> name
m += "className" -> className
m += "basePath" -> basePath
m += "package" -> apiPackage
m += "invokerPackage" -> invokerPackage
@ -104,6 +106,9 @@ abstract class BasicGenerator extends CodegenConfig with PathUtil {
m += "models" -> None
m += "outputDirectory" -> (destinationDir + File.separator + apiPackage.getOrElse("").replaceAll("\\.", File.separator))
m += "newline" -> "\n"
// println(json.writeValueAsString(m))
for ((file, suffix) <- apiTemplateFiles) {
m += "filename" -> (className + suffix)
generateAndWrite(m.toMap, file)
@ -115,6 +120,7 @@ abstract class BasicGenerator extends CodegenConfig with PathUtil {
if (!defaultIncludes.contains(name)) {
val m = new HashMap[String, AnyRef]
m += "name" -> name
m += "className" -> name
m += "apis" -> None
m += "models" -> List((name, schema))
m += "package" -> modelPackage
@ -131,8 +137,6 @@ abstract class BasicGenerator extends CodegenConfig with PathUtil {
codegen.writeSupportingClasses(apiMap.toMap, allModels.toMap)
}
def apiNameFromPath(apiPath: String) = makeApiNameFromPath(apiPath)
def generateAndWrite(bundle: Map[String, AnyRef], templateFile: String) = {
val output = codegen.generateSource(bundle, templateFile)
val outputDir = new File(bundle("outputDirectory").asInstanceOf[String])
@ -148,7 +152,7 @@ abstract class BasicGenerator extends CodegenConfig with PathUtil {
def groupApisToFiles(operations: List[(String /*basePath*/ , String /*apiPath*/ , DocumentationOperation /* operation*/ )]): Map[(String, String), ListBuffer[(String, DocumentationOperation)]] = {
val opMap = new HashMap[(String, String), ListBuffer[(String, DocumentationOperation)]]
for ((basePath, apiPath, operation) <- operations) {
val className = apiNameFromPath(apiPath)
val className = resourceNameFromFullPath(apiPath)
val listToAddTo = opMap.getOrElse((basePath, className), {
val l = new ListBuffer[(String, DocumentationOperation)]
opMap += (basePath, className) -> l

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

@ -146,6 +146,7 @@ class Codegen(config: CodegenConfig) {
var data = Map[String, AnyRef](
"name" -> bundle("name"),
"package" -> bundle("package"),
"className" -> bundle("className"),
"invokerPackage" -> bundle("invokerPackage"),
"imports" -> imports,
"operations" -> f,
@ -192,7 +193,6 @@ class Codegen(config: CodegenConfig) {
def apiToMap(path: String, op: DocumentationOperation): Map[String, AnyRef] = {
var bodyParam: Option[String] = None
var queryParams = new ListBuffer[AnyRef]
val pathParams = new ListBuffer[AnyRef]
val headerParams = new ListBuffer[AnyRef]
@ -202,10 +202,11 @@ class Codegen(config: CodegenConfig) {
if (op.getParameters != null) {
op.getParameters.foreach(param => {
val params = new HashMap[String, AnyRef]
params += (param.paramType + "Param") -> "true"
params += (param.paramType + "Parameter") -> "true"
params += "type" -> param.paramType
params += "defaultValue" -> config.toDefaultValue(param.dataType, param.defaultValue)
params += "dataType" -> config.toDeclaredType(param.dataType)
params += "swaggerDataType" -> param.dataType
params += "description" -> param.description
params += "hasMore" -> "true"
params += "allowMultiple" -> param.allowMultiple.toString
@ -448,6 +449,7 @@ class Codegen(config: CodegenConfig) {
apis.foreach(a => {
apiList += Map(
"name" -> a._1._2,
"className" -> config.toApiName(a._1._2),
"basePath" -> a._1._1,
"operations" -> {
(for (t <- a._2) yield { Map("operation" -> t._2, "path" -> t._1) }).toList
@ -472,6 +474,7 @@ class Codegen(config: CodegenConfig) {
HashMap(
"package" -> config.packageName,
"modelPackage" -> config.modelPackage,
"apiPackage" -> config.apiPackage,
"apis" -> apiList,
"models" -> modelList)

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

@ -37,8 +37,17 @@ trait PathUtil {
}
}
def makeApiNameFromPath(apiPath: String) = {
val name = apiPath.split("/")(1).split("\\.")(0).replaceAll("/", "")
def toApiName(name: String) = {
name.charAt(0).toUpperCase + name.substring(1) + "Api"
}
def nameFromPath(apiPath: String) = {
apiPath.split("/")(1).split("\\.")(0).replaceAll("/", "")
}
def apiNameFromPath(apiPath: String) = toApiName(nameFromPath(apiPath))
def resourceNameFromFullPath(apiPath: String) = {
apiPath.split("/")(1).split("\\.")(0).replaceAll("/", "")
}
}

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

@ -41,6 +41,7 @@ abstract class CodegenConfig {
def modelPackage: Option[String] = None
def escapeReservedWord(word: String) = word
def toApiName(name: String): String
def apiNameFromPath(apiPath: String): String
// only process these apis (by name)

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

@ -263,7 +263,7 @@ class SwaggerSpecValidator(private val doc: Documentation,
case Some(updatedName) => {
if (!p.dataType.equals(updatedName)) {
// LOGGER.finest("--> updated " + dataType + " to " + updatedName)
!!(p, OPERATION_PARAM, format("%s.%s(body: %s)", makeApiNameFromPath(api.getPath()), op.nickname, p.dataType), format("Invalid data type %s. Best guess: %s", p.dataType, updatedName))
!!(p, OPERATION_PARAM, format("%s.%s(body: %s)", apiNameFromPath(api.getPath()), op.nickname, p.dataType), format("Invalid data type %s. Best guess: %s", p.dataType, updatedName))
if (fix) p.dataType = updatedName
}
}
@ -274,7 +274,7 @@ class SwaggerSpecValidator(private val doc: Documentation,
getUpdatedType(validModelNames, dataType) match {
case Some(updatedName) => {
// LOGGER.finest("--> updated " + dataType + " to " + updatedName)
!!(p, OPERATION_PARAM, format("%s.%s(path_%s: %s)", makeApiNameFromPath(api.getPath()), op.nickname, p.name, p.dataType), format("Invalid data type %s. Best guess: %s", p.dataType, updatedName))
!!(p, OPERATION_PARAM, format("%s.%s(path_%s: %s)", apiNameFromPath(api.getPath()), op.nickname, p.name, p.dataType), format("Invalid data type %s. Best guess: %s", p.dataType, updatedName))
if (fix) p.dataType = updatedName
}
case _ => // leave it alone
@ -284,7 +284,7 @@ class SwaggerSpecValidator(private val doc: Documentation,
getUpdatedType(validModelNames, dataType) match {
case Some(updatedName) => {
// LOGGER.finest("--> updated " + dataType + " to " + updatedName)
!!(p, OPERATION_PARAM, format("%s.%s(query_%s: %s)", makeApiNameFromPath(api.getPath()), op.nickname, p.name, p.dataType), format("Invalid %s. Best guess: %s", p.dataType, updatedName))
!!(p, OPERATION_PARAM, format("%s.%s(query_%s: %s)", apiNameFromPath(api.getPath()), op.nickname, p.name, p.dataType), format("Invalid %s. Best guess: %s", p.dataType, updatedName))
if (fix) p.dataType = updatedName
}
case _ => // leave it alone
@ -316,7 +316,7 @@ class SwaggerSpecValidator(private val doc: Documentation,
case Some(updatedName) => {
if (!responseClass.equals(updatedName)) {
LOGGER.finest("--> updated " + responseClass + " to " + updatedName)
!!(op, OPERATION, format("%s.%s(): %s", makeApiNameFromPath(api.getPath()), op.nickname, op.responseClass), format("Invalid response class. Best guess: %s", updatedName))
!!(op, OPERATION, format("%s.%s(): %s", apiNameFromPath(api.getPath()), op.nickname, op.responseClass), format("Invalid response class. Best guess: %s", updatedName))
if (fix) op.responseClass = updatedName
}
}