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: Populate ComponentDescriptor once, in SdkRunner #81

Merged
merged 1 commit into from
Dec 11, 2024
Merged

chore: Populate ComponentDescriptor once, in SdkRunner #81

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 akka-javasdk/src/main/scala/akka/javasdk/impl/SdkRunner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,8 +372,8 @@ private final class Sdk(
logger.debug(s"Registering Workflow [${clz.getName}]")
new WorkflowImpl[S, W](
factoryContext.workflowId,
clz,
serializer,
ComponentDescriptor.descriptorFor(clz, serializer),
timerClient = runtimeComponentClients.timerClient,
sdkExecutionContext,
sdkTracerFactory,
Expand Down Expand Up @@ -435,9 +435,9 @@ private final class Sdk(
sdkSettings,
sdkTracerFactory,
componentId,
clz,
factoryContext.entityId,
serializer,
ComponentDescriptor.descriptorFor(clz, serializer),
context =>
wiredInstance(clz.asInstanceOf[Class[EventSourcedEntity[AnyRef, AnyRef]]]) {
// remember to update component type API doc and docs if changing the set of injectables
Expand All @@ -457,9 +457,9 @@ private final class Sdk(
sdkSettings,
sdkTracerFactory,
componentId,
clz,
factoryContext.entityId,
serializer,
ComponentDescriptor.descriptorFor(clz, serializer),
context =>
wiredInstance(clz.asInstanceOf[Class[KeyValueEntity[AnyRef]]]) {
// remember to update component type API doc and docs if changing the set of injectables
Expand Down
4 changes: 1 addition & 3 deletions ...-javasdk/src/main/scala/akka/javasdk/impl/eventsourcedentity/EventSourcedEntityImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,16 @@ private[impl] final class EventSourcedEntityImpl[S, E, ES <: EventSourcedEntity[
configuration: Settings,
tracerFactory: () => Tracer,
componentId: String,
componentClass: Class[_],
entityId: String,
serializer: JsonSerializer,
componentDescriptor: ComponentDescriptor,
factory: EventSourcedEntityContext => ES)
extends SpiEventSourcedEntity {
import EventSourcedEntityImpl._

// FIXME
// private val traceInstrumentation = new TraceInstrumentation(componentId, EventSourcedEntityCategory, tracerFactory)

private val componentDescriptor = ComponentDescriptor.descriptorFor(componentClass, serializer)

private val router: ReflectiveEventSourcedEntityRouter[AnyRef, AnyRef, EventSourcedEntity[AnyRef, AnyRef]] = {
val context = new EventSourcedEntityContextImpl(entityId)
new ReflectiveEventSourcedEntityRouter[S, E, ES](factory(context), componentDescriptor.commandHandlers, serializer)
Expand Down
4 changes: 1 addition & 3 deletions akka-javasdk/src/main/scala/akka/javasdk/impl/keyvalueentity/KeyValueEntityImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ private[impl] final class KeyValueEntityImpl[S, KV <: KeyValueEntity[S]](
configuration: Settings,
tracerFactory: () => Tracer,
componentId: String,
componentClass: Class[_],
entityId: String,
serializer: JsonSerializer,
componentDescriptor: ComponentDescriptor,
factory: KeyValueEntityContext => KV)
extends SpiEventSourcedEntity {
import KeyValueEntityEffectImpl._
Expand All @@ -87,8 +87,6 @@ private[impl] final class KeyValueEntityImpl[S, KV <: KeyValueEntity[S]](
// FIXME
// private val traceInstrumentation = new TraceInstrumentation(componentId, EventSourcedEntityCategory, tracerFactory)

private val componentDescriptor = ComponentDescriptor.descriptorFor(componentClass, serializer)

private val router: ReflectiveKeyValueEntityRouter[AnyRef, KeyValueEntity[AnyRef]] = {
val context = new KeyValueEntityContextImpl(entityId)
new ReflectiveKeyValueEntityRouter[S, KV](factory(context), componentDescriptor.commandHandlers, serializer)
Expand Down
3 changes: 1 addition & 2 deletions akka-javasdk/src/main/scala/akka/javasdk/impl/workflow/WorkflowImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,14 @@ import kalix.protocol.workflow_entity.WorkflowEntities
@InternalApi
class WorkflowImpl[S, W <: Workflow[S]](
workflowId: String,
componentClass: Class[_],
serializer: JsonSerializer,
componentDescriptor: ComponentDescriptor,
timerClient: TimerClient,
sdkExecutionContext: ExecutionContext,
tracerFactory: () => Tracer,
instanceFactory: Function[WorkflowContext, W])
extends SpiWorkflow {

private val componentDescriptor = ComponentDescriptor.descriptorFor(componentClass, serializer)
private val context = new WorkflowContextImpl(workflowId)

private val router =
Expand Down
Loading