Implement the TypeRegistry from core instead of creating own one

Author: dmitrykuzmin

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

@@ -21,6 +21,7 @@
 package io.spine.server.storage.datastore;
 
 import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.Value;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Iterables;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
@@ -31,6 +32,7 @@
 import io.spine.server.aggregate.AggregateStorage;
 import io.spine.server.delivery.InboxStorage;
 import io.spine.server.entity.Entity;
+import io.spine.server.entity.storage.TypeRegistry;
 import io.spine.server.projection.Projection;
 import io.spine.server.projection.ProjectionStorage;
 import io.spine.server.storage.RecordStorage;
@@ -41,6 +43,7 @@
 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.DsTypeRegistry;
 import io.spine.server.tenant.TenantIndex;
 
 import java.util.Map;
@@ -83,7 +86,7 @@ public class DatastoreStorageFactory implements StorageFactory {
      */
     private final Map<Class<? extends Storage>, DatastoreWrapper> sysWrappers = newConcurrentMap();
 
-    private final ColumnTypeRegistry typeRegistry;
+    private final TypeRegistry<Value<?>> typeRegistry;
 
     private final NsConverterFactory converterFactory;
 
@@ -153,7 +156,7 @@ public InboxStorage createInboxStorage(boolean multitenant) {
         return new DsInboxStorage(wrapper, multitenant);
     }
 
-    public ColumnTypeRegistry getTypeRegistry() {
+    public TypeRegistry<Value<?>> getTypeRegistry() {
         return typeRegistry;
     }
 
@@ -265,7 +268,7 @@ public static Builder newBuilder() {
     public static class Builder {
 
         private Datastore datastore;
-        private ColumnTypeRegistry typeRegistry;
+        private TypeRegistry<Value<?>> typeRegistry;
         private NamespaceConverter namespaceConverter;
         private NsConverterFactory converterFactory;
 
@@ -293,16 +296,16 @@ public Datastore getDatastore() {
         }
 
         /**
-         * Sets a {@link ColumnTypeRegistry} for handling the Entity Columns.
+         * Sets a {@link TypeRegistry} for handling the Entity Columns.
          *
-         * <p>Default value is {@link DefaultColumnTypeRegistry}.
+         * <p>Default value is {@link DsTypeRegistry}.
          *
          * @param typeRegistry
          *         the type registry containing all the supported
          *         {@linkplain io.spine.server.entity.storage.Column column} types
          * @return self for method chaining
          */
-        public Builder setTypeRegistry(ColumnTypeRegistry typeRegistry) {
+        public Builder setTypeRegistry(TypeRegistry<Value<?>> typeRegistry) {
             this.typeRegistry = checkNotNull(typeRegistry);
             return this;
         }
@@ -333,7 +336,7 @@ public Builder setNamespaceConverter(NamespaceConverter converter) {
         public DatastoreStorageFactory build() {
             checkNotNull(datastore);
             if (typeRegistry == null) {
-                typeRegistry = new DefaultColumnTypeRegistry();
+                typeRegistry = new DsTypeRegistry();
             }
             if (namespaceConverter == null) {
                 converterFactory = NsConverterFactory.defaults();

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

@@ -34,6 +34,7 @@
 import io.spine.server.entity.storage.EntityQuery;
 import io.spine.server.entity.storage.EntityRecordWithColumns;
 import io.spine.server.entity.storage.QueryParameters;
+import io.spine.server.entity.storage.TypeRegistry;
 import io.spine.server.storage.RecordStorage;
 import io.spine.type.TypeUrl;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -69,7 +70,7 @@ public class DsRecordStorage<I> extends RecordStorage<I> {
     private final DsLookupByIds<I> idLookup;
     private final DsLookupByQueries queryLookup;
 
-    private final ColumnTypeRegistry columnTypeRegistry;
+    private final TypeRegistry<Value<?>> typeRegistry;
     private final FilterAdapter columnFilterAdapter;
 
     /**
@@ -92,8 +93,8 @@ protected DsRecordStorage(
         this.typeUrl = TypeUrl.from(b.getDescriptor());
         this.idClass = checkNotNull(b.getIdClass());
         this.datastore = b.getDatastore();
-        this.columnTypeRegistry = checkNotNull(b.getColumnTypeRegistry());
-        this.columnFilterAdapter = FilterAdapter.of(this.columnTypeRegistry);
+        this.typeRegistry = checkNotNull(b.getColumnTypeRegistry());
+        this.columnFilterAdapter = FilterAdapter.of(this.typeRegistry);
         this.idLookup = new DsLookupByIds<>(this.datastore, this.typeUrl);
         this.queryLookup = new DsLookupByQueries(this.datastore, this.typeUrl,
                                                  this.columnFilterAdapter);
@@ -268,11 +269,8 @@ protected Entity entityRecordToEntity(I id, EntityRecordWithColumns record) {
     private void populateFromStorageFields(BaseEntity.Builder<Key, Entity.Builder> entity,
                                            EntityRecordWithColumns record) {
         record.columnNames().forEach(columnName -> {
-            Object columnValue = record.columnValue(columnName);
-            PersistenceStrategy<?> strategy =
-                    columnTypeRegistry.persistenceStrategyOf(columnValue.getClass());
-            Value<?> value = strategy.applyTo(columnValue);
-            entity.set(columnName.value(), value);
+            Value<?> columnValue = record.columnValue(columnName, typeRegistry);
+            entity.set(columnName.value(), columnValue);
         });
     }