Merge pull request #126 from SpineEventEngine/repos-post-events

Repos post events (plus refactoring)

Author: alexander-yevsyukov

.idea/codeStyleSettings.xml

@@ -25,7 +25,6 @@
 import com.google.protobuf.Timestamp;
 import org.spine3.protobuf.Messages;
 import org.spine3.protobuf.Timestamps;
-import org.spine3.type.EventClass;
 
 import javax.annotation.Nullable;
 import java.util.Collections;
@@ -105,15 +104,6 @@ public static Message getMessage(Event event) {
         return result;
     }
 
-    /**
-     * Determines the class of the event from the passed event record.
-     */
-    public static EventClass getEventClass(Event event) {
-        final Message message = getMessage(event);
-        final EventClass result = EventClass.of(message);
-        return result;
-    }
-
     /**
      * Obtains the actor user ID from the passed {@code EventContext}.
      *

.idea/inspectionProfiles/Project_Default.xml

@@ -47,10 +47,23 @@ public static Response ok() {
     }
 
     /**
-     * @return {@code true} if the passed response represents `ok` status.
+     * @return {@code true} if the passed response represents `ok` status,
+     *         {@code false} otherwise
      */
     public static boolean isOk(Response response) {
         final boolean result = response.getStatusCase() == Response.StatusCase.OK;
         return result;
     }
+
+    /**
+     * @return {@code true} if the passed response represents `unsupported command` error,
+     *         {@code false} otherwise
+     */
+    public static boolean isUnsupportedCommand(Response response) {
+        if (response.getStatusCase() == Response.StatusCase.ERROR) {
+            final Error error = response.getError();
+            return error.getCode() == CommandValidationError.UNSUPPORTED_COMMAND.getNumber();
+        }
+        return false;
+    }
 }

client/src/main/java/org/spine3/base/Events.java

@@ -3,7 +3,7 @@ buildscript {
         resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
     }
     dependencies {
-        classpath group: 'org.spine3.tools', name: 'protobuf-plugin', version: '1.2', changing: true
+        classpath group: 'org.spine3.tools', name: 'protobuf-plugin', version: '1.3.1', changing: true
     }
 }
 
@@ -16,4 +16,16 @@ dependencies {
     compile project(path: ':server');
 }
 
+protobuf {
+    generateProtoTasks {
+        all().each { final task ->
+            task.plugins {
+                task.generateDescriptorSet = true
+                task.descriptorSetOptions.path = "${projectDir}/build/descriptors/${task.sourceSet.name}.desc"
+                task.descriptorSetOptions.includeImports = true
+            }
+        }
+    }
+}
+
 apply plugin: 'org.spine3.tools.protobuf-plugin';

client/src/main/java/org/spine3/base/Responses.java

@@ -20,13 +20,13 @@
 
 package org.spine3.examples.aggregate.server;
 
-import com.google.common.base.Function;
 import com.google.common.util.concurrent.MoreExecutors;
+import io.grpc.stub.StreamObserver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.spine3.base.Command;
+import org.spine3.base.Response;
 import org.spine3.examples.aggregate.Client;
-import org.spine3.examples.aggregate.OrderId;
 import org.spine3.server.BoundedContext;
 import org.spine3.server.command.CommandBus;
 import org.spine3.server.command.CommandStore;
@@ -35,14 +35,9 @@
 import org.spine3.server.storage.StorageFactory;
 import org.spine3.server.storage.memory.InMemoryStorageFactory;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.List;
 
-import static com.google.common.base.Strings.isNullOrEmpty;
-import static org.spine3.base.Identifiers.ConverterRegistry;
-import static org.spine3.base.Identifiers.NULL_ID_OR_FIELD;
-
 /**
  * A sample application showing basic usage of the framework.
  *
@@ -105,9 +100,23 @@ public void execute() {
         // Generate test requests
         final List<Command> requests = Client.generateRequests();
 
+        final StreamObserver<Response> responseObserver = new StreamObserver<Response>() {
+            @Override
+            public void onNext(Response response) {
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+            }
+
+            @Override
+            public void onCompleted() {
+            }
+        };
+
         // Process requests
         for (Command request : requests) {
-            boundedContext.process(request);
+            boundedContext.post(request, responseObserver);
         }
 
         log().info("All the requests were handled.");
@@ -125,10 +134,6 @@ public void setUp() {
 
         // Register event handlers.
         boundedContext.getEventBus().subscribe(eventLogger);
-
-        //TODO:2015-11-10:alexander.yevsyukov: This must be called by the repository or something belonging to business logic.
-        // Register id converters
-        ConverterRegistry.getInstance().register(OrderId.class, new OrderIdToStringConverter());
     }
 
     /**
@@ -143,21 +148,6 @@ public BoundedContext getBoundedContext() {
         return boundedContext;
     }
 
-    private static class OrderIdToStringConverter implements Function<OrderId, String> {
-
-        @Override
-        public String apply(@Nullable OrderId orderId) {
-            if (orderId == null) {
-                return NULL_ID_OR_FIELD;
-            }
-            final String value = orderId.getValue();
-            if (isNullOrEmpty(value) || value.trim().isEmpty()) {
-                return NULL_ID_OR_FIELD;
-            }
-            return value;
-        }
-    }
-
     private static Logger log() {
         return LogSingleton.INSTANCE.value;
     }

examples/build.gradle

@@ -28,16 +28,16 @@
 import org.spine3.examples.aggregate.event.OrderLineAdded;
 import org.spine3.examples.aggregate.event.OrderPaid;
 import org.spine3.protobuf.Messages;
-import org.spine3.server.EventHandler;
-import org.spine3.server.Subscribe;
+import org.spine3.server.event.EventHandler;
+import org.spine3.server.event.Subscribe;
 
 /**
  * A sample of event handler class that logs some of the events.
  *
  * @author Mikhail Melnik
  */
 @SuppressWarnings({"InstanceMethodNamingConvention", "TypeMayBeWeakened", "UnusedParameters"})
-class EventLogger implements EventHandler {
+class EventLogger extends EventHandler {
 
     private static final String NEW_LINE = System.lineSeparator();
 

examples/src/main/java/org/spine3/examples/aggregate/server/Application.java

@@ -29,9 +29,9 @@
 import org.spine3.examples.aggregate.event.OrderCreated;
 import org.spine3.examples.aggregate.event.OrderLineAdded;
 import org.spine3.examples.aggregate.event.OrderPaid;
-import org.spine3.server.Assign;
 import org.spine3.server.aggregate.Aggregate;
 import org.spine3.server.aggregate.Apply;
+import org.spine3.server.command.Assign;
 
 /**
  * @author Mikhail Melnik

examples/src/main/java/org/spine3/examples/aggregate/server/EventLogger.java

@@ -19,16 +19,41 @@
  */
 package org.spine3.examples.aggregate.server;
 
+import com.google.common.base.Function;
+import org.spine3.base.Identifiers;
 import org.spine3.examples.aggregate.OrderId;
 import org.spine3.server.BoundedContext;
 import org.spine3.server.aggregate.AggregateRepository;
 
+import javax.annotation.Nullable;
+
+import static com.google.common.base.Strings.isNullOrEmpty;
+import static org.spine3.base.Identifiers.NULL_ID_OR_FIELD;
+
 /**
  * @author Mikhail Melnik
  */
 public class OrderRepository extends AggregateRepository<OrderId, OrderAggregate> {
 
     public OrderRepository(BoundedContext boundedContext) {
         super(boundedContext);
+
+        // Register id converters
+        Identifiers.ConverterRegistry.getInstance().register(OrderId.class, new OrderIdToStringConverter());
+    }
+
+    private static class OrderIdToStringConverter implements Function<OrderId, String> {
+
+        @Override
+        public String apply(@Nullable OrderId orderId) {
+            if (orderId == null) {
+                return NULL_ID_OR_FIELD;
+            }
+            final String value = orderId.getValue();
+            if (isNullOrEmpty(value) || value.trim().isEmpty()) {
+                return NULL_ID_OR_FIELD;
+            }
+            return value;
+        }
     }
 }

examples/src/main/java/org/spine3/examples/aggregate/server/OrderAggregate.java

@@ -24,8 +24,8 @@
 import org.spine3.examples.failure.commands.CancelTask;
 import org.spine3.examples.failure.events.TaskCancelled;
 import org.spine3.examples.failure.failures.CannotCancelTaskInProgress;
-import org.spine3.server.Assign;
 import org.spine3.server.aggregate.Aggregate;
+import org.spine3.server.command.Assign;
 
 /**
  * A sample of the aggregate that throws a business failure on a command, which cannot be