Merge pull request #120 from SpineEventEngine/entity-column-update

Entity column API update

Author: dmdashenkov

config

@@ -390,18 +390,18 @@ private Filter getFilter() {
             // Only non-faulty values are used.
         private StructuredQuery.Filter toFilter(FilterAdapter adapter) {
             Value<?> value = adapter.toValue(column, columnFilter);
-            String columnIdentifier = column.storedName();
+            String columnName = column.name();
             switch (columnFilter.getOperator()) {
                 case EQUAL:
-                    return eq(columnIdentifier, value);
+                    return eq(columnName, value);
                 case GREATER_THAN:
-                    return gt(columnIdentifier, value);
+                    return gt(columnName, value);
                 case LESS_THAN:
-                    return lt(columnIdentifier, value);
+                    return lt(columnName, value);
                 case GREATER_OR_EQUAL:
-                    return ge(columnIdentifier, value);
+                    return ge(columnName, value);
                 case LESS_OR_EQUAL:
-                    return le(columnIdentifier, value);
+                    return le(columnName, value);
                 default:
                     throw new IllegalStateException(columnFilter.getOperator()
                                                                 .name());

datastore/src/main/java/io/spine/server/storage/datastore/DsFilters.java

@@ -39,7 +39,7 @@ public abstract class AbstractDatastoreColumnType<J, C> implements DatastoreColu
     /**
      * {@inheritDoc}
      *
-     * <p>Delegates the call to the Datastore-native {@link BaseEntity.Builder#setNull setNull}.
+     * <p>Delegates the call to the Datastore-native {@code setNull}.
      */
     @Override
     public void setNull(BaseEntity.Builder<Key, Entity.Builder> storageRecord,

datastore/src/main/java/io/spine/server/storage/datastore/type/AbstractDatastoreColumnType.java

@@ -30,7 +30,7 @@
 /**
  * The contract of a {@link ColumnType} used by the Datastore storage.
  *
- * <p>Uses {@link Entity.Builder} as the record type and {@code String} as
+ * <p>Uses {@code Entity.Builder} as the record type and {@code String} as
  * the column identifier type.
  */
 @SPI

datastore/src/main/java/io/spine/server/storage/datastore/type/DatastoreColumnType.java

@@ -186,7 +186,7 @@ void testEmptyParameters() {
     @DisplayName("generate filters for `null` column value")
     void testNullFilters() {
         EntityColumn column = mock(EntityColumn.class);
-        when(column.storedName()).thenReturn(ID_STRING_COLUMN_NAME);
+        when(column.name()).thenReturn(ID_STRING_COLUMN_NAME);
         when(column.type()).thenReturn(String.class);
         when(column.persistedType()).thenReturn(String.class);
         when(column.toPersistedValue(any())).thenReturn(null);

datastore/src/test/java/io/spine/server/storage/datastore/DsFiltersTest.java

@@ -45,7 +45,7 @@ class DsProjectionStorageTest extends ProjectionStorageTest {
 
     @Override
     protected Class<? extends TestCounterEntity> getTestEntityClass() {
-        return TestEntity.class;
+        return TestCounterEntity.class;
     }
 
     @Override
@@ -71,11 +71,4 @@ protected ProjectionStorage<ProjectId> newStorage(Class<? extends Entity<?, ?>>
                 datastoreFactory.createProjectionStorage(singleTenantSpec(), projectionClass);
         return result;
     }
-
-    public static class TestEntity extends TestCounterEntity {
-
-        protected TestEntity(ProjectId id) {
-            super(id);
-        }
-    }
 }

datastore/src/test/java/io/spine/server/storage/datastore/DsProjectionStorageTest.java

@@ -46,7 +46,6 @@
 import io.spine.server.storage.datastore.given.CollegeEntity;
 import io.spine.server.storage.datastore.given.DsRecordStorageTestEnv;
 import io.spine.server.storage.datastore.given.DsRecordStorageTestEnv.EntityWithCustomColumnName;
-import io.spine.server.storage.datastore.given.DsRecordStorageTestEnv.TestEntity;
 import io.spine.server.storage.datastore.given.TestConstCounterEntity;
 import io.spine.server.storage.given.RecordStorageTestEnv.TestCounterEntity;
 import io.spine.test.datastore.College;
@@ -144,7 +143,7 @@ protected DsRecordStorage<ProjectId> newStorage(Class<? extends Entity<?, ?>> en
 
     @Override
     protected Class<? extends TestCounterEntity> getTestEntityClass() {
-        return TestEntity.class;
+        return TestCounterEntity.class;
     }
 
     @Override

datastore/src/test/java/io/spine/server/storage/datastore/DsRecordStorageTest.java

@@ -426,13 +426,6 @@ public static EntityId newEntityId(Message message) {
      * Test Entity types
      ************************/
 
-    public static class TestEntity extends RecordStorageTestEnv.TestCounterEntity {
-
-        protected TestEntity(ProjectId id) {
-            super(id);
-        }
-    }
-
     public static class EntityWithCustomColumnName extends AbstractEntity<ProjectId, Project> {
 
         public EntityWithCustomColumnName(ProjectId id) {