Skip to content

fix: favor use of ScalaPB Any in Scala SDK #459

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

Merged
patriknw merged 1 commit into from
Sep 22, 2021
Merged

fix: favor use of ScalaPB Any in Scala SDK #459

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
6 changes: 3 additions & 3 deletions sdk/scala-sdk/src/main/scala/com/akkaserverless/scalasdk/ServiceCall.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.akkaserverless.scalasdk

import com.google.protobuf.Any
import com.google.protobuf.any.{ Any => ScalaPbAny }

/** Represents a call to a service, performed either as a forward, or as an effect. */
trait ServiceCall {
Expand All @@ -33,9 +33,9 @@ trait ServiceCall {
* The message to pass to the call when the call is invoked.
*
* @return
* The message to pass to the call, serialized as an {@link Any}.
* The message to pass to the call, serialized as an {{{ScalaPbAny}}}
*/
def message: Any
def message: ScalaPbAny

/**
* The metadata to pass with the message when the call is invoked.
Expand Down
5 changes: 2 additions & 3 deletions sdk/scala-sdk/src/main/scala/com/akkaserverless/scalasdk/SideEffect.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@
package com.akkaserverless.scalasdk

import com.akkaserverless.javasdk
import com.akkaserverless.scalasdk.impl.JavaSideEffectAdapter
import com.akkaserverless.scalasdk.impl.JavaServiceCallAdapter
import com.akkaserverless.scalasdk.impl.MetadataImpl
import com.google.protobuf
import com.google.protobuf.Descriptors
import com.google.protobuf.any.{ Any => ScalaPbAny }

/* A side effect. */
object SideEffect {
Expand Down Expand Up @@ -67,7 +66,7 @@ private[scalasdk] case class ScalaSideEffectAdapter(javasdkSideEffect: javasdk.S

private[scalasdk] case class ScalaServiceCallAdapter(javasdkServiceCall: javasdk.ServiceCall) extends ServiceCall {
override def ref: ServiceCallRef[_] = ScalaServiceCallRefAdapter(javasdkServiceCall.ref)
override def message: protobuf.Any = javasdkServiceCall.message
override def message: ScalaPbAny = ScalaPbAny.fromJavaProto(javasdkServiceCall.message)
override def metadata: Metadata = {
// FIXME can we get rid of this cast?
new MetadataImpl(javasdkServiceCall.metadata().asInstanceOf[com.akkaserverless.javasdk.impl.MetadataImpl])
Expand Down
5 changes: 3 additions & 2 deletions sdk/scala-sdk/src/main/scala/com/akkaserverless/scalasdk/impl/ServiceCallAdapters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import com.akkaserverless.scalasdk.ServiceCallRef
import com.akkaserverless.scalasdk.SideEffect
import com.google.protobuf
import com.google.protobuf.Descriptors
import com.google.protobuf.any.{ Any => ScalaPbAny }

private[scalasdk] case class ScalaServiceCallFactoryAdapter(javaSdkServiceCallFactory: javasdk.ServiceCallFactory)
extends ServiceCallFactory {
Expand All @@ -35,13 +36,13 @@ private[scalasdk] case class ScalaServiceCallFactoryAdapter(javaSdkServiceCallFa
}
private[scalasdk] case class JavaServiceCallAdapter(scalaSdkServiceCall: ServiceCall) extends javasdk.ServiceCall {
override def ref(): javasdk.ServiceCallRef[_] = JavaServiceCallRefAdapter(scalaSdkServiceCall.ref)
override def message(): protobuf.Any = scalaSdkServiceCall.message
override def message(): protobuf.Any = ScalaPbAny.toJavaProto(scalaSdkServiceCall.message)
override def metadata(): javasdk.Metadata = scalaSdkServiceCall.metadata.asInstanceOf[MetadataImpl].impl
}

private[scalasdk] case class ScalaServiceCallAdapter(javaSdkServiceCall: javasdk.ServiceCall) extends ServiceCall {
override def ref: ServiceCallRef[_] = ScalaServiceCallRefAdapter(javaSdkServiceCall.ref())
override def message: protobuf.Any = javaSdkServiceCall.message
override def message: ScalaPbAny = ScalaPbAny.fromJavaProto(javaSdkServiceCall.message)
override def metadata: Metadata =
new MetadataImpl(javaSdkServiceCall.metadata.asInstanceOf[com.akkaserverless.javasdk.impl.MetadataImpl])
}
Expand Down