From 186019da7f722aa84262b80816fbbaa9ca749517 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 25 Aug 2022 13:00:30 +1200 Subject: [PATCH] Refactor ScalarType move format() default method from ScalarTypeBase to ScalarType --- .../src/main/java/io/ebean/core/type/ScalarType.java | 5 ++++- .../src/main/java/io/ebean/core/type/ScalarTypeBase.java | 6 ------ .../io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java | 6 ------ .../ebeaninternal/server/type/ScalarTypeBytesEncrypted.java | 5 ----- .../server/type/ScalarTypeEncryptedWrapper.java | 6 ------ .../io/ebeaninternal/server/type/ScalarTypeNotFound.java | 5 ----- .../io/ebeaninternal/server/type/ScalarTypeWrapper.java | 6 ------ .../src/main/java/io/ebean/postgis/ScalarTypePgisBase.java | 5 ----- .../java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java | 5 ----- 9 files changed, 4 insertions(+), 45 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 304428924..ae354110e 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 @@ -141,8 +141,11 @@ public interface ScalarType extends StringParser, StringFormatter, ScalarData *

* This is so that ScalarType also implements the StringFormatter interface. */ + @SuppressWarnings("unchecked") @Override - String format(Object value); + default String format(Object value) { + return formatValue((T) value); + } /** * Convert the string value to the appropriate java object. diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java index 40f092624..3231016c2 100644 --- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java +++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java @@ -30,10 +30,4 @@ public abstract class ScalarTypeBase implements ScalarType { return type; } - @Override - @SuppressWarnings("unchecked") - public String format(Object value) { - return formatValue((T) value); - } - } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java index 6bdfedc88..71785fb3d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java @@ -88,12 +88,6 @@ abstract class ScalarTypeBaseVarchar extends ScalarTypeBase { return format(value); } - @Override - @SuppressWarnings("unchecked") - public String format(Object value) { - return formatValue((T) value); - } - @Override public T readData(DataInput dataInput) throws IOException { if (!dataInput.readBoolean()) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java index c1419e010..118078b41 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java @@ -74,11 +74,6 @@ public final class ScalarTypeBytesEncrypted implements ScalarType { return baseType.docType(); } - @Override - public String format(Object v) { - throw new RuntimeException("Not used"); - } - @Override public String formatValue(byte[] v) { throw new RuntimeException("Not used"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java index caa965190..6f04227af 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java @@ -99,12 +99,6 @@ public final class ScalarTypeEncryptedWrapper implements ScalarType, Local return false; } - @Override - @SuppressWarnings("unchecked") - public String format(Object v) { - return formatValue((T) v); - } - @Override public String formatValue(T v) { return wrapped.formatValue(v); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java index 3b84cc68b..235ea7334 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java @@ -63,11 +63,6 @@ class ScalarTypeNotFound implements ScalarType { throw new UnsupportedOperationException(); } - @Override - public String format(Object value) { - throw new UnsupportedOperationException(); - } - @Override public Void parse(String value) { throw new UnsupportedOperationException(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java index 1226280e2..ee707e1c2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java @@ -104,12 +104,6 @@ public class ScalarTypeWrapper implements ScalarType { return false; } - @Override - @SuppressWarnings("unchecked") - public String format(Object v) { - return formatValue((B) v); - } - @Override public String formatValue(B v) { S sv = converter.unwrapValue(v); diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java index cd06256e5..6a825a8b6 100644 --- a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java +++ b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java @@ -101,11 +101,6 @@ abstract class ScalarTypePgisBase implements ScalarType { return null; } - @Override - public String format(Object value) { - return null; - } - @Override public T parse(String value) { return null; diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java b/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java index 34bc43901..cd6a74054 100644 --- a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java +++ b/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java @@ -92,11 +92,6 @@ abstract class ScalarTypeGeoLatteBase implements ScalarType< return null; } - @Override - public String format(Object value) { - return null; - } - @Override public T parse(String value) { return null;