From ff50d1e7a8f57dcf36858ae36f864fb02a6187f1 Mon Sep 17 00:00:00 2001 From: Stewart Stewart Date: Fri, 23 Sep 2016 11:26:43 -0400 Subject: reuse built in file output helpers --- src/main/scala/NamespacedCodegen.scala | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'src/main/scala') diff --git a/src/main/scala/NamespacedCodegen.scala b/src/main/scala/NamespacedCodegen.scala index f079b3a..908d832 100644 --- a/src/main/scala/NamespacedCodegen.scala +++ b/src/main/scala/NamespacedCodegen.scala @@ -21,8 +21,6 @@ object Generator { val parsedSchemas: Map[String, List[String]] = SchemaParser.parse(schemaNames) val dbModel: Model = Await.result(dc.db.run(SchemaParser.createModel(dc.driver, parsedSchemas)), Duration.Inf) - FileHelpers.createOutputPath(outputPath) - val generator = new Generator(uri, pkg, dbModel, outputPath, manualForeignKeys) val generatedCode = generator.code parsedSchemas.keys.map(schemaName => FileHelpers.schemaOutputPath(outputPath, schemaName)) @@ -79,9 +77,11 @@ class Generator(uri: URI, pkg: String, dbModel: Model, outputPath: String, manua |} """.stripMargin - FileHelpers.write( - FileHelpers.schemaOutputPath(outputPath, schemaName), - allImports + generatedSchema + writeStringToFile( + outputPath, + allImports + generatedSchema, + pkg, + schemaName ) generatedSchema @@ -220,17 +220,6 @@ object TypeGenerator extends StringGeneratorHelpers { object FileHelpers { - def schemaOutputPath(path: String, schemaName: String): String = Paths.get(path, s"${schemaName}.scala").toAbsolutePath().toString() - - def createOutputPath(path: String): Boolean = (new File(path)).mkdirs() - - def write(filename: String, content: String) = { - val file = new File(filename) - val bw = new BufferedWriter(new FileWriter(file)) - bw.write(content) - bw.close() - } - } -- cgit v1.2.3