Merge branch 'h3nrique:master' into master

Author: sleipnir

README.md

@@ -2,20 +2,27 @@
 
 Java demo project using [Spawn](https://github.com/eigr/spawn) to find postal codes at [ViaCEP](https://viacep.com.br).
 
-## Start environment
+## Test
+Before running the Maven command, ensure that a container environment (Docker/Podman) is running.
+
+```bash
+mvn test
+```
+
+## Start local environment
 
 ```bash
 docker compose up
 ```
 
-## Test
+## Test local environment
 
 ```bash
 # Request PostalCode
-curl -v -H 'Content-Type: application/json' -d '{ "postalCode": "03694090" }' 'http://localhost:8080/postalcode'
+curl -v -H 'Content-Type: application/json' -d '{ "postalCode": "03568000" }' 'http://localhost:8080/postalcode'
 
 # Get PostalCode info
-curl -v 'http://localhost:8080/postalcode/03694090'
+curl -v 'http://localhost:8080/postalcode/03568000'
 ```
 
 ## To deploy on Openshift with Openshift Pipeline (Tekton)

docker-compose.yaml

@@ -28,7 +28,7 @@ services:
 #      context: https://github.com/eigr/spawn.git#main
 #      dockerfile: ./Dockerfile-proxy
 #    image: spawn/proxy:main-localbuild
-    image: eigr/spawn-proxy:1.4.1-rc.1
+    image: eigr/spawn-proxy:1.4.2-rc.2
     environment:
       SPAWN_USE_INTERNAL_NATS: "false"
       SPAWN_PUBSUB_ADAPTER: nats

pom.xml

@@ -4,17 +4,18 @@
    <groupId>com.github.h3nrique</groupId>
    <artifactId>postalcode-spawn-demo</artifactId>
    <packaging>jar</packaging>
-   <version>1.0-SNAPSHOT</version>
+   <version>1.1-SNAPSHOT</version>
    <name>postalcode-spawn-demo</name>
 
    <properties>
       <maven.compiler.source>17</maven.compiler.source>
       <maven.compiler.target>17</maven.compiler.target>
+      <maven.compiler.release>17</maven.compiler.release>
       <project.encoding>UTF-8</project.encoding>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
       <!-- Lib versions -->
-      <spawn.sdk.version>v1.3.1</spawn.sdk.version>
+      <spawn.sdk.version>v1.4.2</spawn.sdk.version>
       <protobuf.version>4.27.2</protobuf.version>
       <testcontainers.version>1.20.1</testcontainers.version>
       <gson.version>2.11.0</gson.version>
@@ -64,20 +65,31 @@
       <dependency>
          <groupId>ch.qos.logback</groupId>
          <artifactId>logback-classic</artifactId>
-         <version>1.4.14</version>
+         <version>1.5.6</version>
       </dependency>
 
       <!-- Tests -->
       <dependency>
          <groupId>org.junit.jupiter</groupId>
          <artifactId>junit-jupiter-api</artifactId>
-         <version>5.10.2</version>
+         <version>5.10.3</version>
          <scope>test</scope>
      </dependency>
       <dependency>
          <groupId>org.testcontainers</groupId>
          <artifactId>testcontainers</artifactId>
          <scope>test</scope>
+         <exclusions>
+            <exclusion> <!-- Remove when testcontainers update -->
+               <groupId>org.apache.commons</groupId>
+               <artifactId>commons-compress</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>
+      <dependency> <!-- Remove when testcontainers update -->
+         <groupId>org.apache.commons</groupId>
+         <artifactId>commons-compress</artifactId>
+         <version>1.27.1</version>
       </dependency>
    </dependencies>
 
@@ -145,6 +157,7 @@
             <configuration>
                <source>${maven.compiler.source}</source>
                <target>${maven.compiler.target}</target>
+               <release>${maven.compiler.release}</release>
             </configuration>
          </plugin>
          <plugin>
@@ -196,4 +209,4 @@
          </build>
       </profile>
    </profiles>
-</project>
+</project>

request.http

@@ -5,7 +5,7 @@ GET http://localhost:8080/postalcode
 POST http://localhost:8080/postalcode
 Content-Type: application/json
 
-{ "postalCode": "03694090" }
+{ "postalCode": "03568000" }
 
 ### get
-GET http://localhost:8080/postalcode/03694090
+GET http://localhost:8080/postalcode/03568000

src/main/java/com/github/h3nrique/postalcode/actors/PostalCode.java

@@ -3,13 +3,13 @@
 import com.github.h3nrique.postalcode.proto.Common;
 import com.github.h3nrique.postalcode.proto.Postalcode;
 import com.github.h3nrique.postalcode.service.PostalCodeService;
+import io.eigr.spawn.api.actors.ActionBindings;
 import io.eigr.spawn.api.actors.ActorContext;
 import io.eigr.spawn.api.actors.StatefulActor;
 import io.eigr.spawn.api.actors.Value;
 import io.eigr.spawn.api.actors.behaviors.ActorBehavior;
 import io.eigr.spawn.api.actors.behaviors.BehaviorCtx;
 import io.eigr.spawn.api.actors.behaviors.NamedActorBehavior;
-import io.eigr.spawn.internal.ActionBindings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -50,7 +50,7 @@ public Value onCreatePostalCode(ActorContext<Postalcode.PostalCodeState> context
                     .setStatus(Common.PostalCodeStatus.FOUND)
                     .build();
             return Value.at()
-                    .state(builder.build())
+                    .state(state)
                     .noReply();
         }
         return Value.at()

src/main/java/com/github/h3nrique/postalcode/actors/PostalCodeGenerator.java

@@ -3,6 +3,7 @@
 import com.github.h3nrique.postalcode.proto.Common;
 import com.github.h3nrique.postalcode.proto.Postalcode;
 import io.eigr.spawn.api.ActorIdentity;
+import io.eigr.spawn.api.actors.ActionBindings;
 import io.eigr.spawn.api.actors.ActorContext;
 import io.eigr.spawn.api.actors.StatelessActor;
 import io.eigr.spawn.api.actors.Value;
@@ -11,7 +12,6 @@
 import io.eigr.spawn.api.actors.behaviors.NamedActorBehavior;
 import io.eigr.spawn.api.exceptions.ActorCreationException;
 import io.eigr.spawn.api.exceptions.ActorInvocationException;
-import io.eigr.spawn.internal.ActionBindings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/com/github/h3nrique/postalcode/service/PostalCodeService.java

@@ -37,9 +37,10 @@ public Map<String, String> find(String postalCode) {
                 .build();
         Call call = client.newCall(request);
         try (Response response = call.execute()) {
-            assert response.body() != null;
+            ResponseBody body = response.body();
+            assert body != null;
             if(response.isSuccessful()) {
-                String responseJson = response.body().string();
+                String responseJson = body.string();
                 Type type = new TypeToken<Map<String, String>>() { }.getType();
                 Map<String, String> map = new Gson().fromJson(responseJson, type);
                 log.debug("postalcode response '{}'.", map);

src/test/java/com/github/h3nrique/postalcode/actor/AbstractContainerBaseTest.java

@@ -16,21 +16,19 @@
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
-import java.util.concurrent.Executors;
-
 abstract class AbstractContainerBaseTest {
 
-    private static final Logger log = LoggerFactory.getLogger(AbstractContainerBaseTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractContainerBaseTest.class);
 
-    private static final String spawnProxyImageName = "eigr/spawn-proxy:1.4.1-rc.1";
+    private static final String SPAWN_PROXY_IMAGE_NAME = "eigr/spawn-proxy:1.4.2-rc.2";
     static final GenericContainer<?> SPAWN_CONTAINER;
     static final Spawn spawnSystem;
     static final App.Config cfg;
 
     static {
         Testcontainers.exposeHostPorts(8091);
 
-        SPAWN_CONTAINER = new GenericContainer<>(DockerImageName.parse(spawnProxyImageName))
+        SPAWN_CONTAINER = new GenericContainer<>(DockerImageName.parse(SPAWN_PROXY_IMAGE_NAME))
                 .waitingFor(new LogMessageWaitStrategy()
                         .withRegEx(".*Proxy Application started successfully.*"))
                 .withEnv("TZ", "America/Sao_Paulo")
@@ -72,6 +70,6 @@ abstract class AbstractContainerBaseTest {
         } catch (SpawnException e) {
             throw new RuntimeException(e);
         }
-        log.info("Spawn system started");
+        LOG.info("Spawn system started");
     }
 }

src/test/java/com/github/h3nrique/postalcode/actor/CepActorTest.java

@@ -17,7 +17,7 @@ public class CepActorTest extends AbstractContainerBaseTest {
 
     @Test
     public void findCep() throws SpawnException {
-        String cep = "03694090";
+        String cep = "03568000";
         Postalcode.CreateRequest createRequest = Postalcode.CreateRequest.newBuilder()
                 .setPostalCode(cep)
                 .build();

src/test/java/com/github/h3nrique/postalcode/service/PostalCodeServiceTest.java

@@ -22,7 +22,7 @@ public static void setUp() {
 
     @Test
     public void findCepOk() {
-        Map<String, String> cepResult = postalCodeService.find("03694090");
+        Map<String, String> cepResult = postalCodeService.find("03568000");
         assertFalse(cepResult.isEmpty());
         log.debug("cepResult :: [{}]", cepResult);
     }