chore: small naming fixes

block · Sep 28, 2023 · 1e27e57 · 1e27e57
1 parent 92db013
commit 1e27e57
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/kotlin-runtime/ftl-generator/src/main/kotlin/xyz/block/ftl/generator/ModuleGenerator.kt b/kotlin-runtime/ftl-generator/src/main/kotlin/xyz/block/ftl/generator/ModuleGenerator.kt
@@ -41,13 +41,13 @@ class ModuleGenerator() {
     }
   }
 
-  internal fun generateModule(schema: Module): FileSpec {
-    val namespace = "ftl.${schema.name}"
-    val className = schema.name.replaceFirstChar(Char::titlecase)
+  internal fun generateModule(module: Module): FileSpec {
+    val namespace = "ftl.${module.name}"
+    val className = module.name.replaceFirstChar(Char::titlecase)
     val file = FileSpec.builder(namespace, className)
-      .addFileComment("Code generated by FTL-Plugin, do not edit.")
+      .addFileComment("Code generated by FTL-Generator, do not edit.")
 
-    schema.comments.let {
+    module.comments.let {
       file.addFileComment("\n")
       file.addFileComment(it.joinToString("\n"))
     }
@@ -58,10 +58,10 @@ class ModuleGenerator() {
         FunSpec.constructorBuilder().build()
       )
 
-    val types = schema.decls.mapNotNull { it.data_ }
+    val types = module.decls.mapNotNull { it.data_ }
     types.forEach { file.addType(buildDataClass(it)) }
 
-    val verbs = schema.decls.mapNotNull { it.verb }
+    val verbs = module.decls.mapNotNull { it.verb }
     verbs.forEach { moduleClass.addFunction(buildVerbFunction(className, it)) }
 
     file.addType(moduleClass.build())

diff --git a/kotlin-runtime/ftl-generator/src/test/kotlin/xyz/block/ftl/generator/ModuleGeneratorTest.kt b/kotlin-runtime/ftl-generator/src/test/kotlin/xyz/block/ftl/generator/ModuleGeneratorTest.kt
@@ -32,7 +32,7 @@ class ModuleGeneratorTest {
   @Test
   fun `should generate basic module`() {
     val file = generator.generateModule(Module(name = "test"))
-    val expected = """// Code generated by FTL-Plugin, do not edit.
+    val expected = """// Code generated by FTL-Generator, do not edit.
 //
 package ftl.test
 
@@ -83,7 +83,7 @@ public class Test()
     val module = Module(name = "test", comments = listOf("Module comments"), decls = decls)
 
     val file = generator.generateModule(module)
-    val expected = """// Code generated by FTL-Plugin, do not edit.
+    val expected = """// Code generated by FTL-Generator, do not edit.
 // Module comments
 package ftl.test
 
@@ -156,7 +156,7 @@ public class Test()
     )
     val module = Module(name = "test", comments = listOf("Module comments"), decls = decls)
     val file = generator.generateModule(module)
-    val expected = """// Code generated by FTL-Plugin, do not edit.
+    val expected = """// Code generated by FTL-Generator, do not edit.
 // Module comments
 package ftl.test