Skip to content

Commit cb372f6

Browse files
committed
Adjusts
1 parent 6ce5279 commit cb372f6

File tree

7 files changed

+10
-33
lines changed

7 files changed

+10
-33
lines changed

src/main/java/io/eigr/spawn/api/actors/annotations/Action.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131

3232
Class<?> outputType() default Default.class;
3333

34-
public class Default {}
34+
class Default {}
3535
}

src/main/java/io/eigr/spawn/api/actors/annotations/stateful/StatefulNamedActor.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,4 @@
2121
long snapshotTimeout() default 50000;
2222

2323
String channel() default "";
24-
25-
int minPoolSize() default 1;
26-
27-
int maxPoolSize() default 0;
2824
}

src/main/java/io/eigr/spawn/api/actors/annotations/stateful/StatefulUnNamedActor.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,4 @@
2121
long snapshotTimeout() default 50000;
2222

2323
String channel() default "";
24-
25-
int minPoolSize() default 1;
26-
27-
int maxPoolSize() default 0;
2824
}

src/main/java/io/eigr/spawn/api/actors/annotations/stateless/StatelessNamedActor.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,4 @@
1616

1717
String channel() default "";
1818

19-
int minPoolSize() default 1;
20-
21-
int maxPoolSize() default 0;
2219
}

src/main/java/io/eigr/spawn/api/actors/annotations/stateless/StatelessUnNamedActor.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,4 @@
1515
long deactivatedTimeout() default 10000;
1616

1717
String channel() default "";
18-
19-
int minPoolSize() default 1;
20-
21-
int maxPoolSize() default 0;
2218
}

src/main/java/io/eigr/spawn/internal/Entity.java

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,6 @@ public static Entity fromAnnotationToEntity(Class<?> entity, StatefulNamedActor
248248
final long snapshotTimeout = actor.snapshotTimeout();
249249
final boolean isStateful = true;
250250
final Class stateType = actor.stateType();
251-
final int minPoolSize = actor.minPoolSize();
252-
final int maxPoolSize = actor.maxPoolSize();
253251
final String channel = actor.channel();
254252

255253
final Map<String, Entity.EntityMethod> actions = buildActions(entity, Action.class);
@@ -266,8 +264,8 @@ public static Entity fromAnnotationToEntity(Class<?> entity, StatefulNamedActor
266264
snapshotTimeout,
267265
actions,
268266
timerActions,
269-
minPoolSize,
270-
maxPoolSize,
267+
0,
268+
0,
271269
channel,
272270
Optional.ofNullable(arg),
273271
Optional.ofNullable(factory));
@@ -291,8 +289,6 @@ public static Entity fromAnnotationToEntity(Class<?> entity, StatefulUnNamedActo
291289
final long snapshotTimeout = actor.snapshotTimeout();
292290
final boolean isStateful = true;
293291
final Class stateType = actor.stateType();
294-
final int minPoolSize = actor.minPoolSize();
295-
final int maxPoolSize = actor.maxPoolSize();
296292
final String channel = actor.channel();
297293

298294
final Map<String, Entity.EntityMethod> actions = buildActions(entity, Action.class);
@@ -309,8 +305,8 @@ public static Entity fromAnnotationToEntity(Class<?> entity, StatefulUnNamedActo
309305
snapshotTimeout,
310306
actions,
311307
timerActions,
312-
minPoolSize,
313-
maxPoolSize,
308+
0,
309+
0,
314310
channel,
315311
Optional.ofNullable(arg),
316312
Optional.ofNullable(factory));
@@ -376,8 +372,6 @@ public static Entity fromAnnotationToEntity(Class<?> entity, StatelessNamedActor
376372
final ActorKind kind = ActorKind.NAMED;
377373
final long deactivateTimeout = actor.deactivatedTimeout();
378374
final boolean isStateful = false;
379-
final int minPoolSize = actor.minPoolSize();
380-
final int maxPoolSize = actor.maxPoolSize();
381375
final String channel = actor.channel();
382376

383377
final Map<String, Entity.EntityMethod> actions = buildActions(entity, Action.class);
@@ -394,8 +388,8 @@ public static Entity fromAnnotationToEntity(Class<?> entity, StatelessNamedActor
394388
0,
395389
actions,
396390
timerActions,
397-
minPoolSize,
398-
maxPoolSize,
391+
0,
392+
0,
399393
channel,
400394
Optional.ofNullable(arg),
401395
Optional.ofNullable(factory));
@@ -417,8 +411,6 @@ public static Entity fromAnnotationToEntity(Class<?> entity, StatelessUnNamedAct
417411
final ActorKind kind = ActorKind.UNNAMED;
418412
final long deactivateTimeout = actor.deactivatedTimeout();
419413
final boolean isStateful = false;
420-
final int minPoolSize = actor.minPoolSize();
421-
final int maxPoolSize = actor.maxPoolSize();
422414
final String channel = actor.channel();
423415

424416
final Map<String, Entity.EntityMethod> actions = buildActions(entity, Action.class);
@@ -435,8 +427,8 @@ public static Entity fromAnnotationToEntity(Class<?> entity, StatelessUnNamedAct
435427
0,
436428
actions,
437429
timerActions,
438-
minPoolSize,
439-
maxPoolSize,
430+
0,
431+
0,
440432
channel,
441433
Optional.ofNullable(arg),
442434
Optional.ofNullable(factory));

src/main/java/io/eigr/spawn/internal/transport/server/ActorServiceHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private Optional<Value> callAction(String system, String actor, String parent, S
158158
actorContext = new ActorContext(this.spawn);
159159
}
160160

161-
if (inputType.isAssignableFrom(ActorContext.class)) {
161+
if (inputType.isAssignableFrom(ActorContext.class) && actorMethod.getParameterTypes().length == 1) {
162162
return Optional.of((Value) actorMethod.invoke(actorRef, actorContext));
163163
} else {
164164
final Object unpack = value.unpack(inputType);

0 commit comments

Comments
 (0)