Java support passes the TCK

app-creative · Aug 22, 2019 · 4d6596c · 4d6596c
1 parent 1d3c8ee
commit 4d6596c
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 19 deletions.
diff --git a/java-support/src/main/scala/io/cloudstate/javasupport/CloudStateRunner.scala b/java-support/src/main/scala/io/cloudstate/javasupport/CloudStateRunner.scala
@@ -113,7 +113,12 @@ final class CloudStateRunner private[this](_system: ActorSystem, services: Map[S
         configuration.userFunctionInterface,
         configuration.userFunctionPort,
         HttpConnectionContext(UseHttp2.Always))
-    FutureConverters.toJava(serverBindingFuture).thenCompose(_ => system.getWhenTerminated).thenApply(_ => Done)
+    // FIXME Register an onTerminate callback to unbind the Http server
+    FutureConverters.
+      toJava(serverBindingFuture).
+      thenCompose(
+        binding => system.getWhenTerminated.thenCompose(_ => FutureConverters.toJava(binding.unbind()))
+      ).thenApply(_ => Done)
   }
 
   def terminate(): CompletionStage[Done] =

diff --git a/...support/src/main/scala/io/cloudstate/javasupport/impl/eventsourced/EventSourcedImpl.scala b/...support/src/main/scala/io/cloudstate/javasupport/impl/eventsourced/EventSourcedImpl.scala
@@ -126,7 +126,8 @@ final class EventSourcedImpl(_system: ActorSystem, _services: Map[String, EventS
         } finally {
           context.deactivate() // Very important!
         }
-          val clientAction = context.createClientAction(reply, false)
+
+        val clientAction = context.createClientAction(reply, false)
 
         if (!context.hasError) {
           val endSequenceNumber = sequence + context.events.size

diff --git a/samples/java-shopping-cart/src/main/java/io/cloudstate/samples/shoppingcart/Main.java b/samples/java-shopping-cart/src/main/java/io/cloudstate/samples/shoppingcart/Main.java
@@ -9,7 +9,8 @@ public final static void main(String[] args) throws Exception {
     new CloudState().
       registerEventSourcedEntity(
         ShoppingCartEntity.class,
-        Shoppingcart.getDescriptor().findServiceByName("ShoppingCart")
+        Shoppingcart.getDescriptor().findServiceByName("ShoppingCart"),
+        com.example.shoppingcart.persistence.Domain.getDescriptor()
       ).start().toCompletableFuture().get();
   }
 }
diff --git a/...va-shopping-cart/src/main/java/io/cloudstate/samples/shoppingcart/ShoppingCartEntity.java b/...va-shopping-cart/src/main/java/io/cloudstate/samples/shoppingcart/ShoppingCartEntity.java
@@ -66,16 +66,16 @@ public Shoppingcart.Cart getCart() {
 
     @CommandHandler
     public Empty addItem(Shoppingcart.AddLineItem item, CommandContext ctx) {
-        if (item.getQuantity() == 0) {
-            ctx.fail("Cannot add quantity of zero of an item");
+        if (item.getQuantity() <= 0) {
+            ctx.fail("Cannot add negative quantity of to item" + item.getProductId());
         }
         ctx.emit(Domain.ItemAdded.newBuilder().setItem(
                 Domain.LineItem.newBuilder()
                         .setProductId(item.getProductId())
                         .setName(item.getName())
                         .setQuantity(item.getQuantity())
                         .build()
-        ));
+        ).build());
         return Empty.getDefaultInstance();
     }
 
@@ -84,7 +84,7 @@ public Empty removeItem(Shoppingcart.RemoveLineItem item, CommandContext ctx) {
         if (!cart.containsKey(item.getProductId())) {
             ctx.fail("Cannot remove item " + item.getProductId() + " because it is not in the cart.");
         }
-        ctx.emit(Domain.ItemRemoved.newBuilder().setProductId(item.getProductId()));
+        ctx.emit(Domain.ItemRemoved.newBuilder().setProductId(item.getProductId()).build());
         return Empty.getDefaultInstance();
     }
 

diff --git a/tck/src/main/scala/io/cloudstate/tck/CloudStateTCK.scala b/tck/src/main/scala/io/cloudstate/tck/CloudStateTCK.scala
@@ -45,7 +45,7 @@ import com.google.protobuf.empty.Empty
 import io.cloudstate.protocol.event_sourced.{EventSourced, EventSourcedClient, EventSourcedHandler, EventSourcedInit, EventSourcedReply, EventSourcedStreamIn, EventSourcedStreamOut}
 
 object CloudStateTCK {
-  private[this] final val PROXY   = "proxy"
+  private[this] final val PROXY     = "proxy"
   private[this] final val FRONTEND  = "frontend"
   private[this] final val TCK       = "tck"
   private[this] final val HOSTNAME  = "hostname"
@@ -291,17 +291,19 @@ class CloudStateTCK(private[this] final val config: CloudStateTCK.Configuration)
   }
 
   final def fromFrontend_expectFailure(within: FiniteDuration): Failure = {
-    val failure = eventSourcedFromFrontend.expectMsgType[EventSourcedStreamOut](noWait)
+    val failure = eventSourcedFromFrontend.expectMsgType[EventSourcedStreamOut](noWait) // FIXME Expects entity.Failure, but gets lientAction.Action.Failure(Failure(commandId, msg)))
     failure must not be(null)
-    failure.message must be('failure)
-    failure.message.failure must be(defined)
-    failure.message.failure.get
+    failure.message must be('reply)
+    failure.message.reply must be(defined)
+    failure.message.reply.get.clientAction must be(defined)
+    val clientAction = failure.message.reply.get.clientAction.get
+    clientAction.action must be('failure)
+    clientAction.action.failure must be('defined)
+    clientAction.action.failure.get
   }
 
-  final def correlate(cmd: Command, reply: EventSourcedReply)     = cmd.id must be(reply.commandId)
-  final def correlate(cmd: Command, failure: Failure) = cmd.id must be(failure.commandId)
-  final def unrelated(cmd: Command, reply: EventSourcedReply)     = cmd.id must not be reply.commandId
-  final def unrelated(cmd: Command, failure: Failure) = cmd.id must not be failure.commandId
+  final def correlate(cmd: Command, commandId: Long)     = cmd.id must be(commandId)
+  final def unrelated(cmd: Command, commandId: Long)    = cmd.id must not be commandId
 
   ("The TCK for" + config.name) must {
     implicit val scheduler = system.scheduler
@@ -329,7 +331,7 @@ class CloudStateTCK(private[this] final val config: CloudStateTCK.Configuration)
 
           fromBackend_expectInit(noWait)
 
-          correlate(fromBackend_expectCommand(noWait), fromFrontend_expectReply(events = 0, noWait))
+          correlate(fromBackend_expectCommand(noWait), fromFrontend_expectReply(events = 0, noWait).commandId)
 
           eventSourcedFromBackend.expectNoMsg(noWait)
           eventSourcedFromFrontend.expectNoMsg(noWait)
@@ -373,9 +375,9 @@ class CloudStateTCK(private[this] final val config: CloudStateTCK.Configuration)
         foldLeft(Set.empty[Long]){ case (set, (isReply, eventCount)) =>
           val cmd = fromBackend_expectCommand(noWait)
           if (isReply)
-            correlate(cmd, fromFrontend_expectReply(events = eventCount, noWait)) // Verify correlation
+            correlate(cmd, fromFrontend_expectReply(events = eventCount, noWait).commandId) // Verify correlation
           else
-            correlate(cmd, fromFrontend_expectFailure(noWait)) // Verify correlation
+            correlate(cmd, fromFrontend_expectFailure(noWait).commandId) // Verify correlation
           init.entityId must be(cmd.entityId)
           set must not contain(cmd.id)
           set + cmd.id