fix merge mistakes

block · Oct 8, 2024 · 65e68b7 · 65e68b7
1 parent ea0108d
commit 65e68b7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...e/ftl-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/EnumProcessor.java b/...e/ftl-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/EnumProcessor.java
@@ -89,7 +89,8 @@ public void accept(ModuleBuilder moduleBuilder) {
                                     variantClasses.add(variantClazz);
                                 }
                                 if (isVariantLocalToModule) {
-                                    xyz.block.ftl.v1.schema.Type declType = moduleBuilder.buildType(variantType, exported);
+                                    xyz.block.ftl.v1.schema.Type declType = moduleBuilder.buildType(variantType, exported,
+                                            Nullability.NOT_NULL);
                                     TypeValue typeValue = TypeValue.newBuilder().setValue(declType).build();
 
                                     EnumVariant.Builder variantBuilder = EnumVariant.newBuilder()

diff --git a/...-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/TypeAliasProcessor.java b/...-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/TypeAliasProcessor.java
@@ -1,8 +1,11 @@
 package xyz.block.ftl.deployment;
 
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.Type;
 import org.jboss.jandex.TypeVariable;
 import org.slf4j.Logger;