diff --git a/src/main/java/com/avaje/ebean/FutureList.java b/src/main/java/com/avaje/ebean/FutureList.java index 847de9b2a..105a8c411 100644 --- a/src/main/java/com/avaje/ebean/FutureList.java +++ b/src/main/java/com/avaje/ebean/FutureList.java @@ -2,7 +2,6 @@ package com.avaje.ebean; import javax.persistence.PersistenceException; import java.util.List; -import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; diff --git a/src/main/java/com/avaje/ebean/Transaction.java b/src/main/java/com/avaje/ebean/Transaction.java index ce3c80990..67a553de4 100644 --- a/src/main/java/com/avaje/ebean/Transaction.java +++ b/src/main/java/com/avaje/ebean/Transaction.java @@ -2,7 +2,6 @@ package com.avaje.ebean; import com.avaje.ebean.config.PersistBatch; -import javax.persistence.OptimisticLockException; import javax.persistence.PersistenceException; import javax.persistence.RollbackException; import java.io.Closeable; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/socket/RequestProcessor.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/socket/RequestProcessor.java index 43a67e1b2..288584717 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cluster/socket/RequestProcessor.java +++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/socket/RequestProcessor.java @@ -3,7 +3,6 @@ package com.avaje.ebeaninternal.server.cluster.socket; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; import java.net.Socket; /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompoundRoot.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompoundRoot.java index 2e916cf64..cb1cafb64 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompoundRoot.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompoundRoot.java @@ -1,15 +1,14 @@ package com.avaje.ebeaninternal.server.deploy; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; - import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; import com.avaje.ebeaninternal.server.properties.BeanPropertySetter; import com.avaje.ebeaninternal.server.type.CtCompoundProperty; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; + /** * Represents the root BeanProperty for properties of a compound type. *

diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/PersistListenerManager.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/PersistListenerManager.java index bbca13e48..f72eb4d96 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/PersistListenerManager.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/PersistListenerManager.java @@ -1,15 +1,13 @@ package com.avaje.ebeaninternal.server.deploy; -import java.util.List; - -import javax.persistence.PersistenceException; - import com.avaje.ebean.event.BeanPersistListener; import com.avaje.ebeaninternal.server.core.BootupClasses; import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.List; + /** * Manages the assignment/registration of BeanPersistListener with their * respective DeployBeanDescriptor's. diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolder.java b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolder.java index 28ff40180..533b20b72 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolder.java @@ -1,13 +1,12 @@ package com.avaje.ebeaninternal.server.persist; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.IdentityHashMap; - import com.avaje.ebeaninternal.server.core.PersistRequest; import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import java.util.ArrayList; +import java.util.IdentityHashMap; + /** * Holds lists of persist requests for beans of a given type. *

diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersister.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersister.java index 26d25fa4a..87099bb63 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersister.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersister.java @@ -1,17 +1,14 @@ package com.avaje.ebeaninternal.server.persist.dml; -import java.sql.SQLException; - -import javax.persistence.PersistenceException; - -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.core.PersistRequest; import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.lib.util.StringHelper; import com.avaje.ebeaninternal.server.persist.BeanPersister; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.persistence.PersistenceException; +import java.sql.SQLException; + /** * Bean persister that uses the Handler and Meta objects. *

diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java index 77ffe0fe6..082b3b3e7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java @@ -5,7 +5,6 @@ import com.avaje.ebean.RawSql.ColumnMapping; import com.avaje.ebean.RawSql.ColumnMapping.Column; import com.avaje.ebean.RawSqlBuilder; import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.DbHistorySupport; import com.avaje.ebean.config.dbplatform.SqlLimitRequest; import com.avaje.ebean.config.dbplatform.SqlLimitResponse; import com.avaje.ebean.config.dbplatform.SqlLimiter; 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 971ae5854..53541675a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarType.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarType.java @@ -1,16 +1,15 @@ package com.avaje.ebeaninternal.server.type; +import com.avaje.ebean.text.StringFormatter; +import com.avaje.ebean.text.StringParser; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.sql.SQLException; -import com.avaje.ebean.text.StringFormatter; -import com.avaje.ebean.text.StringParser; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - /** * Describes a scalar type. *

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 6090d566d..633affe52 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDate.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDate.java @@ -1,5 +1,8 @@ package com.avaje.ebeaninternal.server.type; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -7,10 +10,6 @@ import java.sql.Date; import java.sql.SQLException; import java.sql.Types; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - /** * Base class for Date types. */ 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 b1f586cad..1b26404ef 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java @@ -1,7 +1,6 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebean.config.JsonConfig; -import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; 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 3e83137b3..bddffdaf1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseVarchar.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseVarchar.java @@ -1,16 +1,15 @@ package com.avaje.ebeaninternal.server.type; +import com.avaje.ebean.text.TextException; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.sql.SQLException; import java.sql.Types; -import com.avaje.ebean.text.TextException; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - /** * Base ScalarType for types which converts to and from a VARCHAR database * column. 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 71f8a7d23..7a3ce5d1f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBoolean.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBoolean.java @@ -1,17 +1,16 @@ package com.avaje.ebeaninternal.server.type; +import com.avaje.ebean.text.TextException; +import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.sql.SQLException; import java.sql.Types; -import com.avaje.ebean.text.TextException; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - /** * ScalarType for Boolean and boolean. *

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 96146175f..3dadd4759 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeByte.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeByte.java @@ -1,17 +1,16 @@ package com.avaje.ebeaninternal.server.type; +import com.avaje.ebean.text.TextException; +import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.sql.SQLException; import java.sql.Types; -import com.avaje.ebean.text.TextException; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - /** * ScalarType for Byte. */ 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 87d30b801..6e751450b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBase.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBase.java @@ -1,16 +1,15 @@ package com.avaje.ebeaninternal.server.type; +import com.avaje.ebean.text.TextException; +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; import java.sql.SQLException; -import com.avaje.ebean.text.TextException; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - /** * Base type for binary types. */ 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 8ffc8ad2b..cfcd10f23 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java @@ -1,15 +1,14 @@ package com.avaje.ebeaninternal.server.type; +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; import java.sql.SQLException; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - /** * Encrypted ScalarType that wraps a byte[] types. */ 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 7b4e869f5..7bb551eb9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDouble.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDouble.java @@ -1,16 +1,15 @@ package com.avaje.ebeaninternal.server.type; +import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.sql.SQLException; import java.sql.Types; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - /** * ScalarType for Double and double. */ 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 13331e5b9..e9a794208 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java @@ -2,7 +2,6 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebean.text.TextException; import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; 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 e96490a5b..1ec9d2d19 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java @@ -1,14 +1,13 @@ package com.avaje.ebeaninternal.server.type; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.sql.SQLException; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - public class ScalarTypeEncryptedWrapper implements ScalarType { private final ScalarType wrapped; 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 b23068c1e..0a8c2f6c1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java @@ -1,5 +1,9 @@ package com.avaje.ebeaninternal.server.type; +import com.avaje.ebean.text.TextException; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -7,11 +11,6 @@ import java.sql.SQLException; import java.sql.Types; import java.util.EnumSet; -import com.avaje.ebean.text.TextException; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - /** * JPA standard based Enum scalar type. *

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 6fe12cf94..e72bbe7ae 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFile.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFile.java @@ -1,13 +1,21 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebean.text.TextException; -import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.sql.SQLException; import java.sql.Types; 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 49bb2bc55..d2d916a64 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInteger.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInteger.java @@ -1,17 +1,16 @@ package com.avaje.ebeaninternal.server.type; +import com.avaje.ebean.text.TextException; +import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.sql.SQLException; import java.sql.Types; -import com.avaje.ebean.text.TextException; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - /** * ScalarType for Integer and int. */ 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 0ccd33c93..57a184c7b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java @@ -1,5 +1,11 @@ package com.avaje.ebeaninternal.server.type; +import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; +import org.joda.time.DateTimeZone; +import org.joda.time.LocalTime; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -7,14 +13,6 @@ import java.sql.SQLException; import java.sql.Time; import java.sql.Types; -import org.joda.time.DateTimeZone; -import org.joda.time.LocalTime; - -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - /** * ScalarType for Joda LocalTime. This maps to a JDBC Time. */ 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 9c6fa750a..df0a1b6a8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java @@ -2,11 +2,16 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebean.text.TextException; import com.avaje.ebean.text.json.EJson; -import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; import java.nio.charset.StandardCharsets; import java.sql.SQLException; import java.sql.Types; 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 bb3959550..f60cc4166 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNode.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNode.java @@ -1,13 +1,18 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebean.text.TextException; -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; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; import java.nio.charset.StandardCharsets; import java.sql.SQLException; import java.sql.Types; 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 b1e67df47..535bb23db 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLong.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLong.java @@ -1,16 +1,15 @@ package com.avaje.ebeaninternal.server.type; +import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.sql.SQLException; import java.sql.Types; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - /** * ScalarType for Long and long. */ 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 71f3ec2f3..c5da1bd6b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMathBigInteger.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMathBigInteger.java @@ -1,7 +1,6 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; 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 60509fe95..1456ce8f7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java @@ -1,6 +1,5 @@ package com.avaje.ebeaninternal.server.type; -import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; 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 428e09b33..fd7c8e428 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstore.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstore.java @@ -3,7 +3,6 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebean.config.dbplatform.DbType; import com.avaje.ebean.text.TextException; import com.avaje.ebean.text.json.EJson; -import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; 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 9a9bde0ba..4afa5eb9d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeShort.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeShort.java @@ -1,17 +1,16 @@ package com.avaje.ebeaninternal.server.type; +import com.avaje.ebean.text.TextException; +import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.sql.SQLException; import java.sql.Types; -import com.avaje.ebean.text.TextException; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - /** * ScalarType for Short and short. */ 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 964498a86..f949ad459 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeString.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeString.java @@ -1,16 +1,15 @@ package com.avaje.ebeaninternal.server.type; +import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.sql.SQLException; import java.sql.Types; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - /** * ScalarType for String. */ 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 99ecd8f6b..c19fc802c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTime.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTime.java @@ -1,5 +1,9 @@ package com.avaje.ebeaninternal.server.type; +import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -7,11 +11,6 @@ import java.sql.SQLException; import java.sql.Time; import java.sql.Types; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - /** * ScalarType for java.sql.Time. */ 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 f340bef68..f3ca97944 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBinary.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBinary.java @@ -1,5 +1,8 @@ package com.avaje.ebeaninternal.server.type; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataInput; @@ -11,10 +14,6 @@ import java.sql.SQLException; import java.sql.Types; import java.util.UUID; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - public class ScalarTypeUUIDBinary extends ScalarTypeBase { protected ScalarTypeUUIDBinary() { 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 ed84a98ad..179a0e63f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeWrapper.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeWrapper.java @@ -1,15 +1,14 @@ package com.avaje.ebeaninternal.server.type; +import com.avaje.ebean.config.ScalarTypeConverter; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.sql.SQLException; -import com.avaje.ebean.config.ScalarTypeConverter; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - /** * A ScalarType that uses a ScalarTypeConverter to convert to and from another underlying * ScalarType. diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYear.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYear.java index 5d4b49478..48c71bb5f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYear.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYear.java @@ -2,7 +2,6 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebean.text.TextException; import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; diff --git a/src/test/java/com/avaje/ebean/config/PropertiesWrapperTest.java b/src/test/java/com/avaje/ebean/config/PropertiesWrapperTest.java index 117c6ee77..24422d657 100644 --- a/src/test/java/com/avaje/ebean/config/PropertiesWrapperTest.java +++ b/src/test/java/com/avaje/ebean/config/PropertiesWrapperTest.java @@ -4,8 +4,8 @@ import org.junit.Test; import java.util.Properties; -import static org.junit.Assert.*; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; public class PropertiesWrapperTest { diff --git a/src/test/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolderTest.java b/src/test/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolderTest.java index c727ac1e0..1ffe29a67 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolderTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolderTest.java @@ -1,7 +1,5 @@ package com.avaje.ebeaninternal.server.persist; -import com.avaje.ebean.Ebean; -import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.ebeaninternal.api.TDSpiEbeanServer; import com.avaje.ebeaninternal.server.core.PersistRequest; import com.avaje.ebeaninternal.server.core.PersistRequestBean; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationTest.java index b092c9554..5a41641d2 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationTest.java @@ -1,17 +1,17 @@ package com.avaje.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; import com.avaje.ebean.text.TextException; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import org.junit.Test; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.time.Duration; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; public class ScalarTypeDurationTest { diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java index e9796f47e..199835aa2 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java @@ -1,17 +1,18 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebean.text.TextException; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import org.junit.Test; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.math.BigDecimal; import java.time.Duration; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; public class ScalarTypeDurationWithNanosTest { diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstantTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstantTest.java index 863618cc5..e434fd9e0 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstantTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstantTest.java @@ -1,19 +1,18 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebean.text.TextException; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import org.junit.Test; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.sql.Timestamp; import java.time.Instant; -import java.time.Year; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class ScalarTypeInstantTest { diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java index 379fb9d5a..1f5211cdc 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java @@ -1,17 +1,18 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebean.text.TextException; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import org.junit.Test; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.sql.Time; import java.time.LocalTime; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; public class ScalarTypeLocalTimeTest { diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java index b002ae46b..31d23fedb 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java @@ -1,16 +1,17 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebean.text.TextException; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import org.junit.Test; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.time.LocalTime; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; public class ScalarTypeLocalTimeWithNanosTest { diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java index 3db9b9bd2..81c807fc7 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java @@ -3,12 +3,10 @@ package com.avaje.ebeaninternal.server.type; import org.junit.Test; import java.sql.Date; -import java.time.Instant; import java.time.LocalDate; -import java.time.LocalDateTime; import java.time.YearMonth; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class ScalarTypeYearMonthDateTest { diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearTest.java index 6c125b057..9246221f7 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearTest.java @@ -1,16 +1,17 @@ package com.avaje.ebeaninternal.server.type; import com.avaje.ebean.text.TextException; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; import org.junit.Test; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.time.Year; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; public class ScalarTypeYearTest { diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java index 31b3cae55..0e9c7aa08 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java @@ -4,10 +4,11 @@ import com.avaje.ebean.config.JsonConfig; import org.junit.Test; import java.sql.Timestamp; -import java.time.OffsetDateTime; import java.time.ZonedDateTime; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; public class ScalarTypeZonedDateTimeTest { diff --git a/src/test/java/com/avaje/tests/ddl/MainDdlWithSchema.java b/src/test/java/com/avaje/tests/ddl/MainDdlWithSchema.java index f68711f8c..fcfac1def 100644 --- a/src/test/java/com/avaje/tests/ddl/MainDdlWithSchema.java +++ b/src/test/java/com/avaje/tests/ddl/MainDdlWithSchema.java @@ -3,7 +3,6 @@ package com.avaje.tests.ddl; import com.avaje.ebean.EbeanServer; import com.avaje.ebean.EbeanServerFactory; import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.UnderscoreNamingConvention; import com.avaje.tests.model.basic.EBasic; public class MainDdlWithSchema { diff --git a/src/test/java/com/avaje/tests/json/TestJsonMapBlob.java b/src/test/java/com/avaje/tests/json/TestJsonMapBlob.java index 6b081a5ea..0933d9564 100644 --- a/src/test/java/com/avaje/tests/json/TestJsonMapBlob.java +++ b/src/test/java/com/avaje/tests/json/TestJsonMapBlob.java @@ -4,7 +4,6 @@ import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.text.json.EJson; import com.avaje.tests.model.json.EBasicJsonMapBlob; -import com.avaje.tests.model.json.EBasicJsonMapVarchar; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/com/avaje/tests/json/TestJsonMapJsonB.java b/src/test/java/com/avaje/tests/json/TestJsonMapJsonB.java index f3b250cc6..f65226c14 100644 --- a/src/test/java/com/avaje/tests/json/TestJsonMapJsonB.java +++ b/src/test/java/com/avaje/tests/json/TestJsonMapJsonB.java @@ -4,7 +4,6 @@ import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.text.json.EJson; import com.avaje.tests.model.json.EBasicJsonMapJsonB; -import com.avaje.tests.model.json.EBasicJsonMapJsonB; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/com/avaje/tests/json/TestJsonMapVarchar.java b/src/test/java/com/avaje/tests/json/TestJsonMapVarchar.java index b8ae74021..5e7e62939 100644 --- a/src/test/java/com/avaje/tests/json/TestJsonMapVarchar.java +++ b/src/test/java/com/avaje/tests/json/TestJsonMapVarchar.java @@ -3,7 +3,6 @@ package com.avaje.tests.json; import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.text.json.EJson; -import com.avaje.tests.model.json.EBasicJsonMap; import com.avaje.tests.model.json.EBasicJsonMapVarchar; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonNode.java b/src/test/java/com/avaje/tests/model/json/EBasicJsonNode.java index 5af19f564..807386138 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonNode.java +++ b/src/test/java/com/avaje/tests/model/json/EBasicJsonNode.java @@ -6,7 +6,6 @@ import com.fasterxml.jackson.databind.JsonNode; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Version; -import java.util.Map; @Entity public class EBasicJsonNode { diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonNodeJsonB.java b/src/test/java/com/avaje/tests/model/json/EBasicJsonNodeJsonB.java index 924175149..0308cdf88 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonNodeJsonB.java +++ b/src/test/java/com/avaje/tests/model/json/EBasicJsonNodeJsonB.java @@ -1,8 +1,6 @@ package com.avaje.tests.model.json; -import com.avaje.ebean.annotation.DbJson; import com.avaje.ebean.annotation.DbJsonB; -import com.avaje.ebean.annotation.DbJsonType; import com.fasterxml.jackson.databind.JsonNode; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/map/MpUser.java b/src/test/java/com/avaje/tests/model/map/MpUser.java index 0c87468c4..c7efaf6e9 100644 --- a/src/test/java/com/avaje/tests/model/map/MpUser.java +++ b/src/test/java/com/avaje/tests/model/map/MpUser.java @@ -1,11 +1,12 @@ package com.avaje.tests.model.map; -import java.util.HashMap; -import java.util.Map; - +import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.*; +import javax.persistence.MapKey; +import javax.persistence.OneToMany; +import java.util.HashMap; +import java.util.Map; @Entity public class MpUser { diff --git a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java index 83fd961a5..b85678f0c 100644 --- a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java +++ b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java @@ -1,12 +1,12 @@ package com.avaje.tests.persistencecontext; -import org.junit.Test; -import static org.assertj.core.api.Assertions.*; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; import com.avaje.tests.model.basic.EBasic; +import org.junit.Test; + +import static org.assertj.core.api.Assertions.assertThat; public class TestPersistenceContextOnUpdateDuringTxn extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java index f5a43e345..b08030538 100644 --- a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java +++ b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java @@ -2,7 +2,6 @@ package com.avaje.tests.persistencecontext; import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; -import com.avaje.ebean.PersistenceContextScope; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.ResetBasicData; diff --git a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextServerConfig.java b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextServerConfig.java index e79b42902..6de010b32 100644 --- a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextServerConfig.java +++ b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextServerConfig.java @@ -1,8 +1,11 @@ package com.avaje.tests.persistencecontext; -import com.avaje.ebean.*; +import com.avaje.ebean.BaseTestCase; +import com.avaje.ebean.EbeanServer; +import com.avaje.ebean.EbeanServerFactory; +import com.avaje.ebean.PersistenceContextScope; +import com.avaje.ebean.Query; import com.avaje.ebean.config.ContainerConfig; -import com.avaje.ebean.config.DataSourceConfig; import com.avaje.ebean.config.ServerConfig; import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.ebeaninternal.api.SpiQuery; diff --git a/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java b/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java index 1b4d51dad..4d0f40bcc 100644 --- a/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java +++ b/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java @@ -3,8 +3,11 @@ package com.avaje.tests.query.lazy; import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.QueryEachConsumer; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.tests.model.basic.*; +import com.avaje.tests.model.basic.Customer; +import com.avaje.tests.model.basic.Order; +import com.avaje.tests.model.basic.OrderDetail; +import com.avaje.tests.model.basic.Product; +import com.avaje.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/text/json/TestJsonMap.java b/src/test/java/com/avaje/tests/text/json/TestJsonMap.java index c96459ca6..22e1d5c58 100644 --- a/src/test/java/com/avaje/tests/text/json/TestJsonMap.java +++ b/src/test/java/com/avaje/tests/text/json/TestJsonMap.java @@ -1,19 +1,17 @@ package com.avaje.tests.text.json; -import java.io.IOException; -import java.util.List; -import java.util.Map; - -import com.avaje.ebean.Query; -import com.avaje.ebean.text.PathProperties; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; +import com.avaje.ebean.text.PathProperties; import com.avaje.ebean.text.json.JsonContext; import com.avaje.ebean.text.json.JsonWriteOptions; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Test; + +import java.io.IOException; +import java.util.List; +import java.util.Map; import static org.junit.Assert.assertTrue;