Implement new JsonSerializerGenerator without document/operation support #416
Conversation
| val valueExpression: String, | ||
| val shape: MemberShape, | ||
| /** Whether we're working with a JsonObjectWriter (true) or JsonArrayWriter (false) */ | ||
| val structMember: Boolean, |
There was a problem hiding this comment.
this was a little confusing when I was reading the code, might make a sealed class for this which will make the usage:
when(parent) {
is Json.Object -> ...
is Json.Array -> ...
}which I think will be much clearer
|
|
||
| /** Generates an expression that serializes the given [inner] expression to the object/array */ | ||
| fun writeInner(w: RustWriter, jsonType: String, key: String, inner: RustWriter.() -> Unit) { | ||
| w.rustInline("$writerName.$jsonType(") |
There was a problem hiding this comment.
I would probably just use withBlock here:
w.withBlock("$writerName.$jsonType(", ");") {
if (structMember) {
w.rust("$key ,")
}
inner(this)
}
| } | ||
| } | ||
| is BlobShape -> context.writeInner(this, "string_unchecked", key) { | ||
| rustInline("&#T($value)", RuntimeType.Base64Encode(runtimeConfig)) |
There was a problem hiding this comment.
you're welcome to use rustInline if you prefer, but we run cargo fmt on the output so it doesn't really matter if we write inline or not
| serializeUnion(SimpleContext(objectName, inner.valueExpression, target)) | ||
| } | ||
| is DocumentShape -> { | ||
| // TODO: Implement document shapes |
There was a problem hiding this comment.
I would probably just leave this in the TODO or at least print a warning.
There was a problem hiding this comment.
The unit test will fail if I leave it as a Kotlin TODO() since I have a Document in the union, which is why I left it as the comment. I would hope our protocol tests would fail if I didn't address this comment :)
| } | ||
|
|
||
| private fun String.borrow(): String = "&$this" |
There was a problem hiding this comment.
up to you, but I personally find it a little clearer with the & in front
| namespace test | ||
| use aws.protocols#restJson1 | ||
|
|
||
| union Choice { |
There was a problem hiding this comment.
I'd throw a jsonName in here somewhere
| } | ||
|
|
||
| /** Generates an expression that serializes the given [value] expression to the object/array */ | ||
| fun writeValue(w: RustWriter, jsonType: String, key: String, value: String) = when (structMember) { |
There was a problem hiding this comment.
I'd probably make jsonType a sealed class that overrides toString
There was a problem hiding this comment.
I can get onboard with a simple enum for this, but at least right now, I don't really need it to be an algebraic data type. Kotlin's sealed classes are tempting to reach for coming from Rust, but they're not anywhere near as ergonomic, unfortunately.
This is more progress towards #161. This renames the existing
JsonSerializerGenerator/JsonParserGeneratorclasses to be prefixed withSerde-to indicate their implementation detail while keeping them wired up, and then introduces a newJsonSerializerGeneratorthat will ultimately replace theSerdeJsonSerializerGenerator. So far, this new generator is able to generate payload serialization code that passes the included unit test's model, but it doesn't yet attempt to generate operation or document serialization.This shouldn't have any impact on the existing SDK since nothing is wired up yet.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.