From 86483ff947b63c23f5984eef77a74f8fc7bd943e Mon Sep 17 00:00:00 2001 From: rbygrave Date: Thu, 29 Jul 2021 11:52:15 +1200 Subject: [PATCH] Use scalarType.format(value) removing scalarType.jsonMapper(value) Remove scalarType.jsonMapper(value) as we can just use format(value) instead --- .../src/main/java/io/ebean/core/type/ScalarType.java | 4 ---- .../ebeaninternal/server/deploy/BeanPropertyJsonMapper.java | 2 +- .../server/type/ScalarTypeJsonObjectMapper.java | 5 ----- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java index 67fc940d7..6388648c3 100644 --- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java +++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java @@ -40,10 +40,6 @@ public interface ScalarType extends StringParser, StringFormatter, ScalarData return false; } - default String jsonMapper(Object value) { - throw new UnsupportedOperationException(); - } - /** * 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. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java index b1838ff18..40c90d853 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java @@ -35,7 +35,7 @@ public class BeanPropertyJsonMapper extends BeanProperty { @Override boolean isDirtyValue(Object value, EntityBeanIntercept ebi) { // dirty detection based on md5 hash of json content - final String json = scalarType.jsonMapper(value); + final String json = scalarType.format(value); final MutableHash oldHash = ebi.mutableHash(propertyIndex); if (oldHash == null || !oldHash.isEqualToJson(json)) { ebi.mutableContent(propertyIndex, json); // so we only convert to json once diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java index e14b1aca9..2c3be2fa3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java @@ -66,11 +66,6 @@ class ScalarTypeJsonObjectMapper { return true; } - @Override - public String jsonMapper(Object value) { - return formatValue(value); - } - @Override public Object read(DataReader reader) throws SQLException { String json = reader.getString();