Skip to content
Merged
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Strata/DDM/Integration/Java/Gen.lean
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ structure types at compile time and generates Java source code consisting of:

## Container types

`List α` → `java.util.List<T>`, `Option α` → nullable `T`
`List α` → `java.util.List<T>`, `Option α` → `java.util.Optional<T>`
-/

namespace Strata.Java
Expand Down Expand Up @@ -242,7 +242,7 @@ private meta def javaTypeForInfo : FieldTypeInfo → String
| .leaf name => (leafJavaType name).getD "java.lang.Object"
| .compound name => escapeJavaName (toPascalCase (name.getString!))
| .list elem => s!"java.util.List<{javaBoxedTypeForInfo elem}>"
| .option elem => javaBoxedTypeForInfo elem
| .option elem => s!"java.util.Optional<{javaBoxedTypeForInfo elem}>"
where
javaBoxedTypeForInfo : FieldTypeInfo → String
| .leaf ``Nat | .leaf ``Int => "Long"
Expand All @@ -263,8 +263,8 @@ private meta partial def serializeExprForInfo (ti : FieldTypeInfo) (accessor : S
-- This branch is used for inner elements of containers (e.g., Option (List T)).
s!"{accessor}.toIon(ion)"
| .option elem =>
let inner := serializeExprForInfo elem accessor
s!"({accessor} != null ? {inner} : ion.newNull())"
let inner := serializeExprForInfo elem s!"{accessor}.get()"
s!"({accessor}.isPresent() ? {inner} : ion.newNull())"

private meta def serializeExprFor (f : FieldInfo) (accessor : String) : String :=
serializeExprForInfo f.typeInfo accessor
Expand Down
Loading