Migrate to the updated core API

dmitrykuzmin · dmitrykuzmin · commit 16293957997b · 2019-10-28T16:21:22.000+02:00
Also fixed the deprecation warnings across the project.
diff --git a/datastore/src/main/java/io/spine/server/storage/datastore/DatastoreStorageFactory.java b/datastore/src/main/java/io/spine/server/storage/datastore/DatastoreStorageFactory.java
@@ -43,7 +43,6 @@
 import io.spine.server.storage.datastore.tenant.NamespaceSupplier;
 import io.spine.server.storage.datastore.tenant.NsConverterFactory;
 import io.spine.server.storage.datastore.tenant.PrefixedNsConverterFactory;
-import io.spine.server.storage.datastore.type.DsColumnMapping;
 import io.spine.server.tenant.TenantIndex;
 
 import java.util.Map;
@@ -296,7 +295,7 @@ public Datastore getDatastore() {
         }
 
         /**
-         * Sets the {@link ColumnMapping}.
+         * Sets the {@link ColumnMapping} to use.
          *
          * <p>Default value is {@link DsColumnMapping}.
          *
diff --git a/datastore/src/main/java/io/spine/server/storage/datastore/DsColumnMapping.java b/datastore/src/main/java/io/spine/server/storage/datastore/DsColumnMapping.java
@@ -18,7 +18,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.spine.server.storage.datastore.type;
+package io.spine.server.storage.datastore;
 
 import com.google.cloud.datastore.Blob;
 import com.google.cloud.datastore.BlobValue;
@@ -41,7 +41,12 @@
 import static com.google.cloud.Timestamp.ofTimeSecondsAndNanos;
 
 /**
- * Non-{@code final}, implement to ..., maybe {@link io.spine.annotation.SPI}.
+ * A standard Datastore column mapping.
+ *
+ * <p>All column values are stored as Datastore {@link Value}-s.
+ *
+ * <p>Users of the storage can extend this class to specify their own column mapping for the
+ * selected types.
  */
 public class DsColumnMapping extends AbstractColumnMapping<Value<?>> {
 
diff --git a/datastore/src/main/java/io/spine/server/storage/datastore/DsEntityComparator.java b/datastore/src/main/java/io/spine/server/storage/datastore/DsEntityComparator.java
@@ -34,7 +34,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static io.spine.client.OrderBy.Direction.ASCENDING;
 import static io.spine.util.Exceptions.newIllegalStateException;
-import static io.spine.validate.Validate.checkNotDefault;
+import static io.spine.util.Preconditions2.checkNotDefaultArg;
 import static java.util.Arrays.stream;
 
 /**
@@ -76,7 +76,7 @@ public int compare(Entity a, Entity b) {
      */
     static Comparator<Entity> implementing(OrderBy orderBy) {
         checkNotNull(orderBy);
-        checkNotDefault(orderBy);
+        checkNotDefaultArg(orderBy);
         Comparator<Entity> comparator = new DsEntityComparator(orderBy.getColumn());
         return orderBy.getDirection() == ASCENDING ? comparator : comparator.reversed();
     }
diff --git a/datastore/src/main/java/io/spine/server/storage/datastore/DsLookupByQueries.java b/datastore/src/main/java/io/spine/server/storage/datastore/DsLookupByQueries.java
@@ -39,9 +39,9 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.collect.Lists.newArrayList;
+import static io.spine.protobuf.Messages.isDefault;
 import static io.spine.server.storage.datastore.DsEntityComparator.implementing;
 import static io.spine.server.storage.datastore.FieldMaskApplier.recordMasker;
-import static io.spine.validate.Validate.isDefault;
 import static java.util.Collections.singleton;
 import static java.util.stream.Collectors.toList;
 
diff --git a/datastore/src/main/java/io/spine/server/storage/datastore/DsProjectionStorage.java b/datastore/src/main/java/io/spine/server/storage/datastore/DsProjectionStorage.java
@@ -33,8 +33,7 @@
 import java.util.Iterator;
 import java.util.Optional;
 
-import static io.spine.server.projection.model.ProjectionClass.asProjectionClass;
-import static io.spine.validate.Validate.isDefault;
+import static io.spine.protobuf.Messages.isDefault;
 
 /**
  * Datastore implementation of the {@link ProjectionStorage}.
@@ -52,7 +51,7 @@ protected DsProjectionStorage(Class<? extends Projection<I, ?, ?>> projectionCla
                                   DsRecordStorage<I> recordStorage,
                                   DsPropertyStorage propertyStorage,
                                   boolean multitenant) {
-        super(asProjectionClass(projectionClass), multitenant);
+        super(projectionClass, multitenant);
         this.recordStorage = recordStorage;
         this.propertyStorage = propertyStorage;
         this.lastTimestampId =
diff --git a/datastore/src/main/java/io/spine/server/storage/datastore/FieldMaskApplier.java b/datastore/src/main/java/io/spine/server/storage/datastore/FieldMaskApplier.java
@@ -30,8 +30,8 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static io.spine.protobuf.AnyPacker.pack;
 import static io.spine.protobuf.AnyPacker.unpack;
+import static io.spine.protobuf.Messages.isDefault;
 import static io.spine.server.entity.FieldMasks.applyMask;
-import static io.spine.validate.Validate.isDefault;
 
 /**
  * Applies the provided mask to nullable or non-nullable records.
diff --git a/datastore/src/main/java/io/spine/server/storage/datastore/FilterAdapter.java b/datastore/src/main/java/io/spine/server/storage/datastore/FilterAdapter.java
@@ -28,7 +28,6 @@
 import io.spine.server.entity.storage.ColumnMapping;
 import io.spine.server.entity.storage.ColumnTypeMapping;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
@@ -64,11 +63,10 @@ Value<?> toValue(Column column, Filter columnFilter) {
         Class<?> columnClass = column.type();
         Object filterValueUnpacked = TypeConverter.toObject(filterValue, columnClass);
 
-        ColumnTypeMapping<?, ? extends Value<?>> storageRule =
+        ColumnTypeMapping<?, ? extends Value<?>> typeMapping =
                 columnMapping.of(filterValueUnpacked.getClass());
-        checkArgument(storageRule != null, "Column of unknown type: %s.", column);
 
-        Value<?> result = storageRule.applyTo(filterValueUnpacked);
+        Value<?> result = typeMapping.applyTo(filterValueUnpacked);
         return result;
     }
 }
diff --git a/datastore/src/main/java/io/spine/server/storage/datastore/RecordStorageBuilder.java b/datastore/src/main/java/io/spine/server/storage/datastore/RecordStorageBuilder.java
@@ -30,7 +30,6 @@
 import io.spine.type.TypeUrl;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static io.spine.server.entity.model.EntityClass.asEntityClass;
 
 /**
  * An implementation base for {@code DsRecordStorage} builders.
@@ -49,7 +48,7 @@ abstract class RecordStorageBuilder<I,
     private boolean multitenant;
     private ColumnMapping<Value<?>> columnMapping;
     private Class<I> idClass;
-    private EntityClass<?> entityClass;
+    private Class<? extends Entity<?, ?>> entityClass;
 
     /**
      * Prevents direct instantiation.
@@ -84,7 +83,7 @@ public B setIdClass(Class<I> idClass) {
     @CanIgnoreReturnValue
     public B setEntityClass(Class<? extends Entity<?, ?>> entityClass) {
         checkNotNull(entityClass);
-        this.entityClass = asEntityClass(entityClass);
+        this.entityClass = entityClass;
         return self();
     }
 
@@ -164,7 +163,7 @@ public boolean isMultitenant() {
     }
 
     /**
-     * Obtains the column mapping used in the storage.
+     * Obtains the column mapping rules used in the storage.
      */
     public ColumnMapping<Value<?>> getColumnMapping() {
         return columnMapping;
@@ -180,7 +179,7 @@ public Class<I> getIdClass() {
     /**
      * Obtains the class of the stored entity.
      */
-    public EntityClass<?> getEntityClass() {
+    public Class<? extends Entity<?, ?>> getEntityClass() {
         return entityClass;
     }
 
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/DatastoreStorageFactoryBuilderTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/DatastoreStorageFactoryBuilderTest.java
@@ -27,7 +27,6 @@
 import io.spine.server.ContextSpec;
 import io.spine.server.entity.storage.ColumnMapping;
 import io.spine.server.storage.datastore.given.TestColumnMapping;
-import io.spine.server.storage.datastore.type.DsColumnMapping;
 import io.spine.testing.server.storage.datastore.TestDatastores;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/DsColumnMappingTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/DsColumnMappingTest.java
@@ -18,7 +18,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.spine.server.storage.datastore.type;
+package io.spine.server.storage.datastore;
 
 import com.google.cloud.datastore.Blob;
 import com.google.cloud.datastore.BlobValue;
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/DsFiltersTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/DsFiltersTest.java
@@ -28,14 +28,11 @@
 import com.google.common.truth.IterableSubject;
 import io.spine.client.Filter;
 import io.spine.client.Filters;
-import io.spine.server.entity.Entity;
-import io.spine.server.entity.model.EntityClass;
 import io.spine.server.entity.storage.Column;
-import io.spine.server.entity.storage.ColumnName;
-import io.spine.server.entity.storage.Columns;
 import io.spine.server.entity.storage.CompositeQueryParameter;
-import io.spine.server.storage.datastore.type.DsColumnMapping;
-import io.spine.server.storage.given.RecordStorageTestEnv.TestCounterEntity;
+import io.spine.server.storage.datastore.given.DsFiltersTestEnv.ArchivedColumn;
+import io.spine.server.storage.datastore.given.DsFiltersTestEnv.DeletedColumn;
+import io.spine.server.storage.datastore.given.DsFiltersTestEnv.IdStringColumn;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -51,7 +48,6 @@
 import static io.spine.client.CompositeFilter.CompositeOperator.ALL;
 import static io.spine.client.CompositeFilter.CompositeOperator.EITHER;
 import static io.spine.client.Filters.lt;
-import static io.spine.server.entity.model.EntityClass.asEntityClass;
 import static io.spine.server.entity.storage.TestCompositeQueryParameterFactory.createParams;
 import static io.spine.server.storage.LifecycleFlagField.archived;
 import static io.spine.server.storage.LifecycleFlagField.deleted;
@@ -62,10 +58,6 @@
 @DisplayName("`DsFilters` should")
 class DsFiltersTest {
 
-    private static final ColumnName ID_STRING_COLUMN_NAME = ColumnName.of("id_string");
-    private static final ColumnName ARCHIVED_COLUMN_NAME = ColumnName.of(archived);
-    private static final ColumnName DELETED_COLUMN_NAME = ColumnName.of(deleted);
-
     @Test
     @DisplayName(HAVE_PARAMETERLESS_CTOR)
     void testPrivateCtor() {
@@ -79,15 +71,15 @@ void testCompositeParams() {
         boolean archivedValue = true;
         boolean deletedValue = true;
         Multimap<Column, Filter> conjunctiveFilters = ImmutableMultimap.of(
-                column(TestCounterEntity.class, ID_STRING_COLUMN_NAME),
-                Filters.gt(ID_STRING_COLUMN_NAME.value(), idStringValue)
+                new IdStringColumn(),
+                Filters.gt(IdStringColumn.NAME.value(), idStringValue)
         );
         ImmutableMultimap<Column, Filter> disjunctiveFilters = ImmutableMultimap.of(
-                column(TestCounterEntity.class, DELETED_COLUMN_NAME),
-                Filters.eq(deleted.name(), deletedValue),
+                new DeletedColumn(),
+                Filters.eq(DeletedColumn.NAME.value(), deletedValue),
 
-                column(TestCounterEntity.class, ARCHIVED_COLUMN_NAME),
-                Filters.eq(archived.name(), archivedValue)
+                new ArchivedColumn(),
+                Filters.eq(ArchivedColumn.NAME.value(), archivedValue)
         );
         Collection<CompositeQueryParameter> parameters = ImmutableSet.of(
                 createParams(conjunctiveFilters, ALL),
@@ -98,9 +90,9 @@ void testCompositeParams() {
         Collection<StructuredQuery.Filter> filters = fromParams(parameters, columnFilterAdapter);
 
         IterableSubject assertFilters = assertThat(filters);
-        assertFilters.contains(and(gt(ID_STRING_COLUMN_NAME.value(), idStringValue),
+        assertFilters.contains(and(gt(IdStringColumn.NAME.value(), idStringValue),
                                    eq(archived.name(), archivedValue)));
-        assertFilters.contains(and(gt(ID_STRING_COLUMN_NAME.value(), idStringValue),
+        assertFilters.contains(and(gt(IdStringColumn.NAME.value(), idStringValue),
                                    eq(deleted.name(), deletedValue)));
     }
 
@@ -109,8 +101,8 @@ void testCompositeParams() {
     void testSingleParameter() {
         String versionValue = "314";
         ImmutableMultimap<Column, Filter> singleFilter = ImmutableMultimap.of(
-                column(TestCounterEntity.class, ID_STRING_COLUMN_NAME),
-                Filters.le(ID_STRING_COLUMN_NAME.value(), versionValue)
+                new IdStringColumn(),
+                Filters.le(IdStringColumn.NAME.value(), versionValue)
         );
         Collection<CompositeQueryParameter> parameters = ImmutableSet.of(
                 createParams(singleFilter, ALL)
@@ -119,7 +111,7 @@ void testSingleParameter() {
         FilterAdapter columnFilterAdapter = FilterAdapter.of(new DsColumnMapping());
         Collection<StructuredQuery.Filter> filters = fromParams(parameters, columnFilterAdapter);
         IterableSubject assertFilters = assertThat(filters);
-        assertFilters.contains(and(le(ID_STRING_COLUMN_NAME.value(), versionValue)));
+        assertFilters.contains(and(le(IdStringColumn.NAME.value(), versionValue)));
     }
 
     @Test
@@ -130,18 +122,18 @@ void testMultipleDisjunctiveGroups() {
         String lessBoundDefiner = "42";
         boolean archivedValue = true;
         boolean deletedValue = true;
-        Column idStringColumn = column(TestCounterEntity.class, ID_STRING_COLUMN_NAME);
+        Column idStringColumn = new IdStringColumn();
         ImmutableMultimap<Column, Filter> versionFilters = ImmutableMultimap.of(
-                idStringColumn, Filters.ge(ID_STRING_COLUMN_NAME.value(), greaterBoundDefiner),
-                idStringColumn, Filters.eq(ID_STRING_COLUMN_NAME.value(), standaloneValue),
-                idStringColumn, lt(ID_STRING_COLUMN_NAME.value(), lessBoundDefiner)
+                idStringColumn, Filters.ge(IdStringColumn.NAME.value(), greaterBoundDefiner),
+                idStringColumn, Filters.eq(IdStringColumn.NAME.value(), standaloneValue),
+                idStringColumn, lt(IdStringColumn.NAME.value(), lessBoundDefiner)
         );
         ImmutableMultimap<Column, Filter> lifecycleFilters = ImmutableMultimap.of(
-                column(TestCounterEntity.class, DELETED_COLUMN_NAME),
-                Filters.eq(deleted.name(), deletedValue),
+                new DeletedColumn(),
+                Filters.eq(DeletedColumn.NAME.value(), deletedValue),
 
-                column(TestCounterEntity.class, ARCHIVED_COLUMN_NAME),
-                Filters.eq(archived.name(), archivedValue)
+                new ArchivedColumn(),
+                Filters.eq(DeletedColumn.NAME.value(), archivedValue)
         );
         Collection<CompositeQueryParameter> parameters = ImmutableSet.of(
                 createParams(versionFilters, EITHER),
@@ -150,18 +142,18 @@ idStringColumn, lt(ID_STRING_COLUMN_NAME.value(), lessBoundDefiner)
         FilterAdapter columnFilterAdapter = FilterAdapter.of(new DsColumnMapping());
         Collection<StructuredQuery.Filter> filters = fromParams(parameters, columnFilterAdapter);
         assertThat(filters).containsExactly(
-                and(ge(ID_STRING_COLUMN_NAME.value(), greaterBoundDefiner),
-                    eq(archived.name(), archivedValue)),
-                and(ge(ID_STRING_COLUMN_NAME.value(), greaterBoundDefiner),
-                    eq(deleted.name(), deletedValue)),
-                and(eq(ID_STRING_COLUMN_NAME.value(), standaloneValue),
-                    eq(archived.name(), archivedValue)),
-                and(eq(ID_STRING_COLUMN_NAME.value(), standaloneValue),
-                    eq(deleted.name(), deletedValue)),
-                and(PropertyFilter.lt(ID_STRING_COLUMN_NAME.value(), lessBoundDefiner),
-                    eq(archived.name(), archivedValue)),
-                and(PropertyFilter.lt(ID_STRING_COLUMN_NAME.value(), lessBoundDefiner),
-                    eq(deleted.name(), deletedValue))
+                and(ge(IdStringColumn.NAME.value(), greaterBoundDefiner),
+                    eq(ArchivedColumn.NAME.value(), archivedValue)),
+                and(ge(IdStringColumn.NAME.value(), greaterBoundDefiner),
+                    eq(DeletedColumn.NAME.value(), deletedValue)),
+                and(eq(IdStringColumn.NAME.value(), standaloneValue),
+                    eq(ArchivedColumn.NAME.value(), archivedValue)),
+                and(eq(IdStringColumn.NAME.value(), standaloneValue),
+                    eq(DeletedColumn.NAME.value(), deletedValue)),
+                and(PropertyFilter.lt(IdStringColumn.NAME.value(), lessBoundDefiner),
+                    eq(ArchivedColumn.NAME.value(), archivedValue)),
+                and(PropertyFilter.lt(IdStringColumn.NAME.value(), lessBoundDefiner),
+                    eq(DeletedColumn.NAME.value(), deletedValue))
         );
     }
 
@@ -175,12 +167,4 @@ void testEmptyParameters() {
         assertFilters.isNotNull();
         assertFilters.isEmpty();
     }
-
-    @SuppressWarnings("rawtypes") // For convenience.
-    private static Column column(Class<? extends Entity> cls, ColumnName columnName) {
-        EntityClass<? extends Entity> entityClass = asEntityClass(cls);
-        Columns columns = Columns.of(entityClass);
-        Column column = columns.get(columnName);
-        return column;
-    }
 }
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/given/DsFiltersTestEnv.java b/datastore/src/test/java/io/spine/server/storage/datastore/given/DsFiltersTestEnv.java
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/given/TestColumnMapping.java b/datastore/src/test/java/io/spine/server/storage/datastore/given/TestColumnMapping.java
diff --git a/datastore/src/test/java/io/spine/server/storage/datastore/tenant/SingleTenantNamespaceSupplierTest.java b/datastore/src/test/java/io/spine/server/storage/datastore/tenant/SingleTenantNamespaceSupplierTest.java
diff --git a/testutil-gcloud/src/main/java/io/spine/testing/server/storage/datastore/TestDatastoreStorageFactory.java b/testutil-gcloud/src/main/java/io/spine/testing/server/storage/datastore/TestDatastoreStorageFactory.java

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@`
`43`	`43`	`import io.spine.server.storage.datastore.tenant.NamespaceSupplier;`
`44`	`44`	`import io.spine.server.storage.datastore.tenant.NsConverterFactory;`
`45`	`45`	`import io.spine.server.storage.datastore.tenant.PrefixedNsConverterFactory;`
`46`		`-import io.spine.server.storage.datastore.type.DsColumnMapping;`
`47`	`46`	`import io.spine.server.tenant.TenantIndex;`
`48`	`47`
`49`	`48`	`import java.util.Map;`
`@@ -296,7 +295,7 @@ public Datastore getDatastore() {`
`296`	`295`	`}`
`297`	`296`
`298`	`297`	`/**`
`299`		`- * Sets the {@link ColumnMapping}.`
	`298`	`+ * Sets the {@link ColumnMapping} to use.`
`300`	`299`	`*`
`301`	`300`	`* <p>Default value is {@link DsColumnMapping}.`
`302`	`301`	`*`