chore: improve error msg in EventingTestKit #1949
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
java-sdk-protobuf
kalix-runtime
efgpinto
commented
Jan 8, 2024
Comment on lines
-104
to
-125
| private def expectOneTyped_internal[T <: GeneratedMessage](msg: JEventingTestKit.Message[ByteString])(implicit | ||
| t: ClassTag[T]): Message[T] = { | ||
| val msg = delegate.expectOneTyped(t.runtimeClass.asInstanceOf[Class[T]], timeout.toJava) | ||
| val md = MetadataConverters.toScala(msg.getMetadata) | ||
| val decodedMsg = codec.decodeMessage(ScalaPbAny(typeUrlFor(md), msg.getPayload)) | ||
|
|
||
| val concreteType = MessageImpl.expectType(decodedMsg) | ||
| Message(concreteType, md) | ||
| } | ||
|
|
||
| private def typeUrlFor(metadata: Metadata): String = { | ||
| metadata | ||
| .get("ce-type") | ||
| .getOrElse { | ||
| val contentType = metadata.get("Content-Type") | ||
| contentType match { | ||
| case Some("text/plain; charset=utf-8") => "type.kalix.io/string" | ||
| case Some("application/octet-stream") => "type.kalix.io/bytes" | ||
| case unknown => | ||
| log.warn(s"Could not extract typeUrl from $unknown") | ||
| "" | ||
| } | ||
| } |
There was a problem hiding this comment.
I'm not sure why we had this logic duplicated in the scala sdk.. it was myself who added it actually, but I think it's just an oversight. Delegating it upstream to the java implementation should work just as fine.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Close #1874
And some clean-up.