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

refactor: Added util function jsonTypeRef for simplification of TypeR… #741

Merged
merged 3 commits into from Nov 24, 2021
Merged

refactor: Added util function jsonTypeRef for simplification of TypeR… #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1519a2
refactor: Added util function jsonTypeRef for simplification of TypeR…
npwork Nov 18, 2021
9b5bf9c
refactor: fixed linter
npwork Nov 24, 2021
be546f2
Merge branch 'master' into refactor-jsontype-extension-method
npwork Nov 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/GraphQLResponse.kt
View file
Open in desktop
Expand Up @@ -49,7 +49,7 @@ data class GraphQLResponse(val json: String, val headers: Map<String, List<Strin
*/

val data: Map<String, Any> = parsed.read("data") ?: emptyMap()
val errors: List<GraphQLError> = parsed.read("errors", object : TypeRef<List<GraphQLError>>() {}) ?: emptyList()
val errors: List<GraphQLError> = parsed.read("errors", jsonTypeRef<List<GraphQLError>>()) ?: emptyList()

constructor(json: String) : this(json, emptyMap())

Expand Down Expand Up @@ -136,3 +136,5 @@ data class GraphQLResponse(val json: String, val headers: Map<String, List<Strin

@JsonIgnoreProperties(ignoreUnknown = true)
data class RequestDetails(val requestId: String?, val edgarLink: String?)

inline fun <reified T> jsonTypeRef(): TypeRef<T> = object : TypeRef<T>() {}
4 changes: 2 additions & 2 deletions graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/WebSocketGraphQLClient.kt
View file
Open in desktop
Expand Up @@ -16,8 +16,8 @@

package com.netflix.graphql.dgs.client

import com.fasterxml.jackson.core.type.TypeReference
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.jacksonTypeRef
import com.netflix.graphql.types.subscription.*
import graphql.GraphQLException
import org.springframework.web.reactive.socket.WebSocketMessage
Expand Down Expand Up @@ -263,7 +263,7 @@ class OperationMessageWebSocketClient(

private fun decodeMessage(message: WebSocketMessage): OperationMessage {
val messageText = message.payloadAsText
val type = object : TypeReference<OperationMessage>() {}
val type = jacksonTypeRef<OperationMessage>()

return MAPPER.readValue(messageText, type)
}
Expand Down
5 changes: 2 additions & 3 deletions graphql-dgs-client/src/test/kotlin/com/netflix/graphql/dgs/client/GraphQLResponseTest.kt
View file
Open in desktop
Expand Up @@ -16,7 +16,6 @@

package com.netflix.graphql.dgs.client

import com.jayway.jsonpath.TypeRef
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test
import org.springframework.http.HttpEntity
Expand Down Expand Up @@ -184,9 +183,9 @@ class GraphQLResponseTest {
emptyMap(), requestExecutor
)

val listOfSubmittedBy: List<String> = graphQLResponse.extractValueAsObject(
val listOfSubmittedBy = graphQLResponse.extractValueAsObject(
"submitReview.edges[*].node.submittedBy",
object : TypeRef<List<String>>() {}
jsonTypeRef<List<String>>()
)
assertThat(listOfSubmittedBy).isInstanceOf(ArrayList::class.java)
assertThat(listOfSubmittedBy.size).isEqualTo(2)
Expand Down
4 changes: 2 additions & 2 deletions graphql-dgs-subscription-types/src/test/kotlin/OperationMessageTest.kt
View file
Open in desktop
Expand Up @@ -14,10 +14,10 @@
* limitations under the License.
*/

import com.fasterxml.jackson.core.type.TypeReference
import com.fasterxml.jackson.databind.JsonMappingException
import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.jacksonTypeRef
import com.netflix.graphql.types.subscription.*
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test
Expand Down Expand Up @@ -76,7 +76,7 @@ class OperationMessageTest {
}

private fun deserialize(message: String) =
MAPPER.readValue(message, object : TypeReference<OperationMessage>() {})
MAPPER.readValue(message, jacksonTypeRef<OperationMessage>())

companion object {
val MAPPER = jacksonObjectMapper()
Expand Down