Poorva | Refactor codegenerator. (#207)

Extract Command and Query classes
medly · Oct 31, 2021 · 8a5d96e · 8a5d96e
1 parent 8dc8ae2
commit 8a5d96e
Show file tree

Hide file tree

Showing 18 changed files with 359 additions and 237 deletions.
diff --git a/cli/src/main/kotlin/norm/api/NormApi.kt b/cli/src/main/kotlin/norm/api/NormApi.kt
@@ -13,13 +13,11 @@ class NormApi(
         connection: Connection
 ) {
     private val sqlAnalyzer = SqlAnalyzer(connection)
-    private val codeGenerator = CodeGenerator()
-
     /**
      * Generates code of classes against given SQL Query
      */
     fun generate(query: String, packageName: String, baseName: String): String {
         val sqlModel = sqlAnalyzer.sqlModel(query)
-        return codeGenerator.generate(sqlModel, packageName, baseName)
+        return CodeGenerator.generate(listOf(sqlModel), packageName, baseName)
     }
 }
diff --git a/cli/src/test/kotlin/norm/test/utils/TestUtils.kt b/cli/src/test/kotlin/norm/test/utils/TestUtils.kt
@@ -11,7 +11,7 @@ fun toArgs(str: String): Array<String> = str.split(" ").toTypedArray()
 
 fun codegen(conn: Connection, query: String, pkg: String, base: String): String {
     val sqlModel = SqlAnalyzer(conn).sqlModel(query)
-    return CodeGenerator().generate(sqlModel, pkg, base).trim()
+    return CodeGenerator.generate(listOf(sqlModel), pkg, base).trim()
 }
 
 fun String.readAsResource(): String = object {}.javaClass.getResource(this).readText().trim()
diff --git a/cli/src/test/resources/gen/array-any.expected.txt b/cli/src/test/resources/gen/array-any.expected.txt
@@ -20,12 +20,6 @@ public class FooParamSetter : ParamSetter<FooParams> {
   }
 }
 
-public data class FooResult(
-  public val id: Int,
-  public val firstName: String?,
-  public val lastName: String?
-)
-
 public class FooRowMapper : RowMapper<FooResult> {
   public override fun map(rs: ResultSet): FooResult = FooResult(
   id = rs.getObject("id") as kotlin.Int,
@@ -40,3 +34,9 @@ public class FooQuery : Query<FooParams, FooResult> {
 
   public override val paramSetter: ParamSetter<FooParams> = FooParamSetter()
 }
+
+public data class FooResult(
+  public val id: Int,
+  public val firstName: String?,
+  public val lastName: String?
+)
diff --git a/cli/src/test/resources/gen/array-columns-mapping.expected.txt b/cli/src/test/resources/gen/array-columns-mapping.expected.txt
@@ -18,12 +18,6 @@ public class FooParamSetter : ParamSetter<FooParams> {
   }
 }
 
-public data class FooResult(
-  public val id: Int,
-  public val colors: Array<String>?,
-  public val details: PGobject?
-)
-
 public class FooRowMapper : RowMapper<FooResult> {
   public override fun map(rs: ResultSet): FooResult = FooResult(
   id = rs.getObject("id") as kotlin.Int,
@@ -39,3 +33,8 @@ public class FooQuery : Query<FooParams, FooResult> {
   public override val paramSetter: ParamSetter<FooParams> = FooParamSetter()
 }
 
+public data class FooResult(
+  public val id: Int,
+  public val colors: Array<String>?,
+  public val details: PGobject?
+)
diff --git a/cli/src/test/resources/gen/array-contains.expected.txt b/cli/src/test/resources/gen/array-contains.expected.txt
@@ -20,11 +20,6 @@ public class FooParamSetter : ParamSetter<FooParams> {
   }
 }
 
-public data class FooResult(
-  public val id: Int,
-  public val colors: Array<String>?
-)
-
 public class FooRowMapper : RowMapper<FooResult> {
   public override fun map(rs: ResultSet): FooResult = FooResult(
   id = rs.getObject("id") as kotlin.Int,
@@ -38,3 +33,8 @@ public class FooQuery : Query<FooParams, FooResult> {
 
   public override val paramSetter: ParamSetter<FooParams> = FooParamSetter()
 }
+
+public data class FooResult(
+  public val id: Int,
+  public val colors: Array<String>?
+)
diff --git a/cli/src/test/resources/gen/empty-params-class.expected.txt b/cli/src/test/resources/gen/empty-params-class.expected.txt
@@ -16,12 +16,6 @@ public class FooParamSetter : ParamSetter<FooParams> {
   }
 }
 
-public data class FooResult(
-  public val id: Int,
-  public val firstName: String?,
-  public val lastName: String?
-)
-
 public class FooRowMapper : RowMapper<FooResult> {
   public override fun map(rs: ResultSet): FooResult = FooResult(
   id = rs.getObject("id") as kotlin.Int,
@@ -36,3 +30,10 @@ public class FooQuery : Query<FooParams, FooResult> {
 
   public override val paramSetter: ParamSetter<FooParams> = FooParamSetter()
 }
+
+public data class FooResult(
+  public val id: Int,
+  public val firstName: String?,
+  public val lastName: String?
+)
+
diff --git a/cli/src/test/resources/gen/left-joined-nullable-check.expected.txt b/cli/src/test/resources/gen/left-joined-nullable-check.expected.txt
@@ -17,16 +17,6 @@ public class FooParamSetter : ParamSetter<FooParams> {
   }
 }
 
-public data class FooResult(
-  public val id: Int,
-  public val firstName: String?,
-  public val lastName: String?,
-  public val departmentId: Int?,
-  public val name: String?,
-  public val combinationsId: Int?,
-  public val colors: Array<String>?
-)
-
 public class FooRowMapper : RowMapper<FooResult> {
   public override fun map(rs: ResultSet): FooResult = FooResult(
   id = rs.getObject("id") as kotlin.Int,
@@ -50,3 +40,13 @@ public class FooQuery : Query<FooParams, FooResult> {
 
   public override val paramSetter: ParamSetter<FooParams> = FooParamSetter()
 }
+
+public data class FooResult(
+  public val id: Int,
+  public val firstName: String?,
+  public val lastName: String?,
+  public val departmentId: Int?,
+  public val name: String?,
+  public val combinationsId: Int?,
+  public val colors: Array<String>?
+)
diff --git a/cli/src/test/resources/gen/query-class-generator.expected.txt b/cli/src/test/resources/gen/query-class-generator.expected.txt
@@ -21,12 +21,6 @@ public class FooParamSetter : ParamSetter<FooParams> {
   }
 }
 
-public data class FooResult(
-  public val id: Int,
-  public val firstName: String?,
-  public val lastName: String?
-)
-
 public class FooRowMapper : RowMapper<FooResult> {
   public override fun map(rs: ResultSet): FooResult = FooResult(
   id = rs.getObject("id") as kotlin.Int,
@@ -41,3 +35,9 @@ public class FooQuery : Query<FooParams, FooResult> {
 
   public override val paramSetter: ParamSetter<FooParams> = FooParamSetter()
 }
+
+public data class FooResult(
+  public val id: Int,
+  public val firstName: String?,
+  public val lastName: String?
+)
diff --git a/cli/src/test/resources/gen/uuid-column-type-generator.expected.txt b/cli/src/test/resources/gen/uuid-column-type-generator.expected.txt
@@ -17,14 +17,6 @@ public class FooParamSetter : ParamSetter<FooParams> {
   }
 }
 
-public data class FooResult(
-  public val id: UUID,
-  public val columnName: String?,
-  public val oldValue: String?,
-  public val newValue: String?,
-  public val capturedAt: OffsetDateTime?
-)
-
 public class FooRowMapper : RowMapper<FooResult> {
   public override fun map(rs: ResultSet): FooResult = FooResult(
   id = rs.getObject("id") as java.util.UUID,
@@ -41,3 +33,11 @@ public class FooQuery : Query<FooParams, FooResult> {
 
   public override val paramSetter: ParamSetter<FooParams> = FooParamSetter()
 }
+
+public data class FooResult(
+  public val id: UUID,
+  public val columnName: String?,
+  public val oldValue: String?,
+  public val newValue: String?,
+  public val capturedAt: OffsetDateTime?
+)