#2105 - Refactor extract ebean-core-type module

- Move ScalarType, DataBinder, DataReader, ExtraTypeFactory to ebean-core-type module - Update the ebean-postgis and other modules
2026-11-13 06:42:57 +00:00 · 2020-11-19 16:10:00 +13:00
1 parent 0bfb6895ad
commit 30a00cb092
@@ -1,17 +0,0 @@
-package io.ebeaninternal.api;
-
-import io.ebean.config.DatabaseConfig;
-import io.ebeaninternal.server.type.ScalarType;
-
-import java.util.List;
-
-/**
- * A factory that provides extra types to Ebean.
- */
-public interface ExtraTypeFactory {
-
-  /**
-   * Provide extra types to Ebean.
-   */
-  List<? extends ScalarType<?>> createTypes(DatabaseConfig config, Object objectMapper);
-}
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.core;

+import io.ebean.core.type.DataReader;
 import io.ebeaninternal.api.SpiDtoQuery;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
@@ -8,7 +9,6 @@ import io.ebeaninternal.server.dto.DtoMappingRequest;
 import io.ebeaninternal.server.dto.DtoQueryPlan;
 import io.ebeaninternal.server.persist.Binder;
 import io.ebeaninternal.server.query.DtoQueryEngine;
-import io.ebeaninternal.server.type.DataReader;
 import io.ebeaninternal.server.type.RsetDataReader;

 import java.sql.ResultSet;
@@ -5,6 +5,7 @@ import io.ebean.annotation.DocStore;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.IdGenerator;
 import io.ebean.config.ScalarTypeConverter;
+import io.ebean.core.type.ScalarType;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanPersistController;
 import io.ebean.event.BeanPersistListener;
@@ -18,7 +19,6 @@ import io.ebean.event.changelog.ChangeLogRegister;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.util.AnnotationUtil;
-import io.ebeaninternal.server.type.ScalarType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -2,8 +2,8 @@ package io.ebeaninternal.server.deploy;

 import io.ebean.bean.EntityBean;
 import io.ebean.bean.PersistenceContext;
+import io.ebean.core.type.DataReader;
 import io.ebeaninternal.server.query.SqlJoinType;
-import io.ebeaninternal.server.type.DataReader;

 import java.sql.SQLException;

@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.deploy;

 import io.ebean.bean.EntityBean;
-import io.ebeaninternal.server.type.DataReader;
+import io.ebean.core.type.DataReader;

 import java.sql.SQLException;

@@ -16,6 +16,8 @@ import io.ebean.config.DatabaseConfig;
 import io.ebean.config.EncryptKey;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarType;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanPersistController;
 import io.ebean.event.BeanPersistListener;
@@ -82,7 +84,6 @@ import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 import io.ebeaninternal.server.querydefn.OrmQueryProperties;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebeaninternal.server.type.DataBind;
-import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.util.SortByClause;
 import io.ebeaninternal.util.SortByClauseParser;
 import io.ebeanservice.docstore.api.DocStoreBeanAdapter;
@@ -90,7 +91,6 @@ import io.ebeanservice.docstore.api.DocStoreUpdateContext;
 import io.ebeanservice.docstore.api.DocStoreUpdates;
 import io.ebeanservice.docstore.api.mapping.DocMappingBuilder;
 import io.ebeanservice.docstore.api.mapping.DocPropertyMapping;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import io.ebeanservice.docstore.api.mapping.DocumentMapping;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.deploy;

 import io.ebean.bean.EntityBean;
+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
-import io.ebeaninternal.server.type.ScalarType;

 import java.util.Arrays;

@@ -1,12 +1,11 @@
 package io.ebeaninternal.server.deploy;

 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
 import io.ebean.bean.EntityBean;
+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.api.json.SpiJsonReader;
 import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
-import io.ebeaninternal.server.type.ScalarType;

 import java.io.IOException;
 import java.util.Map;
@@ -5,10 +5,10 @@ import com.fasterxml.jackson.core.JsonToken;
 import io.ebean.PersistenceIOException;
 import io.ebean.SqlUpdate;
 import io.ebean.bean.EntityBean;
+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.api.json.SpiJsonReader;
 import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
-import io.ebeaninternal.server.type.ScalarType;

 import java.io.IOException;

@@ -2,10 +2,10 @@ package io.ebeaninternal.server.deploy;

 import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.bean.EntityBean;
+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.api.json.SpiJsonReader;
 import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
-import io.ebeaninternal.server.type.ScalarType;

 import java.io.IOException;
 import java.util.Arrays;
@@ -16,6 +16,7 @@ import io.ebean.config.dbplatform.DbHistorySupport;
 import io.ebean.config.dbplatform.DbIdentity;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
+import io.ebean.core.type.ScalarType;
 import io.ebean.event.changelog.ChangeLogFilter;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
@@ -56,7 +57,6 @@ import io.ebeaninternal.server.persist.platform.MultiValueBind;
 import io.ebeaninternal.server.properties.BeanPropertiesReader;
 import io.ebeaninternal.server.properties.BeanPropertyAccess;
 import io.ebeaninternal.server.properties.EnhanceBeanPropertyAccess;
-import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.server.type.ScalarTypeInteger;
 import io.ebeaninternal.server.type.TypeManager;
 import io.ebeaninternal.xmapping.api.XmapEbean;
@@ -3,10 +3,10 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.EncryptKey;
 import io.ebean.config.NamingConvention;
+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.cache.SpiCacheManager;
 import io.ebeaninternal.server.deploy.id.IdBinder;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
-import io.ebeaninternal.server.type.ScalarType;
 import io.ebeanservice.docstore.api.DocStoreBeanAdapter;

 /**
@@ -8,6 +8,9 @@ import io.ebean.bean.PersistenceContext;
 import io.ebean.config.EncryptKey;
 import io.ebean.config.dbplatform.DbEncryptFunction;
 import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarType;
 import io.ebean.plugin.Property;
 import io.ebean.text.StringParser;
 import io.ebean.util.SplitName;
@@ -28,9 +31,7 @@ import io.ebeaninternal.server.query.STreeProperty;
 import io.ebeaninternal.server.query.SqlBeanLoad;
 import io.ebeaninternal.server.query.SqlJoinType;
 import io.ebeaninternal.server.type.DataBind;
-import io.ebeaninternal.server.type.DataReader;
 import io.ebeaninternal.server.type.LocalEncryptedType;
-import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.server.type.ScalarTypeBoolean;
 import io.ebeaninternal.server.type.ScalarTypeEnum;
 import io.ebeaninternal.server.type.ScalarTypeLogicalType;
@@ -38,7 +39,6 @@ import io.ebeaninternal.util.ValueUtil;
 import io.ebeanservice.docstore.api.mapping.DocMappingBuilder;
 import io.ebeanservice.docstore.api.mapping.DocPropertyMapping;
 import io.ebeanservice.docstore.api.mapping.DocPropertyOptions;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import io.ebeanservice.docstore.api.support.DocStructure;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.deploy;

 import io.ebean.Query;
 import io.ebean.bean.EntityBean;
+import io.ebean.core.type.DocPropertyType;
 import io.ebean.text.PathProperties;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -22,7 +23,6 @@ import io.ebeaninternal.server.query.SqlJoinType;
 import io.ebeaninternal.server.querydefn.DefaultOrmQuery;
 import io.ebeanservice.docstore.api.mapping.DocMappingBuilder;
 import io.ebeanservice.docstore.api.mapping.DocPropertyMapping;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import io.ebeanservice.docstore.api.support.DocStructure;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,6 +7,9 @@ import io.ebean.ValuePair;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.PersistenceContext;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarDataReader;
+import io.ebean.core.type.ScalarType;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
@@ -23,9 +26,6 @@ import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.query.STreePropertyAssocOne;
 import io.ebeaninternal.server.query.SqlBeanLoad;
 import io.ebeaninternal.server.query.SqlJoinType;
-import io.ebeaninternal.server.type.DataReader;
-import io.ebeaninternal.server.type.ScalarDataReader;
-import io.ebeaninternal.server.type.ScalarType;

 import javax.persistence.PersistenceException;
 import java.io.IOException;
@@ -4,9 +4,9 @@ import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.PersistenceContext;
+import io.ebean.core.type.DataReader;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.query.STreePropertyAssocMany;
-import io.ebeaninternal.server.type.DataReader;

 import java.util.Map;

@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.deploy;

+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.query.SqlBeanLoad;
-import io.ebeaninternal.server.type.DataReader;
-import io.ebeaninternal.server.type.ScalarType;

 import javax.persistence.PersistenceException;

@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.deploy;

+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.query.STreeProperty;
 import io.ebeaninternal.server.query.SqlJoinType;
-import io.ebeaninternal.server.type.ScalarType;

 import java.util.List;

@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.deploy;

+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.el.ElPropertyDeploy;
 import io.ebeaninternal.server.query.STreeProperty;
-import io.ebeaninternal.server.type.ScalarType;

 import java.sql.Types;

@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.deploy.id;

 import io.ebean.bean.EntityBean;
+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.core.DefaultSqlUpdate;
 import io.ebeaninternal.server.core.InternString;
@@ -10,7 +11,6 @@ import io.ebeaninternal.server.deploy.DbSqlContext;
 import io.ebeaninternal.server.persist.MultiValueWrapper;
 import io.ebeaninternal.server.persist.platform.MultiValueBind;
 import io.ebeaninternal.server.type.DataBind;
-import io.ebeaninternal.server.type.ScalarType;

 import java.io.DataInput;
 import java.io.DataOutput;
@@ -17,6 +17,7 @@ import io.ebean.config.ScalarTypeConverter;
 import io.ebean.config.dbplatform.DbDefaultValue;
 import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebean.config.dbplatform.DbEncryptFunction;
+import io.ebean.core.type.ScalarType;
 import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.server.core.InternString;
 import io.ebeaninternal.server.deploy.BeanProperty;
@@ -26,7 +27,6 @@ import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
 import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.properties.BeanPropertyGetter;
 import io.ebeaninternal.server.properties.BeanPropertySetter;
-import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.server.type.ScalarTypeWrapper;
 import io.ebeanservice.docstore.api.mapping.DocPropertyOptions;

@@ -8,6 +8,7 @@ import io.ebean.bean.BeanCollection.ModifyListenMode;
 import io.ebean.config.BeanNotRegisteredException;
 import io.ebean.config.NamingConvention;
 import io.ebean.config.TableName;
+import io.ebean.core.type.ScalarType;
 import io.ebean.util.CamelCaseHelper;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.deploy.BeanProperty;
@@ -21,7 +22,6 @@ import io.ebeaninternal.server.deploy.meta.DeployOrderColumn;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
 import io.ebeaninternal.server.query.SqlJoinType;
-import io.ebeaninternal.server.type.ScalarType;

 import javax.persistence.CascadeType;
 import javax.persistence.CollectionTable;
@@ -39,6 +39,7 @@ import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebean.config.dbplatform.DbEncryptFunction;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.deploy.DbMigrationInfo;
 import io.ebeaninternal.server.deploy.IndexDefinition;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory;
@@ -46,7 +47,6 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 import io.ebeaninternal.server.type.DataEncryptSupport;
-import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.server.type.ScalarTypeBytesBase;
 import io.ebeaninternal.server.type.ScalarTypeBytesEncrypted;
 import io.ebeaninternal.server.type.ScalarTypeEncryptedWrapper;
@@ -2,10 +2,11 @@ package io.ebeaninternal.server.deploy.parse;

 import io.ebean.Model;
 import io.ebean.annotation.DbArray;
-import io.ebean.annotation.DbMap;
 import io.ebean.annotation.DbJson;
 import io.ebean.annotation.DbJsonB;
+import io.ebean.annotation.DbMap;
 import io.ebean.annotation.UnmappedJson;
+import io.ebean.core.type.ScalarType;
 import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.server.deploy.DetermineManyType;
 import io.ebeaninternal.server.deploy.ManyType;
@@ -14,7 +15,6 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertySimpleCollection;
-import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.server.type.TypeManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,9 +14,9 @@ import io.ebean.config.NamingConvention;
 import io.ebean.config.TableName;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import io.ebeaninternal.server.type.DataEncryptSupport;
-import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.server.type.ScalarTypeArray;
 import io.ebeaninternal.server.type.ScalarTypeWrapper;
 import io.ebeaninternal.server.type.SimpleAesEncryptor;
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.dto;

-import io.ebeaninternal.server.type.DataReader;
-import io.ebeaninternal.server.type.ScalarType;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.type.TypeManager;

 import java.lang.invoke.MethodHandle;
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.dto;

-import io.ebeaninternal.server.type.DataReader;
-import io.ebeaninternal.server.type.ScalarType;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.type.TypeManager;

 import java.lang.invoke.MethodHandle;
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.dto;

+import io.ebean.core.type.DataReader;
 import io.ebean.meta.MetricVisitor;
-import io.ebeaninternal.server.type.DataReader;

 import java.sql.SQLException;

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.dto;

-import io.ebeaninternal.server.type.DataReader;
+import io.ebean.core.type.DataReader;

 import java.sql.SQLException;

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.dto;

-import io.ebeaninternal.server.type.DataReader;
+import io.ebean.core.type.DataReader;

 import java.sql.SQLException;

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.dto;

-import io.ebeaninternal.server.type.DataReader;
+import io.ebean.core.type.DataReader;

 import java.sql.SQLException;

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.dto;

-import io.ebeaninternal.server.type.DataReader;
+import io.ebean.core.type.DataReader;

 import java.sql.SQLException;

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.dto;

-import io.ebeaninternal.server.type.DataReader;
+import io.ebean.core.type.DataReader;

 /**
 * Placeholder to skip reading a column that isn't mapped to a bean property.
@@ -1,12 +1,12 @@
 package io.ebeaninternal.server.el;

 import io.ebean.bean.EntityBean;
+import io.ebean.core.type.ScalarType;
 import io.ebean.plugin.Property;
 import io.ebean.text.StringParser;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.deploy.BeanProperty;
-import io.ebeaninternal.server.type.ScalarType;

 import java.util.Arrays;

@@ -1,17 +1,17 @@
 package io.ebeaninternal.server.persist;

 import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiLogManager;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.persist.platform.MultiValueBind;
 import io.ebeaninternal.server.type.DataBind;
-import io.ebeaninternal.server.type.DataReader;
 import io.ebeaninternal.server.type.GeoTypeBinder;
 import io.ebeaninternal.server.type.PostgresHelper;
 import io.ebeaninternal.server.type.RsetDataReader;
-import io.ebeaninternal.server.type.ScalarType;
 import io.ebeaninternal.server.type.TypeManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.persist.platform;

 import io.ebean.config.dbplatform.ExtraDbTypes;
+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.type.DataBind;
-import io.ebeaninternal.server.type.ScalarType;

 import java.sql.SQLException;
 import java.util.Collection;
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.persist.platform;

+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.type.DataBind;
-import io.ebeaninternal.server.type.ScalarType;

 import java.sql.SQLException;
 import java.util.Collection;
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.persist.platform;

 import io.ebean.config.dbplatform.ExtraDbTypes;
-import io.ebeaninternal.server.type.ScalarType;
+import io.ebean.core.type.ScalarType;

 /**
 * Multi value binder that uses Postgres Array.
@@ -9,6 +9,7 @@ import io.ebean.bean.NodeUsageCollector;
 import io.ebean.bean.NodeUsageListener;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.bean.PersistenceContext;
+import io.ebean.core.type.DataReader;
 import io.ebean.event.readaudit.ReadEvent;
 import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiProfileTransactionEvent;
@@ -24,7 +25,6 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.type.DataBind;
-import io.ebeaninternal.server.type.DataReader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.query;

 import io.ebean.CountedValue;
+import io.ebean.core.type.ScalarDataReader;
 import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiProfileTransactionEvent;
 import io.ebeaninternal.api.SpiQuery;
@@ -8,7 +9,6 @@ import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.type.RsetDataReader;
-import io.ebeaninternal.server.type.ScalarDataReader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -2,6 +2,8 @@ package io.ebeaninternal.server.query;

 import io.ebean.ProfileLocation;
 import io.ebean.config.dbplatform.SqlLimitResponse;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarDataReader;
 import io.ebean.metric.MetricFactory;
 import io.ebean.metric.TimedMetric;
 import io.ebeaninternal.api.CQueryPlanKey;
@@ -14,9 +16,7 @@ import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot;
 import io.ebeaninternal.server.type.DataBind;
 import io.ebeaninternal.server.type.DataBindCapture;
-import io.ebeaninternal.server.type.DataReader;
 import io.ebeaninternal.server.type.RsetDataReader;
-import io.ebeaninternal.server.type.ScalarDataReader;
 import io.ebeaninternal.server.util.Md5;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.query;

-import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping;
 import io.ebean.config.dbplatform.SqlLimitResponse;
+import io.ebean.core.type.DataReader;
 import io.ebeaninternal.server.core.OrmQueryRequest;
-import io.ebeaninternal.server.type.DataReader;
+import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping;
 import io.ebeaninternal.server.type.RsetDataReaderIndexed;

 import java.sql.ResultSet;
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.query;
 import io.ebean.RowConsumer;
 import io.ebean.RowMapper;
 import io.ebean.SqlRow;
+import io.ebean.core.type.ScalarType;
 import io.ebean.meta.MetricVisitor;
 import io.ebean.metric.MetricFactory;
 import io.ebean.metric.TimedMetricMap;
@@ -10,7 +11,6 @@ import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.RelationalQueryEngine;
 import io.ebeaninternal.server.core.RelationalQueryRequest;
 import io.ebeaninternal.server.persist.Binder;
-import io.ebeaninternal.server.type.ScalarType;

 import javax.persistence.PersistenceException;
 import java.sql.SQLException;
@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.query;

+import io.ebean.core.type.ScalarDataReader;
+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
-import io.ebeaninternal.server.type.ScalarDataReader;
-import io.ebeaninternal.server.type.ScalarType;

 import java.util.List;

@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.query;

 import io.ebean.bean.EntityBean;
-import io.ebeaninternal.server.type.ScalarDataReader;
+import io.ebean.core.type.ScalarDataReader;

 public interface STreePropertyAssocOne extends STreePropertyAssoc {

@@ -2,10 +2,10 @@ package io.ebeaninternal.server.query;

 import io.ebean.Version;
 import io.ebean.bean.EntityBean;
+import io.ebean.core.type.ScalarDataReader;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
-import io.ebeaninternal.server.type.ScalarDataReader;

 import java.sql.SQLException;
 import java.util.List;
@@ -5,6 +5,7 @@ import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.PersistenceContext;
+import io.ebean.core.type.ScalarDataReader;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiQuery.Mode;
@@ -13,7 +14,6 @@ import io.ebeaninternal.server.deploy.DbSqlContext;
 import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.id.IdBinder;
-import io.ebeaninternal.server.type.ScalarDataReader;

 import java.sql.SQLException;
 import java.sql.Timestamp;
@@ -2,12 +2,12 @@ package io.ebeaninternal.server.query;

 import io.ebean.Version;
 import io.ebean.bean.EntityBean;
+import io.ebean.core.type.ScalarType;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
 import io.ebeaninternal.server.deploy.TableJoin;
-import io.ebeaninternal.server.type.ScalarType;

 import java.util.ArrayList;
 import java.util.List;
@@ -2,10 +2,10 @@ package io.ebeaninternal.server.query;

 import io.ebean.Version;
 import io.ebean.bean.EntityBean;
+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
-import io.ebeaninternal.server.type.ScalarType;

 import java.util.List;
 import java.util.Set;
@@ -2,12 +2,12 @@ package io.ebeaninternal.server.query;

 import io.ebean.Version;
 import io.ebean.bean.EntityBean;
+import io.ebean.core.type.ScalarType;
 import io.ebean.util.SplitName;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
 import io.ebeaninternal.server.deploy.TableJoin;
-import io.ebeaninternal.server.type.ScalarType;

 import java.util.List;
 import java.util.Set;
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.text.json;

-import io.ebeaninternal.server.type.ScalarType;
-import io.ebeaninternal.server.type.TypeManager;
 import com.fasterxml.jackson.core.JsonGenerator;
+import io.ebean.core.type.ScalarType;
+import io.ebeaninternal.server.type.TypeManager;

 import java.io.IOException;
 import java.util.List;
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.ScalarType;
+
 import java.util.UUID;

 /**
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.ScalarType;
+
 public class ArrayElementConverterEnum implements ArrayElementConverter<String> {

  final ScalarType<?> scalarType;
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.DataBinder;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -1,166 +0,0 @@
-package io.ebeaninternal.server.type;
-
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.List;
-
-/**
- * Data binder for ScalarTypes generally to an underlying PreparedStatement.
- */
-public interface DataBinder {
-
-  /**
-   * Add something to the binding log.
-   */
-  StringBuilder append(Object entry);
-
-  /**
-   * Return the binding log.
-   */
-  StringBuilder log();
-
-  /**
-   * Close the underlying prepared statement.
-   */
-  void close() throws SQLException;
-
-  /**
-   * Return the current position. Effectively column binding position.
-   */
-  int currentPos();
-
-  /**
-   * Return the next position.
-   */
-  int nextPos();
-
-  /**
-   * Decrement the position.
-   */
-  void decrementPos();
-
-  /**
-   * Execute as a dml statement.
-   */
-  int executeUpdate() throws SQLException;
-
-  /**
-   * Return the underlying PreparedStatement.
-   */
-  PreparedStatement getPstmt();
-
-  /**
-   * Return any inputStreams that have been bound (and should be closed).
-   * This is used for batched statement execution only.
-   */
-  List<InputStream> getInputStreams();
-
-  /**
-   * Bind an object.
-   */
-  void setObject(Object value) throws SQLException;
-
-  /**
-   * Bind an object with given sql type.
-   */
-  void setObject(Object value, int sqlType) throws SQLException;
-
-  /**
-   * Bind null.
-   */
-  void setNull(int jdbcType) throws SQLException;
-
-  /**
-   * Bind a string value.
-   */
-  void setString(String value) throws SQLException;
-
-  /**
-   * Bind a int value.
-   */
-  void setInt(int value) throws SQLException;
-
-  /**
-   * Bind a long value.
-   */
-  void setLong(long value) throws SQLException;
-
-  /**
-   * Bind a short value.
-   */
-  void setShort(short value) throws SQLException;
-
-  /**
-   * Bind a float value.
-   */
-  void setFloat(float value) throws SQLException;
-
-  /**
-   * Bind a double value.
-   */
-  void setDouble(double value) throws SQLException;
-
-  /**
-   * Bind a BigDecimal value.
-   */
-  void setBigDecimal(BigDecimal value) throws SQLException;
-
-  /**
-   * Bind a date value.
-   */
-  void setDate(java.sql.Date value) throws SQLException;
-
-  /**
-   * Bind a timestamp value.
-   */
-  void setTimestamp(Timestamp value) throws SQLException;
-
-  /**
-   * Bind a time value.
-   */
-  void setTime(Time value) throws SQLException;
-
-  /**
-   * Bind a boolean value.
-   */
-  void setBoolean(boolean value) throws SQLException;
-
-  /**
-   * Bind a byte array value.
-   */
-  void setBytes(byte[] value) throws SQLException;
-
-  /**
-   * Bind a byte value.
-   */
-  void setByte(byte value) throws SQLException;
-
-  /**
-   * Bind a char value.
-   */
-  void setChar(char value) throws SQLException;
-
-  /**
-   * Bind a InputStream value.
-   */
-  void setBinaryStream(InputStream inputStream, long length) throws SQLException;
-
-  /**
-   * Bind a byte array value.
-   */
-  void setBlob(byte[] bytes) throws SQLException;
-
-  /**
-   * Bind a string clob value.
-   */
-  void setClob(String content) throws SQLException;
-
-  /**
-   * Bind an array value.
-   */
-  void setArray(String arrayType, Object[] elements) throws SQLException;
-}
@@ -1,53 +0,0 @@
-package io.ebeaninternal.server.type;
-
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.sql.Array;
-import java.sql.SQLException;
-
-public interface DataReader {
-
-  void close() throws SQLException;
-
-  boolean next() throws SQLException;
-
-  void resetColumnPosition();
-
-  void incrementPos(int increment);
-
-  byte[] getBinaryBytes() throws SQLException;
-
-  String getStringFromStream() throws SQLException;
-
-  String getString() throws SQLException;
-
-  Boolean getBoolean() throws SQLException;
-
-  Byte getByte() throws SQLException;
-
-  Short getShort() throws SQLException;
-
-  Integer getInt() throws SQLException;
-
-  Long getLong() throws SQLException;
-
-  Float getFloat() throws SQLException;
-
-  Double getDouble() throws SQLException;
-
-  byte[] getBytes() throws SQLException;
-
-  java.sql.Date getDate() throws SQLException;
-
-  java.sql.Time getTime() throws SQLException;
-
-  java.sql.Timestamp getTimestamp() throws SQLException;
-
-  BigDecimal getBigDecimal() throws SQLException;
-
-  Array getArray() throws SQLException;
-
-  Object getObject() throws SQLException;
-
-  InputStream getBinaryStream() throws SQLException;
-}
@@ -2,11 +2,13 @@ package io.ebeaninternal.server.type;

 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.core.BasicTypeConverter;

 import java.math.BigInteger;
 import java.sql.Types;
 import java.util.Calendar;
+import java.util.Date;

 /**
 * Helper to create some default ScalarType objects for Booleans,
@@ -64,7 +66,7 @@ public class DefaultTypeFactory {
  /**
   * Create the default ScalarType for java.util.Date.
   */
-  public ScalarType<java.util.Date> createUtilDate(JsonConfig.DateTime mode, JsonConfig.Date jsonDate) {
+  public ScalarType<Date> createUtilDate(JsonConfig.DateTime mode, JsonConfig.Date jsonDate) {
    // by default map anonymous java.util.Date to java.sql.Timestamp.
    return createUtilDate(mode, jsonDate, java.sql.Types.TIMESTAMP);
  }
@@ -14,15 +14,16 @@ import io.ebean.config.PlatformConfig;
 import io.ebean.config.ScalarTypeConverter;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ExtraTypeFactory;
+import io.ebean.core.type.ScalarType;
 import io.ebean.types.Cidr;
 import io.ebean.types.Inet;
 import io.ebean.util.AnnotationUtil;
-import io.ebeaninternal.api.ExtraTypeFactory;
 import io.ebeaninternal.api.DbOffline;
 import io.ebeaninternal.api.GeoTypeProvider;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 import org.joda.time.LocalDateTime;
@@ -1,5 +1,8 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+
 import javax.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.sql.Types;
@@ -1,5 +1,8 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+
 import java.sql.SQLException;
 import java.sql.Types;

@@ -1,5 +1,8 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.DataBinder;
+
 import java.sql.SQLException;

 /**
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.ScalarType;
+
 import java.lang.reflect.Type;

 /**
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.DataReader;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;

 import java.io.ByteArrayOutputStream;
@@ -1,15 +0,0 @@
-package io.ebeaninternal.server.type;
-
-import java.sql.SQLException;
-
-/**
- * Reads from and binds to database columns.
- */
-public interface ScalarDataReader<T> {
-
-  /**
-   * Read and return the appropriate value from the dataReader.
-   */
-  T read(DataReader reader) throws SQLException;
-
-}
@@ -1,226 +0,0 @@
-package io.ebeaninternal.server.type;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import io.ebean.text.StringFormatter;
-import io.ebean.text.StringParser;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.sql.SQLException;
-
-/**
- * Describes a scalar type.
- * <p>
- * Scalar in the sense that the types are not compound types. Scalar types only
- * map to a single database column.
- * </p>
- * <p>
- * These types fall into two categories. Types that are mapped natively to JDBC
- * types and the rest. Types that map to native JDBC types do not require any
- * data type conversion to be persisted to the database. These are java types
- * that map via java.sql.Types.
- * </p>
- * <p>
- * Types that are not native to JDBC require some conversion. These include some
- * common java types such as java.util.Date, java.util.Calendar,
- * java.math.BigInteger.
- * </p>
- * <p>
- * Note that Booleans may be native for some databases and require conversion on
- * other databases.
- * </p>
- */
-public interface ScalarType<T> extends StringParser, StringFormatter, ScalarDataReader<T> {
-
-  /**
-   * Return true if this is a binary type and can not support parse() and format() from/to string.
-   * This allows Ebean to optimise marshalling types to string.
-   */
-  boolean isBinaryType();
-
-  /**
-   * Return true if this is a mutable scalar type (like hstore).
-   */
-  boolean isMutable();
-
-  /**
-   * For mutable scalarType's return true if the value is dirty.
-   * Non-dirty properties may be excluded from updates.
-   */
-  boolean isDirty(Object value);
-
-  /**
-   * Return the default DB column length for this type.
-   * <p>
-   * If a BeanProperty has no explicit length defined then this length should
-   * be assigned.
-   * </p>
-   * <p>
-   * This is primarily to support defining a length on Enum types (to
-   * supplement defining the length on the BeanProperty directly).
-   * </p>
-   */
-  int getLength();
-
-  /**
-   * Return true if the type is native to JDBC.
-   * <p>
-   * If it is native to JDBC then its values/instances do not need to be
-   * converted to and from an associated JDBC type.
-   * </p>
-   */
-  boolean isJdbcNative();
-
-  /**
-   * Return the type as per java.sql.Types that this maps to.
-   * <p>
-   * This type should be consistent with the toJdbcType() method in converting
-   * the type to the appropriate type for binding to preparedStatements.
-   * </p>
-   */
-  int getJdbcType();
-
-  /**
-   * Return the type that matches the bean property type.
-   * <p>
-   * This represents the 'logical' type rather than the JDBC type this maps
-   * to.
-   * </p>
-   */
-  Class<T> getType();
-
-  /**
-   * Read the value from the resultSet and convert if necessary to the logical
-   * bean property value.
-   */
-  @Override
-  T read(DataReader reader) throws SQLException;
-
-  /**
-   * Ignore the reading of this value. Typically this means moving the index
-   * position in the ResultSet.
-   */
-  void loadIgnore(DataReader reader);
-
-  /**
-   * Convert (if necessary) and bind the value to the preparedStatement.
-   * <p>
-   * value may need to be converted from the logical bean property type to the
-   * JDBC type.
-   * </p>
-   */
-  void bind(DataBinder binder, T value) throws SQLException;
-
-  /**
-   * Convert the value as necessary to the JDBC type.
-   * <p>
-   * Note that this should also match the type as per the getJdbcType()
-   * method.
-   * </p>
-   * <p>
-   * This is typically used when the matching type is used in a where clause
-   * and we use this to ensure it is an appropriate jdbc type.
-   * </p>
-   */
-  Object toJdbcType(Object value);
-
-  /**
-   * Convert the value as necessary to the logical Bean type.
-   * <p>
-   * The type as per the bean property.
-   * </p>
-   * <p>
-   * This is used to automatically convert id values (typically from a string
-   * to a int, long or UUID).
-   * </p>
-   */
-  T toBeanType(Object value);
-
-  /**
-   * Convert the type into a string representation.
-   * <p>
-   * Reciprocal of parse().
-   * </p>
-   */
-  String formatValue(T value);
-
-  /**
-   * Convert the type into a string representation.
-   * <p>
-   * This assumes the value is of the correct type.
-   * </p>
-   * <p>
-   * This is so that ScalarType also implements the StringFormatter interface.
-   * </p>
-   */
-  @Override
-  String format(Object value);
-
-  /**
-   * Convert the string value to the appropriate java object.
-   * <p>
-   * Mostly used to support CSV, JSON and XML parsing.
-   * </p>
-   * <p>
-   * Reciprocal of formatValue().
-   * </p>
-   */
-  @Override
-  T parse(String value);
-
-  /**
-   * Return the type this maps to for JSON document stores.
-   */
-  DocPropertyType getDocType();
-
-  /**
-   * Return true if the type can accept long systemTimeMillis input.
-   * <p>
-   * This is used to determine if is is sensible to use the
-   * {@link #convertFromMillis(long)} method.
-   * </p>
-   * <p>
-   * This includes the Date, Calendar, sql Date, Time, Timestamp, JODA types
-   * as well as Long, BigDecimal and String (although it generally is not
-   * expected to parse systemTimeMillis to a String or BigDecimal).
-   * </p>
-   */
-  boolean isDateTimeCapable();
-
-  /**
-   * Convert the value into a long version value.
-   */
-  long asVersion(T value);
-
-  /**
-   * Convert the systemTimeMillis into the appropriate java object.
-   * <p>
-   * For non dateTime types this will throw an exception.
-   * </p>
-   */
-  T convertFromMillis(long dateTime);
-
-  /**
-   * Read the value from binary input.
-   */
-  T readData(DataInput dataInput) throws IOException;
-
-  /**
-   * Write the value to binary output.
-   */
-  void writeData(DataOutput dataOutput, T v) throws IOException;
-
-  /**
-   * Read the value from JsonParser.
-   */
-  T jsonRead(JsonParser parser) throws IOException;
-
-  /**
-   * Write the value to the JsonGenerator.
-   */
-  void jsonWrite(JsonGenerator writer, T value) throws IOException;
-
-}
@@ -1,6 +1,8 @@
 package io.ebeaninternal.server.type;

-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarType;

 import java.sql.Array;
 import java.sql.SQLException;
@@ -3,10 +3,12 @@ package io.ebeaninternal.server.type;

 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarType;
 import io.ebean.text.TextException;
 import io.ebean.text.json.EJson;
 import io.ebeaninternal.json.ModifyAwareList;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;

 import javax.persistence.PersistenceException;
 import java.io.IOException;
@@ -1,6 +1,8 @@
 package io.ebeaninternal.server.type;

-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarType;

 import java.lang.reflect.Type;
 import java.sql.SQLException;
@@ -3,10 +3,12 @@ package io.ebeaninternal.server.type;

 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarType;
 import io.ebean.text.TextException;
 import io.ebean.text.json.EJson;
 import io.ebeaninternal.json.ModifyAwareSet;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;

 import javax.persistence.PersistenceException;
 import java.io.IOException;
@@ -1,6 +1,8 @@
 package io.ebeaninternal.server.type;

-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarType;

 import java.lang.reflect.Type;
 import java.sql.SQLException;
@@ -1,5 +1,8 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarType;
+
 /**
 * Base ScalarType object.
 */
@@ -4,7 +4,9 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import io.ebean.config.JsonConfig;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.DocPropertyType;

 import java.io.DataInput;
 import java.io.DataOutput;
@@ -3,7 +3,9 @@ package io.ebeaninternal.server.type;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.config.JsonConfig;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.DocPropertyType;

 import java.io.DataInput;
 import java.io.DataOutput;
@@ -1,9 +1,11 @@
 package io.ebeaninternal.server.type;

-import io.ebean.text.TextException;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.text.TextException;

 import java.io.DataInput;
 import java.io.DataOutput;
@@ -1,9 +1,11 @@
 package io.ebeaninternal.server.type;

-import io.ebeaninternal.server.core.BasicTypeConverter;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.DocPropertyType;
+import io.ebeaninternal.server.core.BasicTypeConverter;

 import java.io.DataInput;
 import java.io.DataOutput;
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.ScalarType;
+
 /**
 * Boolean ScalarType's must implement to support DDL default values etc.
 */
@@ -1,11 +1,13 @@
 package io.ebeaninternal.server.type;

-import io.ebean.text.TextException;
-import io.ebeaninternal.server.core.BasicTypeConverter;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.text.TextException;
+import io.ebeaninternal.server.core.BasicTypeConverter;

 import java.io.DataInput;
 import java.io.DataOutput;
@@ -1,10 +1,12 @@
 package io.ebeaninternal.server.type;

-import io.ebean.text.TextException;
-import io.ebeaninternal.server.core.BasicTypeConverter;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.text.TextException;
+import io.ebeaninternal.server.core.BasicTypeConverter;

 import java.io.ByteArrayOutputStream;
 import java.io.DataInput;
@@ -1,9 +1,10 @@
 package io.ebeaninternal.server.type;

-import io.ebean.text.TextException;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.text.TextException;

 import java.io.ByteArrayOutputStream;
 import java.io.DataInput;
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.DataReader;
+
 import java.sql.SQLException;
 import java.sql.Types;

@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.DataReader;
+
 import java.sql.SQLException;
 import java.sql.Types;

@@ -1,8 +1,11 @@
 package io.ebeaninternal.server.type;

-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarType;

 import java.io.ByteArrayOutputStream;
 import java.io.DataInput;
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.DataReader;
+
 import java.sql.SQLException;
 import java.sql.Types;

@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.DataReader;
+
 import java.sql.SQLException;
 import java.sql.Types;

@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;

 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.DataBinder;
 import io.ebeaninternal.server.core.BasicTypeConverter;

 import java.sql.Date;
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
 import io.ebeaninternal.server.core.BasicTypeConverter;

 import java.sql.SQLException;
@@ -1,8 +1,10 @@
 package io.ebeaninternal.server.type;

-import io.ebeaninternal.server.core.BasicTypeConverter;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+import io.ebeaninternal.server.core.BasicTypeConverter;

 import java.io.IOException;
 import java.sql.SQLException;
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;

 import io.ebean.config.dbplatform.ExtraDbTypes;
+import io.ebean.core.type.DataBinder;
 import io.ebean.types.Cidr;

 import java.sql.SQLException;
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.DataReader;
+
 import java.sql.SQLException;
 import java.sql.Types;

@@ -1,6 +1,8 @@
 package io.ebeaninternal.server.type;

 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
 import io.ebeaninternal.server.core.BasicTypeConverter;

 import java.sql.Date;
@@ -1,5 +1,8 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+
 import javax.persistence.EnumType;
 import java.sql.SQLException;
 import java.sql.Types;
@@ -1,9 +1,11 @@
 package io.ebeaninternal.server.type;

-import io.ebeaninternal.server.core.BasicTypeConverter;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.DocPropertyType;
+import io.ebeaninternal.server.core.BasicTypeConverter;

 import java.io.DataInput;
 import java.io.DataOutput;
@@ -1,10 +1,12 @@
 package io.ebeaninternal.server.type;

-import io.ebean.text.TextException;
-import io.ebeaninternal.server.core.BasicTypeConverter;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.text.TextException;
+import io.ebeaninternal.server.core.BasicTypeConverter;

 import java.io.DataInput;
 import java.io.DataOutput;
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
 import io.ebeaninternal.server.core.BasicTypeConverter;

 import java.math.BigDecimal;
@@ -1,8 +1,11 @@
 package io.ebeaninternal.server.type;

-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarType;

 import java.io.DataInput;
 import java.io.DataOutput;
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.ScalarType;
+
 import javax.persistence.EnumType;
 import java.util.Set;

@@ -2,8 +2,10 @@ package io.ebeaninternal.server.type;

 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.DocPropertyType;
 import io.ebean.text.TextException;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;

 import javax.persistence.EnumType;
 import java.io.DataInput;
@@ -1,5 +1,9 @@
 package io.ebeaninternal.server.type;

+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarType;
+
 import javax.persistence.EnumType;
 import java.sql.SQLException;
 import java.util.Iterator;
@@ -1,9 +1,11 @@
 package io.ebeaninternal.server.type;

-import io.ebean.text.TextException;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.DataReader;
+import io.ebean.core.type.DocPropertyType;
+import io.ebean.text.TextException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;