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.

Sign up for GitHub

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

Jump to bottom

Tentative fix to deal with issues using generateJSONWithStreaming #247

Merged
merged 9 commits into from
Aug 16, 2023
Merged

Tentative fix to deal with issues using generateJSONWithStreaming #247

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8baeb51
Tentative fix to deal with issues using generateJSONWithStreaming
gabriele-tomassetti Aug 11, 2023
8ef3d50
Add parameter names
gabriele-tomassetti Aug 14, 2023
f1b723d
Add more JsonGeneration tests
gabriele-tomassetti Aug 14, 2023
cfe767e
Linting
gabriele-tomassetti Aug 14, 2023
426c006
Fix missing severity property in streaming serialization of issues
gabriele-tomassetti Aug 15, 2023
24807da
Add deserialization tests for checking JSON Generation with streaming
gabriele-tomassetti Aug 15, 2023
f992a05
Fix for deserialization of classes with simpleName
gabriele-tomassetti Aug 15, 2023
a9d7bcc
Linting
gabriele-tomassetti Aug 16, 2023
1c73248
Use canonicalName rather than package.name
gabriele-tomassetti Aug 16, 2023
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
14 changes: 8 additions & 6 deletions core/src/main/kotlin/com/strumenta/kolasu/serialization/JsonGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ class JsonGenerator {
root: Node,
withIds: IdentityHashMap<Node, String>? = null,
withOriginIds: IdentityHashMap<Node, String>? = null,
withDestinationIds: IdentityHashMap<Node, String>? = null
withDestinationIds: IdentityHashMap<Node, String>? = null,
shortClassNames: Boolean = false
): JsonElement {
return nodeToJson(
root, shortClassNames,
Expand Down Expand Up @@ -130,27 +131,28 @@ class JsonGenerator {
if (result.root == null) {
writer.nullValue()
} else {
result.root.toJsonStreaming(writer, shortClassNames)
generateJSONWithStreaming(result.root, writer, shortClassNames)
}
writer.endObject()
}

fun generateJSONWithStreaming(root: Node, writer: JsonWriter, shortClassNames: Boolean = false) {
root.toJsonStreaming(writer, shortClassNames)
val gson = gsonBuilder.setPrettyPrinting().create()
gson.toJson(generateJSON(root, null, null, null, shortClassNames), writer)
gabriele-tomassetti marked this conversation as resolved.
Show resolved Hide resolved
}

fun generateString(root: Node, withIds: IdentityHashMap<Node, String>? = null): String {
val gson = GsonBuilder().setPrettyPrinting().create()
val gson = gsonBuilder.setPrettyPrinting().create()
return gson.toJson(generateJSON(root, withIds))
}

fun generateString(result: Result<out Node>, withIds: IdentityHashMap<Node, String>? = null): String {
val gson = GsonBuilder().setPrettyPrinting().create()
val gson = gsonBuilder.setPrettyPrinting().create()
return gson.toJson(generateJSON(result, withIds))
}

fun generateString(result: ParsingResult<out Node>, withIds: IdentityHashMap<Node, String>? = null): String {
val gson = GsonBuilder().setPrettyPrinting().create()
val gson = gsonBuilder.setPrettyPrinting().create()
return gson.toJson(generateJSON(result, withIds))
}

Expand Down
7 changes: 3 additions & 4 deletions core/src/test/kotlin/com/strumenta/kolasu/serialization/JsonGenerationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,9 @@ class JsonGenerationTest {
assertEquals(
"""{"#type":"com.strumenta.kolasu.serialization.MyRoot",
|"mainSection":{"#type":"com.strumenta.kolasu.serialization.Section","contents":
|[{"#type":"com.strumenta.kolasu.serialization.Content","annidatedContent":null,"id":1},
|{"#type":"com.strumenta.kolasu.serialization.Content","annidatedContent":
|{"#type":"com.strumenta.kolasu.serialization.Content","annidatedContent":
|{"#type":"com.strumenta.kolasu.serialization.Content","annidatedContent":null,"id":4},"id":3},"id":2}],
|[{"#type":"com.strumenta.kolasu.serialization.Content","id":1},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be useful to add several examples, using the flag shortClassNames set to false and to true

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would also be useful to have tests to load the examples, both with shortClassNames set to false and to true

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added more examples for generation, still working on deserialization tests.

|{"#type":"com.strumenta.kolasu.serialization.Content","annidatedContent":{"#type":"com.strumenta.kolasu.serialization.Content",
|"annidatedContent":{"#type":"com.strumenta.kolasu.serialization.Content","id":4},"id":3},"id":2}],
|"name":"Section1"},"otherSections":[]}
""".trimMargin().replace("\n", ""),
json,
Expand Down
Loading