fix: build broke from last PR but I didn't see it :( (#881)

block · Feb 6, 2024 · a5d45c9 · a5d45c9
1 parent bcbf8f7
commit a5d45c9
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 102 deletions.
diff --git a/frontend/src/protos/google/protobuf/timestamp_pb.ts b/frontend/src/protos/google/protobuf/timestamp_pb.ts
diff --git a/frontend/src/protos/opentelemetry/proto/collector/metrics/v1/metrics_service_pb.ts b/frontend/src/protos/opentelemetry/proto/collector/metrics/v1/metrics_service_pb.ts
diff --git a/frontend/src/protos/opentelemetry/proto/common/v1/common_pb.ts b/frontend/src/protos/opentelemetry/proto/common/v1/common_pb.ts
diff --git a/frontend/src/protos/opentelemetry/proto/metrics/v1/metrics_pb.ts b/frontend/src/protos/opentelemetry/proto/metrics/v1/metrics_pb.ts
diff --git a/frontend/src/protos/opentelemetry/proto/resource/v1/resource_pb.ts b/frontend/src/protos/opentelemetry/proto/resource/v1/resource_pb.ts
diff --git a/frontend/src/protos/opentelemetry/proto/trace/v1/trace_pb.ts b/frontend/src/protos/opentelemetry/proto/trace/v1/trace_pb.ts
diff --git a/frontend/src/protos/xyz/block/ftl/v1/schema/schema_pb.ts b/frontend/src/protos/xyz/block/ftl/v1/schema/schema_pb.ts
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
@@ -155,7 +155,6 @@ class ModuleGenerator() {
       type.bool != null -> ClassName("kotlin", "Boolean")
       type.time != null -> ClassName("java.time", "OffsetDateTime")
       type.any != null -> ClassName("kotlin", "Any")
-      type.parameter != null -> TypeVariableName(type.parameter.name)
       type.array != null -> {
         val element = type.array?.element ?: throw IllegalArgumentException(
           "Missing element type in kotlin array generator"

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
@@ -41,7 +41,7 @@ public class TestModule()
           name = "ParamTestData",
           typeParameters = listOf(TypeParameter(name = "T")),
           fields = listOf(
-            Field(name = "t", type = Type(parameter = TypeParameter(name = "T"))),
+            Field(name = "t", type = Type(dataRef = DataRef(name = "T"))),
           )
         )
       ),
@@ -87,7 +87,7 @@ public class TestModule()
               name = "parameterizedDataRef", type = Type(
                 dataRef = DataRef(
                   name = "ParamTestData",
-                  typeParameters = listOf(Type(parameter = TypeParameter(name = "T")))
+                  typeParameters = listOf(Type(dataRef = DataRef(name = "T")))
                 )
               )
             ),

diff --git a/...in-runtime/ftl-runtime/src/main/kotlin/xyz/block/ftl/schemaextractor/ExtractSchemaRule.kt b/...in-runtime/ftl-runtime/src/main/kotlin/xyz/block/ftl/schemaextractor/ExtractSchemaRule.kt
@@ -410,7 +410,7 @@ class SchemaExtractor(
   private fun KotlinType.toSchemaType(position: Position): Type {
     if (this.unwrap().constructor.isTypeParameterTypeConstructor()) {
       return Type(
-        parameter = TypeParameter(
+        dataRef = DataRef(
           name = this.constructor.declarationDescriptor?.name?.asString() ?: "T",
           pos = position,
         )

diff --git a/...untime/ftl-runtime/src/test/kotlin/xyz/block/ftl/schemaextractor/ExtractSchemaRuleTest.kt b/...untime/ftl-runtime/src/test/kotlin/xyz/block/ftl/schemaextractor/ExtractSchemaRuleTest.kt
@@ -131,7 +131,7 @@ internal class ExtractSchemaRuleTest(private val env: KotlinCoreEnvironment) {
             fields = listOf(
               Field(
                 name = "t",
-                type = Type(parameter = TypeParameter(name = "T"))
+                type = Type(dataRef = DataRef(name = "T"))
               ),
               Field(
                 name = "name",

diff --git a/protos/xyz/block/ftl/v1/schema/schema.pb.go b/protos/xyz/block/ftl/v1/schema/schema.pb.go
diff --git a/protos/xyz/block/ftl/v1/schema/schema.proto b/protos/xyz/block/ftl/v1/schema/schema.proto
@@ -184,8 +184,7 @@ message Type {
     DataRef dataRef = 9;
     Unit unit = 10;
     Any any = 11;
-    TypeParameter parameter = 12;
-    Optional optional = 13;
+    Optional optional = 12;
   }
 }