Extract schema from type enum holder classes

block · Oct 2, 2024 · fdfbc89 · fdfbc89
1 parent 401feab
commit fdfbc89
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...e/ftl-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/ModuleBuilder.java b/...e/ftl-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/ModuleBuilder.java
@@ -531,8 +531,8 @@ private boolean updateEnum(String name, Decl decl) {
                     .setExport(export)
                     .build();
             decls.put(name, Decl.newBuilder().setEnum(merged).build());
-            if (export && !existing.getEnum().getExport()) {
-                // If the existing enum was not exported, we need to update variants too
+            if (export) {
+                // Need to update export on variants too
                 for (var childDecl : merged.getVariantsList()) {
                     if (childDecl.getValue().hasTypeValue() && childDecl.getValue().getTypeValue().getValue().hasRef()) {
                         var ref = childDecl.getValue().getTypeValue().getValue().getRef();

diff --git a/...me/java/deployment/src/main/java/xyz/block/ftl/javalang/deployment/JavaCodeGenerator.java b/...me/java/deployment/src/main/java/xyz/block/ftl/javalang/deployment/JavaCodeGenerator.java
@@ -27,6 +27,7 @@
 import com.squareup.javapoet.TypeVariableName;
 import com.squareup.javapoet.WildcardTypeName;
 
+import xyz.block.ftl.EnumHolder;
 import xyz.block.ftl.GeneratedRef;
 import xyz.block.ftl.Subscription;
 import xyz.block.ftl.TypeAlias;
@@ -170,6 +171,7 @@ protected void generateEnum(Module module, Enum data, String packageName, Map<De
                     // Value type isn't a Ref, so we make a wrapper class that implements our interface
                     TypeSpec.Builder dataBuilder = TypeSpec.classBuilder(className(name))
                             .addAnnotation(getGeneratedRefAnnotation(module.getName(), name))
+                            .addAnnotation(AnnotationSpec.builder(EnumHolder.class).build())
                             .addModifiers(Modifier.PUBLIC, Modifier.FINAL);
                     dataBuilder.addField(valueTypeName, "value", Modifier.PRIVATE, Modifier.FINAL);
                     dataBuilder.addMethod(MethodSpec.constructorBuilder()
@@ -201,6 +203,8 @@ protected void generateDataObject(Module module, Data data, String packageName,
         TypeSpec.Builder dataBuilder = TypeSpec.classBuilder(thisType)
                 .addAnnotation(getGeneratedRefAnnotation(module.getName(), data.getName()))
                 .addModifiers(Modifier.PUBLIC);
+
+        // if data is part of a type enum, generate the interface methods for each variant
         DeclRef key = new DeclRef(module.getName(), data.getName());
         if (enumVariantInfoMap.containsKey(key)) {
             for (var enumVariantInfo : enumVariantInfoMap.get(key)) {
@@ -214,8 +218,8 @@ protected void generateDataObject(Module module, Data data, String packageName,
                         variantTypeName, variantValuesTypes, true);
             }
         }
-        MethodSpec.Builder allConstructor = MethodSpec.constructorBuilder().addModifiers(Modifier.PUBLIC);
 
+        MethodSpec.Builder allConstructor = MethodSpec.constructorBuilder().addModifiers(Modifier.PUBLIC);
         dataBuilder.addMethod(allConstructor.build());
         for (var param : data.getTypeParametersList()) {
             dataBuilder.addTypeVariable(TypeVariableName.get(param.getName()));