Externalize a few classes. Add utility method for Timestamps.

Mikhail Mikhaylov · Mikhail Mikhaylov · commit 753308c04d25 · 2016-04-12T15:07:28.000+03:00
diff --git a/client/src/main/java/org/spine3/protobuf/Timestamps.java b/client/src/main/java/org/spine3/protobuf/Timestamps.java
@@ -83,17 +83,17 @@ public static int compare(@Nullable Timestamp t1, @Nullable Timestamp t2) {
         }
         int result = Long.compare(t1.getSeconds(), t2.getSeconds());
         result = (result == 0) ?
-                Integer.compare(t1.getNanos(), t2.getNanos()) :
-                result;
+                 Integer.compare(t1.getNanos(), t2.getNanos()) :
+                 result;
         return result;
     }
 
     /**
      * Calculates if the {@code timestamp} is between the {@code start} and {@code finish} timestamps.
      *
      * @param timestamp the timestamp to check if it is between the {@code start} and {@code finish}
-     * @param start the first point in time, must be before the {@code finish} timestamp
-     * @param finish the second point in time, must be after the {@code start} timestamp
+     * @param start     the first point in time, must be before the {@code finish} timestamp
+     * @param finish    the second point in time, must be after the {@code start} timestamp
      * @return true if the {@code timestamp} is after the {@code start} and before the {@code finish} timestamps,
      * false otherwise
      */
@@ -138,6 +138,17 @@ public static Date convertToDate(TimestampOrBuilder timestamp) {
         return date;
     }
 
+    /**
+     * Retrieves total nanoseconds from {@link Timestamp}.
+     *
+     * @return long value
+     */
+    public static long convertToNanos(TimestampOrBuilder timestamp) {
+        final long nanosFromSeconds = timestamp.getSeconds() * MILLIS_PER_SECOND * NANOS_PER_MILLISECOND;
+        final long totalNanos = nanosFromSeconds + timestamp.getNanos();
+        return totalNanos;
+    }
+
     private static class TimestampComparator implements Comparator<Timestamp>, Serializable {
         @Override
         public int compare(Timestamp t1, Timestamp t2) {
@@ -164,7 +175,6 @@ public static Timestamp minutesAgo(int value) {
     }
 
     /**
-     *
      * @param value a positive number of minutes
      * @return the moment `value` seconds ago
      */
diff --git a/server/src/test/java/org/spine3/server/aggregate/AggregateRepositoryShould.java b/server/src/test/java/org/spine3/server/aggregate/AggregateRepositoryShould.java
@@ -34,6 +34,7 @@
 import org.spine3.test.project.command.CreateProject;
 import org.spine3.test.project.event.ProjectCreated;
 import org.spine3.test.project.event.TaskAdded;
+import org.spine3.testdata.ProjectAggregate;
 import org.spine3.type.CommandClass;
 import org.spine3.validate.Validate;
 
@@ -58,23 +59,6 @@ public void setUp() {
         repository = new ProjectAggregateRepository(boundedContext);
     }
 
-    private static class ProjectAggregate extends Aggregate<ProjectId, Project, Project.Builder> {
-
-        public ProjectAggregate(ProjectId id) {
-            super(id);
-        }
-
-        @Assign
-        public ProjectCreated handle(CreateProject cmd, CommandContext ctx) {
-            return projectCreatedEvent(cmd.getProjectId());
-        }
-
-        @Assign
-        public TaskAdded handle(AddTask cmd, CommandContext ctx) {
-            return taskAddedEvent(cmd.getProjectId());
-        }
-    }
-
     private static class ProjectAggregateRepository extends AggregateRepository<ProjectId, ProjectAggregate> {
         private ProjectAggregateRepository(BoundedContext boundedContext) {
             super(boundedContext);
diff --git a/server/src/test/java/org/spine3/server/entity/EntityShould.java b/server/src/test/java/org/spine3/server/entity/EntityShould.java
@@ -27,6 +27,7 @@
 import org.junit.Test;
 import org.spine3.test.project.Project;
 import org.spine3.test.project.ProjectId;
+import org.spine3.testdata.TestEntity;
 
 import static com.google.protobuf.util.TimeUtil.getCurrentTime;
 import static org.junit.Assert.assertEquals;
@@ -87,7 +88,7 @@ public void store_state() {
     @Test
     public void validate_state_when_set_it() {
         entity.setState(state, 0, TimeUtil.getCurrentTime());
-        assertTrue(entity.isValidateMethodCalled);
+        assertTrue(entity.isValidateMethodCalled());
     }
 
     @Test(expected = NullPointerException.class)
@@ -115,7 +116,8 @@ public void set_default_state() {
         final long expectedTimeSec = currentTimeSeconds();
 
         assertEquals(entity.getDefaultState(), entity.getState());
-        assertEquals(expectedTimeSec, entity.whenModified().getSeconds());
+        assertEquals(expectedTimeSec, entity.whenModified()
+                                            .getSeconds());
         assertEquals(0, entity.getVersion());
     }
 
@@ -135,7 +137,8 @@ public void record_modification_time_when_incrementing_version() {
         entity.incrementVersion();
         final long expectedTimeSec = currentTimeSeconds();
 
-        assertEquals(expectedTimeSec, entity.whenModified().getSeconds());
+        assertEquals(expectedTimeSec, entity.whenModified()
+                                            .getSeconds());
     }
 
     @Test
@@ -156,7 +159,8 @@ public void record_modification_time_when_updating_state() {
         entity.incrementState(state);
         final long expectedTimeSec = currentTimeSeconds();
 
-        assertEquals(expectedTimeSec, entity.whenModified().getSeconds());
+        assertEquals(expectedTimeSec, entity.whenModified()
+                                            .getSeconds());
     }
 
     @Test
@@ -168,41 +172,29 @@ public void return_id_class() {
 
     @Test
     public void return_id_simple_class_name() {
-        final String expected = entity.getId().getClass().getSimpleName();
+        final String expected = entity.getId()
+                                      .getClass()
+                                      .getSimpleName();
         final String actual = entity.getShortIdTypeName();
         assertEquals(expected, actual);
     }
 
     @Test
     public void return_id_protobuf_type_name() {
         final EntityWithMessageId entityWithMessageId = new EntityWithMessageId();
-        final String expected = ProjectId.getDescriptor().getName();
+        final String expected = ProjectId.getDescriptor()
+                                         .getName();
         final String actual = entityWithMessageId.getShortIdTypeName();
         assertEquals(expected, actual);
     }
 
     private static Project newProject() {
         final Project.Builder project = Project.newBuilder()
-                .setProjectId(newProjectId())
-                .setStatus(newUuid());
+                                               .setProjectId(newProjectId())
+                                               .setStatus(newUuid());
         return project.build();
     }
 
-    private static class TestEntity extends Entity<String, Project> {
-
-        private boolean isValidateMethodCalled = false;
-
-        protected TestEntity(String id) {
-            super(id);
-        }
-
-        @Override
-        protected void validate(Project state) throws IllegalStateException {
-            super.validate(state);
-            isValidateMethodCalled = true;
-        }
-    }
-
     private static class EntityWithUnsupportedId extends Entity<Exception, Project> {
 
         protected EntityWithUnsupportedId(Exception id) {
diff --git a/server/src/test/java/org/spine3/testdata/ProjectAggregate.java b/server/src/test/java/org/spine3/testdata/ProjectAggregate.java
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+package org.spine3.testdata;
+
+import org.spine3.base.CommandContext;
+import org.spine3.server.Assign;
+import org.spine3.server.aggregate.Aggregate;
+import org.spine3.test.project.Project;
+import org.spine3.test.project.ProjectId;
+import org.spine3.test.project.command.AddTask;
+import org.spine3.test.project.command.CreateProject;
+import org.spine3.test.project.event.ProjectCreated;
+import org.spine3.test.project.event.TaskAdded;
+
+import static org.spine3.testdata.TestEventMessageFactory.projectCreatedEvent;
+import static org.spine3.testdata.TestEventMessageFactory.taskAddedEvent;
+
+public class ProjectAggregate extends Aggregate<ProjectId, Project, Project.Builder> {
+
+    public ProjectAggregate(ProjectId id) {
+        super(id);
+    }
+
+    @Assign
+    public ProjectCreated handle(CreateProject cmd, CommandContext ctx) {
+        return projectCreatedEvent(cmd.getProjectId());
+    }
+
+    @Assign
+    public TaskAdded handle(AddTask cmd, CommandContext ctx) {
+        return taskAddedEvent(cmd.getProjectId());
+    }
+}
diff --git a/server/src/test/java/org/spine3/testdata/TestEntity.java b/server/src/test/java/org/spine3/testdata/TestEntity.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package org.spine3.testdata;
+
+import org.spine3.server.entity.Entity;
+import org.spine3.test.project.Project;
+
+/**
+ * Extracted from {@link org.spine3.server.entity.EntityShould}
+ *
+ * @author Mikhail Mikhaylov
+ */
+public class TestEntity extends Entity<String, Project> {
+
+    private boolean isValidateMethodCalled = false;
+
+    public TestEntity(String id) {
+        super(id);
+    }
+
+    @Override
+    protected void validate(Project state) throws IllegalStateException {
+        super.validate(state);
+        isValidateMethodCalled = true;
+    }
+
+    public boolean isValidateMethodCalled() {
+        return isValidateMethodCalled;
+    }
+}
