From 798976fbd2b14bd0535daf7803e267a197624035 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Thu, 3 Mar 2016 21:39:10 +1300 Subject: [PATCH] #585 - Refactor of ScalarType jsonWrite() method such that it only takes JsonGenerator - part 4, tidy up --- .../ebeaninternal/server/type/ScalarHelp.java | 18 +++++++++ .../server/type/ScalarTypeBaseDateTime.java | 9 ++--- .../server/type/ScalarTypeBaseVarchar.java | 10 +---- .../server/type/ScalarTypeBigDecimal.java | 38 +++++++++---------- .../server/type/ScalarTypeBytesBase.java | 34 ++++++++--------- .../server/type/ScalarTypeDouble.java | 1 - .../server/type/ScalarTypeDuration.java | 4 +- .../type/ScalarTypeEncryptedWrapper.java | 1 - .../server/type/ScalarTypeEnumStandard.java | 20 ++++------ .../server/type/ScalarTypeInteger.java | 1 - .../server/type/ScalarTypeJodaLocalTime.java | 37 +++++++++--------- .../server/type/ScalarTypeJsonMap.java | 25 +++++------- .../server/type/ScalarTypeJsonNode.java | 20 ++++------ .../server/type/ScalarTypeLocalTime.java | 1 - .../server/type/ScalarTypeMathBigInteger.java | 10 ++--- .../server/type/ScalarTypeMonthDay.java | 1 - .../server/type/ScalarTypePostgresHstore.java | 12 ++---- .../server/type/ScalarTypeString.java | 5 +-- .../server/type/ScalarTypeTime.java | 1 - .../server/type/ScalarTypeUUIDBinary.java | 5 +-- .../server/type/ScalarTypeUUIDNative.java | 11 ++---- .../server/type/ScalarTypeUtilDate.java | 17 ++++----- .../server/type/ScalarTypeWrapper.java | 1 - 23 files changed, 123 insertions(+), 159 deletions(-) create mode 100644 src/main/java/com/avaje/ebeaninternal/server/type/ScalarHelp.java diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarHelp.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarHelp.java new file mode 100644 index 000000000..8735a4a7f --- /dev/null +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarHelp.java @@ -0,0 +1,18 @@ +package com.avaje.ebeaninternal.server.type; + +import java.io.DataOutput; +import java.io.IOException; + +/** + * Utility methods for ScalarTypes. + */ +public class ScalarHelp { + + /** + * Write the string content as UTF with the proceeding boolean true indicating the non-null. + */ + public static void writeUTF(DataOutput dataOutput, String content) throws IOException { + dataOutput.writeBoolean(true); + dataOutput.writeUTF(content); + } +} diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java index 0e3b45c96..f15c7eabd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java @@ -4,7 +4,6 @@ import com.avaje.ebean.config.JsonConfig; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import java.io.DataInput; import java.io.DataOutput; @@ -126,14 +125,12 @@ public abstract class ScalarTypeBaseDateTime extends ScalarTypeBase { return DocPropertyType.DATETIME; } - public String formatValue(T t) { - Timestamp ts = convertToTimestamp(t); - return ts.toString(); + public String formatValue(T value) { + return convertToTimestamp(value).toString(); } public T parse(String value) { - Timestamp ts = Timestamp.valueOf(value); - return convertFromTimestamp(ts); + return convertFromTimestamp(Timestamp.valueOf(value)); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseVarchar.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseVarchar.java index 1d071098a..bb51f81a2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseVarchar.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseVarchar.java @@ -4,7 +4,6 @@ import com.avaje.ebean.text.TextException; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import java.io.DataInput; import java.io.DataOutput; @@ -50,7 +49,6 @@ public abstract class ScalarTypeBaseVarchar extends ScalarTypeBase { public void bind(DataBind b, T value) throws SQLException { if (value == null) { b.setNull(Types.VARCHAR); - } else { b.setString(convertToDbString(value)); } @@ -107,19 +105,15 @@ public abstract class ScalarTypeBaseVarchar extends ScalarTypeBase { if (!dataInput.readBoolean()) { return null; } else { - String val = dataInput.readUTF(); - return convertFromDbString(val); + return convertFromDbString(dataInput.readUTF()); } } public void writeData(DataOutput dataOutput, T value) throws IOException { - if (value == null) { dataOutput.writeBoolean(false); } else { - dataOutput.writeBoolean(true); - String s = convertToDbString(value); - dataOutput.writeUTF(s); + ScalarHelp.writeUTF(dataOutput, convertToDbString(value)); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBigDecimal.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBigDecimal.java index e6f94d3c0..4e9da66af 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBigDecimal.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBigDecimal.java @@ -4,7 +4,6 @@ import com.avaje.ebeaninternal.server.core.BasicTypeConverter; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import java.io.DataInput; import java.io.DataOutput; @@ -22,25 +21,6 @@ public class ScalarTypeBigDecimal extends ScalarTypeBase { super(BigDecimal.class, true, Types.DECIMAL); } - public BigDecimal readData(DataInput dataInput) throws IOException { - if (!dataInput.readBoolean()) { - return null; - } else { - double val = dataInput.readDouble(); - return new BigDecimal(val); - } - } - - public void writeData(DataOutput dataOutput, BigDecimal b) throws IOException { - - if (b == null) { - dataOutput.writeBoolean(false); - } else { - dataOutput.writeBoolean(true); - dataOutput.writeDouble(b.doubleValue()); - } - } - public void bind(DataBind b, BigDecimal value) throws SQLException { if (value == null) { b.setNull(Types.DECIMAL); @@ -78,6 +58,24 @@ public class ScalarTypeBigDecimal extends ScalarTypeBase { return true; } + public BigDecimal readData(DataInput dataInput) throws IOException { + if (!dataInput.readBoolean()) { + return null; + } else { + return new BigDecimal(dataInput.readDouble()); + } + } + + public void writeData(DataOutput dataOutput, BigDecimal b) throws IOException { + + if (b == null) { + dataOutput.writeBoolean(false); + } else { + dataOutput.writeBoolean(true); + dataOutput.writeDouble(b.doubleValue()); + } + } + @Override public BigDecimal jsonRead(JsonParser parser) throws IOException { return parser.getDecimalValue(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBase.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBase.java index 262206f29..787e81a1d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBase.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBase.java @@ -4,7 +4,6 @@ import com.avaje.ebean.text.TextException; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import java.io.ByteArrayOutputStream; import java.io.DataInput; @@ -41,23 +40,6 @@ public abstract class ScalarTypeBytesBase extends ScalarTypeBase { return (byte[]) value; } - @Override - public void jsonWrite(JsonGenerator writer, byte[] value) throws IOException { - writer.writeBinary(value); - } - - @Override - public byte[] jsonRead(JsonParser parser) throws IOException { - ByteArrayOutputStream out = new ByteArrayOutputStream(500); - parser.readBinaryValue(out); - return out.toByteArray(); - } - - @Override - public DocPropertyType getDocType() { - return DocPropertyType.BINARY; - } - public String formatValue(byte[] t) { throw new TextException("Not supported"); } @@ -96,4 +78,20 @@ public abstract class ScalarTypeBytesBase extends ScalarTypeBase { } } + @Override + public void jsonWrite(JsonGenerator writer, byte[] value) throws IOException { + writer.writeBinary(value); + } + + @Override + public byte[] jsonRead(JsonParser parser) throws IOException { + ByteArrayOutputStream out = new ByteArrayOutputStream(500); + parser.readBinaryValue(out); + return out.toByteArray(); + } + + @Override + public DocPropertyType getDocType() { + return DocPropertyType.BINARY; + } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDouble.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDouble.java index ba4baaefc..dd1be180f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDouble.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDouble.java @@ -4,7 +4,6 @@ import com.avaje.ebeaninternal.server.core.BasicTypeConverter; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import java.io.DataInput; import java.io.DataOutput; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java index 9c93931b5..6f0dc11a4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java @@ -5,7 +5,6 @@ import com.avaje.ebeaninternal.server.core.BasicTypeConverter; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import java.io.DataInput; import java.io.DataOutput; @@ -77,8 +76,7 @@ public class ScalarTypeDuration extends ScalarTypeBase { if (value == null) { dataOutput.writeBoolean(false); } else { - dataOutput.writeBoolean(true); - dataOutput.writeUTF(convertToBigDecimal(value).toString()); + ScalarHelp.writeUTF(dataOutput, convertToBigDecimal(value).toString()); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java index fd3101a0e..9cf74f6ba 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java @@ -3,7 +3,6 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import java.io.DataInput; import java.io.DataOutput; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java index ea9b9048a..36a4b6fba 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java @@ -4,7 +4,6 @@ import com.avaje.ebean.text.TextException; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import java.io.DataInput; import java.io.DataOutput; @@ -208,13 +207,13 @@ public class ScalarTypeEnumStandard { } @Override - public String format(Object t) { - return ((Enum) t).name(); + public String format(Object value) { + return ((Enum) value).name(); } @Override - public String formatValue(Object t) { - return ((Enum) t).name(); + public String formatValue(Object value) { + return ((Enum) value).name(); } @Override @@ -252,20 +251,17 @@ public class ScalarTypeEnumStandard { if (!dataInput.readBoolean()) { return null; } else { - String s = dataInput.readUTF(); - return parse(s); + return parse(dataInput.readUTF()); } } @Override - public void writeData(DataOutput dataOutput, Object v) throws IOException { - if (v == null) { + public void writeData(DataOutput dataOutput, Object value) throws IOException { + if (value == null) { dataOutput.writeBoolean(false); } else { - dataOutput.writeBoolean(true); - dataOutput.writeUTF(format(v)); + ScalarHelp.writeUTF(dataOutput, format(value)); } } - } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInteger.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInteger.java index 819b4239c..52787032f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInteger.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInteger.java @@ -5,7 +5,6 @@ import com.avaje.ebeaninternal.server.core.BasicTypeConverter; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import java.io.DataInput; import java.io.DataOutput; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java index 6680c91db..eeb8ad79c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java @@ -71,24 +71,6 @@ public class ScalarTypeJodaLocalTime extends ScalarTypeBase { return new LocalTime(value); } - @Override - public void jsonWrite(JsonGenerator writer, LocalTime value) throws IOException { - writer.writeString(value.toString()); - } - - @Override - public LocalTime jsonRead(JsonParser parser) throws IOException { - if (JsonToken.VALUE_NUMBER_INT == parser.getCurrentToken()) { - return convertFromMillis(parser.getLongValue()); - } else { - return parse(parser.getValueAsString()); - } - } - - @Override - public DocPropertyType getDocType() { - return DocPropertyType.STRING; - } @Override public LocalTime convertFromMillis(long systemTimeMillis) { @@ -120,4 +102,23 @@ public class ScalarTypeJodaLocalTime extends ScalarTypeBase { dataOutput.writeUTF(format(value)); } } + + @Override + public void jsonWrite(JsonGenerator writer, LocalTime value) throws IOException { + writer.writeString(value.toString()); + } + + @Override + public LocalTime jsonRead(JsonParser parser) throws IOException { + if (JsonToken.VALUE_NUMBER_INT == parser.getCurrentToken()) { + return convertFromMillis(parser.getLongValue()); + } else { + return parse(parser.getValueAsString()); + } + } + + @Override + public DocPropertyType getDocType() { + return DocPropertyType.STRING; + } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java index a88320644..e24811032 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java @@ -5,7 +5,6 @@ import com.avaje.ebean.text.json.EJson; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import java.io.DataInput; import java.io.DataOutput; @@ -177,19 +176,16 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase { if (!dataInput.readBoolean()) { return null; } else { - String json = dataInput.readUTF(); - return parse(json); + return parse(dataInput.readUTF()); } } @Override - public void writeData(DataOutput dataOutput, Map v) throws IOException { - if (v == null) { + public void writeData(DataOutput dataOutput, Map map) throws IOException { + if (map == null) { dataOutput.writeBoolean(false); } else { - dataOutput.writeBoolean(true); - String json = format(v); - dataOutput.writeUTF(json); + ScalarHelp.writeUTF(dataOutput, format(map)); } } @@ -198,17 +194,14 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase { EJson.write(value, writer); } + @Override + public Map jsonRead(JsonParser parser) throws IOException { + return EJson.parseObject(parser, parser.getCurrentToken()); + } + @Override public DocPropertyType getDocType() { return DocPropertyType.OBJECT; } - @Override - public Map jsonRead(JsonParser parser) throws IOException { - // at this point the BeanProperty has read the START_OBJECT token - // to check for a null value. Pass the START_OBJECT token through to - // the EJson parsing so that it knows the first token has been read - return EJson.parseObject(parser, parser.getCurrentToken()); - } - } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNode.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNode.java index 1aee52278..16c3447b2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNode.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNode.java @@ -4,7 +4,6 @@ import com.avaje.ebean.text.TextException; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -189,8 +188,7 @@ public abstract class ScalarTypeJsonNode extends ScalarTypeBase { if (!dataInput.readBoolean()) { return null; } else { - String json = dataInput.readUTF(); - return parse(json); + return parse(dataInput.readUTF()); } } @@ -199,9 +197,7 @@ public abstract class ScalarTypeJsonNode extends ScalarTypeBase { if (value == null) { dataOutput.writeBoolean(false); } else { - dataOutput.writeBoolean(true); - String json = format(value); - dataOutput.writeUTF(json); + ScalarHelp.writeUTF(dataOutput, format(value)); } } @@ -210,16 +206,14 @@ public abstract class ScalarTypeJsonNode extends ScalarTypeBase { objectMapper.writeTree(writer, value); } + @Override + public JsonNode jsonRead(JsonParser parser) throws IOException { + return objectMapper.readValue(parser, JsonNode.class); + } + @Override public DocPropertyType getDocType() { return DocPropertyType.OBJECT; } - @Override - public JsonNode jsonRead(JsonParser parser) throws IOException { - // at this point the BeanProperty has read the START_OBJECT token - // to check for a null value. - return objectMapper.readValue(parser, JsonNode.class); - } - } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTime.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTime.java index b1c660e4c..1e3d0da6f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTime.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTime.java @@ -5,7 +5,6 @@ import com.avaje.ebeaninternal.server.core.BasicTypeConverter; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import java.io.DataInput; import java.io.DataOutput; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMathBigInteger.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMathBigInteger.java index d07cdc009..04f152f9f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMathBigInteger.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMathBigInteger.java @@ -4,7 +4,6 @@ import com.avaje.ebeaninternal.server.core.BasicTypeConverter; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import java.io.DataInput; import java.io.DataOutput; @@ -34,11 +33,11 @@ public class ScalarTypeMathBigInteger extends ScalarTypeBase { @Override public BigInteger read(DataReader dataReader) throws SQLException { - Long l = dataReader.getLong(); - if (l == null) { + Long value = dataReader.getLong(); + if (value == null) { return null; } - return new BigInteger(String.valueOf(l)); + return new BigInteger(String.valueOf(value)); } @Override @@ -76,8 +75,7 @@ public class ScalarTypeMathBigInteger extends ScalarTypeBase { if (!dataInput.readBoolean()) { return null; } else { - long val = dataInput.readLong(); - return BigInteger.valueOf(val); + return BigInteger.valueOf(dataInput.readLong()); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java index fd5d058b7..78511b653 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java @@ -55,7 +55,6 @@ public class ScalarTypeMonthDay extends ScalarTypeBase { return ts == null ? null : convertFromDate(ts); } - @Override public void bind(DataBind b, MonthDay value) throws SQLException { if (value == null) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstore.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstore.java index a9e3272b7..a519579dd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstore.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstore.java @@ -6,7 +6,6 @@ import com.avaje.ebean.text.json.EJson; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import java.io.DataInput; import java.io.DataOutput; @@ -96,19 +95,16 @@ public class ScalarTypePostgresHstore extends ScalarTypeBase { if (!dataInput.readBoolean()) { return null; } else { - String json = dataInput.readUTF(); - return parse(json); + return parse(dataInput.readUTF()); } } @Override - public void writeData(DataOutput dataOutput, Map v) throws IOException { - if (v == null) { + public void writeData(DataOutput dataOutput, Map map) throws IOException { + if (map == null) { dataOutput.writeBoolean(false); } else { - dataOutput.writeBoolean(true); - String json = format(v); - dataOutput.writeUTF(json); + ScalarHelp.writeUTF(dataOutput, format(map)); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeString.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeString.java index 6a318a567..0c3b31103 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeString.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeString.java @@ -4,7 +4,6 @@ import com.avaje.ebeaninternal.server.core.BasicTypeConverter; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import java.io.DataInput; import java.io.DataOutput; @@ -46,8 +45,8 @@ public class ScalarTypeString extends ScalarTypeBase { } @Override - public String formatValue(String t) { - return t; + public String formatValue(String value) { + return value; } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTime.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTime.java index 7f5b167e0..09e046062 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTime.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTime.java @@ -4,7 +4,6 @@ import com.avaje.ebeaninternal.server.core.BasicTypeConverter; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import java.io.DataInput; import java.io.DataOutput; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBinary.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBinary.java index aff5b0091..170ec8a57 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBinary.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBinary.java @@ -3,7 +3,6 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -135,12 +134,10 @@ public class ScalarTypeUUIDBinary extends ScalarTypeBase { @Override public void writeData(DataOutput dataOutput, UUID value) throws IOException { - if (value == null) { dataOutput.writeBoolean(false); } else { - dataOutput.writeBoolean(true); - dataOutput.writeUTF(format(value)); + ScalarHelp.writeUTF(dataOutput, format(value)); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDNative.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDNative.java index e558a628b..a3a2ff0c0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDNative.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDNative.java @@ -89,13 +89,11 @@ public class ScalarTypeUUIDNative extends ScalarTypeBase { } @Override - public void writeData(DataOutput dataOutput, UUID v) throws IOException { - if (v == null) { + public void writeData(DataOutput dataOutput, UUID value) throws IOException { + if (value == null) { dataOutput.writeBoolean(false); } else { - dataOutput.writeBoolean(true); - String json = format(v); - dataOutput.writeUTF(json); + ScalarHelp.writeUTF(dataOutput, format(value)); } } @@ -106,8 +104,7 @@ public class ScalarTypeUUIDNative extends ScalarTypeBase { @Override public UUID jsonRead(JsonParser parser) throws IOException { - String strValue = parser.getValueAsString(); - return strValue == null ? null : parse(strValue); + return parse(parser.getValueAsString()); } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUtilDate.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUtilDate.java index d0dfaa6ee..3d1f4b728 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUtilDate.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUtilDate.java @@ -45,14 +45,11 @@ public class ScalarTypeUtilDate { } @Override - public void bind(DataBind b, java.util.Date value) - throws SQLException { + public void bind(DataBind dataBind, java.util.Date value) throws SQLException { if (value == null) { - b.setNull(Types.TIMESTAMP); + dataBind.setNull(Types.TIMESTAMP); } else { - - Timestamp timestamp = new Timestamp(value.getTime()); - b.setTimestamp(timestamp); + dataBind.setTimestamp(new Timestamp(value.getTime())); } } @@ -73,8 +70,8 @@ public class ScalarTypeUtilDate { } @Override - public Timestamp convertToTimestamp(Date t) { - return new Timestamp(t.getTime()); + public Timestamp convertToTimestamp(Date date) { + return new Timestamp(date.getTime()); } @Override @@ -101,8 +98,8 @@ public class ScalarTypeUtilDate { } @Override - public java.sql.Date convertToDate(Date t) { - return new java.sql.Date(t.getTime()); + public java.sql.Date convertToDate(Date date) { + return new java.sql.Date(date.getTime()); } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeWrapper.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeWrapper.java index 4cf0b8ee7..a75ce7e17 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeWrapper.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeWrapper.java @@ -4,7 +4,6 @@ import com.avaje.ebean.config.ScalarTypeConverter; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import java.io.DataInput; import java.io.DataOutput;