fix: JsonAlias on getters / setters (#5660)

Author: stuartwdouglas

jvm-runtime/ftl-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/ModuleBuilder.java

@@ -886,8 +886,12 @@ private void buildDataElement(Data.Builder data, DotName className, Visibility v
             if (!Modifier.isStatic(field.flags())) {
                 Field.Builder builder = Field.newBuilder().setName(field.name())
                         .setType(buildType(field.type(), visibility, field));
-                if (field.hasAnnotation(JsonAlias.class)) {
-                    var aliases = field.annotation(JsonAlias.class);
+                MethodInfo getter = clazz.method(accessorName(field));
+                var aliases = field.annotation(JsonAlias.class);
+                if (aliases == null && getter != null) {
+                    aliases = getter.annotation(JsonAlias.class);
+                }
+                if (aliases != null) {
                     if (aliases.value() != null) {
                         for (var alias : aliases.value().asStringArray()) {
                             builder.addMetadata(
@@ -897,8 +901,11 @@ private void buildDataElement(Data.Builder data, DotName className, Visibility v
                         }
                     }
                 }
-                if (field.hasAnnotation(JsonProperty.class)) {
-                    var jsonProperty = field.annotation(JsonProperty.class);
+                var jsonProperty = field.annotation(JsonProperty.class);
+                if (jsonProperty == null && getter != null) {
+                    jsonProperty = getter.annotation(JsonProperty.class);
+                }
+                if (jsonProperty != null) {
                     if (jsonProperty.value() != null && !jsonProperty.value().asString().isEmpty()) {
                         builder.setName(jsonProperty.value().asString());
                     }
@@ -909,6 +916,14 @@ private void buildDataElement(Data.Builder data, DotName className, Visibility v
         buildDataElement(data, clazz.superName(), visibility);
     }
 
+    private String accessorName(FieldInfo field) {
+        if (field.type().kind() == org.jboss.jandex.Type.Kind.PRIMITIVE
+                && field.type().asPrimitiveType().primitive() == PrimitiveType.Primitive.BOOLEAN) {
+            return "is" + Character.toUpperCase(field.name().charAt(0)) + field.name().substring(1);
+        }
+        return "get" + Character.toUpperCase(field.name().charAt(0)) + field.name().substring(1);
+    }
+
     public ModuleBuilder addDecls(Decl decl) {
         if (decl.hasData()) {
             if (this.decls.containsKey(decl.getData().getName())) {

jvm-runtime/ftl-runtime/java/deployment/src/test/java/xyz/block/ftl/kotlin/deployment/test/seralization/JsonAliasTest.java

@@ -0,0 +1,74 @@
+package xyz.block.ftl.kotlin.deployment.test.seralization;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.fasterxml.jackson.annotation.JsonAlias;
+
+import io.quarkus.test.QuarkusUnitTest;
+import xyz.block.ftl.Data;
+import xyz.block.ftl.kotlin.deployment.test.SchemaUtil;
+import xyz.block.ftl.schema.v1.Decl;
+
+public class JsonAliasTest {
+
+    // Start unit test with your extension loaded
+    @RegisterExtension
+    static final QuarkusUnitTest unitTest = new QuarkusUnitTest()
+            .setArchiveProducer(() -> {
+                var archive = ShrinkWrap.create(JavaArchive.class);
+                archive.addClass(SchemaUtil.class);
+                return archive;
+            });
+
+    @Test
+    public void testDataWithJsonAlias() throws Exception {
+        var module = SchemaUtil.getSchema();
+        Assertions.assertEquals(1, module.getDeclsCount());
+        var e = module.getDeclsList().stream().filter(Decl::hasData).findFirst().orElseThrow();
+        Assertions.assertEquals("Person", e.getData().getName());
+        Assertions.assertEquals(2, e.getData().getFieldsCount());
+        for (var field : e.getData().getFieldsList()) {
+            switch (field.getName()) {
+                case "first" -> {
+                    Assertions.assertEquals("given", field.getMetadata(0).getAlias().getAlias());
+                    Assertions.assertTrue(field.getType().hasString());
+                }
+                case "last" -> {
+                    Assertions.assertEquals("surname", field.getMetadata(0).getAlias().getAlias());
+                    Assertions.assertTrue(field.getType().hasString());
+                }
+                default -> throw new AssertionError("Unexpected field: " + field.getName());
+            }
+
+        }
+    }
+
+    @Data
+    public static class Person {
+        @JsonAlias("given")
+        String first;
+
+        String last;
+
+        @JsonAlias("surname")
+        public String getLast() {
+            return last;
+        }
+
+        public void setLast(String last) {
+            this.last = last;
+        }
+
+        public String getFirst() {
+            return first;
+        }
+
+        public void setFirst(String first) {
+            this.first = first;
+        }
+    }
+}

jvm-runtime/ftl-runtime/java/deployment/src/test/java/xyz/block/ftl/kotlin/deployment/test/seralization/verbs/JsonPropertyTest.java renamed to jvm-runtime/ftl-runtime/java/deployment/src/test/java/xyz/block/ftl/kotlin/deployment/test/seralization/JsonPropertyTest.java

@@ -1,4 +1,4 @@
-package xyz.block.ftl.kotlin.deployment.test.seralization.verbs;
+package xyz.block.ftl.kotlin.deployment.test.seralization;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;