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

[3.x] fix content-length for the String constructor #4683

Merged
merged 2 commits into from
Feb 16, 2023
Merged

[3.x] fix content-length for the String constructor #4683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8312bb9
fix content-length for the String constructor
martinbonnin Feb 13, 2023
a456763
revert unwanted change on CodegenTests
martinbonnin Feb 13, 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
3 changes: 2 additions & 1 deletion libraries/apollo-compiler/src/test/kotlin/com/apollographql/apollo3/compiler/CodegenTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,10 +319,11 @@ class CodegenTest {

val targetLanguage = if (generateKotlinModels) KOTLIN_1_5 else JAVA
val targetLanguagePath = if (generateKotlinModels) "kotlin" else "java"
@Suppress("DEPRECATION")
val flattenModels = when {
folder.name in listOf("capitalized_fields", "companion") -> true
targetLanguage == JAVA -> true
else -> false
else -> codegenModels == MODELS_COMPAT
}
val customScalarsMapping = if (folder.name in listOf(
"custom_scalar_type",
Expand Down
2 changes: 1 addition & 1 deletion ...mockserver/src/commonMain/kotlin/com/apollographql/apollo3/mockserver/MockServerCommon.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ constructor(
) : this(
statusCode = statusCode,
body = flowOf(body.encodeUtf8()),
headers = headers + mapOf("Content-Length" to body.length.toString()),
headers = headers + mapOf("Content-Length" to body.encodeUtf8().size.toString()),
delayMillis = delayMillis,
)

Expand Down