From 666d69246750c0d3e1896338aeb82c64c9c777d9 Mon Sep 17 00:00:00 2001 From: Paulo Henrique Alves Date: Fri, 17 May 2024 10:23:36 -0300 Subject: [PATCH 1/2] Changed details log to debug. --- .../spawn/internal/transport/server/ActorServiceHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/eigr/spawn/internal/transport/server/ActorServiceHandler.java b/src/main/java/io/eigr/spawn/internal/transport/server/ActorServiceHandler.java index 9b05933..a58ab67 100644 --- a/src/main/java/io/eigr/spawn/internal/transport/server/ActorServiceHandler.java +++ b/src/main/java/io/eigr/spawn/internal/transport/server/ActorServiceHandler.java @@ -83,7 +83,7 @@ private Protocol.ActorInvocationResponse handleRequest(HttpExchange exchange) th Any value = actorInvocationRequest.getValue(); Optional maybeValueResponse = callAction(system, actor, parent, commandName, value, context); - log.info("Actor {} return ActorInvocationResponse for command {}. Result value: {}", + log.debug("Actor {} return ActorInvocationResponse for command {}. Result value: {}", actor, commandName, maybeValueResponse); if (maybeValueResponse.isPresent()) { From ebc1c0414a8a3ce0e17f9468740cdb435d7d1be3 Mon Sep 17 00:00:00 2001 From: Paulo Henrique Alves Date: Fri, 17 May 2024 16:03:38 -0300 Subject: [PATCH 2/2] Updated libs. --- pom.xml | 14 ++++++------ src/main/java/io/eigr/spawn/api/ActorRef.java | 22 +++++++++---------- .../java/io/eigr/spawn/api/actors/Value.java | 12 +++++----- .../stateful/StatefulNamedActor.java | 4 ++-- .../stateful/StatefulPooledActor.java | 4 ++-- .../stateful/StatefulUnNamedActor.java | 4 ++-- .../spawn/api/actors/workflows/Broadcast.java | 8 +++---- .../api/actors/workflows/SideEffect.java | 8 +++---- 8 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pom.xml b/pom.xml index e7ecc84..e532007 100644 --- a/pom.xml +++ b/pom.xml @@ -11,13 +11,13 @@ 11 11 - UTF-8 + UTF-8 3.1.8 4.13.2 - 8.0.33 - 4.10.0 - 3.22.2 - 1.17.6 + 8.4.0 + 4.12.0 + 4.26.1 + 1.19.8 @@ -110,9 +110,9 @@ protobuf-maven-plugin 0.6.1 - com.google.protobuf:protoc:3.19.2:exe:${os.detected.classifier} + com.google.protobuf:protoc:4.26.1:exe:${os.detected.classifier} grpc-java - io.grpc:protoc-gen-grpc-java:1.47.0:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:1.64.0:exe:${os.detected.classifier} diff --git a/src/main/java/io/eigr/spawn/api/ActorRef.java b/src/main/java/io/eigr/spawn/api/ActorRef.java index cd0d480..4a3a703 100644 --- a/src/main/java/io/eigr/spawn/api/ActorRef.java +++ b/src/main/java/io/eigr/spawn/api/ActorRef.java @@ -3,7 +3,7 @@ import com.github.benmanes.caffeine.cache.Cache; import com.google.protobuf.Any; import com.google.protobuf.Empty; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.GeneratedMessage; import io.eigr.functions.protocol.Protocol; import io.eigr.functions.protocol.actors.ActorOuterClass; import io.eigr.spawn.api.exceptions.ActorCreationException; @@ -104,7 +104,7 @@ protected static void spawnAllActors(List actorIds, Spa * @return an Optional containing, or not, the response object to the Action call * @since 0.0.1 */ - public Optional invoke(String action, Class outputType) throws ActorInvocationException { + public Optional invoke(String action, Class outputType) throws ActorInvocationException { Optional res = invokeActor(action, Empty.getDefaultInstance(), outputType, Optional.empty()); return res.map(outputType::cast); @@ -122,7 +122,7 @@ public Optional invoke(String action, Class * @return an Optional containing, or not, the response object to the Action call * @since 0.0.1 */ - public Optional invoke(String action, Class outputType, InvocationOpts opts) throws ActorInvocationException { + public Optional invoke(String action, Class outputType, InvocationOpts opts) throws ActorInvocationException { Optional res = invokeActor(action, Empty.getDefaultInstance(), outputType, Optional.ofNullable(opts)); return res.map(outputType::cast); @@ -139,7 +139,7 @@ public Optional invoke(String action, Class * @return an Optional containing, or not, the response object to the Action call * @since 0.0.1 */ - public Optional invoke(String action, S value, Class outputType) throws ActorInvocationException { + public Optional invoke(String action, S value, Class outputType) throws ActorInvocationException { Optional res = invokeActor(action, value, outputType, Optional.empty()); return res.map(outputType::cast); @@ -158,7 +158,7 @@ public Optional * @return an Optional containing, or not, the response object to the Action call * @since 0.0.1 */ - public Optional invoke(String action, S value, Class outputType, InvocationOpts opts) throws ActorInvocationException { + public Optional invoke(String action, S value, Class outputType, InvocationOpts opts) throws ActorInvocationException { Optional res = invokeActor(action, value, outputType, Optional.ofNullable(opts)); return res.map(outputType::cast); @@ -172,7 +172,7 @@ public Optional * @param action name of the action to be called. * @since 0.0.1 */ - public void invokeAsync(String action) throws ActorInvocationException { + public void invokeAsync(String action) throws ActorInvocationException { InvocationOpts opts = InvocationOpts.builder().async(true).build(); invokeActor(action, Empty.getDefaultInstance(), null, Optional.of(opts)); } @@ -187,7 +187,7 @@ public void invokeAsync(String action) throws Act * Please see the {@link io.eigr.spawn.api.InvocationOpts} class for more information * @since 0.0.1 */ - public void invokeAsync(String action, InvocationOpts opts) throws ActorInvocationException { + public void invokeAsync(String action, InvocationOpts opts) throws ActorInvocationException { InvocationOpts mergedOpts = InvocationOpts.builder() .async(true) .delaySeconds(opts.getDelaySeconds()) @@ -207,7 +207,7 @@ public void invokeAsync(String action, Invocation * @param value the action argument object. * @since 0.0.1 */ - public void invokeAsync(String action, T value) throws ActorInvocationException { + public void invokeAsync(String action, T value) throws ActorInvocationException { InvocationOpts opts = InvocationOpts.builder().async(true).build(); invokeActorAsync(action, value, Optional.of(opts)); } @@ -223,7 +223,7 @@ public void invokeAsync(String action, T value) t * Please see the {@link io.eigr.spawn.api.InvocationOpts} class for more information * @since 0.0.1 */ - public void invokeAsync(String action, T value, InvocationOpts opts) throws ActorInvocationException { + public void invokeAsync(String action, T value, InvocationOpts opts) throws ActorInvocationException { InvocationOpts mergedOpts = InvocationOpts.builder() .async(true) .delaySeconds(opts.getDelaySeconds()) @@ -258,7 +258,7 @@ public boolean isUnNamedActor() { return false; } - private Optional invokeActor( + private Optional invokeActor( String cmd, S argument, Class outputType, Optional options) throws ActorInvocationException { Objects.requireNonNull(this.actorId, "ActorId cannot be null"); @@ -318,7 +318,7 @@ private Optional return Optional.empty(); } - private void invokeActorAsync( + private void invokeActorAsync( String cmd, S argument, Optional options) { Objects.requireNonNull(this.actorId, "ActorId cannot be null"); diff --git a/src/main/java/io/eigr/spawn/api/actors/Value.java b/src/main/java/io/eigr/spawn/api/actors/Value.java index a0bdd77..5f7e190 100644 --- a/src/main/java/io/eigr/spawn/api/actors/Value.java +++ b/src/main/java/io/eigr/spawn/api/actors/Value.java @@ -1,6 +1,6 @@ package io.eigr.spawn.api.actors; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.GeneratedMessage; import io.eigr.spawn.api.actors.workflows.Broadcast; import io.eigr.spawn.api.actors.workflows.Forward; import io.eigr.spawn.api.actors.workflows.Pipe; @@ -57,11 +57,11 @@ public static Value at() { return new Value(); } - public R getResponse() { + public R getResponse() { return (R) response; } - public S getState() { + public S getState() { return (S) state; } @@ -89,17 +89,17 @@ public ResponseType getType() { return type; } - public Value response(R value) { + public Value response(R value) { this.response = value; return this; } - public Value state(S state) { + public Value state(S state) { this.state = state; return this; } - public Value state(S state, boolean checkpoint) { + public Value state(S state, boolean checkpoint) { this.state = state; this.checkpoint = checkpoint; return this; diff --git a/src/main/java/io/eigr/spawn/api/actors/annotations/stateful/StatefulNamedActor.java b/src/main/java/io/eigr/spawn/api/actors/annotations/stateful/StatefulNamedActor.java index 706ef3b..20fe253 100644 --- a/src/main/java/io/eigr/spawn/api/actors/annotations/stateful/StatefulNamedActor.java +++ b/src/main/java/io/eigr/spawn/api/actors/annotations/stateful/StatefulNamedActor.java @@ -1,6 +1,6 @@ package io.eigr.spawn.api.actors.annotations.stateful; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.GeneratedMessage; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -14,7 +14,7 @@ String name() default ""; - Class stateType(); + Class stateType(); long deactivatedTimeout() default 60000; diff --git a/src/main/java/io/eigr/spawn/api/actors/annotations/stateful/StatefulPooledActor.java b/src/main/java/io/eigr/spawn/api/actors/annotations/stateful/StatefulPooledActor.java index 63f0116..017ede0 100644 --- a/src/main/java/io/eigr/spawn/api/actors/annotations/stateful/StatefulPooledActor.java +++ b/src/main/java/io/eigr/spawn/api/actors/annotations/stateful/StatefulPooledActor.java @@ -1,6 +1,6 @@ package io.eigr.spawn.api.actors.annotations.stateful; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.GeneratedMessage; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -14,7 +14,7 @@ String name() default ""; - Class stateType(); + Class stateType(); long deactivatedTimeout() default 60000; diff --git a/src/main/java/io/eigr/spawn/api/actors/annotations/stateful/StatefulUnNamedActor.java b/src/main/java/io/eigr/spawn/api/actors/annotations/stateful/StatefulUnNamedActor.java index bb087af..681d35f 100644 --- a/src/main/java/io/eigr/spawn/api/actors/annotations/stateful/StatefulUnNamedActor.java +++ b/src/main/java/io/eigr/spawn/api/actors/annotations/stateful/StatefulUnNamedActor.java @@ -1,6 +1,6 @@ package io.eigr.spawn.api.actors.annotations.stateful; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.GeneratedMessage; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -14,7 +14,7 @@ String name() default ""; - Class stateType(); + Class stateType(); long deactivatedTimeout() default 60000; diff --git a/src/main/java/io/eigr/spawn/api/actors/workflows/Broadcast.java b/src/main/java/io/eigr/spawn/api/actors/workflows/Broadcast.java index 2a077e5..69ee689 100644 --- a/src/main/java/io/eigr/spawn/api/actors/workflows/Broadcast.java +++ b/src/main/java/io/eigr/spawn/api/actors/workflows/Broadcast.java @@ -1,14 +1,14 @@ package io.eigr.spawn.api.actors.workflows; import com.google.protobuf.Any; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.GeneratedMessage; import io.eigr.functions.protocol.Protocol; import org.jetbrains.annotations.NotNull; import java.util.Objects; import java.util.Optional; -public final class Broadcast { +public final class Broadcast { private final Optional channel; private final Optional action; @@ -21,12 +21,12 @@ private Broadcast(Optional channel, Optional action, T payload) } @NotNull - public static Broadcast to(String channel, String action, T payload) { + public static Broadcast to(String channel, String action, T payload) { return new Broadcast(Optional.of(channel), Optional.of(action), payload); } @NotNull - public static Broadcast to(String channel, T payload) { + public static Broadcast to(String channel, T payload) { return new Broadcast(Optional.ofNullable(channel), Optional.empty(), payload); } diff --git a/src/main/java/io/eigr/spawn/api/actors/workflows/SideEffect.java b/src/main/java/io/eigr/spawn/api/actors/workflows/SideEffect.java index 4514294..a340326 100644 --- a/src/main/java/io/eigr/spawn/api/actors/workflows/SideEffect.java +++ b/src/main/java/io/eigr/spawn/api/actors/workflows/SideEffect.java @@ -1,7 +1,7 @@ package io.eigr.spawn.api.actors.workflows; import com.google.protobuf.Any; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.GeneratedMessage; import io.eigr.functions.protocol.Protocol; import io.eigr.functions.protocol.actors.ActorOuterClass; import io.eigr.spawn.api.InvocationOpts; @@ -11,7 +11,7 @@ import java.util.Optional; import java.util.StringJoiner; -public final class SideEffect { +public final class SideEffect { private final ActorRef actor; private final String command; @@ -32,11 +32,11 @@ private SideEffect(ActorRef actor, String command, T payload, InvocationOpts opt this.opts = Optional.of(opts); } - public static SideEffect to(ActorRef actor, String command, T payload) { + public static SideEffect to(ActorRef actor, String command, T payload) { return new SideEffect(actor, command, payload); } - public static SideEffect to(ActorRef actor, String command, T payload, InvocationOpts opts) { + public static SideEffect to(ActorRef actor, String command, T payload, InvocationOpts opts) { return new SideEffect(actor, command, payload, opts); }