mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-22 15:10:02 +00:00
Refactor move ScalarTypeBase to the ebean-core-type module (for external reuse)
Doing this in preparation for moving the joda-time scalar types into their own module (so that they can become optional).
This commit is contained in:
1 parent
4b11147b83
commit
cd30c47951
29 files changed
+31
-16
No files matched your search
+3
-6
@@ -1,18 +1,15 @@
|
|||||||
package io.ebeaninternal.server.type;
|
package io.ebean.core.type;
|
||||||
|
|
||||||
import io.ebean.core.type.DataReader;
|
|
||||||
import io.ebean.core.type.ScalarType;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Base ScalarType object.
|
* Base ScalarType object.
|
||||||
*/
|
*/
|
||||||
abstract class ScalarTypeBase<T> implements ScalarType<T> {
|
public abstract class ScalarTypeBase<T> implements ScalarType<T> {
|
||||||
|
|
||||||
protected final Class<T> type;
|
protected final Class<T> type;
|
||||||
protected final boolean jdbcNative;
|
protected final boolean jdbcNative;
|
||||||
protected final int jdbcType;
|
protected final int jdbcType;
|
||||||
|
|
||||||
ScalarTypeBase(Class<T> type, boolean jdbcNative, int jdbcType) {
|
public ScalarTypeBase(Class<T> type, boolean jdbcNative, int jdbcType) {
|
||||||
this.type = type;
|
this.type = type;
|
||||||
this.jdbcNative = jdbcNative;
|
this.jdbcNative = jdbcNative;
|
||||||
this.jdbcType = jdbcType;
|
this.jdbcType = jdbcType;
|
||||||
@@ -7,6 +7,7 @@ import io.ebean.config.JsonConfig;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
import java.io.DataOutput;
|
import java.io.DataOutput;
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import io.ebean.config.JsonConfig;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
import java.io.DataOutput;
|
import java.io.DataOutput;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
import io.ebean.text.TextException;
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
import java.io.DataOutput;
|
import java.io.DataOutput;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebeaninternal.server.core.BasicTypeConverter;
|
import io.ebeaninternal.server.core.BasicTypeConverter;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.JsonToken;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
import io.ebean.text.TextException;
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebeaninternal.server.core.BasicTypeConverter;
|
import io.ebeaninternal.server.core.BasicTypeConverter;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebean.text.TextException;
|
import io.ebean.text.TextException;
|
||||||
import io.ebeaninternal.server.core.BasicTypeConverter;
|
import io.ebeaninternal.server.core.BasicTypeConverter;
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
|
|||||||
import com.fasterxml.jackson.core.JsonParser;
|
import com.fasterxml.jackson.core.JsonParser;
|
||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebean.text.TextException;
|
import io.ebean.text.TextException;
|
||||||
|
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebeaninternal.server.core.BasicTypeConverter;
|
import io.ebeaninternal.server.core.BasicTypeConverter;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
import io.ebean.text.TextException;
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebeaninternal.server.core.BasicTypeConverter;
|
import io.ebeaninternal.server.core.BasicTypeConverter;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
import io.ebean.text.TextException;
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
|
|
||||||
import javax.persistence.EnumType;
|
import javax.persistence.EnumType;
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebean.text.TextException;
|
import io.ebean.text.TextException;
|
||||||
import io.ebeaninternal.api.CoreLog;
|
import io.ebeaninternal.api.CoreLog;
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebeaninternal.server.core.BasicTypeConverter;
|
import io.ebeaninternal.server.core.BasicTypeConverter;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebean.text.TextException;
|
import io.ebean.text.TextException;
|
||||||
import io.ebeaninternal.server.core.BasicTypeConverter;
|
import io.ebeaninternal.server.core.BasicTypeConverter;
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.core.JsonToken;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebeaninternal.server.core.BasicTypeConverter;
|
import io.ebeaninternal.server.core.BasicTypeConverter;
|
||||||
import org.joda.time.DateTimeZone;
|
import org.joda.time.DateTimeZone;
|
||||||
import org.joda.time.LocalTime;
|
import org.joda.time.LocalTime;
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.type;
|
|||||||
|
|
||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
import java.io.DataOutput;
|
import java.io.DataOutput;
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import io.ebean.config.dbplatform.DbPlatformType;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebean.text.TextException;
|
import io.ebean.text.TextException;
|
||||||
import io.ebean.text.json.EJson;
|
import io.ebean.text.json.EJson;
|
||||||
import io.ebean.util.IOUtils;
|
import io.ebean.util.IOUtils;
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebean.text.TextException;
|
import io.ebean.text.TextException;
|
||||||
import io.ebean.util.IOUtils;
|
import io.ebean.util.IOUtils;
|
||||||
|
|
||||||
|
|||||||
+1
-4
@@ -8,10 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
|||||||
import com.fasterxml.jackson.databind.ObjectWriter;
|
import com.fasterxml.jackson.databind.ObjectWriter;
|
||||||
import com.fasterxml.jackson.databind.introspect.AnnotatedField;
|
import com.fasterxml.jackson.databind.introspect.AnnotatedField;
|
||||||
import io.ebean.annotation.MutationDetection;
|
import io.ebean.annotation.MutationDetection;
|
||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.*;
|
||||||
import io.ebean.core.type.DataReader;
|
|
||||||
import io.ebean.core.type.DocPropertyType;
|
|
||||||
import io.ebean.core.type.ScalarType;
|
|
||||||
import io.ebean.text.TextException;
|
import io.ebean.text.TextException;
|
||||||
import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
|
import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebean.text.TextException;
|
import io.ebean.text.TextException;
|
||||||
import io.ebeaninternal.server.core.BasicTypeConverter;
|
import io.ebeaninternal.server.core.BasicTypeConverter;
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebeaninternal.server.core.BasicTypeConverter;
|
import io.ebeaninternal.server.core.BasicTypeConverter;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebeaninternal.server.core.BasicTypeConverter;
|
import io.ebeaninternal.server.core.BasicTypeConverter;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
import java.io.DataOutput;
|
import java.io.DataOutput;
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import io.ebean.config.dbplatform.DbPlatformType;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebean.text.TextException;
|
import io.ebean.text.TextException;
|
||||||
import io.ebean.text.json.EJson;
|
import io.ebean.text.json.EJson;
|
||||||
import io.ebeaninternal.json.ModifyAwareMap;
|
import io.ebeaninternal.json.ModifyAwareMap;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
import io.ebean.text.TextException;
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebeaninternal.server.core.BasicTypeConverter;
|
import io.ebeaninternal.server.core.BasicTypeConverter;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebeaninternal.server.core.BasicTypeConverter;
|
import io.ebeaninternal.server.core.BasicTypeConverter;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebeaninternal.server.core.BasicTypeConverter;
|
import io.ebeaninternal.server.core.BasicTypeConverter;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
|
|||||||
import com.fasterxml.jackson.core.JsonParser;
|
import com.fasterxml.jackson.core.JsonParser;
|
||||||
import io.ebean.config.dbplatform.DbPlatformType;
|
import io.ebean.config.dbplatform.DbPlatformType;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebeaninternal.server.core.BasicTypeConverter;
|
import io.ebeaninternal.server.core.BasicTypeConverter;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
|
|||||||
import io.ebean.core.type.DataBinder;
|
import io.ebean.core.type.DataBinder;
|
||||||
import io.ebean.core.type.DataReader;
|
import io.ebean.core.type.DataReader;
|
||||||
import io.ebean.core.type.DocPropertyType;
|
import io.ebean.core.type.DocPropertyType;
|
||||||
import io.ebean.text.TextException;
|
import io.ebean.core.type.ScalarTypeBase;
|
||||||
import io.ebeaninternal.server.core.BasicTypeConverter;
|
import io.ebeaninternal.server.core.BasicTypeConverter;
|
||||||
|
|
||||||
import java.io.DataInput;
|
import java.io.DataInput;
|
||||||
|
|||||||
Reference in new issue
Block a user