From a4f0e3936a6a86a91d8b82d63f6590a1f75daf8b Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Thu, 3 Mar 2016 20:27:13 +1300 Subject: [PATCH] #585 - Refactor of ScalarType jsonWrite() method such that it only takes JsonGenerator - part 2, use JsonGenerator --- .../server/deploy/BeanProperty.java | 2 +- .../server/deploy/BeanPropertyCompound.java | 1 + .../server/text/json/DefaultJsonScalar.java | 5 +++-- .../server/type/CtCompoundType.java | 2 +- .../ebeaninternal/server/type/ScalarType.java | 4 ++-- .../server/type/ScalarTypeBaseDate.java | 4 ++-- .../server/type/ScalarTypeBaseDateTime.java | 10 +++++----- .../server/type/ScalarTypeBaseVarchar.java | 6 +++--- .../server/type/ScalarTypeBigDecimal.java | 6 +++--- .../server/type/ScalarTypeBoolean.java | 6 +++--- .../server/type/ScalarTypeByte.java | 18 +++++++++++++----- .../server/type/ScalarTypeBytesBase.java | 10 ++++------ .../server/type/ScalarTypeBytesEncrypted.java | 8 +++----- .../server/type/ScalarTypeDouble.java | 6 +++--- .../server/type/ScalarTypeDuration.java | 6 +++--- .../type/ScalarTypeEncryptedWrapper.java | 4 ++-- .../server/type/ScalarTypeEnumStandard.java | 6 +++--- .../server/type/ScalarTypeFile.java | 6 +++--- .../server/type/ScalarTypeFloat.java | 6 +++--- .../server/type/ScalarTypeInteger.java | 6 +++--- .../server/type/ScalarTypeJodaLocalTime.java | 6 +++--- .../server/type/ScalarTypeJsonMap.java | 8 ++++---- .../server/type/ScalarTypeJsonNode.java | 8 ++++---- .../server/type/ScalarTypeLocalTime.java | 6 +++--- .../server/type/ScalarTypeLong.java | 6 +++--- .../server/type/ScalarTypeMathBigInteger.java | 6 +++--- .../server/type/ScalarTypeMonthDay.java | 4 ++-- .../server/type/ScalarTypePostgresHstore.java | 8 ++++---- .../server/type/ScalarTypeShort.java | 6 +++--- .../server/type/ScalarTypeString.java | 6 +++--- .../server/type/ScalarTypeTime.java | 6 +++--- .../server/type/ScalarTypeUUIDBinary.java | 4 ++-- .../server/type/ScalarTypeUUIDNative.java | 4 ++-- .../server/type/ScalarTypeWrapper.java | 4 ++-- .../server/type/ScalarTypeYear.java | 6 +++--- .../ebeaninternal/server/type/JsonTester.java | 2 +- .../type/ScalarTypePostgresHstoreTest.java | 9 ++++----- src/test/resources/logback-test.xml | 4 ++-- 38 files changed, 115 insertions(+), 110 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java index 3eaa1fa8e..42d806472 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java @@ -1244,7 +1244,7 @@ public class BeanProperty implements ElPropertyValue, Property { } else { if (scalarType != null) { writeJson.writeFieldName(name); - scalarType.jsonWrite(writeJson, value); + scalarType.jsonWrite(writeJson.gen(), value); } else { writeJson.writeValueUsingObjectMapper(name, value); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompound.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompound.java index a0f7d8ce4..11872ba51 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompound.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompound.java @@ -155,6 +155,7 @@ public class BeanPropertyCompound extends BeanProperty { if (value == null) { ctx.writeNullField(name); } else { + ctx.writeFieldName(name); compoundType.jsonWrite(ctx, value, name); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/text/json/DefaultJsonScalar.java b/src/main/java/com/avaje/ebeaninternal/server/text/json/DefaultJsonScalar.java index e6d028cf3..e91c31709 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/text/json/DefaultJsonScalar.java +++ b/src/main/java/com/avaje/ebeaninternal/server/text/json/DefaultJsonScalar.java @@ -22,17 +22,18 @@ public class DefaultJsonScalar implements JsonScalar { } @Override + @SuppressWarnings("unchecked") public void write(Object value) throws IOException { if (value instanceof String) { writeJson.writeString((String)value); } else { - ScalarType scalarType = (ScalarType)typeManager.getScalarType(value.getClass()); + ScalarType scalarType = typeManager.getScalarType(value.getClass()); if (scalarType == null) { throw new IllegalArgumentException("unhandled type " + value.getClass()); } - scalarType.jsonWrite(writeJson, value); + scalarType.jsonWrite(writeJson.gen(), value); } } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/CtCompoundType.java b/src/main/java/com/avaje/ebeaninternal/server/type/CtCompoundType.java index 1d6301658..7def927ec 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/CtCompoundType.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/CtCompoundType.java @@ -191,7 +191,7 @@ public final class CtCompoundType implements ScalarDataReader { } else { ctx.writeFieldName(propName); - ((ScalarType) propReaders[i]).jsonWrite(ctx, value); + ((ScalarType) propReaders[i]).jsonWrite(ctx.gen(), value); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarType.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarType.java index 70d4e5b2c..bc0eb2ace 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarType.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarType.java @@ -2,8 +2,8 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebean.text.StringFormatter; import com.avaje.ebean.text.StringParser; -import com.avaje.ebean.text.json.JsonWriter; 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; @@ -208,6 +208,6 @@ public interface ScalarType extends StringParser, StringFormatter, ScalarData /** * Write the value to the JsonGenerator. */ - void jsonWrite(JsonWriter writer, T value) throws IOException; + void jsonWrite(JsonGenerator writer, T value) throws IOException; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDate.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDate.java index 6f5f22d2c..3970cc3f5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDate.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDate.java @@ -1,7 +1,7 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; -import com.avaje.ebean.text.json.JsonWriter; +import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -79,7 +79,7 @@ public abstract class ScalarTypeBaseDate extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, T value) throws IOException { + public void jsonWrite(JsonGenerator writer, T value) throws IOException { writer.writeNumber(convertToMillis(value)); } 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 12743b662..46feca57f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java @@ -2,7 +2,7 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebean.config.JsonConfig; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; -import com.avaje.ebean.text.json.JsonWriter; +import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -104,19 +104,19 @@ public abstract class ScalarTypeBaseDateTime extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, T value) throws IOException { + public void jsonWrite(JsonGenerator writer, T value) throws IOException { switch (mode) { case ISO8601: { - writer.gen().writeString(toJsonISO8601(value)); + writer.writeString(toJsonISO8601(value)); break; } case NANOS: { - writer.gen().writeNumber(toJsonNanos(value)); + writer.writeNumber(toJsonNanos(value)); break; } default: { - writer.gen().writeNumber(convertToMillis(value)); + writer.writeNumber(convertToMillis(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 79c320548..66df95a5a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseVarchar.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseVarchar.java @@ -1,8 +1,8 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.avaje.ebean.text.TextException; -import com.avaje.ebean.text.json.JsonWriter; +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; @@ -129,7 +129,7 @@ public abstract class ScalarTypeBaseVarchar extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, T value) throws IOException { + public void jsonWrite(JsonGenerator writer, T value) throws IOException { writer.writeString(format(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 2abf5836e..b33ce570c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBigDecimal.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBigDecimal.java @@ -1,8 +1,8 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; -import com.avaje.ebean.text.json.JsonWriter; 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; @@ -84,7 +84,7 @@ public class ScalarTypeBigDecimal extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, BigDecimal value) throws IOException { + public void jsonWrite(JsonGenerator writer, BigDecimal value) throws IOException { writer.writeNumber(value); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBoolean.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBoolean.java index 0e5fad9b5..d0c1e090d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBoolean.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBoolean.java @@ -1,9 +1,9 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.avaje.ebean.text.TextException; -import com.avaje.ebean.text.json.JsonWriter; 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; @@ -336,7 +336,7 @@ public class ScalarTypeBoolean { } @Override - public void jsonWrite(JsonWriter writer, Boolean value) throws IOException { + public void jsonWrite(JsonGenerator writer, Boolean value) throws IOException { writer.writeBoolean(value); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeByte.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeByte.java index 36cacca55..672724ad1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeByte.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeByte.java @@ -1,12 +1,13 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.avaje.ebean.text.TextException; -import com.avaje.ebean.text.json.JsonWriter; 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.ByteArrayOutputStream; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -43,13 +44,20 @@ public class ScalarTypeByte extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, Byte value) throws IOException { - throw new IOException("Not supported"); + public void jsonWrite(JsonGenerator writer, Byte value) throws IOException { + writer.writeBinary(new byte[]{value}); } @Override public Byte jsonRead(JsonParser parser, JsonToken event) throws IOException { - throw new IOException("Not supported"); + ByteArrayOutputStream os = new ByteArrayOutputStream(); + parser.readBinaryValue(os); + byte[] bytes = os.toByteArray(); + if (bytes.length == 0) { + return null; + } else { + return bytes[0]; + } } @Override 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 03bd7d29b..7b0a55bcb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBase.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBase.java @@ -1,12 +1,11 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.avaje.ebean.text.TextException; -import com.avaje.ebean.text.json.JsonWriter; +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; import java.io.DataInput; import java.io.DataOutput; @@ -43,9 +42,8 @@ public abstract class ScalarTypeBytesBase extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, byte[] value) throws IOException { - ByteArrayInputStream is = new ByteArrayInputStream(value); - writer.writeBinary(is, value.length); + public void jsonWrite(JsonGenerator writer, byte[] value) throws IOException { + writer.writeBinary(value); } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java index 4a831be39..30475d1f4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java @@ -1,11 +1,10 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebean.text.json.JsonWriter; 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; import java.io.DataInput; import java.io.DataOutput; @@ -66,9 +65,8 @@ public class ScalarTypeBytesEncrypted implements ScalarType { } @Override - public void jsonWrite(JsonWriter writer, byte[] value) throws IOException { - ByteArrayInputStream is = new ByteArrayInputStream(value); - writer.writeBinary(is, value.length); + public void jsonWrite(JsonGenerator writer, byte[] value) throws IOException { + writer.writeBinary(value); } @Override 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 b826884f3..f17b24546 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDouble.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDouble.java @@ -1,8 +1,8 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; -import com.avaje.ebean.text.json.JsonWriter; 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; @@ -91,7 +91,7 @@ public class ScalarTypeDouble extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, Double value) throws IOException { + public void jsonWrite(JsonGenerator writer, Double value) throws IOException { writer.writeNumber(value); } 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 139632043..0bdf83175 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java @@ -1,9 +1,9 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.avaje.ebean.text.TextException; -import com.avaje.ebean.text.json.JsonWriter; 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; @@ -108,7 +108,7 @@ public class ScalarTypeDuration extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, Duration value) throws IOException { + public void jsonWrite(JsonGenerator writer, Duration value) throws IOException { writer.writeString(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 65c6b388a..15debf6c2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java @@ -1,7 +1,7 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebean.text.json.JsonWriter; 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; @@ -139,7 +139,7 @@ public class ScalarTypeEncryptedWrapper implements ScalarType { } @Override - public void jsonWrite(JsonWriter writer, T value) throws IOException { + public void jsonWrite(JsonGenerator writer, T value) throws IOException { wrapped.jsonWrite(writer, value); } 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 1df472dea..68f730306 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java @@ -1,8 +1,8 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.avaje.ebean.text.TextException; -import com.avaje.ebean.text.json.JsonWriter; +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; @@ -238,7 +238,7 @@ public class ScalarTypeEnumStandard { } @Override - public void jsonWrite(JsonWriter writer, Object value) throws IOException { + public void jsonWrite(JsonGenerator writer, Object value) throws IOException { writer.writeString(formatValue(value)); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFile.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFile.java index b19cdd39f..7c9722a7a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFile.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFile.java @@ -1,8 +1,8 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.avaje.ebean.text.TextException; -import com.avaje.ebean.text.json.JsonWriter; +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 org.slf4j.Logger; @@ -112,7 +112,7 @@ public class ScalarTypeFile extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, File value) throws IOException { + public void jsonWrite(JsonGenerator writer, File value) throws IOException { InputStream is = getInputStream(value); writer.writeBinary(is, (int) value.length()); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFloat.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFloat.java index 4154c843d..0baf6acd1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFloat.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFloat.java @@ -1,8 +1,8 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; -import com.avaje.ebean.text.json.JsonWriter; 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; @@ -91,7 +91,7 @@ public class ScalarTypeFloat extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, Float value) throws IOException { + public void jsonWrite(JsonGenerator writer, Float value) throws IOException { writer.writeNumber(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 b7f9108c5..782f19cdd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInteger.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInteger.java @@ -1,9 +1,9 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.avaje.ebean.text.TextException; -import com.avaje.ebean.text.json.JsonWriter; 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; @@ -91,7 +91,7 @@ public class ScalarTypeInteger extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, Integer value) throws IOException { + public void jsonWrite(JsonGenerator writer, Integer value) throws IOException { writer.writeNumber(value); } 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 7d95f46f2..73ec76ab7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java @@ -1,8 +1,8 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; -import com.avaje.ebean.text.json.JsonWriter; 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 org.joda.time.DateTimeZone; @@ -72,7 +72,7 @@ public class ScalarTypeJodaLocalTime extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, LocalTime value) throws IOException { + public void jsonWrite(JsonGenerator writer, LocalTime value) throws IOException { writer.writeString(value.toString()); } 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 f197df9ad..6f3bb1d50 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java @@ -1,9 +1,9 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.avaje.ebean.text.TextException; import com.avaje.ebean.text.json.EJson; -import com.avaje.ebean.text.json.JsonWriter; +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; @@ -194,8 +194,8 @@ public abstract class ScalarTypeJsonMap extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, Map value) throws IOException { - EJson.write(value, writer.gen()); + public void jsonWrite(JsonGenerator writer, Map value) throws IOException { + EJson.write(value, writer); } @Override 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 70969e78d..80c70f091 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNode.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNode.java @@ -1,8 +1,8 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.avaje.ebean.text.TextException; -import com.avaje.ebean.text.json.JsonWriter; +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; @@ -206,8 +206,8 @@ public abstract class ScalarTypeJsonNode extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, JsonNode value) throws IOException { - objectMapper.writeTree(writer.gen(), value); + public void jsonWrite(JsonGenerator writer, JsonNode value) throws IOException { + objectMapper.writeTree(writer, value); } @Override 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 77f13dffc..75a40c7a3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTime.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTime.java @@ -1,9 +1,9 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.avaje.ebean.text.TextException; -import com.avaje.ebean.text.json.JsonWriter; 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; @@ -100,7 +100,7 @@ public class ScalarTypeLocalTime extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, LocalTime value) throws IOException { + public void jsonWrite(JsonGenerator writer, LocalTime value) throws IOException { writer.writeString(value.toString()); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLong.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLong.java index b68facc53..b3c29e74b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLong.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLong.java @@ -1,8 +1,8 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; -import com.avaje.ebean.text.json.JsonWriter; 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; @@ -91,7 +91,7 @@ public class ScalarTypeLong extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, Long value) throws IOException { + public void jsonWrite(JsonGenerator writer, Long value) throws IOException { writer.writeNumber(value); } 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 0204ed005..9df78440e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMathBigInteger.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMathBigInteger.java @@ -1,8 +1,8 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; -import com.avaje.ebean.text.json.JsonWriter; 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; @@ -98,7 +98,7 @@ public class ScalarTypeMathBigInteger extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, BigInteger value) throws IOException { + public void jsonWrite(JsonGenerator writer, BigInteger value) throws IOException { writer.writeNumber(value.longValue()); } 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 df8120744..553ce58e0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java @@ -1,7 +1,7 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; -import com.avaje.ebean.text.json.JsonWriter; +import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -125,7 +125,7 @@ public class ScalarTypeMonthDay extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, MonthDay value) throws IOException { + public void jsonWrite(JsonGenerator writer, MonthDay value) throws IOException { writer.writeString(format(value)); } 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 42d7984f5..23d057b4e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstore.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstore.java @@ -1,10 +1,10 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebean.config.dbplatform.DbType; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.avaje.ebean.text.TextException; import com.avaje.ebean.text.json.EJson; -import com.avaje.ebean.text.json.JsonWriter; +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; @@ -113,8 +113,8 @@ public class ScalarTypePostgresHstore extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, Map value) throws IOException { - EJson.write(value, writer.gen()); + public void jsonWrite(JsonGenerator writer, Map value) throws IOException { + EJson.write(value, writer); } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeShort.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeShort.java index d47ad0d66..d8f14794c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeShort.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeShort.java @@ -1,9 +1,9 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; import com.avaje.ebean.text.TextException; -import com.avaje.ebean.text.json.JsonWriter; 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; @@ -92,7 +92,7 @@ public class ScalarTypeShort extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, Short value) throws IOException { + public void jsonWrite(JsonGenerator writer, Short value) throws IOException { writer.writeNumber(value); } 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 eac29615a..dc90540bf 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeString.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeString.java @@ -1,8 +1,8 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; -import com.avaje.ebean.text.json.JsonWriter; 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; @@ -91,7 +91,7 @@ public class ScalarTypeString extends ScalarTypeBase { } @Override - public void jsonWrite(JsonWriter writer, String value) throws IOException { + public void jsonWrite(JsonGenerator writer, String value) throws IOException { writer.writeString(value); } 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 56571ccaf..867ed66b4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTime.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTime.java @@ -1,8 +1,8 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; -import com.avaje.ebean.text.json.JsonWriter; 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; @@ -93,7 +93,7 @@ public class ScalarTypeTime extends ScalarTypeBase