diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java index 87d96187b..1ff82ee3f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java @@ -10,6 +10,8 @@ import java.sql.Types; abstract class ScalarTypeArrayBase extends ScalarTypeJsonCollection { + static final Object[] EMPTY_ARRAY = new Object[]{}; + ScalarTypeArrayBase(Class type, int dbType, DocPropertyType docPropertyType, boolean nullable) { super(type, dbType, docPropertyType, nullable); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java index cce8f185a..84fdab9fe 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java @@ -16,15 +16,9 @@ import java.lang.reflect.Type; import java.math.BigDecimal; import java.sql.SQLException; import java.sql.Types; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.concurrent.locks.ReentrantLock; -import static java.util.Collections.EMPTY_LIST; - /** * Type mapped for DB ARRAY type (Postgres only effectively). */ @@ -136,7 +130,7 @@ class ScalarTypeArrayList extends ScalarTypeArrayBase implements ScalarTyp if (nullable) { binder.setNull(Types.ARRAY); } else { - binder.setArray(arrayType, toArray(EMPTY_LIST)); + binder.setArray(arrayType, EMPTY_ARRAY); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java index c0651ded8..a72c5ec6e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java @@ -14,8 +14,6 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.locks.ReentrantLock; -import static java.util.Collections.EMPTY_LIST; - /** * H2 database support for DB ARRAY. */ @@ -90,7 +88,7 @@ final class ScalarTypeArrayListH2 extends ScalarTypeArrayList { if (nullable) { binder.setNull(Types.ARRAY); } else { - binder.setObject(toArray(EMPTY_LIST)); + binder.setObject(EMPTY_ARRAY); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java index 3a9b69849..2929391cb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java @@ -15,16 +15,9 @@ import java.io.IOException; import java.lang.reflect.Type; import java.sql.SQLException; import java.sql.Types; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; +import java.util.*; import java.util.concurrent.locks.ReentrantLock; -import static java.util.Collections.EMPTY_SET; - /** * Type mapped for DB ARRAY type (Postgres only effectively). */ @@ -125,7 +118,7 @@ class ScalarTypeArraySet extends ScalarTypeArrayBase implements ScalarTypeA if (nullable) { binder.setNull(Types.ARRAY); } else { - binder.setArray(arrayType, toArray(EMPTY_SET)); + binder.setArray(arrayType, EMPTY_ARRAY); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java index 1d5c78553..874eda11b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java @@ -13,8 +13,6 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.locks.ReentrantLock; -import static java.util.Collections.EMPTY_SET; - /** * H2 database support for DB ARRAY. */ @@ -84,7 +82,7 @@ final class ScalarTypeArraySetH2 extends ScalarTypeArraySet { if (nullable) { binder.setNull(Types.ARRAY); } else { - binder.setObject(toArray(EMPTY_SET)); + binder.setObject(EMPTY_ARRAY); } } }