From 3e52c71c1b099c16e9005c95afa3e3870711cb97 Mon Sep 17 00:00:00 2001
From: Stewart Stewart <stewinsalot@gmail.com>
Date: Wed, 15 Feb 2017 14:40:54 -0800
Subject: simplify package string generation

---
 src/main/scala/NamespacedCodegen.scala | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'src/main/scala/NamespacedCodegen.scala')

diff --git a/src/main/scala/NamespacedCodegen.scala b/src/main/scala/NamespacedCodegen.scala
index 7e1423a..5487b41 100644
--- a/src/main/scala/NamespacedCodegen.scala
+++ b/src/main/scala/NamespacedCodegen.scala
@@ -83,14 +83,6 @@ object Generator {
 
 }
 
-class PackageNameGenerator(pkg: String, dbModel: Model)
-    extends SourceCodeGenerator(dbModel) {
-  override def code: String =
-    s"""|package ${pkg}
-        |
-        |""".stripMargin
-}
-
 class ImportGenerator(dbModel: Model, schemaImports: List[String])
     extends SourceCodeGenerator(dbModel) {
   override def code: String =
@@ -109,7 +101,6 @@ class Generator(pkg: String,
     extends SourceCodeGenerator(schemaOnlyModel)
     with OutputHelpers {
 
-  val packageName = new PackageNameGenerator(pkg, fullDatabaseModel).code
   val allImports: String =
     new ImportGenerator(fullDatabaseModel, schemaImports).code
 
@@ -126,12 +117,14 @@ class Generator(pkg: String,
                            pkg: String,
                            container: String,
                            parentType: Option[String]): String = {
-    packageName + allImports + s"""|object ${container} extends {
-                                   |  val profile = $profile
-                                   |} with $schemaBaseClass {
-                                   |  import profile.api._
-                                   |  ${code}
-                                   |}""".stripMargin
+    s"""|package $pkg
+        |$allImports
+        |object ${container} extends {
+        |  val profile = $profile
+        |} with $schemaBaseClass {
+        |  import profile.api._
+        |  ${code}
+        |}""".stripMargin
     // TODO: use parentType
   }
 
-- 
cgit v1.2.3