Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Enums in JVM #2842

Merged
merged 39 commits into from
Oct 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
30604d9
rename javamodule to javaclient
tomdaffurn Sep 25, 2024
1f7ec20
rename verbs to javaserver
tomdaffurn Sep 25, 2024
39db3ee
move comment test code to javaserver
tomdaffurn Sep 25, 2024
e7fcb2e
Generate enums in Java
tomdaffurn Sep 26, 2024
f1dda75
Handle a Decl used in multiple enums
tomdaffurn Sep 26, 2024
e03433a
Reused enums not working in Go. Fix in Java
tomdaffurn Sep 27, 2024
37b3a16
Write @Enum annotation into generated enums
tomdaffurn Sep 30, 2024
6520f9f
Write @Enum annotation into generated enums
tomdaffurn Sep 30, 2024
8d1ffae
Quarkus build processors log their task count
tomdaffurn Sep 30, 2024
4bd062d
Quarkus build processors log their task count
tomdaffurn Sep 30, 2024
5066685
Extract schema for value enums
tomdaffurn Sep 30, 2024
ef7668f
Merge branch 'main' into tom/jvm-enum-extract
tomdaffurn Sep 30, 2024
9fc1872
Validate enums field and type
tomdaffurn Oct 1, 2024
085784d
Properly handle enums. Validate schema name clashes
tomdaffurn Oct 1, 2024
15fc6b7
Clean up logs from processors
tomdaffurn Oct 1, 2024
8b1f40b
Extract schema from type enums
tomdaffurn Oct 2, 2024
2be4671
Extract schema from type enum holder classes
tomdaffurn Oct 2, 2024
401feab
merge from main; resolve conflicts
tomdaffurn Oct 2, 2024
fdfbc89
Extract schema from type enum holder classes
tomdaffurn Oct 2, 2024
fed496b
Serialise/deserialize value enums
tomdaffurn Oct 4, 2024
8836dec
Serialise/deserialize type enums
tomdaffurn Oct 8, 2024
319997c
update integration tests
tomdaffurn Oct 8, 2024
ea0108d
merge from main; resolve conflicts
tomdaffurn Oct 8, 2024
65e68b7
fix merge mistakes
tomdaffurn Oct 8, 2024
7f964c2
revert whitespace
tomdaffurn Oct 8, 2024
ee192a6
whitespace
tomdaffurn Oct 8, 2024
4ea9f38
whitespace
tomdaffurn Oct 8, 2024
63d3e64
Merge branch 'main' into tom/jvm-enum-extract
tomdaffurn Oct 9, 2024
361d491
Merge branch 'main' into tom/jvm-enum-extract
tomdaffurn Oct 9, 2024
65c4233
fix typealias exceptions
tomdaffurn Oct 9, 2024
a3395bd
fix accidental whitespace
tomdaffurn Oct 9, 2024
f7d1bba
refactor EnumProcessor for clarity
tomdaffurn Oct 9, 2024
b937adc
comments
tomdaffurn Oct 9, 2024
dc6b07e
fix errors
tomdaffurn Oct 9, 2024
16d77c2
comments
tomdaffurn Oct 9, 2024
9fd824f
Don't produce decls for type aliases in other modules
tomdaffurn Oct 9, 2024
959fd2e
fix integration tests
tomdaffurn Oct 9, 2024
b8b1b50
cleanup
tomdaffurn Oct 9, 2024
5f0f0a3
change to jboss logger
tomdaffurn Oct 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
rename javamodule to javaclient
  • Loading branch information
tomdaffurn committed Sep 25, 2024
commit 30604d95ecdf76d5a1a9c57527956cf9fba1fb81
6 changes: 3 additions & 3 deletions jvm-runtime/jvm_integration_test.go
Original file line number Diff line number Diff line change
@@ -147,10 +147,10 @@ func TestJVMToGoCall(t *testing.T) {
in.Run(t,
in.WithJavaBuild(),
in.CopyModuleWithLanguage("gomodule", "go"),
in.CopyModuleWithLanguage("javamodule", "java"),
in.CopyModuleWithLanguage("javaclient", "java"),
in.CopyModuleWithLanguage("kotlinmodule", "kotlin"),
in.Deploy("gomodule"),
in.Deploy("javamodule"),
in.Deploy("javaclient"),
in.Deploy("kotlinmodule"),
in.SubTests(tests...),
)
@@ -175,7 +175,7 @@ func PairedTest(name string, testFunc func(module string) in.Action) []in.SubTes
},
{
Name: name + "-java",
Action: testFunc("javamodule"),
Action: testFunc("javaclient"),
},
{
Name: name + "-kotlin",
2 changes: 2 additions & 0 deletions jvm-runtime/testdata/java/javaclient/ftl.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
module = "javaclient"
language = "java"
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>xyz.block.ftl.examples</groupId>
<artifactId>javamodule</artifactId>
<artifactId>javaclient</artifactId>
<version>1.0-SNAPSHOT</version>

<parent>
2 changes: 0 additions & 2 deletions jvm-runtime/testdata/java/javamodule/ftl.toml

This file was deleted.

File renamed without changes.
File renamed without changes.