Move command- and event-related classes and annotations to corresponding sub-packages.

alexander-yevsyukov · alexander-yevsyukov · commit c5f635591363 · 2016-04-19T09:55:12.000+03:00
diff --git a/examples/src/main/java/org/spine3/examples/aggregate/server/EventLogger.java b/examples/src/main/java/org/spine3/examples/aggregate/server/EventLogger.java
@@ -28,8 +28,8 @@
 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.
diff --git a/examples/src/main/java/org/spine3/examples/aggregate/server/OrderAggregate.java b/examples/src/main/java/org/spine3/examples/aggregate/server/OrderAggregate.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
diff --git a/examples/src/main/java/org/spine3/examples/failure/TaskAggregate.java b/examples/src/main/java/org/spine3/examples/failure/TaskAggregate.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
diff --git a/examples/src/main/java/org/spine3/examples/failure/failures/CannotCancelTaskInProgress.java b/examples/src/main/java/org/spine3/examples/failure/failures/CannotCancelTaskInProgress.java
@@ -21,7 +21,7 @@
 package org.spine3.examples.failure.failures;
 
 import org.spine3.examples.failure.TaskId;
-import org.spine3.server.FailureThrowable;
+import org.spine3.server.failure.FailureThrowable;
 
 /**
  * @author Alexander Yevsyukov
diff --git a/server/src/main/java/org/spine3/server/BoundedContext.java b/server/src/main/java/org/spine3/server/BoundedContext.java
@@ -34,11 +34,13 @@
 import org.spine3.protobuf.Messages;
 import org.spine3.server.aggregate.AggregateRepository;
 import org.spine3.server.command.CommandBus;
+import org.spine3.server.command.CommandDispatcher;
 import org.spine3.server.command.CommandStore;
 import org.spine3.server.command.CommandValidation;
 import org.spine3.server.entity.Entity;
 import org.spine3.server.entity.Repository;
 import org.spine3.server.event.EventBus;
+import org.spine3.server.event.EventDispatcher;
 import org.spine3.server.event.EventStore;
 import org.spine3.server.storage.AggregateStorage;
 import org.spine3.server.storage.EntityStorage;
diff --git a/server/src/main/java/org/spine3/server/aggregate/Aggregate.java b/server/src/main/java/org/spine3/server/aggregate/Aggregate.java
@@ -33,8 +33,8 @@
 import org.spine3.base.EventId;
 import org.spine3.base.Events;
 import org.spine3.protobuf.Messages;
-import org.spine3.server.CommandHandler;
 import org.spine3.server.aggregate.error.MissingEventApplierException;
+import org.spine3.server.command.CommandHandler;
 import org.spine3.server.entity.Entity;
 import org.spine3.server.reflect.Classes;
 import org.spine3.server.reflect.CommandHandlerMethod;
diff --git a/server/src/main/java/org/spine3/server/aggregate/AggregateRepository.java b/server/src/main/java/org/spine3/server/aggregate/AggregateRepository.java
@@ -26,12 +26,12 @@
 import org.spine3.base.Errors;
 import org.spine3.base.Event;
 import org.spine3.server.BoundedContext;
-import org.spine3.server.CommandDispatcher;
-import org.spine3.server.FailureThrowable;
+import org.spine3.server.command.CommandDispatcher;
 import org.spine3.server.command.CommandStatusService;
 import org.spine3.server.entity.GetTargetIdFromCommand;
 import org.spine3.server.entity.Repository;
 import org.spine3.server.event.EventBus;
+import org.spine3.server.failure.FailureThrowable;
 import org.spine3.server.storage.AggregateEvents;
 import org.spine3.server.storage.AggregateStorage;
 import org.spine3.server.storage.StorageFactory;
diff --git a/server/src/main/java/org/spine3/server/command/Assign.java b/server/src/main/java/org/spine3/server/command/Assign.java
@@ -18,9 +18,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.spine3.server;
-
-import org.spine3.server.command.CommandBus;
+package org.spine3.server.command;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/server/src/main/java/org/spine3/server/command/CommandBus.java b/server/src/main/java/org/spine3/server/command/CommandBus.java
@@ -29,10 +29,8 @@
 import org.spine3.base.Errors;
 import org.spine3.base.Response;
 import org.spine3.base.Responses;
-import org.spine3.server.CommandDispatcher;
-import org.spine3.server.CommandHandler;
-import org.spine3.server.FailureThrowable;
 import org.spine3.server.error.UnsupportedCommandException;
+import org.spine3.server.failure.FailureThrowable;
 import org.spine3.server.type.CommandClass;
 import org.spine3.server.validate.MessageValidator;
 import org.spine3.validate.options.ConstraintViolation;
diff --git a/server/src/main/java/org/spine3/server/command/CommandDispatcher.java b/server/src/main/java/org/spine3/server/command/CommandDispatcher.java
@@ -18,7 +18,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.spine3.server;
+package org.spine3.server.command;
 
 import org.spine3.base.Command;
 import org.spine3.server.type.CommandClass;
diff --git a/server/src/main/java/org/spine3/server/command/CommandHandler.java b/server/src/main/java/org/spine3/server/command/CommandHandler.java
@@ -18,7 +18,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.spine3.server;
+package org.spine3.server.command;
 
 import com.google.common.collect.ImmutableList;
 import com.google.protobuf.Empty;
@@ -32,6 +32,7 @@
 import org.spine3.base.Identifiers;
 import org.spine3.server.entity.Entity;
 import org.spine3.server.event.EventBus;
+import org.spine3.server.failure.FailureThrowable;
 import org.spine3.server.reflect.CommandHandlerMethod;
 import org.spine3.server.reflect.MethodRegistry;
 
@@ -89,7 +90,7 @@ public void handle(Message commandMessage, CommandContext context) throws Invoca
         postEvents(events);
     }
 
-    public CommandHandlerMethod getHandlerMethod(Class<? extends Message> commandClass) {
+    /* package */ CommandHandlerMethod getHandlerMethod(Class<? extends Message> commandClass) {
         return MethodRegistry.getInstance().get(getClass(), commandClass, CommandHandlerMethod.factory());
     }
 
diff --git a/server/src/main/java/org/spine3/server/command/CommandStatusService.java b/server/src/main/java/org/spine3/server/command/CommandStatusService.java
@@ -21,7 +21,7 @@
 package org.spine3.server.command;
 
 import org.spine3.base.CommandId;
-import org.spine3.server.FailureThrowable;
+import org.spine3.server.failure.FailureThrowable;
 
 /**
  * The service for updating a status of a command.
diff --git a/server/src/main/java/org/spine3/server/command/DispatcherRegistry.java b/server/src/main/java/org/spine3/server/command/DispatcherRegistry.java
@@ -24,8 +24,6 @@
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.protobuf.Message;
-import org.spine3.server.CommandDispatcher;
-import org.spine3.server.CommandHandler;
 import org.spine3.server.reflect.Classes;
 import org.spine3.server.reflect.CommandHandlerMethod;
 import org.spine3.server.type.CommandClass;
diff --git a/server/src/main/java/org/spine3/server/command/HandlerRegistry.java b/server/src/main/java/org/spine3/server/command/HandlerRegistry.java
@@ -23,8 +23,6 @@
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.protobuf.Message;
-import org.spine3.server.CommandDispatcher;
-import org.spine3.server.CommandHandler;
 import org.spine3.server.error.CommandHandlerAlreadyRegisteredException;
 import org.spine3.server.reflect.CommandHandlerMethod;
 import org.spine3.server.reflect.HandlerMethod;
diff --git a/server/src/main/java/org/spine3/server/entity/EntityEventDispatcher.java b/server/src/main/java/org/spine3/server/entity/EntityEventDispatcher.java
@@ -22,7 +22,7 @@
 
 import com.google.protobuf.Message;
 import org.spine3.base.EventContext;
-import org.spine3.server.EventDispatcher;
+import org.spine3.server.event.EventDispatcher;
 import org.spine3.server.type.EventClass;
 
 /**
diff --git a/server/src/main/java/org/spine3/server/event/DispatcherRegistry.java b/server/src/main/java/org/spine3/server/event/DispatcherRegistry.java
@@ -21,7 +21,6 @@
 package org.spine3.server.event;
 
 import com.google.common.collect.HashMultimap;
-import org.spine3.server.EventDispatcher;
 import org.spine3.server.type.EventClass;
 
 import java.util.Set;
diff --git a/server/src/main/java/org/spine3/server/event/EventBus.java b/server/src/main/java/org/spine3/server/event/EventBus.java
@@ -27,9 +27,6 @@
 import org.spine3.base.Event;
 import org.spine3.base.EventContext;
 import org.spine3.base.Events;
-import org.spine3.server.EventDispatcher;
-import org.spine3.server.EventHandler;
-import org.spine3.server.Subscribe;
 import org.spine3.server.aggregate.AggregateRepository;
 import org.spine3.server.procman.ProcessManager;
 import org.spine3.server.type.EventClass;
diff --git a/server/src/main/java/org/spine3/server/event/EventDispatcher.java b/server/src/main/java/org/spine3/server/event/EventDispatcher.java
@@ -18,7 +18,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.spine3.server;
+package org.spine3.server.event;
 
 import org.spine3.base.Event;
 import org.spine3.server.type.EventClass;
diff --git a/server/src/main/java/org/spine3/server/event/EventHandler.java b/server/src/main/java/org/spine3/server/event/EventHandler.java
@@ -18,11 +18,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.spine3.server;
+package org.spine3.server.event;
 
 import com.google.protobuf.Message;
 import org.spine3.base.EventContext;
-import org.spine3.server.event.EventBus;
 import org.spine3.server.reflect.EventHandlerMethod;
 import org.spine3.server.reflect.MethodRegistry;
 
diff --git a/server/src/main/java/org/spine3/server/event/HandlerRegistry.java b/server/src/main/java/org/spine3/server/event/HandlerRegistry.java
@@ -24,7 +24,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Multimap;
 import com.google.protobuf.Message;
-import org.spine3.server.EventHandler;
 import org.spine3.server.reflect.EventHandlerMethod;
 import org.spine3.server.reflect.MethodMap;
 import org.spine3.server.type.EventClass;
diff --git a/server/src/main/java/org/spine3/server/event/Subscribe.java b/server/src/main/java/org/spine3/server/event/Subscribe.java
@@ -18,9 +18,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.spine3.server;
-
-import org.spine3.server.event.EventBus;
+package org.spine3.server.event;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/server/src/main/java/org/spine3/server/failure/FailureThrowable.java b/server/src/main/java/org/spine3/server/failure/FailureThrowable.java
@@ -18,7 +18,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.spine3.server;
+package org.spine3.server.failure;
 
 import com.google.common.base.Throwables;
 import com.google.protobuf.Any;
@@ -32,7 +32,6 @@
  *
  * @author Alexander Yevsyukov
  */
-@SuppressWarnings("AbstractClassWithoutAbstractMethods")
 public abstract class FailureThrowable extends Throwable {
 
     private static final long serialVersionUID = 0L;
diff --git a/server/src/main/java/org/spine3/server/failure/package-info.java b/server/src/main/java/org/spine3/server/failure/package-info.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2016, TeamDev Ltd. All rights reserved.
+ *
+ * Redistribution and use in source and/or binary forms, with or without
+ * modification, must retain the above copyright notice and the following
+ * disclaimer.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * This package provides classes for working with business failures.
+ */
+
+@ParametersAreNonnullByDefault
+package org.spine3.server.failure;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/src/main/java/org/spine3/server/procman/ProcessManagerRepository.java b/server/src/main/java/org/spine3/server/procman/ProcessManagerRepository.java
@@ -30,8 +30,8 @@
 import org.spine3.base.EventContext;
 import org.spine3.base.Events;
 import org.spine3.server.BoundedContext;
-import org.spine3.server.CommandDispatcher;
 import org.spine3.server.command.CommandBus;
+import org.spine3.server.command.CommandDispatcher;
 import org.spine3.server.entity.EntityEventDispatcher;
 import org.spine3.server.entity.EntityRepository;
 import org.spine3.server.entity.GetTargetIdFromCommand;
diff --git a/server/src/main/java/org/spine3/server/projection/ProjectionRepository.java b/server/src/main/java/org/spine3/server/projection/ProjectionRepository.java
@@ -26,8 +26,8 @@
 import org.spine3.base.EventContext;
 import org.spine3.base.Events;
 import org.spine3.server.BoundedContext;
-import org.spine3.server.EventDispatcher;
 import org.spine3.server.entity.EntityRepository;
+import org.spine3.server.event.EventDispatcher;
 import org.spine3.server.storage.EntityStorage;
 import org.spine3.server.storage.ProjectionStorage;
 import org.spine3.server.storage.StorageFactory;
diff --git a/server/src/main/java/org/spine3/server/reflect/CommandHandlerMethod.java b/server/src/main/java/org/spine3/server/reflect/CommandHandlerMethod.java
@@ -23,8 +23,8 @@
 import com.google.common.base.Predicate;
 import com.google.protobuf.Message;
 import org.spine3.base.CommandContext;
-import org.spine3.server.Assign;
-import org.spine3.server.CommandHandler;
+import org.spine3.server.command.Assign;
+import org.spine3.server.command.CommandHandler;
 
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nullable;
diff --git a/server/src/main/java/org/spine3/server/reflect/EventHandlerMethod.java b/server/src/main/java/org/spine3/server/reflect/EventHandlerMethod.java
@@ -23,7 +23,7 @@
 import com.google.common.base.Predicate;
 import com.google.protobuf.Message;
 import org.spine3.base.EventContext;
-import org.spine3.server.Subscribe;
+import org.spine3.server.event.Subscribe;
 
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nullable;
diff --git a/server/src/test/java/org/spine3/server/BoundedContextShould.java b/server/src/test/java/org/spine3/server/BoundedContextShould.java
@@ -39,12 +39,15 @@
 import org.spine3.server.aggregate.Aggregate;
 import org.spine3.server.aggregate.AggregateRepository;
 import org.spine3.server.aggregate.Apply;
+import org.spine3.server.command.Assign;
 import org.spine3.server.command.CommandBus;
 import org.spine3.server.command.CommandStore;
 import org.spine3.server.entity.IdFunction;
 import org.spine3.server.event.EventBus;
+import org.spine3.server.event.EventHandler;
 import org.spine3.server.event.EventStore;
 import org.spine3.server.event.GetProducerIdFromEvent;
+import org.spine3.server.event.Subscribe;
 import org.spine3.server.procman.CommandRouted;
 import org.spine3.server.procman.ProcessManager;
 import org.spine3.server.procman.ProcessManagerRepository;
diff --git a/server/src/test/java/org/spine3/server/aggregate/AggregateShould.java b/server/src/test/java/org/spine3/server/aggregate/AggregateShould.java
@@ -35,7 +35,7 @@
 import org.spine3.base.UserId;
 import org.spine3.client.UserUtil;
 import org.spine3.protobuf.Timestamps;
-import org.spine3.server.Assign;
+import org.spine3.server.command.Assign;
 import org.spine3.test.project.Project;
 import org.spine3.test.project.ProjectId;
 import org.spine3.test.project.command.AddTask;
diff --git a/server/src/test/java/org/spine3/server/command/CommandBusShould.java b/server/src/test/java/org/spine3/server/command/CommandBusShould.java
@@ -31,12 +31,9 @@
 import org.spine3.base.Responses;
 import org.spine3.client.CommandFactory;
 import org.spine3.client.test.TestCommandFactory;
-import org.spine3.server.Assign;
-import org.spine3.server.CommandDispatcher;
-import org.spine3.server.CommandHandler;
-import org.spine3.server.FailureThrowable;
 import org.spine3.server.error.UnsupportedCommandException;
 import org.spine3.server.event.EventBus;
+import org.spine3.server.failure.FailureThrowable;
 import org.spine3.server.type.CommandClass;
 import org.spine3.test.failures.Failures;
 import org.spine3.test.project.command.AddTask;
diff --git a/server/src/test/java/org/spine3/server/event/EventBusShould.java b/server/src/test/java/org/spine3/server/event/EventBusShould.java
@@ -26,9 +26,6 @@
 import org.junit.Test;
 import org.spine3.base.Event;
 import org.spine3.base.EventContext;
-import org.spine3.server.EventDispatcher;
-import org.spine3.server.EventHandler;
-import org.spine3.server.Subscribe;
 import org.spine3.server.storage.StorageFactory;
 import org.spine3.server.storage.memory.InMemoryStorageFactory;
 import org.spine3.server.type.EventClass;
diff --git a/server/src/test/java/org/spine3/server/procman/ProcessManagerRepositoryShould.java b/server/src/test/java/org/spine3/server/procman/ProcessManagerRepositoryShould.java
@@ -32,14 +32,14 @@
 import org.spine3.base.Event;
 import org.spine3.base.EventContext;
 import org.spine3.base.Events;
-import org.spine3.server.Assign;
 import org.spine3.server.BoundedContext;
 import org.spine3.server.BoundedContextTestStubs;
-import org.spine3.server.CommandDispatcher;
-import org.spine3.server.FailureThrowable;
-import org.spine3.server.Subscribe;
+import org.spine3.server.command.Assign;
+import org.spine3.server.command.CommandDispatcher;
 import org.spine3.server.entity.IdFunction;
 import org.spine3.server.event.GetProducerIdFromEvent;
+import org.spine3.server.event.Subscribe;
+import org.spine3.server.failure.FailureThrowable;
 import org.spine3.server.storage.memory.InMemoryStorageFactory;
 import org.spine3.server.type.CommandClass;
 import org.spine3.server.type.EventClass;
diff --git a/server/src/test/java/org/spine3/server/procman/ProcessManagerShould.java b/server/src/test/java/org/spine3/server/procman/ProcessManagerShould.java
@@ -33,9 +33,9 @@
 import org.spine3.base.EventContext;
 import org.spine3.base.Events;
 import org.spine3.protobuf.Messages;
-import org.spine3.server.Assign;
-import org.spine3.server.Subscribe;
+import org.spine3.server.command.Assign;
 import org.spine3.server.command.CommandBus;
+import org.spine3.server.event.Subscribe;
 import org.spine3.test.project.ProjectId;
 import org.spine3.test.project.command.AddTask;
 import org.spine3.test.project.command.CreateProject;
diff --git a/server/src/test/java/org/spine3/server/projection/ProjectionRepositoryShould.java b/server/src/test/java/org/spine3/server/projection/ProjectionRepositoryShould.java
diff --git a/server/src/test/java/org/spine3/server/projection/ProjectionShould.java b/server/src/test/java/org/spine3/server/projection/ProjectionShould.java
diff --git a/server/src/test/java/org/spine3/server/reflect/MethodMapShould.java b/server/src/test/java/org/spine3/server/reflect/MethodMapShould.java
diff --git a/server/src/test/java/org/spine3/testdata/ProjectAggregate.java b/server/src/test/java/org/spine3/testdata/ProjectAggregate.java
