mirror of
https://github.com/valitydev/openapi-generator.git
synced 2024-11-07 19:08:52 +00:00
Merge pull request #187 from earldouglas/return-generated-files
Return files generated from BasicGenerator#generateClientWithoutExit
This commit is contained in:
Tony Tam
commit
be44221d98
@ -43,12 +43,12 @@ abstract class BasicGenerator extends CodegenConfig with PathUtil {
|
||||
|
||||
var codegen = new Codegen(this)
|
||||
|
||||
def generateClient(args: Array[String]) = {
|
||||
def generateClient(args: Array[String]): Unit = {
|
||||
generateClientWithoutExit(args)
|
||||
System.exit(0)
|
||||
}
|
||||
|
||||
def generateClientWithoutExit(args: Array[String]) {
|
||||
def generateClientWithoutExit(args: Array[String]): Seq[File] = {
|
||||
if (args.length == 0) {
|
||||
throw new RuntimeException("Need url to resource listing as argument. You can also specify VM Argument -DfileMap=/path/to/folder/containing.resources.json/")
|
||||
}
|
||||
|
||||
@ -555,87 +555,110 @@ class Codegen(config: CodegenConfig) {
|
||||
write(m)
|
||||
}
|
||||
|
||||
def writeSupportingClasses(apis: Map[(String, String), List[(String, Operation)]], models: Map[String, Model], apiVersion: String) = {
|
||||
val rootDir = new java.io.File(".")
|
||||
val engine = new TemplateEngine(Some(rootDir))
|
||||
final def writeSupportingClasses(
|
||||
apis: Map[(String, String), List[(String, Operation)]],
|
||||
models: Map[String, Model],
|
||||
apiVersion: String,
|
||||
rootDir: Option[File],
|
||||
dataF: (Map[(String, String), List[(String, Operation)]], Map[String, Model]) => Map[String, AnyRef]): Seq[File] = {
|
||||
|
||||
val apiList = new ListBuffer[Map[String, AnyRef]]
|
||||
apis.foreach(a => {
|
||||
apiList += Map(
|
||||
"name" -> a._1._2,
|
||||
"filename" -> config.toApiFilename(a._1._2),
|
||||
"className" -> config.toApiName(a._1._2),
|
||||
"basePath" -> a._1._1,
|
||||
"operations" -> {
|
||||
(for (t <- a._2) yield { Map("operation" -> apiToMap(t._1, t._2), "path" -> t._1) }).toList
|
||||
})
|
||||
})
|
||||
val engine = new TemplateEngine(rootDir orElse Some(new File(".")))
|
||||
val data = dataF(apis, models)
|
||||
|
||||
val modelList = new ListBuffer[HashMap[String, AnyRef]]
|
||||
|
||||
models.foreach(m => {
|
||||
val json = writeJson(m._2)
|
||||
modelList += HashMap(
|
||||
"modelName" -> m._1,
|
||||
"model" -> modelToMap(m._1, m._2),
|
||||
"filename" -> config.toModelFilename(m._1),
|
||||
"modelJson" -> json,
|
||||
"hasMoreModels" -> "true")
|
||||
})
|
||||
modelList.size match {
|
||||
case 0 =>
|
||||
case _ => modelList.last.asInstanceOf[HashMap[String, String]] -= "hasMoreModels"
|
||||
}
|
||||
|
||||
val data: HashMap[String, AnyRef] =
|
||||
HashMap(
|
||||
"invokerPackage" -> config.invokerPackage,
|
||||
"package" -> config.packageName,
|
||||
"modelPackage" -> config.modelPackage,
|
||||
"apiPackage" -> config.apiPackage,
|
||||
"apis" -> apiList,
|
||||
"models" -> modelList,
|
||||
"apiVersion" -> apiVersion) ++ config.additionalParams
|
||||
|
||||
config.supportingFiles.map(file => {
|
||||
val outputFiles = config.supportingFiles map { file =>
|
||||
val supportingFile = file._1
|
||||
val outputDir = file._2
|
||||
val destFile = file._3
|
||||
|
||||
val outputFilename = outputDir + File.separator + destFile
|
||||
val outputFolder = new File(outputFilename).getParent
|
||||
val outputFile = new File(outputDir.replaceAll("\\.", File.separator) + File.separator + destFile)
|
||||
val outputFolder = outputFile.getParent
|
||||
new File(outputFolder).mkdirs
|
||||
|
||||
if (supportingFile.endsWith(".mustache")) {
|
||||
val output = {
|
||||
val (resourceName, (_, template)) = compileTemplate(supportingFile, Some(rootDir), Some(engine))
|
||||
val (resourceName, (_, template)) = compileTemplate(supportingFile, rootDir, Some(engine))
|
||||
engine.layout(resourceName, template, data.toMap)
|
||||
}
|
||||
val fw = new FileWriter(outputFilename, false)
|
||||
val fw = new FileWriter(outputFile, false)
|
||||
fw.write(output + "\n")
|
||||
fw.close()
|
||||
println("wrote " + outputFilename)
|
||||
println("wrote " + outputFile.getPath())
|
||||
} else {
|
||||
val file = new File(config.templateDir + File.separator + supportingFile)
|
||||
if(file.isDirectory()) {
|
||||
if (file.isDirectory()) {
|
||||
// copy the whole directory
|
||||
FileUtils.copyDirectory(file, new File(outputDir))
|
||||
println("copied directory " + supportingFile)
|
||||
} else {
|
||||
val is = getInputStream(config.templateDir + File.separator + supportingFile)
|
||||
val outputFile = new File(outputFilename)
|
||||
val parentDir = new File(outputFile.getParent)
|
||||
val parentDir = outputFile.getParentFile()
|
||||
if (parentDir != null && !parentDir.exists) {
|
||||
println("making directory: " + parentDir.toString + ": " + parentDir.mkdirs)
|
||||
}
|
||||
FileUtils.copyInputStreamToFile(is, new File(outputFilename))
|
||||
println("copied " + outputFilename)
|
||||
FileUtils.copyInputStreamToFile(is, outputFile)
|
||||
println("copied " + outputFile.getPath())
|
||||
is.close
|
||||
}
|
||||
}
|
||||
})
|
||||
outputFile
|
||||
}
|
||||
//a shutdown method will be added to scalate in an upcoming release
|
||||
engine.compiler.shutdown()
|
||||
outputFiles
|
||||
}
|
||||
|
||||
def writeSupportingClasses(apis: Map[(String, String), List[(String, Operation)]],
|
||||
models: Map[String, Model], apiVersion: String): Seq[File] = {
|
||||
|
||||
val rootDir: Option[File] = Some(new File("."))
|
||||
|
||||
def apiListF(apis: Map[(String, String), List[(String, Operation)]]): List[Map[String, AnyRef]] = {
|
||||
val apiList = new ListBuffer[Map[String, AnyRef]]
|
||||
apis.foreach(a => {
|
||||
apiList += Map(
|
||||
"name" -> a._1._2,
|
||||
"filename" -> config.toApiFilename(a._1._2),
|
||||
"className" -> config.toApiName(a._1._2),
|
||||
"basePath" -> a._1._1,
|
||||
"operations" -> {
|
||||
(for (t <- a._2) yield { Map("operation" -> apiToMap(t._1, t._2), "path" -> t._1) }).toList
|
||||
})
|
||||
})
|
||||
apiList.toList
|
||||
}
|
||||
|
||||
def modelListF(models: Map[String, Model]): List[Map[String, AnyRef]] = {
|
||||
val modelList = new ListBuffer[HashMap[String, AnyRef]]
|
||||
|
||||
models.foreach(m => {
|
||||
val json = writeJson(m._2)
|
||||
modelList += HashMap(
|
||||
"modelName" -> m._1,
|
||||
"model" -> modelToMap(m._1, m._2),
|
||||
"filename" -> config.toModelFilename(m._1),
|
||||
"modelJson" -> json,
|
||||
"hasMoreModels" -> "true")
|
||||
})
|
||||
modelList.size match {
|
||||
case 0 =>
|
||||
case _ => modelList.last.asInstanceOf[HashMap[String, String]] -= "hasMoreModels"
|
||||
}
|
||||
|
||||
modelList.map(_.toMap).toList
|
||||
}
|
||||
|
||||
def dataF(apis: Map[(String, String), List[(String, Operation)]],
|
||||
models: Map[String, Model]): Map[String, AnyRef] =
|
||||
Map(
|
||||
"invokerPackage" -> config.invokerPackage,
|
||||
"package" -> config.packageName,
|
||||
"modelPackage" -> config.modelPackage,
|
||||
"apiPackage" -> config.apiPackage,
|
||||
"apis" -> apiListF(apis),
|
||||
"models" -> modelListF(models),
|
||||
"apiVersion" -> apiVersion) ++ config.additionalParams
|
||||
|
||||
writeSupportingClasses(apis, models, apiVersion, rootDir, dataF)
|
||||
}
|
||||
|
||||
protected def isListType(dt: String) = isCollectionType(dt, "List") || isCollectionType(dt, "Array") || isCollectionType(dt, "Set")
|
||||
|
||||
@ -114,91 +114,55 @@ object ScalaAsyncClientGenerator extends App {
|
||||
}
|
||||
|
||||
class AsyncClientCodegen(clientName: String, config: CodegenConfig, rootDir: Option[File] = None) extends Codegen(config) {
|
||||
override def writeSupportingClasses(apis: Map[(String, String), List[(String, Operation)]], models: Map[String, Model], apiVersion: String) = {
|
||||
val engine = new TemplateEngine(rootDir orElse Some(new File(".")))
|
||||
|
||||
val apiList = new ListBuffer[Map[String, AnyRef]]
|
||||
override def writeSupportingClasses(apis: Map[(String, String), List[(String, Operation)]],
|
||||
models: Map[String, Model], apiVersion: String): Seq[File] = {
|
||||
|
||||
apis.map(a => {
|
||||
apiList += Map(
|
||||
"name" -> a._1._2,
|
||||
"filename" -> config.toApiFilename(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
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
|
||||
val modelList = new ListBuffer[HashMap[String, AnyRef]]
|
||||
|
||||
models.foreach(m => {
|
||||
val json = write(m._2)
|
||||
def apiListF(apis: Map[(String, String), List[(String, Operation)]]): List[Map[String, AnyRef]] = {
|
||||
val apiList = new ListBuffer[Map[String, AnyRef]]
|
||||
apis.map(a => {
|
||||
apiList += Map(
|
||||
"name" -> a._1._2,
|
||||
"filename" -> config.toApiFilename(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
|
||||
})
|
||||
})
|
||||
apiList.toList
|
||||
}
|
||||
|
||||
def modelListF(models: Map[String, Model]): List[Map[String, AnyRef]] = {
|
||||
val modelList = new ListBuffer[HashMap[String, AnyRef]]
|
||||
models.foreach(m => {
|
||||
val json = write(m._2)
|
||||
modelList += HashMap(
|
||||
"modelName" -> m._1,
|
||||
"model" -> m._2,
|
||||
"filename" -> config.toModelFilename(m._1),
|
||||
"modelJson" -> json,
|
||||
"hasMore" -> "true")
|
||||
})
|
||||
modelList.size match {
|
||||
case 0 =>
|
||||
case _ => modelList.last.asInstanceOf[HashMap[String, String]] -= "hasMore"
|
||||
})
|
||||
modelList.size match {
|
||||
case 0 =>
|
||||
case _ => modelList.last.asInstanceOf[HashMap[String, String]] -= "hasMore"
|
||||
}
|
||||
modelList.map(_.toMap).toList
|
||||
}
|
||||
|
||||
val data =
|
||||
def dataF(apis: Map[(String, String), List[(String, Operation)]],
|
||||
models: Map[String, Model]): Map[String, AnyRef] =
|
||||
Map(
|
||||
"clientName" -> clientName.underscore.pascalize,
|
||||
"projectName" -> clientName.underscore.dasherize,
|
||||
"package" -> config.packageName,
|
||||
"modelPackage" -> config.modelPackage,
|
||||
"apiPackage" -> config.apiPackage,
|
||||
"apis" -> apiList,
|
||||
"models" -> modelList)
|
||||
"apis" -> apiListF(apis),
|
||||
"models" -> modelListF(models))
|
||||
|
||||
config.supportingFiles.map(file => {
|
||||
val supportingFile = file._1
|
||||
val outputDir = file._2
|
||||
val destFile = file._3
|
||||
|
||||
val outputFilename = outputDir.replaceAll("\\.", File.separator) + File.separator + destFile
|
||||
val outputFolder = new File(outputFilename).getParent
|
||||
new File(outputFolder).mkdirs
|
||||
|
||||
if (supportingFile.endsWith(".mustache")) {
|
||||
val output = {
|
||||
val (resourceName, (_, template)) = compileTemplate(supportingFile, rootDir, Some(engine))
|
||||
engine.layout(resourceName, template, data.toMap)
|
||||
}
|
||||
val fw = new FileWriter(outputFilename, false)
|
||||
fw.write(output + "\n")
|
||||
fw.close()
|
||||
println("wrote " + outputFilename)
|
||||
} else {
|
||||
val file = new File(config.templateDir + File.separator + supportingFile)
|
||||
if(file.isDirectory) {
|
||||
// copy the whole directory
|
||||
FileUtils.copyDirectory(file, new File(outputDir))
|
||||
println("copied directory " + supportingFile)
|
||||
} else {
|
||||
val is = getInputStream(config.templateDir + File.separator + supportingFile)
|
||||
val outputFile = new File(outputFilename)
|
||||
val parentDir = new File(outputFile.getParent)
|
||||
if (parentDir != null && !parentDir.exists) {
|
||||
println("making directory: " + parentDir.toString + ": " + parentDir.mkdirs)
|
||||
}
|
||||
FileUtils.copyInputStreamToFile(is, new File(outputFilename))
|
||||
println("copied " + outputFilename)
|
||||
is.close
|
||||
}
|
||||
}
|
||||
})
|
||||
//a shutdown method will be added to scalate in an upcoming release
|
||||
|
||||
engine.compiler.shutdown()
|
||||
writeSupportingClasses(apis, models, apiVersion, rootDir, dataF)
|
||||
}
|
||||
|
||||
override protected def compileTemplate(templateFile: String, rootDir: Option[File] = None, engine: Option[TemplateEngine] = None): (String, (TemplateEngine, Template)) = {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user