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

chore: Still PbAny in KeyValueEntitiesImpl #66

Merged
merged 1 commit into from
Dec 6, 2024
Merged

chore: Still PbAny in KeyValueEntitiesImpl #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 10 additions & 4 deletions akka-javasdk/src/main/scala/akka/javasdk/impl/effect/EffectSupport.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,15 @@ import kalix.protocol.component
@InternalApi
private[impl] object EffectSupport {

def asProtocol(messageReply: MessageReplyImpl[JavaPbAny]): component.Reply =
component.Reply(
Some(ScalaPbAny.fromJavaProto(messageReply.message)),
MetadataImpl.toProtocol(messageReply.metadata))
def asProtocol(messageReply: MessageReplyImpl[_]): component.Reply = {
val scalaPbAny =
messageReply.message match {
case pb: ScalaPbAny => pb
case pb: JavaPbAny => ScalaPbAny.fromJavaProto(pb)
case other => throw new IllegalStateException(s"Expected PbAny, but was [${other.getClass.getName}]")
}

component.Reply(Some(scalaPbAny), MetadataImpl.toProtocol(messageReply.metadata))
}

}
3 changes: 1 addition & 2 deletions akka-javasdk/src/main/scala/akka/javasdk/impl/effect/SecondaryEffectImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package akka.javasdk.impl.effect

import akka.annotation.InternalApi
import akka.javasdk.Metadata
import com.google.protobuf.{ Any => JavaPbAny }
import kalix.protocol.component.ClientAction

/**
Expand All @@ -16,7 +15,7 @@ import kalix.protocol.component.ClientAction
private[javasdk] sealed trait SecondaryEffectImpl {
final def replyToClientAction(commandId: Long): Option[ClientAction] = {
this match {
case message: MessageReplyImpl[JavaPbAny] @unchecked =>
case message: MessageReplyImpl[_] =>
Some(ClientAction(ClientAction.Action.Reply(EffectSupport.asProtocol(message))))
case failure: ErrorReplyImpl =>
Some(
Expand Down
6 changes: 4 additions & 2 deletions akka-javasdk/src/main/scala/akka/javasdk/impl/keyvalueentity/KeyValueEntitiesImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,10 @@ private[impl] final class KeyValueEntitiesImpl(
val cmdPayloadPbAny = command.payload.getOrElse(
// FIXME smuggling 0 arity method called from component client through here
ScalaPbAny.defaultInstance.withTypeUrl(AnySupport.JsonTypeUrlPrefix).withValue(ByteString.empty()))
val cmdBytesPayload = AnySupport.toSpiBytesPayload(cmdPayloadPbAny)
val cmd = service.serializer.fromBytes(cmdBytesPayload)
// FIXME shall we deserialize here or in the router? the router needs the contentType as well.
// val cmdBytesPayload = AnySupport.toSpiBytesPayload(cmdPayloadPbAny)
// val cmd = service.serializer.fromBytes(cmdBytesPayload)
val cmd = cmdPayloadPbAny
Copy link
Member Author

Choose a reason for hiding this comment

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

The original was:

val cmd = service.messageCodec.decodeMessage

I can't tell how many times I have run into that trap. That was not decoding at all for the normal JsonMessageCodec, so it was still PbAny passed down to the router.


val context =
new CommandContextImpl(thisEntityId, command.name, command.id, metadata, span, tracerFactory)
Expand Down
6 changes: 4 additions & 2 deletions akka-javasdk/src/main/scala/akka/javasdk/impl/view/ViewsImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,10 @@ final class ViewsImpl(_services: Map[String, ViewService[_]], sdkDispatcherName:
}

val commandName = receiveEvent.commandName
val bytesPayload = AnySupport.toSpiBytesPayload(receiveEvent.getPayload)
val msg = service.serializer.fromBytes(bytesPayload)
// FIXME shall we deserialize here or in the router? the router needs the contentType as well.
// val bytesPayload = AnySupport.toSpiBytesPayload(receiveEvent.getPayload)
// val msg = service.serializer.fromBytes(bytesPayload)
val msg = receiveEvent.getPayload
val metadata = MetadataImpl.of(receiveEvent.metadata.map(_.entries.toVector).getOrElse(Nil))
val addedToMDC = metadata.traceId match {
case Some(traceId) =>
Expand Down
Loading