diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/BaseDB2Platform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/BaseDB2Platform.java index dce52f4ea..8b313d26d 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/BaseDB2Platform.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/BaseDB2Platform.java @@ -1,7 +1,6 @@ package io.ebean.config.dbplatform.db2; import io.ebean.BackgroundExecutor; -import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.config.dbplatform.DbPlatformType; diff --git a/ebean-api/src/test/java/io/ebean/util/TestAnnotationUtil.java b/ebean-api/src/test/java/io/ebean/util/TestAnnotationUtil.java index 7d7519c03..f75433c09 100644 --- a/ebean-api/src/test/java/io/ebean/util/TestAnnotationUtil.java +++ b/ebean-api/src/test/java/io/ebean/util/TestAnnotationUtil.java @@ -2,7 +2,6 @@ package io.ebean.util; import static org.assertj.core.api.Assertions.assertThat; -import java.io.File; import java.util.Set; import org.junit.jupiter.api.Test; diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java index 53d0c4551..027956e1f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java @@ -3,8 +3,6 @@ package io.ebeaninternal.api; import io.ebean.*; import io.ebean.bean.BeanCollectionLoader; import io.ebean.bean.CallOrigin; -import io.ebean.config.DatabaseConfig; -import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.event.readaudit.ReadAuditLogger; import io.ebean.event.readaudit.ReadAuditPrepare; import io.ebean.meta.MetricVisitor; diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryBindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryBindCapture.java index 636b6689c..db5cbd9b6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryBindCapture.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryBindCapture.java @@ -1,6 +1,5 @@ package io.ebeaninternal.api; -import io.ebean.meta.QueryPlanRequest; import io.ebeaninternal.server.type.bindcapture.BindCapture; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/ChangeJsonBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/ChangeJsonBuilder.java index f399b78ad..5d71023b8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/ChangeJsonBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/ChangeJsonBuilder.java @@ -5,7 +5,6 @@ import com.fasterxml.jackson.core.JsonGenerator; import io.ebean.event.changelog.BeanChange; import io.ebean.event.changelog.ChangeSet; import io.ebean.event.changelog.ChangeType; -import io.ebean.text.json.JsonContext; import java.io.IOException; import java.io.Writer; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java index f11cf9f8e..01812fe5f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java @@ -15,8 +15,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.concurrent.locks.ReentrantLock; -import javax.persistence.PersistenceException; - /** * Wraps the objects involved in executing a SQL / Relational Query. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java index ff41de9b4..8810465b2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java @@ -5,7 +5,6 @@ import io.avaje.classpath.scanner.ClassPathScannerFactory; import io.ebean.config.DatabaseConfig; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.ServiceLoader; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index 27327f1b9..6dd11ffbe 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -1167,6 +1167,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty { /** * Returns true if this isLob() or the type will effectively map to a lob. */ + @Override public boolean isDbLob() { if (lob) { return true; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java index 4cf692468..b74035dc0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java @@ -1,14 +1,9 @@ package io.ebeaninternal.server.deploy.parse; -import io.ebean.annotation.Aggregation; -import io.ebean.annotation.Avg; import io.ebean.annotation.DbMigration; import io.ebean.annotation.Index; import io.ebean.annotation.Indices; -import io.ebean.annotation.Max; -import io.ebean.annotation.Min; import io.ebean.annotation.Platform; -import io.ebean.annotation.Sum; import io.ebean.config.NamingConvention; import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.util.AnnotationUtil; @@ -20,7 +15,6 @@ import javax.persistence.JoinColumns; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import java.lang.annotation.Annotation; -import java.lang.reflect.Field; import java.util.Collections; import java.util.Set; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java index 6d183b936..1aa5fc7ef 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java @@ -3,7 +3,6 @@ package io.ebeaninternal.server.query; import io.ebean.QueryIterator; import io.ebeaninternal.server.core.OrmQueryRequest; -import javax.persistence.PersistenceException; import java.sql.SQLException; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java index 3df436716..aae6b0c47 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java @@ -3,7 +3,6 @@ package io.ebeaninternal.server.query; import io.ebean.QueryIterator; import io.ebeaninternal.server.core.OrmQueryRequest; -import javax.persistence.PersistenceException; import java.sql.SQLException; import java.util.ArrayList; import java.util.NoSuchElementException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java index 42d2395b5..5547d1c92 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java @@ -1,11 +1,8 @@ package io.ebeaninternal.server.query; -import io.ebean.bean.EntityBean; -import io.ebean.core.type.ScalarType; import io.ebean.util.SplitName; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import io.ebeaninternal.server.deploy.DbReadContext; import io.ebeaninternal.server.deploy.DbSqlContext; import io.ebeaninternal.server.deploy.TableJoin; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java index 502c28a6d..02f76b61c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java @@ -1,9 +1,6 @@ package io.ebeaninternal.server.query; -import io.ebean.bean.EntityBean; -import io.ebean.core.type.ScalarType; import io.ebeaninternal.api.SpiQuery; -import io.ebeaninternal.server.deploy.DbReadContext; import io.ebeaninternal.server.deploy.DbSqlContext; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java index 8ac394a8c..16c4aafad 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java @@ -10,7 +10,6 @@ import io.ebeaninternal.api.SpiProfileHandler; import org.slf4j.Logger; import java.io.*; -import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java index a48fc9e67..c85bd2c5d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java @@ -15,7 +15,6 @@ import io.ebeaninternal.server.persist.BatchedSqlException; import io.ebeaninternal.server.util.Str; import io.ebeanservice.docstore.api.DocStoreTransaction; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.persistence.PersistenceException; import javax.persistence.RollbackException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java index 079782972..746dce154 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java @@ -1,6 +1,5 @@ package io.ebeaninternal.server.type; -import io.ebean.annotation.DbArray; import io.ebean.core.type.ScalarType; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; diff --git a/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java b/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java index 5366597a1..afd83b4d0 100644 --- a/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java +++ b/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java @@ -10,8 +10,6 @@ import org.slf4j.LoggerFactory; import java.util.Properties; -import javax.sql.DataSource; - /** * Automatically configure ServerConfig for testing purposes. *

diff --git a/ebean-test/src/main/java/io/ebean/test/config/platform/Config.java b/ebean-test/src/main/java/io/ebean/test/config/platform/Config.java index 117c04a18..8bde15468 100644 --- a/ebean-test/src/main/java/io/ebean/test/config/platform/Config.java +++ b/ebean-test/src/main/java/io/ebean/test/config/platform/Config.java @@ -5,7 +5,6 @@ import io.ebean.datasource.DataSourceConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; -import java.util.Locale; import java.util.Properties; /** diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_refresh.java b/ebean-test/src/test/java/io/ebean/EbeanServer_refresh.java index 1ff650b7d..2d1e957e7 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_refresh.java +++ b/ebean-test/src/test/java/io/ebean/EbeanServer_refresh.java @@ -9,7 +9,6 @@ import org.tests.model.basic.ResetBasicData; import java.io.File; import java.io.IOException; import java.nio.file.Files; -import java.nio.file.OpenOption; import java.nio.file.Path; import java.nio.file.StandardOpenOption; import java.util.*; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java index 383671363..94aa02e3d 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java @@ -15,7 +15,6 @@ import org.tests.model.ivo.converter.MoneyTypeConverter; import javax.persistence.EnumType; import java.sql.SQLException; import java.sql.Types; -import java.util.Calendar; import java.util.GregorianCalendar; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java index dbcaf4b0d..fe904adfb 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java @@ -5,7 +5,6 @@ import io.ebean.CountDistinctOrder; import io.ebean.DB; import io.ebean.Query; import io.ebean.annotation.Identity; -import io.ebean.annotation.Platform; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java index f39c3ee61..0febee7cf 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java @@ -1,7 +1,6 @@ package org.tests.inheritance.bothsides; import javax.persistence.Entity; -import javax.persistence.Inheritance; @Entity public class Target1 extends TargetBase { diff --git a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java index acfffce20..a19c89c7d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java @@ -28,6 +28,7 @@ public class TWithPreInsert implements TWithPreInsertCommon { */ transient int requestCascadeState; + @Override public Integer getId() { return id; } @@ -36,18 +37,22 @@ public class TWithPreInsert implements TWithPreInsertCommon { this.id = id; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public String getTitle() { return title; } + @Override public void setTitle(String title) { this.title = title; } @@ -60,6 +65,7 @@ public class TWithPreInsert implements TWithPreInsertCommon { return requestCascadeState; } + @Override public void requestCascadeState(int requestCascadeState) { this.requestCascadeState = requestCascadeState; } diff --git a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java index 39a1d8dff..5f679f9f6 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java @@ -24,6 +24,7 @@ public class TWithPreInsertChild implements TWithPreInsertCommon { this.name = name; } + @Override public Integer getId() { return id; } @@ -32,18 +33,22 @@ public class TWithPreInsertChild implements TWithPreInsertCommon { this.id = id; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public String getTitle() { return title; } + @Override public void setTitle(String title) { this.title = title; } @@ -52,6 +57,7 @@ public class TWithPreInsertChild implements TWithPreInsertCommon { return requestCascadeState; } + @Override public void requestCascadeState(int requestCascadeState) { this.requestCascadeState = requestCascadeState; } diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java index c462a80cc..b95c889e7 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java @@ -9,7 +9,6 @@ import io.ebean.util.IOUtils; import org.junit.jupiter.api.Test; import java.io.*; -import java.nio.charset.StandardCharsets; import java.util.LinkedHashMap; import java.util.Map;