diff --git a/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java b/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java index 0e716b159..eb94870d9 100644 --- a/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java +++ b/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java @@ -6,9 +6,7 @@ import org.junit.jupiter.api.Test; import java.util.Properties; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class DbPrimaryTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java b/ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java index 6f3ced974..00f395f36 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java +++ b/ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java @@ -1,11 +1,6 @@ package io.ebean; -import io.ebean.config.CurrentTenantProvider; -import io.ebean.config.DatabaseConfig; -import io.ebean.config.TenantCatalogProvider; -import io.ebean.config.TenantDataSourceProvider; -import io.ebean.config.TenantMode; -import io.ebean.config.TenantSchemaProvider; +import io.ebean.config.*; import io.ebean.config.dbplatform.mysql.MySqlPlatform; import io.ebean.config.dbplatform.postgres.PostgresPlatform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java index dd7d461ef..d86dc382d 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java +++ b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java @@ -1,8 +1,8 @@ package io.ebean; -import org.tests.model.basic.EBasicVer; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicVer; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java index e30c33aea..10ed5fbb9 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java +++ b/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java @@ -1,8 +1,8 @@ package io.ebean; -import org.tests.model.basic.EBasicVer; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicVer; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebean/ExtendedServerTest.java b/ebean-test/src/test/java/io/ebean/ExtendedServerTest.java index 3f39680c8..9be28fa76 100644 --- a/ebean-test/src/test/java/io/ebean/ExtendedServerTest.java +++ b/ebean-test/src/test/java/io/ebean/ExtendedServerTest.java @@ -1,6 +1,5 @@ package io.ebean; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebean/PropertyTest.java b/ebean-test/src/test/java/io/ebean/PropertyTest.java index a4462f9de..128103dfb 100644 --- a/ebean-test/src/test/java/io/ebean/PropertyTest.java +++ b/ebean-test/src/test/java/io/ebean/PropertyTest.java @@ -1,6 +1,5 @@ package io.ebean; -import io.ebean.OrderBy; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/io/ebean/StringHelperTest.java b/ebean-test/src/test/java/io/ebean/StringHelperTest.java index eba711bb4..5beeeb905 100644 --- a/ebean-test/src/test/java/io/ebean/StringHelperTest.java +++ b/ebean-test/src/test/java/io/ebean/StringHelperTest.java @@ -6,10 +6,7 @@ import org.junit.jupiter.api.Test; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class StringHelperTest { diff --git a/ebean-test/src/test/java/io/ebean/TestDirtyProperties.java b/ebean-test/src/test/java/io/ebean/TestDirtyProperties.java index 019469533..3f2b0e581 100644 --- a/ebean-test/src/test/java/io/ebean/TestDirtyProperties.java +++ b/ebean-test/src/test/java/io/ebean/TestDirtyProperties.java @@ -3,9 +3,9 @@ package io.ebean; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import io.ebeaninternal.server.core.DefaultBeanState; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.EMain; import org.tests.model.embedded.Eembeddable; -import org.junit.jupiter.api.Test; import java.util.Map; import java.util.Set; diff --git a/ebean-test/src/test/java/io/ebean/TextExpressionListTest.java b/ebean-test/src/test/java/io/ebean/TextExpressionListTest.java index 63e380715..e6c85b6f1 100644 --- a/ebean-test/src/test/java/io/ebean/TextExpressionListTest.java +++ b/ebean-test/src/test/java/io/ebean/TextExpressionListTest.java @@ -1,11 +1,10 @@ package io.ebean; -import io.ebean.DB; import io.ebean.search.Match; import io.ebean.search.MultiMatch; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; public class TextExpressionListTest { diff --git a/ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java b/ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java index a04180ae1..e233bc562 100644 --- a/ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java +++ b/ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java @@ -2,11 +2,11 @@ package io.ebean.bean; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.compositekeys.db.AuditInfo; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.sql.Date; import java.util.HashSet; diff --git a/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java b/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java index e8c2dd208..143e3b19e 100644 --- a/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java @@ -10,10 +10,7 @@ import org.junit.jupiter.api.Test; import java.util.Properties; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class DatabaseConfigTest { diff --git a/ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java b/ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java index bf0214ae1..03465543b 100644 --- a/ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java @@ -1,9 +1,10 @@ package io.ebean.config; +import io.ebean.migration.MigrationConfig; import org.junit.jupiter.api.Test; import java.util.Properties; -import io.ebean.migration.MigrationConfig; + import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java b/ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java index 6a99267b9..a497e0d92 100644 --- a/ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java @@ -5,9 +5,7 @@ import org.junit.jupiter.api.Test; import java.util.Properties; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class DocStoreConfigTest { diff --git a/ebean-test/src/test/java/io/ebean/config/TestTableName.java b/ebean-test/src/test/java/io/ebean/config/TestTableName.java index eaf4632a9..ccf73ce03 100644 --- a/ebean-test/src/test/java/io/ebean/config/TestTableName.java +++ b/ebean-test/src/test/java/io/ebean/config/TestTableName.java @@ -1,7 +1,6 @@ package io.ebean.config; import io.ebean.BaseTestCase; -import io.ebean.config.TableName; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java b/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java index 167d39d54..4d8b5ee88 100644 --- a/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java +++ b/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java @@ -13,10 +13,7 @@ import org.tests.model.basic.ECustomId; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class BeanFindControllerTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java b/ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java index bba31ad7b..87cab8635 100644 --- a/ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java +++ b/ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java @@ -1,11 +1,7 @@ package io.ebean.event; -import io.ebean.BaseTestCase; -import io.ebean.BeanState; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.DatabaseFactory; +import io.ebean.*; import io.ebean.config.DatabaseConfig; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/io/ebean/json/EJsonTests.java b/ebean-test/src/test/java/io/ebean/json/EJsonTests.java index 720e280a6..929c6582c 100644 --- a/ebean-test/src/test/java/io/ebean/json/EJsonTests.java +++ b/ebean-test/src/test/java/io/ebean/json/EJsonTests.java @@ -1,10 +1,10 @@ package io.ebean.json; -import io.ebean.text.json.EJson; -import io.ebeaninternal.json.ModifyAwareMap; -import io.ebean.ModifyAwareType; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; +import io.ebean.ModifyAwareType; +import io.ebean.text.json.EJson; +import io.ebeaninternal.json.ModifyAwareMap; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,12 +14,7 @@ import java.io.FileWriter; import java.io.IOException; import java.io.StringReader; import java.nio.file.Files; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java b/ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java index 47523eb91..cb6e4a9d2 100644 --- a/ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java +++ b/ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java @@ -9,13 +9,7 @@ import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.querydefn.OrmQueryDetail; import org.junit.jupiter.api.Test; import org.tests.inheritance.Stockforecast; -import org.tests.model.basic.Car; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.OrderDetail; -import org.tests.model.basic.Person; -import org.tests.model.basic.Product; -import org.tests.model.basic.Vehicle; +import org.tests.model.basic.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/io/ebean/plugin/PropertyTest.java b/ebean-test/src/test/java/io/ebean/plugin/PropertyTest.java index 82197e1e4..d20757d55 100644 --- a/ebean-test/src/test/java/io/ebean/plugin/PropertyTest.java +++ b/ebean-test/src/test/java/io/ebean/plugin/PropertyTest.java @@ -2,9 +2,9 @@ package io.ebean.plugin; import io.ebean.DB; import io.ebean.Database; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; -import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/plugin/SpiServerTest.java b/ebean-test/src/test/java/io/ebean/plugin/SpiServerTest.java index f36edd730..2189aaa44 100644 --- a/ebean-test/src/test/java/io/ebean/plugin/SpiServerTest.java +++ b/ebean-test/src/test/java/io/ebean/plugin/SpiServerTest.java @@ -3,18 +3,14 @@ package io.ebean.plugin; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; -import org.tests.model.basic.Customer; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Customer; import org.tests.model.basic.VwCustomer; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class SpiServerTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java b/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java index b1f91e4dd..17ecd262b 100644 --- a/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java +++ b/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java @@ -2,8 +2,8 @@ package io.ebean.test; import com.fasterxml.jackson.databind.JsonNode; import io.ebean.DB; -import org.junit.jupiter.api.Test; import org.etest.BSimpleFor; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebean/test/JsonTest.java b/ebean-test/src/test/java/io/ebean/test/JsonTest.java index 3cb6857ad..430dc1bff 100644 --- a/ebean-test/src/test/java/io/ebean/test/JsonTest.java +++ b/ebean-test/src/test/java/io/ebean/test/JsonTest.java @@ -1,8 +1,8 @@ package io.ebean.test; import com.fasterxml.jackson.databind.JsonNode; -import org.junit.jupiter.api.Test; import org.etest.PlainBean; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebean/test/UserContextTest.java b/ebean-test/src/test/java/io/ebean/test/UserContextTest.java index 7ab6826c9..71dd478cb 100644 --- a/ebean-test/src/test/java/io/ebean/test/UserContextTest.java +++ b/ebean-test/src/test/java/io/ebean/test/UserContextTest.java @@ -2,7 +2,8 @@ package io.ebean.test; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class UserContextTest { diff --git a/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java b/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java index a36e23aa8..2fb3b5fce 100644 --- a/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java +++ b/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java @@ -12,9 +12,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class PathPropertiesTests { diff --git a/ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java b/ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java index 69d4ecb77..6cf8f52db 100644 --- a/ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java +++ b/ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java @@ -1,11 +1,11 @@ package io.ebean.text.json; +import com.fasterxml.jackson.core.JsonParser; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.PersistenceContext; -import org.tests.model.basic.Customer; -import com.fasterxml.jackson.core.JsonParser; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Customer; import java.io.StringReader; diff --git a/ebean-test/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java b/ebean-test/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java index 5c3e8dc35..d20108a20 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java @@ -3,7 +3,8 @@ package io.ebeaninternal.api; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class PlatformMatchTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java b/ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java index b77df5424..a0bd66adb 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java @@ -4,9 +4,7 @@ import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; public class ExtraDdlXmlReaderTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java b/ebean-test/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java index 929b13d49..507475e27 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java @@ -3,16 +3,8 @@ package io.ebeaninternal.json; import org.junit.jupiter.api.Test; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; +import java.io.*; +import java.util.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java index 30a3e5afc..4bcb40b8e 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java @@ -7,13 +7,13 @@ import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; import io.ebeaninternal.server.transaction.DefaultPersistenceContext; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; import org.tests.model.basic.Customer.Status; import org.tests.model.embedded.EAddress; import org.tests.model.embedded.EPerson; -import org.junit.jupiter.api.Test; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java index ecce75b0e..53bf0c21d 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java @@ -5,16 +5,12 @@ import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.transaction.DefaultPersistenceContext; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; import org.tests.model.basic.TBytesOnly; -import org.junit.jupiter.api.Test; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; +import java.io.*; import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java index 9180dd7c1..512f663fd 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java @@ -4,7 +4,7 @@ import io.ebean.cache.ServerCacheConfig; import io.ebean.cache.ServerCacheOptions; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DefaultServerCacheConfigTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java index 67b3b3664..86bab509f 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java @@ -1,10 +1,8 @@ package io.ebeaninternal.server.changelog; import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.event.changelog.BeanChange; import io.ebean.event.changelog.ChangeSet; -import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; import java.io.StringWriter; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java index f05d738f6..d639abf65 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java @@ -2,12 +2,12 @@ package io.ebeaninternal.server.changelog; import io.ebean.BaseTestCase; import io.ebean.event.changelog.ChangeLogFilter; +import org.junit.jupiter.api.Test; import org.tests.inheritance.model.ProductConfiguration; import org.tests.model.basic.Address; import org.tests.model.basic.Contact; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; -import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java index 2b3dd7b11..063a7a515 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java @@ -4,8 +4,8 @@ import io.ebean.BaseTestCase; import io.ebeanservice.docstore.api.mapping.DocPropertyAdapter; import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; import io.ebeanservice.docstore.api.mapping.DocumentMapping; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java index b3883db7e..13a25e08a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java @@ -6,8 +6,8 @@ import io.ebean.event.AbstractBeanPersistListener; import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistListener; import io.ebeaninternal.api.SpiEbeanServer; -import org.tests.model.basic.EBasic; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasic; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java index 4cbffc35c..3407b37be 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java @@ -3,9 +3,9 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java index 048871533..c63966f21 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java @@ -13,9 +13,7 @@ import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class BeanPropertyAssocManyTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java index af2192d69..71b888046 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java @@ -1,7 +1,6 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; -import io.ebeaninternal.server.query.STreeProperty; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java index 2faa11bc6..aadc88109 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java @@ -2,7 +2,8 @@ package io.ebeaninternal.server.deploy; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class IndexDefinitionTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java index db7c3ea55..112fcf345 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java @@ -6,11 +6,11 @@ import io.ebean.Database; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import io.ebeaninternal.api.SpiEbeanServer; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.composite.RCustomer; import org.tests.model.composite.RCustomerKey; -import org.junit.jupiter.api.Test; import org.tests.model.embedded.UserInterestLive; import org.tests.model.embedded.UserInterestLiveKey; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java index 92efbc603..551db2d8e 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java @@ -9,10 +9,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.Set; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestReferenceWithConstructorProperties extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java index b0693d3c9..ef44734b8 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java @@ -1,6 +1,9 @@ package io.ebeaninternal.server.expression; -import io.ebean.*; +import io.ebean.BaseTestCase; +import io.ebean.EbeanServer; +import io.ebean.Query; +import io.ebean.Transaction; import io.ebean.event.BeanQueryRequest; import io.ebeaninternal.api.SpiExpression; import io.ebeaninternal.server.deploy.BeanDescriptor; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java index e555a536e..58e33b9d2 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java @@ -4,8 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.ExpressionList; import io.ebeaninternal.api.SpiExpression; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java index 27a696a34..c87e46c47 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java @@ -1,9 +1,9 @@ package io.ebeaninternal.server.expression; +import io.ebeaninternal.api.BindValuesKey; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import io.ebeaninternal.api.BindValuesKey; public class RawExpressionTest extends BaseExpressionTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java index 1fea2b556..38fceeefc 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java @@ -2,13 +2,12 @@ package io.ebeaninternal.server.grammer; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.Query; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import io.ebeaninternal.api.SpiQuery; import io.ebean.test.LoggedSql; +import io.ebeaninternal.api.SpiQuery; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.OrderDetail; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java index a90696702..a4499ae96 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java @@ -6,8 +6,8 @@ import io.ebean.Query; import io.ebeaninternal.server.core.OrmQueryRequest; import io.ebeaninternal.server.core.OrmQueryRequestTestHelper; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java index 47cd5c2a3..ec71fcf03 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.persist; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; public class BatchDepthOrderTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java b/ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java index 7ea376eee..194d92aa0 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java @@ -1,20 +1,14 @@ package io.ebeaninternal.server.query; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.FutureIds; -import io.ebean.FutureList; -import io.ebean.FutureRowCount; -import io.ebean.Query; -import io.ebean.Transaction; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.concurrent.ExecutionException; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.fail; public class TestFutureRowCountErrorHandling extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java index 03f14cae3..189fd4457 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java @@ -2,8 +2,8 @@ package io.ebeaninternal.server.querydefn; import io.ebean.BaseTestCase; import io.ebeaninternal.server.deploy.BeanDescriptor; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java index bc7ddc8a2..a96af7b33 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.rawsql; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DRawSqlServiceTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java index cb3da9f2d..84239ca9b 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java @@ -1,12 +1,6 @@ package io.ebeaninternal.server.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; -import io.ebean.SqlRow; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.datasource.DataSourceConfig; @@ -21,11 +15,7 @@ import org.tests.model.rawsql.ERawSqlAggBean; import javax.sql.DataSource; import java.nio.charset.StandardCharsets; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; +import java.sql.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java index 0985f2ff8..70914dace 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java @@ -1,10 +1,6 @@ package io.ebeaninternal.server.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java index a9759fa34..054269e66 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java @@ -6,12 +6,8 @@ import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteBeanVisitor; import io.ebean.text.json.JsonWriteOptions; import io.ebean.text.json.JsonWriter; -import org.tests.model.basic.Address; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Country; -import org.tests.model.basic.Customer; -import org.tests.model.basic.ResetBasicData; import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.math.BigDecimal; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java index 53c897057..682e76363 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java @@ -5,11 +5,11 @@ import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonReadBeanVisitor; import io.ebean.text.json.JsonReadOptions; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.io.StringReader; import java.util.List; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java index 5ebd28abe..faf74d993 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java @@ -1,14 +1,14 @@ package io.ebeaninternal.server.text.json; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringWriter; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java index 4184980d0..4983c31e3 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java @@ -3,11 +3,7 @@ package io.ebeaninternal.server.transaction; import io.ebean.bean.PersistenceContext; import io.ebeaninternal.server.deploy.PersistenceContextUtil; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Car; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Product; -import org.tests.model.basic.Vehicle; +import org.tests.model.basic.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java index 5a77cde6f..9fe2386c7 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java @@ -1,10 +1,6 @@ package io.ebeaninternal.server.transaction; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.DatabaseFactory; -import io.ebean.Transaction; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; @@ -15,9 +11,7 @@ import org.tests.model.basic.UTDetail; import org.tests.model.basic.UTMaster; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.*; public class DefaultTransactionThreadLocalTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java index 57b4943cc..2b774b9d3 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java @@ -3,11 +3,7 @@ package io.ebeaninternal.server.type; import io.ebeaninternal.json.ModifyAwareFlag; import org.junit.jupiter.api.Test; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; +import java.io.*; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java index cac5747d5..52180f322 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java @@ -4,16 +4,8 @@ import io.ebeaninternal.json.ModifyAwareList; import io.ebeaninternal.json.ModifyAwareSet; import org.junit.jupiter.api.Test; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; +import java.io.*; +import java.util.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java index 8a97f37ce..18bcaad5a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java @@ -3,11 +3,7 @@ package io.ebeaninternal.server.type; import io.ebeaninternal.json.ModifyAwareMap; import org.junit.jupiter.api.Test; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; +import java.io.*; import java.util.HashMap; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java index 1c1b17d90..5e6fe9e49 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java @@ -3,11 +3,7 @@ package io.ebeaninternal.server.type; import io.ebeaninternal.json.ModifyAwareSet; import org.junit.jupiter.api.Test; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; +import java.io.*; import java.util.Arrays; import java.util.HashSet; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java index 03a77f6ad..1da2f5773 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java @@ -12,7 +12,9 @@ import org.mockito.Mockito; import java.io.IOException; import java.io.StringReader; import java.sql.SQLException; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java index e2b80a668..fcbe7b535 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java @@ -3,15 +3,13 @@ package io.ebeaninternal.server.type; import io.ebean.DB; import io.ebean.text.json.JsonContext; -import org.tests.model.basic.TOne; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TOne; import java.sql.Types; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeBooleanTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java index b2205f0fa..c40950842 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java @@ -11,9 +11,7 @@ import java.sql.Timestamp; import java.time.Instant; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeInstantTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java index 8b998ba37..80918a5a2 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java @@ -1,11 +1,11 @@ package io.ebeaninternal.server.type; import io.ebean.DB; -import org.tests.model.basic.TJodaEntity; import org.joda.time.DateTimeZone; import org.joda.time.LocalDateTime; import org.joda.time.LocalTime; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TJodaEntity; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java index 540491c4f..835546e1a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java @@ -9,9 +9,7 @@ import java.time.ZoneOffset; import java.util.TimeZone; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeOffsetDateTimeTest { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java index 47c9acb50..7ea6d2b3c 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java @@ -2,15 +2,14 @@ package io.ebeaninternal.server.type; import io.ebean.BaseTestCase; import io.ebean.config.EncryptKey; -import io.ebeaninternal.server.type.SimpleAesEncryptor; -import org.tests.basic.encrypt.BasicEncryptKey; import org.junit.jupiter.api.Test; +import org.tests.basic.encrypt.BasicEncryptKey; + +import java.sql.Timestamp; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; -import java.sql.Timestamp; - public class TestSimpleEncryptor extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java index 89a4a5241..30708eda0 100644 --- a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java +++ b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java @@ -9,8 +9,8 @@ import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import io.ebeanservice.docstore.api.DocStoreUpdateContext; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; import java.io.IOException; diff --git a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java index bc70bab28..3c10ee57e 100644 --- a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java +++ b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java @@ -1,8 +1,8 @@ package io.ebeanservice.docstore.api.support; -import io.ebean.DocStoreQueueEntry; import io.ebean.DB; import io.ebean.Database; +import io.ebean.DocStoreQueueEntry; import io.ebean.plugin.BeanDocType; import io.ebean.plugin.BeanType; import io.ebeanservice.docstore.api.DocStoreUpdates; @@ -13,9 +13,7 @@ import org.tests.model.basic.Order; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; public class DocStoreDeleteEventTest { diff --git a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java index 42832258a..e353f1a01 100644 --- a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java +++ b/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java @@ -1,14 +1,14 @@ package io.ebeanservice.docstore.api.support; -import io.ebean.DocStoreQueueEntry; import io.ebean.DB; import io.ebean.Database; +import io.ebean.DocStoreQueueEntry; import io.ebean.plugin.BeanDocType; import io.ebean.plugin.BeanType; import io.ebeanservice.docstore.api.DocStoreUpdates; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import org.tests.model.basic.Order; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java b/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java index 28ca8c5de..0148551a6 100644 --- a/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java +++ b/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java @@ -1,12 +1,12 @@ package misc.migration.history.v1_0; +import io.ebean.annotation.History; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; - /** * detects a bug where dropHistoryTable is not applied correctly * diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java index 1d57570bf..b05ccab94 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java @@ -1,11 +1,6 @@ package misc.migration.v1_0; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; - +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java index c8147fdcd..96e588017 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java @@ -1,12 +1,6 @@ package misc.migration.v1_0; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "migtest_fk_none_via_join") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java index e1c16afd6..6e895a2f1 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java @@ -10,7 +10,6 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Table; import javax.validation.constraints.Size; - import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java index f2db733e7..834099a10 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java @@ -1,16 +1,16 @@ package misc.migration.v1_0; +import io.ebean.annotation.EnumValue; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.EnumValue; - @Entity @Table(name = "migtest_e_enum") public class EEnum { - + public enum Status { @EnumValue("N") NEW, @@ -21,9 +21,9 @@ public class EEnum { @EnumValue("I") INACTIVE, } - + @Id Integer id; - + Status testStatus; } diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java index d8c76df75..d29a2c45b 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java @@ -1,13 +1,13 @@ package misc.migration.v1_0; +import io.ebean.annotation.History; +import io.ebean.annotation.HistoryExclude; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; -import io.ebean.annotation.HistoryExclude; - @Entity @Table(name = "migtest_e_history2") @History diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java index b5e41db5d..1224581a7 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java @@ -1,12 +1,12 @@ package misc.migration.v1_0; +import io.ebean.annotation.History; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; - @Entity @Table(name = "migtest_e_history3") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java index aba167995..ce1b464e1 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java @@ -1,12 +1,12 @@ package misc.migration.v1_0; +import io.ebean.annotation.History; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; - @Entity @Table(name = "migtest_e_history4") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java index 133a00c3d..a6e5f5ee6 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java @@ -1,12 +1,12 @@ package misc.migration.v1_0; +import io.ebean.annotation.History; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; - @Entity @Table(name = "migtest_e_history5") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java index c95eb7796..9a1fd23b7 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java @@ -1,13 +1,13 @@ package misc.migration.v1_0; +import io.ebean.annotation.History; +import io.ebean.annotation.NotNull; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; -import io.ebean.annotation.NotNull; - @Entity @Table(name = "migtest_e_history6") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/ERef.java b/ebean-test/src/test/java/misc/migration/v1_0/ERef.java index f4cfdf875..46103c173 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/ERef.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/ERef.java @@ -1,23 +1,22 @@ package misc.migration.v1_0; -import java.util.List; +import io.ebean.annotation.Index; +import io.ebean.annotation.NotNull; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; import javax.validation.constraints.Size; - -import io.ebean.annotation.Index; -import io.ebean.annotation.NotNull; +import java.util.List; @Entity @Table(name = "migtest_e_ref") public class ERef { - + @Id Integer id; - + @OneToMany List basics; diff --git a/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java index e331399ed..5c039bb06 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java @@ -1,12 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.CascadeType; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java index 07a523039..deed36868 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java @@ -1,11 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; - +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java index dae77dd67..5cac1da05 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java @@ -1,12 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "migtest_fk_none_via_join") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java index 9e5b1742d..0c2e5cde1 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java @@ -1,18 +1,10 @@ package misc.migration.v1_1; -import io.ebean.annotation.DbDefault; -import io.ebean.annotation.DbMigration; -import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -import io.ebean.annotation.NotNull; +import io.ebean.annotation.*; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java index 9cad6715c..d949d4838 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java @@ -1,15 +1,15 @@ package misc.migration.v1_1; +import io.ebean.annotation.DbComment; +import io.ebean.annotation.DbMigration; +import io.ebean.annotation.History; +import io.ebean.annotation.Platform; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.Platform; -import io.ebean.annotation.DbComment; -import io.ebean.annotation.DbMigration; -import io.ebean.annotation.History; - @Entity @Table(name = "migtest_e_history") @History diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java index 7b05d9fe7..951173c5c 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java @@ -1,16 +1,16 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.validation.constraints.Size; - import io.ebean.annotation.DbDefault; import io.ebean.annotation.History; import io.ebean.annotation.HistoryExclude; import io.ebean.annotation.NotNull; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.validation.constraints.Size; + @Entity @Table(name = "migtest_e_history2") @History diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java index a3756572a..e8ab4ecc8 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java @@ -1,13 +1,13 @@ package misc.migration.v1_1; +import io.ebean.annotation.History; +import io.ebean.annotation.HistoryExclude; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; -import io.ebean.annotation.HistoryExclude; - @Entity @Table(name = "migtest_e_history3") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java index ba5628390..1ac4d4508 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java @@ -1,12 +1,12 @@ package misc.migration.v1_1; +import io.ebean.annotation.History; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; - @Entity @Table(name = "migtest_e_history4") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java index 9bb9aba0b..f10731489 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java @@ -1,14 +1,14 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - import io.ebean.annotation.DbDefault; import io.ebean.annotation.History; import io.ebean.annotation.NotNull; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + @Entity @Table(name = "migtest_e_history5") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java index c05f51a15..171772b0d 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java @@ -1,14 +1,14 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - import io.ebean.annotation.DbDefault; import io.ebean.annotation.History; import io.ebean.annotation.NotNull; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + @Entity @Table(name = "migtest_e_history6") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java b/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java index 3213ddcd3..7c23cc540 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java @@ -1,22 +1,22 @@ package misc.migration.v1_1; +import io.ebean.annotation.SoftDelete; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.SoftDelete; - @Entity @Table(name = "migtest_e_softdelete") public class ESoftdelete { - + @Id Integer id; - - + + String testString; - + @SoftDelete boolean deleted; } diff --git a/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java index 7cf239f91..bdcd43845 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java @@ -1,11 +1,10 @@ package misc.migration.v1_1; -import java.util.List; - import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; import javax.persistence.Table; +import java.util.List; @Entity @Table(name = "migtest_mtm_c") @@ -38,7 +37,7 @@ public class MtmChild { public List getMasters() { return masters; } - + public void setMasters(List masters) { this.masters = masters; } diff --git a/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java index 067d396dc..ecc97bbe7 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java @@ -1,11 +1,10 @@ package misc.migration.v1_1; -import java.util.List; - import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; import javax.persistence.Table; +import java.util.List; @Entity @Table(name = "migtest_mtm_m") @@ -38,7 +37,7 @@ public class MtmMaster { public List getChildren() { return children; } - + public void setChildren(List children) { this.children = children; } diff --git a/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java b/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java index f44bbaa9d..80de9b999 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java @@ -1,10 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "migtest_oto_master") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java index 8cdb2a38a..de1e43003 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java @@ -1,11 +1,6 @@ package misc.migration.v1_2; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; - +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java index 809b17f76..38b64fee7 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java @@ -1,12 +1,6 @@ package misc.migration.v1_2; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "migtest_fk_none_via_join") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java index eb2a16d9e..8ebd0776a 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java @@ -10,7 +10,6 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Table; import javax.validation.constraints.Size; - import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java index 26f2a5d31..b77161f21 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java @@ -1,16 +1,16 @@ package misc.migration.v1_2; +import io.ebean.annotation.EnumValue; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.EnumValue; - @Entity @Table(name = "migtest_e_enum") public class EEnum { - + public enum Status { @EnumValue("N") NEW, @@ -21,9 +21,9 @@ public class EEnum { @EnumValue("I") INACTIVE, } - + @Id Integer id; - + Status testStatus; } diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java index 18a2c17fe..2647b7af4 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java @@ -1,13 +1,13 @@ package misc.migration.v1_2; +import io.ebean.annotation.History; +import io.ebean.annotation.HistoryExclude; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; -import io.ebean.annotation.HistoryExclude; - @Entity @Table(name = "migtest_e_history2") @History diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java index f945e6e7b..2e31ad85c 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java @@ -1,12 +1,12 @@ package misc.migration.v1_2; +import io.ebean.annotation.History; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; - @Entity @Table(name = "migtest_e_history3") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java index 083928e5c..c556f2c47 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java @@ -1,12 +1,12 @@ package misc.migration.v1_2; +import io.ebean.annotation.History; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; - @Entity @Table(name = "migtest_e_history4") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java index 9de9206a0..957ba43f4 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java @@ -1,12 +1,12 @@ package misc.migration.v1_2; +import io.ebean.annotation.History; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.History; - @Entity @Table(name = "migtest_e_history5") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java index 1d886ccb2..7c321b580 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java @@ -1,14 +1,14 @@ package misc.migration.v1_2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - import io.ebean.annotation.DbDefault; import io.ebean.annotation.History; import io.ebean.annotation.NotNull; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + @Entity @Table(name = "migtest_e_history6") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/ERef.java b/ebean-test/src/test/java/misc/migration/v1_2/ERef.java index df16ba21c..66ef3e373 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/ERef.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/ERef.java @@ -1,23 +1,22 @@ package misc.migration.v1_2; -import java.util.List; +import io.ebean.annotation.Index; +import io.ebean.annotation.NotNull; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; import javax.validation.constraints.Size; - -import io.ebean.annotation.Index; -import io.ebean.annotation.NotNull; +import java.util.List; @Entity @Table(name = "migtest_e_ref") public class ERef { - + @Id Integer id; - + @OneToMany List basics; diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java b/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java index 798fd7fd3..32b65492a 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java @@ -1,10 +1,6 @@ package org.tests.aggregateformula; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java index 8d5707da1..c51e7ff58 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java @@ -6,11 +6,7 @@ import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Address; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/MainDbBoolean.java b/ebean-test/src/test/java/org/tests/basic/MainDbBoolean.java index 1a7f8375c..a45243287 100644 --- a/ebean-test/src/test/java/org/tests/basic/MainDbBoolean.java +++ b/ebean-test/src/test/java/org/tests/basic/MainDbBoolean.java @@ -14,7 +14,8 @@ import org.tests.model.basic.TSMaster; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Used to run some tests manually on a specific Database type. diff --git a/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java b/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java index 23794b476..547483ceb 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java +++ b/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java @@ -25,9 +25,7 @@ import java.util.Set; import static io.ebean.annotation.Platform.H2; import static io.ebean.annotation.Platform.POSTGRES; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestAnnotationBase extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java b/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java index 219cdc63b..d32d86d4c 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java +++ b/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java @@ -3,11 +3,11 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java b/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java index 7a003e1eb..a619cebce 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java +++ b/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java @@ -3,11 +3,11 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java b/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java index 1823cc8f1..efe924f85 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java +++ b/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; public class TestBatchLazyMany extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java b/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java index 76d170d6f..74e2441a5 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java +++ b/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java @@ -3,11 +3,11 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.Order.Status; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.sql.Date; diff --git a/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java b/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java index 1d526b52e..4365d4860 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java +++ b/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java @@ -2,7 +2,6 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java index 955b8b199..ef0717cdb 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java @@ -2,11 +2,10 @@ package org.tests.basic; import io.ebean.DB; import io.ebean.TransactionalTestCase; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java index ba2e50621..16ba29c32 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java index 9db52ad7f..dfe431246 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.PersistentFile; import org.tests.model.basic.PersistentFileContent; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java index d130bf67d..433fb270c 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java b/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java index 6c86524c4..824f6bca3 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java @@ -2,8 +2,8 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.TMapSuperEntity; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TMapSuperEntity; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java index 8197c1bfc..3b049591b 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java @@ -4,8 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Database; -import org.tests.model.embedded.EMain; import org.junit.jupiter.api.Test; +import org.tests.model.embedded.EMain; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java b/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java index 11d94f3d2..35c137540 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java @@ -3,9 +3,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java b/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java index 80a2c24ca..afc456e04 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java +++ b/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java @@ -3,10 +3,10 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; import org.tests.model.basic.MyEBasicConfigStartup; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestFetchId.java b/ebean-test/src/test/java/org/tests/basic/TestFetchId.java index df3b48d8f..2ebc4dab4 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestFetchId.java +++ b/ebean-test/src/test/java/org/tests/basic/TestFetchId.java @@ -2,15 +2,12 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.FutureIds; import io.ebean.Query; -import io.ebean.test.LoggedSql; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; import java.util.concurrent.ExecutionException; diff --git a/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java b/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java index f80c513c7..a42667b7d 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java +++ b/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java @@ -3,12 +3,11 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; import java.util.List; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; public class TestInEmpty extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java b/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java index 2df6b2667..c4b12d8e7 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java +++ b/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java @@ -2,10 +2,10 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Car; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestJodaType.java b/ebean-test/src/test/java/org/tests/basic/TestJodaType.java index d2bbdd893..30b98d23b 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestJodaType.java +++ b/ebean-test/src/test/java/org/tests/basic/TestJodaType.java @@ -6,9 +6,9 @@ import io.ebean.core.type.ScalarType; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanProperty; -import org.tests.model.basic.TJodaEntity; import org.joda.time.LocalTime; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TJodaEntity; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java b/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java index f9548cc36..70a2290c1 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java +++ b/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java @@ -2,12 +2,8 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.Address; -import org.tests.model.basic.Car; -import org.tests.model.basic.Trip; -import org.tests.model.basic.Vehicle; -import org.tests.model.basic.VehicleDriver; import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.sql.Timestamp; import java.util.Date; diff --git a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java index beb486ed9..c96373de3 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java +++ b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java b/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java index fce2ed0ba..5722ffbbb 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java @@ -3,9 +3,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.jupiter.api.Test; public class TestM2MCascadeOne extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java b/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java index 00aac40f4..10591aa09 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java @@ -2,10 +2,10 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.sql.Date; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java b/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java index eab068fec..7f601523a 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java +++ b/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java @@ -2,12 +2,12 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ResetBasicData; import org.tests.model.interfaces.Address; import org.tests.model.interfaces.IAddress; import org.tests.model.interfaces.IPerson; import org.tests.model.interfaces.Person; -import org.junit.jupiter.api.Test; public class TestManyOneInterface extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java b/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java index a43efaccf..6c6f34fa1 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java +++ b/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java @@ -2,8 +2,8 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.TMapSuperEntity; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TMapSuperEntity; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java index 1aef8eb4f..71007df58 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java @@ -2,11 +2,11 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.Platform; import io.ebean.annotation.IgnorePlatform; +import io.ebean.annotation.Platform; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.metaannotation.SizeMedium; -import org.junit.jupiter.api.Test; import javax.persistence.PersistenceException; diff --git a/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java b/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java index ea0fb44b7..030d4e3a4 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java +++ b/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java @@ -2,8 +2,8 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.MNonUpdPropEntity; import org.junit.jupiter.api.Test; +import org.tests.model.basic.MNonUpdPropEntity; public class TestNonUpdateProperty extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java index 848a9dde7..a552f0a92 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java @@ -3,11 +3,10 @@ package org.tests.basic; import io.ebean.DB; import io.ebean.Query; import io.ebean.TransactionalTestCase; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java index 6c1fdb0c4..2d8263759 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java +++ b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java @@ -2,10 +2,10 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java index 9d9d8becd..e18c55c57 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java +++ b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java @@ -2,10 +2,10 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java index bf53599b9..1347da7e2 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java @@ -1,11 +1,6 @@ package org.tests.basic; -import io.ebean.AcquireLockException; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Query; -import io.ebean.Transaction; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java b/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java index 08db38a0b..63dec52d1 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java @@ -8,11 +8,10 @@ import io.ebean.cache.ServerCacheManager; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.core.CacheOptions; import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; public class TestQueryWithCache extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java b/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java index f7cb9eadd..c9b687fae 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java @@ -4,11 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Address; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.OrderDetail; -import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.*; import java.util.Iterator; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java index 320f16ea0..75208a534 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.PersistentFile; import org.tests.model.basic.PersistentFileContent; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java index 660366c12..e7e23283d 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java +++ b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java b/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java index 23d1f1a68..bf98a2d00 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java @@ -3,11 +3,11 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestTransient.java b/ebean-test/src/test/java/org/tests/basic/TestTransient.java index 8ea4d3f86..9edd48cac 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestTransient.java +++ b/ebean-test/src/test/java/org/tests/basic/TestTransient.java @@ -10,10 +10,7 @@ import java.sql.Types; import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestTransient extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java b/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java index cf40d4890..c00635678 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java @@ -2,10 +2,10 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java b/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java index cf0c7ade7..95cfce6d1 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java +++ b/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java @@ -2,8 +2,8 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.TUuidEntity; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TUuidEntity; public class TestUuidInsert extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java b/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java index 9a4b48729..1c554e093 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java +++ b/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; -import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java index ad2f35453..f0989b7ac 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java @@ -3,11 +3,10 @@ package org.tests.basic; import io.ebean.DB; import io.ebean.Query; import io.ebean.TransactionalTestCase; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java index f2f2679f4..99197ac98 100644 --- a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java +++ b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java @@ -3,11 +3,11 @@ package org.tests.basic.delete; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java index 83003b889..17af48c3c 100644 --- a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java +++ b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java @@ -3,11 +3,11 @@ package org.tests.basic.delete; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java index e0f401256..143aa059c 100644 --- a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java +++ b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java @@ -6,8 +6,8 @@ import io.ebean.SqlRow; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.dbplatform.DbEncrypt; -import io.ebeaninternal.api.SpiEbeanServer; import io.ebean.test.LoggedSql; +import io.ebeaninternal.api.SpiEbeanServer; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicEncrypt; import org.tests.model.basic.EBasicEncryptRelate; diff --git a/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java b/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java index b4ed0fb0a..54f26782e 100644 --- a/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java +++ b/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java @@ -3,8 +3,8 @@ package org.tests.basic.event; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.TWithPreInsert; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TWithPreInsert; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java b/ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java index b8376087a..01da50bbe 100644 --- a/ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java +++ b/ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java @@ -2,11 +2,10 @@ package org.tests.basic.join; import io.ebean.DB; import io.ebean.TransactionalTestCase; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.Order.Status; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java index eaf598cf4..9068b760a 100644 --- a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java +++ b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java @@ -4,9 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; -import org.tests.model.basic.EBasicClobFetchEager; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicClobFetchEager; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java index 66b741523..7289a7ac2 100644 --- a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java +++ b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java @@ -3,9 +3,9 @@ package org.tests.basic.lob; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.tests.model.basic.EBasicClobNoVer; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicClobNoVer; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java b/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java index 1bba53a87..092924ed1 100644 --- a/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java +++ b/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java @@ -2,8 +2,8 @@ package org.tests.basic.lob; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.TBytesOnly; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TBytesOnly; public class TestByteOnly extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java b/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java index 20a6c468e..fb5369233 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java @@ -1,16 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java b/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java index 631863de5..7687f56d8 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java @@ -1,14 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "drel_invoice") diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java b/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java index 8a26d64de..ab4f0c4ba 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java @@ -4,9 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.*; public class TestOne2OneBookingInvoice extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java b/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java index 98ded2763..a26f18257 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java @@ -1,14 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "tire") diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java b/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java index 2f07043dc..01b617d0d 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java @@ -1,13 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "wheel") diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java b/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java index 854f0a574..133adada4 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java @@ -2,8 +2,8 @@ package org.tests.basic.type; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.ESomeType; import org.junit.jupiter.api.Test; +import org.tests.model.basic.ESomeType; import java.util.Currency; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java b/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java index d70bdd3b1..5229806e5 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java @@ -2,8 +2,8 @@ package org.tests.basic.type; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.TOne; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TOne; public class TestQueryBooleanProperty extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java index ac113e3a1..65b7b8005 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java @@ -1,19 +1,14 @@ package org.tests.batchinsert; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.DtoQuery2Test; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Transaction; +import io.ebean.*; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.ServerMetrics; -import io.ebeaninternal.api.SpiTransaction; import io.ebean.test.LoggedSql; +import io.ebeaninternal.api.SpiTransaction; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java index cc89ca3d4..f20e9bf91 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java @@ -4,11 +4,7 @@ import io.ebean.DB; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Transactional; import org.junit.jupiter.api.Test; -import org.tests.batchinsert.o2o.MeterAddressData; -import org.tests.batchinsert.o2o.MeterContractData; -import org.tests.batchinsert.o2o.MeterSpecialNeedsClient; -import org.tests.batchinsert.o2o.MeterSpecialNeedsContact; -import org.tests.batchinsert.o2o.MeterVersion; +import org.tests.batchinsert.o2o.*; public class TestBatchInsertOneToOne { private MeterVersion build(){ diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java index 61a405681..b8c041f5b 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java @@ -2,7 +2,6 @@ package org.tests.batchinsert; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.PersistBatch; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java index d91cc475e..9357a2668 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java @@ -1,9 +1,10 @@ package org.tests.batchinsert.o2o; import io.ebean.annotation.NotNull; -import java.util.UUID; + import javax.persistence.Entity; import javax.persistence.Id; +import java.util.UUID; @Entity public class MeterAddressData { diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java index 537dc411b..f4112c746 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java @@ -1,11 +1,12 @@ package org.tests.batchinsert.o2o; import io.ebean.annotation.NotNull; -import java.util.UUID; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; +import java.util.UUID; @Entity public class MeterContractData { diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java index d042b5dff..c2c6375c2 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java @@ -1,10 +1,10 @@ package org.tests.batchinsert.o2o; -import java.util.UUID; import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; +import java.util.UUID; @Entity public class MeterSpecialNeedsClient { diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java index 029868433..e75f24aeb 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java @@ -1,8 +1,8 @@ package org.tests.batchinsert.o2o; -import java.util.UUID; import javax.persistence.Entity; import javax.persistence.Id; +import java.util.UUID; @Entity public class MeterSpecialNeedsContact { diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java index 49ce21860..8339ca353 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java @@ -1,11 +1,12 @@ package org.tests.batchinsert.o2o; import io.ebean.annotation.NotNull; -import java.util.UUID; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; +import java.util.UUID; @Entity public class MeterVersion { diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java b/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java index 1bfcf92ef..dfca84655 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java @@ -3,15 +3,10 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Expr; -import io.ebean.FetchConfig; import io.ebean.Transaction; -import org.tests.basic.MyTestDataSourcePoolListener; -import org.tests.model.basic.Address; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.ResetBasicData; import org.junit.jupiter.api.Test; +import org.tests.basic.MyTestDataSourcePoolListener; +import org.tests.model.basic.*; import java.util.ArrayList; import java.util.Collections; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java index aad2db190..879fb1097 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java @@ -4,9 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; -import org.tests.model.basic.UUOne; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.basic.UUOne; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java index d0179d210..8dd286907 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java @@ -3,11 +3,11 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java index 8381f78f4..d819dbe2f 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java @@ -1,12 +1,10 @@ package org.tests.batchload; import io.ebean.DB; -import io.ebean.FetchConfig; import io.ebean.TransactionalTestCase; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java index 8137164a1..6766cfe9a 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java @@ -2,8 +2,8 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.UUOne; import org.junit.jupiter.api.Test; +import org.tests.model.basic.UUOne; import javax.persistence.EntityNotFoundException; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java index 7e20c0990..0eabc9570 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java @@ -2,8 +2,8 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.UUOne; import org.junit.jupiter.api.Test; +import org.tests.model.basic.UUOne; import javax.persistence.EntityNotFoundException; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java index 182800f35..deae22962 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java @@ -2,11 +2,11 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.DB; +import io.ebean.test.LoggedSql; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import io.ebean.test.LoggedSql; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java index 4f5e38abf..64a88e1f1 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java @@ -5,11 +5,11 @@ import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Query; import io.ebean.cache.ServerCache; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java index 3814e262e..03386f656 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java @@ -2,7 +2,6 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java b/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java index d632e1039..ac0127398 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java @@ -2,7 +2,6 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java index 837341de1..ffa0a5608 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java @@ -1,6 +1,9 @@ package org.tests.batchload; -import io.ebean.*; +import io.ebean.DB; +import io.ebean.Query; +import io.ebean.QueryIterator; +import io.ebean.TransactionalTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; @@ -10,9 +13,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestSecondaryQueries extends TransactionalTestCase { diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java index 905af3d8a..069287b91 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java @@ -9,9 +9,7 @@ import org.tests.model.basic.OCachedBean; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.*; /** * Test class testing clearing cache with delete query diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java b/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java index 042c02d51..59e54d538 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java @@ -4,9 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java b/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java index 575d9f3b6..4f22cff59 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java @@ -1,33 +1,17 @@ package org.tests.cache; -import io.ebean.BaseTestCase; -import io.ebean.CacheMode; -import io.ebean.DB; -import io.ebean.SqlUpdate; -import io.ebean.Transaction; -import io.ebean.Update; +import io.ebean.*; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebeaninternal.server.cache.CachedManyIds; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Country; -import org.tests.model.basic.Customer; -import org.tests.model.basic.OBeanChild; -import org.tests.model.basic.OCachedBean; -import org.tests.model.basic.OCachedBeanChild; -import org.tests.model.basic.Order; -import org.tests.model.basic.OrderDetail; -import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.*; import java.util.ArrayList; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestCacheCollectionIds extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java b/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java index bb3c01e6e..829d07279 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java @@ -4,11 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Address; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Country; -import org.tests.model.basic.Customer; -import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java b/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java index 415591b14..225a7ac38 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java @@ -2,9 +2,9 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedInhChildA; import org.tests.model.basic.OCachedInhRoot; -import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java b/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java index 48baaaadb..1da96116a 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java @@ -11,9 +11,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestCacheNaturalId extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java b/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java index 83686b795..a6a52c38b 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java +++ b/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java @@ -5,9 +5,9 @@ import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java b/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java index 8c70e5922..c65383dc0 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java @@ -8,9 +8,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.L2CachedLazyDirtFlagResetBean; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestL2DirtyFlagOnLazyLoad extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java b/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java index 40eee3349..fdeb6f30d 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java @@ -1,13 +1,12 @@ package org.tests.cache; -import static org.assertj.core.api.Assertions.assertThat; - +import io.ebean.BaseTestCase; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.cache.M2MCacheChild; import org.tests.model.cache.M2MCacheMaster; -import io.ebean.BaseTestCase; -import io.ebean.DB; +import static org.assertj.core.api.Assertions.assertThat; public class TestM2MCache extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java index 890a70b0b..bafb239eb 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java @@ -2,7 +2,6 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java index 677baec98..292a361af 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java @@ -11,9 +11,7 @@ import org.tests.model.basic.EBasicVer; import java.util.List; import java.util.Optional; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryCacheInsert extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java index 602809718..8f08e776c 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java @@ -1,19 +1,15 @@ package org.tests.cache; -import io.ebean.BaseTestCase; -import io.ebean.CacheMode; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Query; - -import org.tests.model.basic.EBasicVer; +import io.ebean.*; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicVer; import java.util.List; import java.util.Map; import java.util.Set; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; public class TestQueryCacheReadOnly extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java index 064b76890..fd58c7d5c 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java @@ -2,12 +2,7 @@ package org.tests.cache.embeddedid; import io.ebean.annotation.Cache; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Cache diff --git a/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java b/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java index 933bb076f..6ead0106b 100644 --- a/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java +++ b/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java @@ -5,8 +5,8 @@ import io.ebean.CallableSql; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Disabled; -import org.tests.model.basic.EBasic; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasic; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java index 7e0dd4df3..093a2946f 100644 --- a/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java +++ b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java @@ -2,11 +2,7 @@ package org.tests.cascade; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java b/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java index 8607084d3..89141a345 100644 --- a/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java +++ b/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java @@ -1,10 +1,6 @@ package org.tests.cascade; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/cascade/RelDetail.java b/ebean-test/src/test/java/org/tests/cascade/RelDetail.java index 170f194b0..29e494539 100644 --- a/ebean-test/src/test/java/org/tests/cascade/RelDetail.java +++ b/ebean-test/src/test/java/org/tests/cascade/RelDetail.java @@ -1,13 +1,8 @@ package org.tests.cascade; +import javax.persistence.*; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; - @Entity public class RelDetail { diff --git a/ebean-test/src/test/java/org/tests/cascade/RelMaster.java b/ebean-test/src/test/java/org/tests/cascade/RelMaster.java index e7a736b0f..06bf64f18 100644 --- a/ebean-test/src/test/java/org/tests/cascade/RelMaster.java +++ b/ebean-test/src/test/java/org/tests/cascade/RelMaster.java @@ -1,10 +1,6 @@ package org.tests.cascade; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class RelMaster { diff --git a/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java b/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java index 853ff3ae2..c1eca9d9b 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java @@ -2,12 +2,11 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.Transaction; - -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.util.List; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; public class TestMasterDetailDelete extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java b/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java index 35aad8927..94cc8b6f7 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java @@ -2,7 +2,6 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.Transaction; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.AfterEach; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java index 43ccfd776..66f14e982 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java @@ -3,10 +3,10 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; -import org.tests.model.basic.TSDetail; -import org.tests.model.basic.TSMaster; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TSDetail; +import org.tests.model.basic.TSMaster; import java.util.List; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java index 5924c9d4f..376389835 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java @@ -2,9 +2,9 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java index 0fe581597..f265bf341 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java @@ -2,9 +2,9 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import org.junit.jupiter.api.Test; import javax.persistence.OptimisticLockException; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java index b796d5c05..4545424d2 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java @@ -4,11 +4,11 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.composite.RCustomer; import org.tests.model.composite.RCustomerKey; import org.tests.model.composite.ROrder; import org.tests.model.composite.ROrderPK; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java index 7c0f3c955..26db614db 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java @@ -4,11 +4,11 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.PagedList; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.CKeyAssoc; import org.tests.model.basic.CKeyDetail; import org.tests.model.basic.CKeyParent; import org.tests.model.basic.CKeyParentId; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java index 77344808f..bcaf57f4a 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java @@ -2,9 +2,9 @@ package org.tests.compositekeys; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.compositekeys.db.CaoBean; import org.tests.compositekeys.db.CaoKey; -import org.junit.jupiter.api.Test; public class TestCaoCompositeKeyWithAnnotationOverrides extends BaseTestCase { 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 c3472f57c..e637a0465 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java @@ -9,15 +9,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java index 441035b6a..8638fe610 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java @@ -1,10 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class CaoBean { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java index 1b0aa526b..9aca96574 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java @@ -1,13 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class Item { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java b/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java index b9822b807..79d541673 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java @@ -1,10 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import javax.persistence.*; @Entity public class ParcelLocation { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java index e75aae7de..be0891ac8 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java @@ -1,11 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java b/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java index 4cbe63fec..a6defdc4e 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java @@ -1,7 +1,6 @@ package org.tests.compositekeys.db; import io.ebean.annotation.Identity; -import io.ebean.annotation.IdentityGenerated; import javax.persistence.EmbeddedId; import javax.persistence.Entity; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java index 298d6bc4b..bfd160d98 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java @@ -1,13 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java b/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java index 0c4a56d67..9a90095bf 100644 --- a/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java +++ b/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java @@ -5,8 +5,8 @@ import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Database; import io.ebean.bean.EntityBean; -import org.tests.model.basic.MProtectedConstructBean; import org.junit.jupiter.api.Test; +import org.tests.model.basic.MProtectedConstructBean; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/org/tests/ddd/iud/TestDPersonEl.java b/ebean-test/src/test/java/org/tests/ddd/iud/TestDPersonEl.java index 8927ded5d..e01f736f8 100644 --- a/ebean-test/src/test/java/org/tests/ddd/iud/TestDPersonEl.java +++ b/ebean-test/src/test/java/org/tests/ddd/iud/TestDPersonEl.java @@ -6,15 +6,16 @@ import io.ebean.plugin.BeanType; import io.ebean.plugin.ExpressionPath; import io.ebean.plugin.SpiServer; import io.ebean.text.json.JsonContext; +import org.junit.jupiter.api.Test; import org.tests.model.ddd.DPerson; import org.tests.model.ivo.Money; -import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Currency; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestDPersonEl { diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java index 148e219b9..5d95be203 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java @@ -1,11 +1,6 @@ package org.tests.ddl; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import javax.persistence.*; @Entity public class DfkNoneViaJoin { diff --git a/ebean-test/src/test/java/org/tests/delete/DcMaster.java b/ebean-test/src/test/java/org/tests/delete/DcMaster.java index e1c8d0144..22a0e1b3a 100644 --- a/ebean-test/src/test/java/org/tests/delete/DcMaster.java +++ b/ebean-test/src/test/java/org/tests/delete/DcMaster.java @@ -1,10 +1,6 @@ package org.tests.delete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java index 2db15fdee..dc563f1a2 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java @@ -1,8 +1,8 @@ package org.tests.delete; import io.ebean.BaseTestCase; -import org.tests.model.onetoone.Account; import org.junit.jupiter.api.Test; +import org.tests.model.onetoone.Account; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java index c1bd19cbb..4e826b584 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java @@ -1,19 +1,11 @@ package org.tests.delete; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Query; -import io.ebean.Transaction; +import io.ebean.*; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; -import org.tests.model.basic.BBookmarkUser; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Country; -import org.tests.model.basic.Customer; -import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java b/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java index d3729226c..ecea5c295 100644 --- a/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java +++ b/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java @@ -1,10 +1,8 @@ package org.tests.docstore; -import static org.assertj.core.api.Assertions.assertThat; - -import java.util.Arrays; - +import io.ebean.BaseTestCase; +import io.ebean.text.json.JsonReadOptions; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Product; @@ -12,8 +10,9 @@ import org.tests.model.basic.ResetBasicData; import org.tests.model.docstore.CustomerReport; import org.tests.model.docstore.ProductReport; -import io.ebean.BaseTestCase; -import io.ebean.text.json.JsonReadOptions; +import java.util.Arrays; + +import static org.assertj.core.api.Assertions.assertThat; public class CustomerReportTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java index fd6f0f0f3..f21d12225 100644 --- a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java +++ b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java @@ -15,7 +15,6 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -import static org.junit.jupiter.api.Assertions.assertTrue; public class DocLinkTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/draftable/LinkQueryPublishTest.java b/ebean-test/src/test/java/org/tests/draftable/LinkQueryPublishTest.java index 5c5613a28..13540041c 100644 --- a/ebean-test/src/test/java/org/tests/draftable/LinkQueryPublishTest.java +++ b/ebean-test/src/test/java/org/tests/draftable/LinkQueryPublishTest.java @@ -4,8 +4,8 @@ import io.ebean.DB; import io.ebean.Database; import io.ebean.PagedList; import io.ebean.Query; -import org.tests.model.draftable.Link; import org.junit.jupiter.api.Test; +import org.tests.model.draftable.Link; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/el/TestELBasic.java b/ebean-test/src/test/java/org/tests/el/TestELBasic.java index c29d8b70b..9fd4d619b 100644 --- a/ebean-test/src/test/java/org/tests/el/TestELBasic.java +++ b/ebean-test/src/test/java/org/tests/el/TestELBasic.java @@ -3,15 +3,11 @@ package org.tests.el; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; -import io.ebeaninternal.server.deploy.BeanDescriptor; -import io.ebeaninternal.server.deploy.BeanFkeyProperty; -import io.ebeaninternal.server.deploy.BeanProperty; -import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.*; import io.ebeaninternal.server.el.ElPropertyChain; import io.ebeaninternal.server.el.ElPropertyDeploy; -import org.tests.model.basic.Customer; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Customer; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/org/tests/el/TestPathExpression.java b/ebean-test/src/test/java/org/tests/el/TestPathExpression.java index 26fa4e0e4..3c7e87c26 100644 --- a/ebean-test/src/test/java/org/tests/el/TestPathExpression.java +++ b/ebean-test/src/test/java/org/tests/el/TestPathExpression.java @@ -5,10 +5,10 @@ import io.ebean.bean.EntityBean; import io.ebean.plugin.BeanType; import io.ebean.plugin.ExpressionPath; import io.ebean.plugin.SpiServer; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java b/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java index 5cffc6f19..2646707e6 100644 --- a/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java +++ b/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java @@ -3,10 +3,8 @@ package org.tests.el; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.tests.model.basic.Customer; import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThat; +import org.tests.model.basic.Customer; public class TestUnderscoreParam extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java index ef33658fd..1360c1cb6 100644 --- a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java +++ b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java @@ -1,9 +1,9 @@ package org.tests.enhancement; import io.ebean.BaseTestCase; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java index fc12e6ea1..3a945c8e7 100644 --- a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java +++ b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java @@ -3,9 +3,9 @@ package org.tests.enhancement; import io.ebean.BaseTestCase; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; +import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/family/TestInheritance.java b/ebean-test/src/test/java/org/tests/family/TestInheritance.java index 239e4f77b..485428b79 100644 --- a/ebean-test/src/test/java/org/tests/family/TestInheritance.java +++ b/ebean-test/src/test/java/org/tests/family/TestInheritance.java @@ -13,10 +13,7 @@ import org.tests.model.family.ChildPerson; import org.tests.model.family.GrandParentPerson; import org.tests.model.family.ParentPerson; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestInheritance extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java b/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java index d18f8fa2d..c44fea1fa 100644 --- a/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java +++ b/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java @@ -2,8 +2,8 @@ package org.tests.generated; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.EGenProps; import org.junit.jupiter.api.Test; +import org.tests.model.EGenProps; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java b/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java index c26692fb1..00c3b03cb 100644 --- a/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java +++ b/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java @@ -3,14 +3,12 @@ package org.tests.generated; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.MyCurrentUserProvider; -import org.tests.model.EWhoProps; import org.junit.jupiter.api.Test; +import org.tests.model.EWhoProps; import org.tests.model.generated.User; import org.tests.model.generated.WhoPropsOneToMany; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.*; public class TestGeneratedWho extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java b/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java index d3ef275fc..5f2b96fb3 100644 --- a/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java +++ b/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java @@ -3,8 +3,8 @@ package org.tests.genkey; import io.ebean.BaseTestCase; import io.ebean.config.dbplatform.IdType; import io.ebeaninternal.server.deploy.BeanDescriptor; -import org.tests.model.basic.TOne; import org.junit.jupiter.api.Test; +import org.tests.model.basic.TOne; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java b/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java index f3e26c876..c78e49c6e 100644 --- a/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java +++ b/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java @@ -1,11 +1,6 @@ package org.tests.history; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.SqlQuery; -import io.ebean.SqlRow; -import io.ebean.Transaction; -import io.ebean.Version; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java b/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java index c6672bc67..537c2fe4b 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java +++ b/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java @@ -14,9 +14,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.*; public class TestGeneratedKeys extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java b/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java index d6fb39d36..e6b2fbad8 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java @@ -1,15 +1,15 @@ package org.tests.idkeys; +import io.ebean.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.TOne; -import io.ebean.BaseTestCase; - -import static org.junit.jupiter.api.Assertions.*; - import java.sql.SQLException; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + /** * Test lazy loading */ diff --git a/ebean-test/src/test/java/org/tests/inherit/DIntParent.java b/ebean-test/src/test/java/org/tests/inherit/DIntParent.java index 1b491a9bd..f67cd5041 100644 --- a/ebean-test/src/test/java/org/tests/inherit/DIntParent.java +++ b/ebean-test/src/test/java/org/tests/inherit/DIntParent.java @@ -1,12 +1,6 @@ package org.tests.inherit; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "dint_parent") diff --git a/ebean-test/src/test/java/org/tests/inherit/Data.java b/ebean-test/src/test/java/org/tests/inherit/Data.java index 616beefec..0f20e16c3 100644 --- a/ebean-test/src/test/java/org/tests/inherit/Data.java +++ b/ebean-test/src/test/java/org/tests/inherit/Data.java @@ -1,10 +1,6 @@ package org.tests.inherit; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/inherit/EUncle.java b/ebean-test/src/test/java/org/tests/inherit/EUncle.java index f9c8960f7..6dbe92089 100644 --- a/ebean-test/src/test/java/org/tests/inherit/EUncle.java +++ b/ebean-test/src/test/java/org/tests/inherit/EUncle.java @@ -1,10 +1,6 @@ package org.tests.inherit; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "rawinherit_uncle") diff --git a/ebean-test/src/test/java/org/tests/inherit/Parent.java b/ebean-test/src/test/java/org/tests/inherit/Parent.java index ff1dfb140..4eac1553a 100644 --- a/ebean-test/src/test/java/org/tests/inherit/Parent.java +++ b/ebean-test/src/test/java/org/tests/inherit/Parent.java @@ -1,13 +1,6 @@ package org.tests.inherit; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java b/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java index 2a8449c8e..8a3964f9e 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java +++ b/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java @@ -1,10 +1,6 @@ package org.tests.inheritance; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import javax.persistence.*; /** */ diff --git a/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java b/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java index 3582a7b7d..613637800 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java +++ b/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java @@ -1,16 +1,10 @@ package org.tests.inheritance; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToOne; -import javax.validation.constraints.NotNull; - import io.ebean.annotation.Index; +import javax.persistence.*; +import javax.validation.constraints.NotNull; + /** * Model class to reference an organization node. * diff --git a/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java b/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java index 4ae802112..c5ac10b64 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java +++ b/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java @@ -1,11 +1,6 @@ package org.tests.inheritance; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import javax.persistence.*; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java index aab913688..6dbe29216 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java @@ -3,17 +3,11 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.tests.model.basic.Car; -import org.tests.model.basic.CarAccessory; -import org.tests.model.basic.CarFuse; -import org.tests.model.basic.Truck; -import org.tests.model.basic.Vehicle; -import org.tests.model.basic.VehicleDriver; import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.util.List; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; public class TestInheritInsert extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java index a4a0547e2..0f72ec0e6 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java @@ -1,10 +1,10 @@ package org.tests.inheritance; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Car; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java index 1f2301da0..deb32300f 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java @@ -3,8 +3,6 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; -import io.ebean.DB; -import io.ebean.Database; import org.junit.jupiter.api.Test; import org.tests.inheritance.model.CalculationResult; import org.tests.inheritance.model.Configurations; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java index 228e3ed47..1be175266 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java @@ -6,11 +6,7 @@ import io.ebean.bean.BeanCollection.ModifyListenMode; import io.ebean.common.BeanList; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Animal; -import org.tests.model.basic.AnimalShelter; -import org.tests.model.basic.BigDog; -import org.tests.model.basic.Cat; -import org.tests.model.basic.Dog; +import org.tests.model.basic.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java index e6d7d7dc9..57e36f9f6 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java @@ -3,7 +3,6 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; -import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.inheritance.order.OrderMasterInheritance; import org.tests.inheritance.order.OrderedA; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java index 33e1afe81..a041117ac 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java @@ -1,15 +1,14 @@ package org.tests.inheritance; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - +import io.ebean.BaseTestCase; import io.ebean.test.LoggedSql; +import org.junit.jupiter.api.Test; import org.tests.inherit.ChildA; import org.tests.inherit.ChildB; import org.tests.inherit.Parent; -import org.junit.jupiter.api.Test; -import io.ebean.BaseTestCase; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestInheritanceRefBean extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java b/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java index 438f18cb3..a67d6a764 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java @@ -3,9 +3,9 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TIntChild; import org.tests.model.basic.TIntRoot; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java b/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java index 37c7fc9b1..3f9f870ed 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java @@ -2,12 +2,12 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.AttributeHolder; -import org.tests.model.basic.ListAttribute; -import org.tests.model.basic.ListAttributeValue; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.tests.model.basic.AttributeHolder; +import org.tests.model.basic.ListAttribute; +import org.tests.model.basic.ListAttributeValue; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java b/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java index 05fdb92e7..b9391055c 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java @@ -2,11 +2,10 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.Test; - public class TestTreeOrganisations extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java index 334752405..c4c3d0202 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java +++ b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java @@ -1,12 +1,6 @@ package org.tests.inheritance.abstrakt; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "block") diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java index fdcbf0a3f..7e376add8 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java @@ -1,12 +1,6 @@ package org.tests.inheritance.cache; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; +import javax.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java index 9ea1f90a7..88b2de299 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java @@ -1,11 +1,6 @@ package org.tests.inheritance.cache; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import javax.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java index a87ebd3ff..aea64c388 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java @@ -3,9 +3,9 @@ package org.tests.inheritance.cache; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.cache.CInhOne; import org.tests.model.basic.cache.CInhRoot; -import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java index d9d9ab08e..76d9ddc0c 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java @@ -1,10 +1,6 @@ package org.tests.inheritance.cascadedelete; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.PreRemove; +import javax.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java index 0f580744a..899381d4e 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java +++ b/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java @@ -1,17 +1,6 @@ package org.tests.inheritance.company.domain; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java index 8bc2dbf1a..5ef6ef7c8 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java +++ b/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java @@ -1,10 +1,6 @@ package org.tests.inheritance.company.domain; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-test/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java index 05860052c..3d32d3d05 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java +++ b/ebean-test/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestInheritAbstract { diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java b/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java index 9cde2d7f3..6d315b65a 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java @@ -1,10 +1,6 @@ package org.tests.inheritance.model; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import javax.persistence.*; @Entity public class CalculationResult { diff --git a/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java index 408d764ff..e28fe6b66 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java +++ b/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java @@ -1,10 +1,6 @@ package org.tests.inheritance.order; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java b/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java index 9a711b781..0d3679d91 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java @@ -2,8 +2,8 @@ package org.tests.insert; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.Customer; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Customer; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java b/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java index c4c0095df..1794098e6 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java @@ -3,7 +3,6 @@ package org.tests.insert; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.DataIntegrityException; -import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; @@ -11,8 +10,6 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import javax.persistence.PersistenceException; - import static org.junit.jupiter.api.Assertions.assertThrows; public class TestInsertDataIntegrityException extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java b/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java index 87a427a65..8682874dc 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java @@ -1,10 +1,9 @@ package org.tests.insert; import io.ebean.BaseTestCase; -import io.ebean.DuplicateKeyException; import io.ebean.DB; +import io.ebean.DuplicateKeyException; import io.ebean.annotation.Transactional; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java b/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java index 0615e42f6..436f2e6b4 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java @@ -2,9 +2,9 @@ package org.tests.insert; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.orderentity.OrderEntity; import org.tests.model.orderentity.OrderItemEntity; -import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java b/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java index fb2af986b..4b57bede3 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java +++ b/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java @@ -2,7 +2,6 @@ package org.tests.iud; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.PagedList; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java b/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java index d478dcbeb..b86cc5e5c 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java +++ b/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java @@ -2,9 +2,9 @@ package org.tests.iud; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.info.InfoCompany; import org.tests.model.info.InfoCustomer; -import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java b/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java index 306f1cdbc..3741a2d55 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java +++ b/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java @@ -3,8 +3,8 @@ package org.tests.iud; import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; -import org.tests.model.basic.EBasicVer; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicVer; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java index 7fd2ee8ce..ff9c3216c 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java @@ -10,11 +10,7 @@ import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistRequest; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; -import org.tests.model.json.EBasicJsonJackson3; -import org.tests.model.json.EBasicJsonList; -import org.tests.model.json.EBasicJsonMulti; -import org.tests.model.json.PlainBean; -import org.tests.model.json.PlainBeanDirtyAware; +import org.tests.model.json.*; import java.util.Arrays; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java index 984cf4454..ce84f08b3 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java @@ -4,18 +4,14 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import io.ebean.text.TextException; import io.ebean.test.LoggedSql; +import io.ebean.text.TextException; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonList; import org.tests.model.json.PlainBean; import javax.persistence.PersistenceException; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java index ffbe90185..e186de792 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java @@ -3,10 +3,10 @@ package org.tests.json; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import io.ebean.text.json.EJson; import io.ebean.test.LoggedSql; -import org.tests.model.json.EBasicJsonMap; +import io.ebean.text.json.EJson; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonMap; import org.tests.model.json.EBasicJsonMapDetail; import java.io.IOException; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java index 0fc2ff68c..d73f27625 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java @@ -3,8 +3,8 @@ package org.tests.json; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; -import org.tests.model.json.EBasicJsonMapBlob; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonMapBlob; import java.io.IOException; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java index fb69a3e53..c87ad37f4 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java @@ -3,8 +3,8 @@ package org.tests.json; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; -import org.tests.model.json.EBasicJsonMapClob; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonMapClob; import java.io.IOException; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java index 76226c209..66e28b5f9 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java @@ -3,8 +3,8 @@ package org.tests.json; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; -import org.tests.model.json.EBasicJsonMapJsonB; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonMapJsonB; import java.io.IOException; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java index 46ced092a..551040e72 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java @@ -3,8 +3,8 @@ package org.tests.json; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; -import org.tests.model.json.EBasicJsonMapVarchar; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonMapVarchar; import java.io.IOException; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java index 48a78a3ce..77bdfbb1c 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java @@ -3,24 +3,21 @@ package org.tests.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.json.EBasicJsonNode; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringWriter; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.*; public class TestJsonNodeBasic extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java index c910a5115..0e349ff26 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java @@ -1,11 +1,11 @@ package org.tests.json; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import org.tests.model.json.EBasicJsonNodeBlob; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import io.ebean.BaseTestCase; +import io.ebean.DB; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonNodeBlob; import java.io.IOException; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java index 292dc2807..f863981f6 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java @@ -1,11 +1,11 @@ package org.tests.json; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import org.tests.model.json.EBasicJsonNodeJsonB; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import io.ebean.BaseTestCase; +import io.ebean.DB; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonNodeJsonB; import java.io.IOException; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java index 105e0eacd..c2de2026a 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java @@ -1,11 +1,11 @@ package org.tests.json; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import org.tests.model.json.EBasicJsonNodeVarchar; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import io.ebean.BaseTestCase; +import io.ebean.DB; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonNodeVarchar; import java.io.IOException; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java b/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java index 6f483933b..4ab61389b 100644 --- a/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java +++ b/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java @@ -2,8 +2,8 @@ package org.tests.json; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.json.EBasicJsonUnmapped; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonUnmapped; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java index 8186ba1b5..dcab59dcf 100644 --- a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java +++ b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java @@ -3,8 +3,8 @@ package org.tests.json.include; import io.ebean.DB; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; -import org.tests.model.basic.Order; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; import java.util.ArrayList; diff --git a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java index 5bc591256..846717a3c 100644 --- a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java +++ b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java @@ -3,8 +3,8 @@ package org.tests.json.include; import io.ebean.DB; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; -import org.tests.model.json.EBasicJsonMap; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonMap; import java.util.LinkedHashMap; diff --git a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java index e674504bb..5a24b7539 100644 --- a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java +++ b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java @@ -3,8 +3,8 @@ package org.tests.json.include; import io.ebean.DB; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; -import org.tests.model.basic.AttributeHolder; import org.junit.jupiter.api.Test; +import org.tests.model.basic.AttributeHolder; import java.util.LinkedHashSet; diff --git a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeNull.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeNull.java index ed1b5b9b8..5da6413bf 100644 --- a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeNull.java +++ b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeNull.java @@ -3,8 +3,8 @@ package org.tests.json.include; import io.ebean.DB; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; -import org.tests.json.transientproperties.EJsonTransientObject; import org.junit.jupiter.api.Test; +import org.tests.json.transientproperties.EJsonTransientObject; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java index 1047a5dcf..03f7ac156 100644 --- a/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java +++ b/ebean-test/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java @@ -4,9 +4,9 @@ import io.ebean.DB; import io.ebean.config.JsonConfig; import io.ebean.text.PathProperties; import io.ebean.text.json.JsonWriteOptions; +import org.junit.jupiter.api.Test; import org.tests.json.transientproperties.EJsonTransientEntityList; import org.tests.json.transientproperties.EJsonTransientList; -import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java index c835041c2..a3d937a77 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java @@ -1,7 +1,7 @@ package org.tests.json.transientproperties; -import io.ebean.annotation.Sql; import com.fasterxml.jackson.annotation.JsonIgnore; +import io.ebean.annotation.Sql; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java index 6b4740512..5da5ffdbf 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java @@ -2,11 +2,7 @@ package org.tests.lazyforeignkeys; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java index 76baa16fa..9d88e84ed 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java @@ -2,10 +2,9 @@ package org.tests.lazyforeignkeys; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.Query; -import io.ebean.text.PathProperties; import io.ebean.test.LoggedSql; +import io.ebean.text.PathProperties; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/level/Level1.java b/ebean-test/src/test/java/org/tests/level/Level1.java index 4ddd33314..16f79a6ee 100644 --- a/ebean-test/src/test/java/org/tests/level/Level1.java +++ b/ebean-test/src/test/java/org/tests/level/Level1.java @@ -1,11 +1,6 @@ package org.tests.level; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import javax.persistence.*; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/level/Level2.java b/ebean-test/src/test/java/org/tests/level/Level2.java index d49732c0c..76d1339f4 100644 --- a/ebean-test/src/test/java/org/tests/level/Level2.java +++ b/ebean-test/src/test/java/org/tests/level/Level2.java @@ -1,11 +1,6 @@ package org.tests.level; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java b/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java index aa1ce507e..73675df63 100644 --- a/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java +++ b/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java @@ -2,11 +2,11 @@ package org.tests.level.test; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.level.Level1; import org.tests.level.Level2; import org.tests.level.Level3; import org.tests.level.Level4; -import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java index 452998032..9700a1229 100644 --- a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java +++ b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java @@ -4,8 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; -import org.tests.model.basic.EBasicWithLifecycle; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicWithLifecycle; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java index b3bd52fa2..48efd17ec 100644 --- a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java +++ b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java @@ -2,14 +2,13 @@ package org.tests.lifecycle; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.EBasicWithLifecycleExceptions; import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThatThrownBy; - -import java.io.IOException; +import org.tests.model.basic.EBasicWithLifecycleExceptions; import javax.persistence.PersistenceException; +import java.io.IOException; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; public class TestLifecycleExceptions extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java index 97b07b941..67841cff6 100644 --- a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java +++ b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java @@ -1,16 +1,15 @@ package org.tests.lifecycle; -import static org.assertj.core.api.Assertions.assertThat; - -import java.util.Arrays; -import java.util.List; - +import io.ebean.BaseTestCase; +import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicLog; import org.tests.model.basic.EBasicWithLog; -import io.ebean.BaseTestCase; -import io.ebean.DB; +import java.util.Arrays; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; public class TestLifecycleWithLog extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java index 0011b53bc..b60af0b06 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java @@ -2,10 +2,10 @@ package org.tests.m2m; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.m2m.Permission; import org.tests.model.m2m.Role; import org.tests.model.m2m.Tenant; -import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java index 2dbfa06f0..6d996c61c 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java @@ -2,9 +2,9 @@ package org.tests.m2m; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java index fbe5ca783..425ae3812 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java @@ -2,9 +2,9 @@ package org.tests.m2m; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.m2m.MailBox; import org.tests.model.m2m.MailUser; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java index 5d5c85ca7..0cd6ca95d 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java @@ -2,8 +2,8 @@ package org.tests.m2m; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.m2m.MnyTopic; import org.junit.jupiter.api.Test; +import org.tests.model.m2m.MnyTopic; /** * Added to test DDL generation for ManyToMany related back to itself. diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java index 655537e4b..43928257d 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java @@ -1,12 +1,8 @@ package org.tests.merge; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.FetchPath; -import io.ebean.MergeOptions; -import io.ebean.MergeOptionsBuilder; -import io.ebean.text.PathProperties; +import io.ebean.*; import io.ebean.test.LoggedSql; +import io.ebean.text.PathProperties; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java index afc915bb9..af12d5787 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java @@ -2,11 +2,7 @@ package org.tests.model.aggregation; import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java index e967f3150..58eae294d 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java @@ -2,12 +2,7 @@ package org.tests.model.aggregation; import io.ebean.Model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java index 54c8eb0a4..d88df603d 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java @@ -1,11 +1,6 @@ package org.tests.model.aggregation; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java index d8015931f..66d3677f3 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java @@ -2,12 +2,7 @@ package org.tests.model.aggregation; import io.ebean.Model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java index 6b62e6255..0ff6f57e1 100644 --- a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java +++ b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java @@ -8,11 +8,7 @@ import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; -import java.util.UUID; +import java.util.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java index 0a9f7ffb7..69328ce15 100644 --- a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java +++ b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java @@ -11,11 +11,7 @@ import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; -import java.util.UUID; +import java.util.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Address.java b/ebean-test/src/test/java/org/tests/model/basic/Address.java index 3b68776bd..98234699a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Address.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Address.java @@ -3,12 +3,7 @@ package org.tests.model.basic; import io.ebean.annotation.InvalidateQueryCache; import org.tests.model.basic.metaannotation.SizeMedium; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Animal.java b/ebean-test/src/test/java/org/tests/model/basic/Animal.java index 62e893506..069b1e4cf 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Animal.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Animal.java @@ -1,13 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/model/basic/Attribute.java b/ebean-test/src/test/java/org/tests/model/basic/Attribute.java index 49efb2b6e..d660c93f0 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Attribute.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Attribute.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import javax.persistence.*; @Entity @Inheritance() diff --git a/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java b/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java index 3e18cb56d..9cc71440d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import javax.persistence.*; /** * A user may have multiple bookmarks diff --git a/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java index 36ef22ab8..1b1cb0a81 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java @@ -2,12 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.CascadeType; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Car.java b/ebean-test/src/test/java/org/tests/model/basic/Car.java index 9bf17245e..268920a34 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Car.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Car.java @@ -2,13 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.DbEnumValue; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import javax.persistence.*; import java.util.HashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Contact.java b/ebean-test/src/test/java/org/tests/model/basic/Contact.java index 4612fbf14..883d27d5c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Contact.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Contact.java @@ -1,21 +1,10 @@ package org.tests.model.basic; -import io.ebean.annotation.Cache; -import io.ebean.annotation.ChangeLog; -import io.ebean.annotation.CreatedTimestamp; -import io.ebean.annotation.DocEmbedded; -import io.ebean.annotation.DocStore; import io.ebean.annotation.Index; +import io.ebean.annotation.*; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.sql.Timestamp; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Country.java b/ebean-test/src/test/java/org/tests/model/basic/Country.java index c2de046f1..bde38fc78 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Country.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Country.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import io.ebean.annotation.Cache; -import io.ebean.annotation.CacheBeanTuning; -import io.ebean.annotation.ChangeLog; -import io.ebean.annotation.ChangeLogInsertMode; -import io.ebean.annotation.DocStore; -import io.ebean.annotation.ReadAudit; +import io.ebean.annotation.*; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Customer.java b/ebean-test/src/test/java/org/tests/model/basic/Customer.java index 4f8c7d206..0b4f98539 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Customer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Customer.java @@ -1,24 +1,9 @@ package org.tests.model.basic; -import io.ebean.annotation.Cache; -import io.ebean.annotation.ChangeLog; -import io.ebean.annotation.ChangeLogInsertMode; -import io.ebean.annotation.DbComment; -import io.ebean.annotation.DbEnumValue; -import io.ebean.annotation.DocEmbedded; -import io.ebean.annotation.DocStore; -import io.ebean.annotation.JsonIgnore; -import io.ebean.annotation.Where; +import io.ebean.annotation.*; import org.tests.model.basic.finder.CustomerFinder; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.sql.Date; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasic.java b/ebean-test/src/test/java/org/tests/model/basic/EBasic.java index 278328f92..603102032 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasic.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasic.java @@ -7,7 +7,6 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; import javax.validation.constraints.Size; - import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java index 0ac02e749..214a2447f 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java @@ -1,25 +1,16 @@ package org.tests.model.basic; -import io.ebean.annotation.Cache; -import io.ebean.annotation.ChangeLog; -import io.ebean.annotation.DbJson; -import io.ebean.annotation.ReadAudit; -import io.ebean.annotation.WhenCreated; -import io.ebean.annotation.WhenModified; -import io.ebean.annotation.WhoCreated; -import io.ebean.annotation.WhoModified; +import io.ebean.annotation.*; +import org.tests.model.json.PlainBean; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Version; import javax.validation.constraints.Size; - -import org.tests.model.json.PlainBean; +import java.sql.Timestamp; import static io.ebean.annotation.MutationDetection.SOURCE; -import java.sql.Timestamp; - @Cache(enableQueryCache = true) @ReadAudit @ChangeLog(updatesThatInclude = {"name", "shortDescription", "plainBean"}) @@ -52,7 +43,7 @@ public class EBasicChangeLog { @Version Long version; - + @DbJson(length = 500, mutationDetection = SOURCE) // such that we can rebuild old values PlainBean plainBean; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java index b95d56bf8..4ae5a6b1d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Version; +import javax.persistence.*; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java index 31cbcab7a..3fb5cc9e4 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java @@ -2,11 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Encrypted; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; import java.sql.Date; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java index bd13f97e2..77c6b2f2b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java @@ -2,11 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Encrypted; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java index 64426c075..f77af37f5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java @@ -2,12 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Encrypted; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.time.LocalDate; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java index f375b9823..44902ed31 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java @@ -6,17 +6,7 @@ import io.ebean.annotation.PreSoftDelete; import io.ebean.annotation.SoftDelete; import javax.annotation.PostConstruct; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "e_basic_withlife") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java index 76c1f00f0..e5df815e9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java @@ -5,17 +5,7 @@ import io.ebean.annotation.PreSoftDelete; import io.ebean.annotation.SoftDelete; import javax.annotation.PostConstruct; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "e_basic_with_ex") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java index 3ff7634f0..eee062e94 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java @@ -6,17 +6,7 @@ import io.ebean.annotation.PreSoftDelete; import io.ebean.annotation.SoftDelete; import javax.annotation.PostConstruct; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "e_basic_withlog") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java index 4766414dc..20a1326b2 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java @@ -1,13 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/ESimple.java b/ebean-test/src/test/java/org/tests/model/basic/ESimple.java index fdf1aa9e5..a827bc5b4 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ESimple.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ESimple.java @@ -1,10 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import javax.persistence.*; @Entity public class ESimple { diff --git a/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java index 5d9c1aeee..3f426696d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java @@ -1,6 +1,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; + import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java b/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java index bae5aa6dc..3e6ebfaec 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "non_updateprop") diff --git a/ebean-test/src/test/java/org/tests/model/basic/MRole.java b/ebean-test/src/test/java/org/tests/model/basic/MRole.java index 280a91ce0..c66a1db60 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MRole.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MRole.java @@ -1,10 +1,6 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/MUser.java b/ebean-test/src/test/java/org/tests/model/basic/MUser.java index a2e1a701c..7abf2ec60 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MUser.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MUser.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java b/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java index f34eb753d..aa71e9497 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OrderBy; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java b/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java index d189decb2..df731191e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.OneToMany; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java b/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java index 10c1bc385..2534a6ebf 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java @@ -1,10 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import javax.persistence.*; @Entity public class MyLobSizeJoinMany { diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java index 7879b5251..abe945bb5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java @@ -2,12 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java index 1027070cc..ef6acaec8 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java @@ -1,12 +1,12 @@ package org.tests.model.basic; +import io.ebean.annotation.Cache; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.Table; -import io.ebean.annotation.Cache; - /** * Cached entity for inheritance. * diff --git a/ebean-test/src/test/java/org/tests/model/basic/OEngine.java b/ebean-test/src/test/java/org/tests/model/basic/OEngine.java index fc3a4cc8f..cb239a007 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OEngine.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OEngine.java @@ -4,7 +4,6 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; import javax.persistence.Version; - import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java b/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java index 955807fab..9f758cf21 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java @@ -1,11 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; - +import javax.persistence.*; import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java b/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java index 8d4060cc6..6face7896 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java @@ -3,11 +3,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; import io.ebean.annotation.DocEmbedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.io.Serializable; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Person.java b/ebean-test/src/test/java/org/tests/model/basic/Person.java index 39496a703..d58d0f681 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Person.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Person.java @@ -1,14 +1,6 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Phone.java b/ebean-test/src/test/java/org/tests/model/basic/Phone.java index 3ba7b3ebe..736e748af 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Phone.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Phone.java @@ -1,14 +1,6 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Product.java b/ebean-test/src/test/java/org/tests/model/basic/Product.java index 30f5b62b1..60f73475c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Product.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Product.java @@ -1,10 +1,6 @@ package org.tests.model.basic; -import io.ebean.annotation.Cache; -import io.ebean.annotation.CacheQueryTuning; -import io.ebean.annotation.CreatedTimestamp; -import io.ebean.annotation.DocStore; -import io.ebean.annotation.Identity; +import io.ebean.annotation.*; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Section.java b/ebean-test/src/test/java/org/tests/model/basic/Section.java index 6330543d3..039541188 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Section.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Section.java @@ -2,11 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java b/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java index 22551e37a..80c0f8d36 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java @@ -1,10 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; +import javax.persistence.*; @Entity public class TBytesOnly { diff --git a/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java b/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java index db7d3d89c..e71c03998 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java @@ -1,14 +1,8 @@ package org.tests.model.basic; +import javax.persistence.*; import java.io.Serializable; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; - @Entity @Inheritance @DiscriminatorColumn(name = "my_type", length = 3, discriminatorType = DiscriminatorType.INTEGER) diff --git a/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java b/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java index aa3943278..543958ed7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java @@ -1,10 +1,9 @@ package org.tests.model.basic; -import java.io.Serializable; - import javax.persistence.MappedSuperclass; import javax.persistence.Transient; import javax.persistence.Version; +import java.io.Serializable; @MappedSuperclass public class TMappedSuper2 implements Serializable { diff --git a/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java b/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java index 2898ad07e..50667a784 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java @@ -3,12 +3,7 @@ package org.tests.model.basic; import io.ebean.annotation.Index; import io.ebean.annotation.Platform; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.Size; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java b/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java index 7861490ff..6ef9960ba 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java @@ -1,12 +1,6 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Truck.java b/ebean-test/src/test/java/org/tests/model/basic/Truck.java index 1c7778734..c32d70777 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Truck.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Truck.java @@ -2,11 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.DbEnumValue; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import javax.persistence.*; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java b/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java index 7aa42e28a..07c5fec39 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java @@ -2,12 +2,7 @@ package org.tests.model.basic; import io.ebean.Model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.time.LocalDate; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/UUOne.java b/ebean-test/src/test/java/org/tests/model/basic/UUOne.java index 53c88446a..6a97b4fed 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UUOne.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UUOne.java @@ -2,11 +2,7 @@ package org.tests.model.basic; import io.ebean.annotation.Cache; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java b/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java index f446fe397..1c9116065 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java @@ -1,10 +1,6 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java b/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java index ba5130156..72fbc08cf 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java @@ -1,24 +1,9 @@ package org.tests.model.basic; -import io.ebean.annotation.Cache; -import io.ebean.annotation.ChangeLog; -import io.ebean.annotation.ChangeLogInsertMode; -import io.ebean.annotation.DbComment; -import io.ebean.annotation.DbEnumValue; -import io.ebean.annotation.DocEmbedded; -import io.ebean.annotation.DocStore; -import io.ebean.annotation.JsonIgnore; -import io.ebean.annotation.View; -import io.ebean.annotation.Where; +import io.ebean.annotation.*; import org.tests.model.basic.finder.CustomerFinder; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Transient; +import javax.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.sql.Date; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java index 63e918724..fcfb8479f 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java @@ -1,8 +1,7 @@ package org.tests.model.basic.cache; -import org.tests.model.basic.BasicDomain; - import io.ebean.annotation.Cache; +import org.tests.model.basic.BasicDomain; import javax.persistence.Entity; import javax.persistence.ManyToOne; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java index fb96be1d3..bed1d44ab 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java @@ -1,6 +1,6 @@ package org.tests.model.basic.cache; -import java.util.UUID; +import io.ebean.annotation.Cache; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -8,8 +8,7 @@ import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; - -import io.ebean.annotation.Cache; +import java.util.UUID; @Entity @Cache(enableQueryCache = true, enableBeanCache = false) diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java index 5c9925c35..7c458bd12 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java @@ -1,13 +1,12 @@ package org.tests.model.basic.cache; -import java.util.UUID; +import io.ebean.annotation.Cache; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.validation.constraints.Size; - -import io.ebean.annotation.Cache; +import java.util.UUID; @Entity @Cache(enableQueryCache = true, enableBeanCache = false) diff --git a/ebean-test/src/test/java/org/tests/model/basic/first/First.java b/ebean-test/src/test/java/org/tests/model/basic/first/First.java index 8c848ed10..d6c96c825 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/first/First.java +++ b/ebean-test/src/test/java/org/tests/model/basic/first/First.java @@ -1,10 +1,6 @@ package org.tests.model.basic.first; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "f_first") diff --git a/ebean-test/src/test/java/org/tests/model/basic/first/Second.java b/ebean-test/src/test/java/org/tests/model/basic/first/Second.java index ca015b149..dd3ffd624 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/first/Second.java +++ b/ebean-test/src/test/java/org/tests/model/basic/first/Second.java @@ -1,10 +1,6 @@ package org.tests.model.basic.first; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; @AttributeOverride(name = "name", column = @Column(name = "mod_name")) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java b/ebean-test/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java index ce1d7a68d..5f73cc56c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java +++ b/ebean-test/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java @@ -1,11 +1,7 @@ package org.tests.model.basic.metaannotation; import javax.validation.constraints.Size; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * Meta-Annotation that defines @Size(max=100) diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/DummyDao.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/DummyDao.java index 1c8301889..3f38c166e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/DummyDao.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/DummyDao.java @@ -8,9 +8,7 @@ import io.ebean.annotation.TxType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class DummyDao { diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java index ccbb77d38..c405b9ed7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java @@ -1,11 +1,6 @@ package org.tests.model.basic.xtra; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "td_child") diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java index 5347430fc..1f401072c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java @@ -1,18 +1,7 @@ package org.tests.model.basic.xtra; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java index aec8a8e39..9b9b13028 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java @@ -12,8 +12,6 @@ import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java index e3c57c10d..f8eb5b2a3 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java @@ -1,10 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; import java.util.Objects; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java index ef93cc984..9d4b37f1b 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java @@ -1,10 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import javax.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java index a23eff0d3..99b3143b7 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java @@ -1,10 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import javax.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java index 4d7a84f95..ceda12349 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java @@ -1,6 +1,9 @@ package org.tests.model.bridge; -import javax.persistence.*; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.IdClass; +import javax.persistence.Version; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java b/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java index 0b0520dca..78952eb7a 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java @@ -2,7 +2,6 @@ package org.tests.model.bridge; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.Transaction; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java index d40b26a63..07b3b9a91 100644 --- a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java +++ b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java @@ -1,10 +1,10 @@ package org.tests.model.cache; +import io.ebean.annotation.Cache; + import javax.persistence.Entity; import javax.persistence.Id; -import io.ebean.annotation.Cache; - @Entity @Cache(enableQueryCache = true, enableBeanCache = true) public class M2MCacheChild { @@ -30,4 +30,4 @@ public class M2MCacheChild { this.name = name; } -} \ No newline at end of file +} diff --git a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java index 5eedc2994..d422eb5a4 100644 --- a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java +++ b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java @@ -1,16 +1,11 @@ package org.tests.model.cache; +import io.ebean.annotation.Cache; + +import javax.persistence.*; import java.util.LinkedHashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; - -import io.ebean.annotation.Cache; - @Entity @Cache(enableQueryCache = true, enableBeanCache = true) public class M2MCacheMaster { diff --git a/ebean-test/src/test/java/org/tests/model/carwheel/Car.java b/ebean-test/src/test/java/org/tests/model/carwheel/Car.java index 65981f46b..7da07463b 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheel/Car.java +++ b/ebean-test/src/test/java/org/tests/model/carwheel/Car.java @@ -2,14 +2,7 @@ package org.tests.model.carwheel; import io.ebean.annotation.Aggregation; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java b/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java index 9561cb796..886ea8d53 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java +++ b/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java @@ -1,11 +1,6 @@ package org.tests.model.carwheel; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "sa_tire") diff --git a/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java b/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java index 3390f6dd4..402f90788 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java +++ b/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java @@ -1,14 +1,6 @@ package org.tests.model.carwheel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "sa_wheel") diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java index 988ab4666..3479c3a65 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java @@ -2,15 +2,7 @@ package org.tests.model.carwheeltruck; import io.ebean.annotation.SoftDelete; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; +import javax.persistence.*; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java index 86529a19c..746a2233b 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java @@ -1,11 +1,6 @@ package org.tests.model.carwheeltruck; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import javax.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java index 74f9e8248..d9f917421 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java @@ -2,11 +2,7 @@ package org.tests.model.carwheeltruck; import org.tests.model.basic.EBasic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; import static javax.persistence.CascadeType.ALL; diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java b/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java index 59cd53edb..d19b742db 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java @@ -1,11 +1,6 @@ package org.tests.model.composite; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import javax.persistence.*; @Entity public class CkeClient { diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java b/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java index 2d4456ce9..4a897c1b6 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java @@ -4,7 +4,6 @@ import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Embeddable; import javax.validation.constraints.Size; - import java.util.Objects; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java b/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java index 09939ead3..de55f7c1a 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java @@ -4,7 +4,6 @@ import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Embeddable; import javax.validation.constraints.Size; - import java.util.Objects; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/composite/ROrder.java b/ebean-test/src/test/java/org/tests/model/composite/ROrder.java index 0b543321a..b5b48bcd9 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/ROrder.java +++ b/ebean-test/src/test/java/org/tests/model/composite/ROrder.java @@ -1,13 +1,6 @@ package org.tests.model.composite; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.Size; diff --git a/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java b/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java index 7fe9bcfdf..0caada259 100644 --- a/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java +++ b/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java @@ -3,11 +3,7 @@ package org.tests.model.converstation; import io.ebean.annotation.FetchPreference; import org.tests.model.BaseModel; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java b/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java index 74ffb0e92..4deef720b 100644 --- a/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java +++ b/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java @@ -1,18 +1,16 @@ package org.tests.model.docstore; -import java.util.List; +import io.ebean.annotation.DocStore; +import org.tests.model.basic.Customer; import javax.persistence.DiscriminatorValue; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; - -import org.tests.model.basic.Customer; - -import io.ebean.annotation.DocStore; +import java.util.List; /** * Entity that will stored as JSON in database - * + * * @author Roland Praml, FOCONIS AG * */ diff --git a/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java b/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java index 605ccde9a..194fa8385 100644 --- a/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java +++ b/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java @@ -1,19 +1,18 @@ package org.tests.model.docstore; +import io.ebean.annotation.DocStore; +import org.tests.model.basic.Product; + import javax.persistence.DiscriminatorValue; import javax.persistence.ManyToOne; -import org.tests.model.basic.Product; - -import io.ebean.annotation.DocStore; - @DocStore @DiscriminatorValue("PR") public class ProductReport extends Report { @ManyToOne private Product product; - + public Product getProduct() { return product; } diff --git a/ebean-test/src/test/java/org/tests/model/docstore/Report.java b/ebean-test/src/test/java/org/tests/model/docstore/Report.java index cefcbce10..707a56bd8 100644 --- a/ebean-test/src/test/java/org/tests/model/docstore/Report.java +++ b/ebean-test/src/test/java/org/tests/model/docstore/Report.java @@ -1,32 +1,31 @@ package org.tests.model.docstore; -import java.util.List; +import io.ebean.annotation.DocStore; import javax.persistence.Inheritance; import javax.persistence.OneToMany; - -import io.ebean.annotation.DocStore; +import java.util.List; @DocStore @Inheritance public class Report { private String title; - + @OneToMany private List embeddedReports; - + public void setTitle(String title) { this.title = title; } - + public String getTitle() { return title; } - + public List getEmbeddedReports() { return embeddedReports; } - + public void setEmbeddedReports(List embeddedReports) { this.embeddedReports = embeddedReports; } diff --git a/ebean-test/src/test/java/org/tests/model/draftable/Link.java b/ebean-test/src/test/java/org/tests/model/draftable/Link.java index 956282059..547f3012b 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/Link.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/Link.java @@ -1,11 +1,6 @@ package org.tests.model.draftable; -import io.ebean.annotation.Draft; -import io.ebean.annotation.DraftDirty; -import io.ebean.annotation.DraftReset; -import io.ebean.annotation.Draftable; -import io.ebean.annotation.History; -import io.ebean.annotation.SoftDelete; +import io.ebean.annotation.*; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java index 763b137ab..c41a7540a 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java @@ -2,13 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.annotation.Cache; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java index 29f82cb41..de38b9a11 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java @@ -1,10 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; import static javax.persistence.CascadeType.ALL; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java index c4998d855..03b6cb086 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java @@ -2,12 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.annotation.Cache; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java index 992178c54..b4e2b70d1 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java @@ -2,12 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.annotation.Cache; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java index 8bd280ea1..2dad35c3c 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java @@ -2,14 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.annotation.Cache; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKeyColumn; -import javax.persistence.Transient; -import javax.persistence.Version; - +import javax.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java index 3627b50b5..b3b505068 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java @@ -3,8 +3,8 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.text.json.JsonContext; import io.ebean.test.LoggedSql; +import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java index fe7d326e6..d89cbc311 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java @@ -2,12 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.annotation.Cache; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.MapKeyColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java index f0c854db7..d6661f1e2 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java @@ -1,11 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import javax.persistence.*; import java.util.LinkedHashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java index 4b027fe06..44bd1d576 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java @@ -2,8 +2,8 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.text.json.JsonContext; import io.ebean.test.LoggedSql; +import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java index 5299f4dca..6cf06f282 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java @@ -1,11 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java index 58f3ec21b..750512cc7 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java @@ -1,11 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java index 084a8f1a7..0f3cb85a1 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java @@ -1,11 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java index 3f1e463f1..3fa8ac694 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java @@ -3,8 +3,8 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.PersistBatch; -import io.ebeaninternal.api.SpiEbeanServer; import io.ebean.test.LoggedSql; +import io.ebeaninternal.api.SpiEbeanServer; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java index 3d6eee18f..fef7fb95e 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java @@ -3,8 +3,8 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.PersistBatch; -import io.ebeaninternal.api.SpiEbeanServer; import io.ebean.test.LoggedSql; +import io.ebeaninternal.api.SpiEbeanServer; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java index f08c5a35b..c42510d67 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java @@ -1,10 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "eemb_inner") diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java index 1ae4da057..2f6797c33 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java @@ -1,12 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.CascadeType; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java b/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java index 0b833fdd1..98e3a1733 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java @@ -2,11 +2,7 @@ package org.tests.model.embedded; import io.ebean.annotation.Cache; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; import java.util.Date; @Cache diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EMain.java b/ebean-test/src/test/java/org/tests/model/embedded/EMain.java index 2b5776999..edb13ac1b 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EMain.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EMain.java @@ -1,10 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "e_main") diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java index 8a0c60446..ef5e82a80 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java @@ -1,12 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class EPerson { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java index e4c11d935..b532ceff6 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java @@ -1,12 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class EPerson2 { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java index 78c87ab9b..59e793384 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java @@ -1,12 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class EPerson3 { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java b/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java index ac5f5d6b3..912e95e87 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java @@ -1,10 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class PrimaryRevision { diff --git a/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java b/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java index 9ea2c97a2..621d81885 100644 --- a/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java @@ -3,19 +3,14 @@ package org.tests.model.family; import io.ebean.annotation.Formula; import org.tests.model.basic.EBasic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; @Entity public class GrandParentPerson extends InheritablePerson { private static final long serialVersionUID = 1L; - + @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL) @OrderBy("identifier") private List children = new ArrayList<>(); @@ -41,8 +36,8 @@ public class GrandParentPerson extends InheritablePerson { @ManyToOne(optional = true, fetch = FetchType.EAGER) @Formula(select = "f3.id", join = "left join e_basic f3 on f3.name = ${ta}.family_name") private EBasic basicSameName; - - + + // Demonstrate formula usage @Formula(select = "coalesce(${ta}.some_bean_id,1)") @ManyToOne @@ -84,11 +79,11 @@ public class GrandParentPerson extends InheritablePerson { public EBasic getEffectiveBean() { return effectiveBean; } - + public EBasic getBasicSameName() { return basicSameName; } - + public void setBasicSameName(EBasic basicSameName) { this.basicSameName = basicSameName; } diff --git a/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java b/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java index 36c7fc74f..113e95bc0 100644 --- a/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java @@ -2,11 +2,10 @@ package org.tests.model.family; import org.tests.model.basic.EBasic; -import java.io.Serializable; - import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.MappedSuperclass; +import java.io.Serializable; @MappedSuperclass public abstract class InheritablePerson implements Serializable { diff --git a/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java b/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java index 242721993..4f48c9d33 100644 --- a/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java @@ -3,11 +3,7 @@ package org.tests.model.family; import io.ebean.annotation.Formula; import org.tests.model.basic.EBasic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java b/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java index c2f699723..ea2651039 100644 --- a/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java +++ b/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java @@ -4,11 +4,7 @@ import io.ebean.Finder; import io.ebean.Model; import io.ebean.annotation.JsonIgnore; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java b/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java index 086475b59..bf93c9c58 100644 --- a/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java @@ -3,11 +3,7 @@ package org.tests.model.info; import io.ebean.Finder; import io.ebean.Model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class InfoCustomer extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java index b7b93cd85..e2c052a49 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java +++ b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java @@ -1,10 +1,6 @@ package org.tests.model.inheritexposedtype; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import javax.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java index e0a7b1c2a..395f99a13 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java +++ b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java @@ -2,8 +2,8 @@ package org.tests.model.inheritexposedtype.test; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.inheritexposedtype.IXPhoto; import org.junit.jupiter.api.Test; +import org.tests.model.inheritexposedtype.IXPhoto; public class TestInheritExposeDtype extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java index 553b12fad..f8d38fab5 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java @@ -1,10 +1,6 @@ package org.tests.model.inheritmany; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.OneToMany; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java index d59055c71..95e3b97e8 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java @@ -1,10 +1,6 @@ package org.tests.model.inheritmany; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import javax.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java b/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java index 6cfc52193..0950feaab 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java @@ -1,10 +1,6 @@ package org.tests.model.interfaces; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java b/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java index 61f1f66ff..127eb6162 100644 --- a/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java +++ b/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java @@ -9,9 +9,7 @@ import org.joda.time.Period; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.*; public class TestJodaInsertUpdate extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java index bdfa43add..6a84ff2f7 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java @@ -7,12 +7,7 @@ import io.ebean.annotation.DbJsonB; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Version; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; @Entity public class EBasicJsonJackson { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java index 45a305105..8e801113c 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java @@ -7,12 +7,7 @@ import io.ebean.annotation.DbJsonB; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Version; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; @Entity public class EBasicJsonJackson2 { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java index cee12d9e7..225939bb7 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java @@ -2,7 +2,6 @@ package org.tests.model.json; import io.ebean.Model; import io.ebean.annotation.DbJson; -import io.ebean.annotation.MutationDetection; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java index 520016df9..30e0f502f 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java @@ -2,11 +2,7 @@ package org.tests.model.json; import io.ebean.annotation.DbJson; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java index 23dcd33d9..7e294914d 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java @@ -2,13 +2,11 @@ package org.tests.model.json; import io.ebean.Model; import io.ebean.annotation.DbJson; -import io.ebean.annotation.MutationDetection; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Version; -import static io.ebean.annotation.MutationDetection.NONE; import static io.ebean.annotation.MutationDetection.SOURCE; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java index 7488ac4f8..97ce8bb81 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java @@ -1,7 +1,7 @@ package org.tests.model.json; -import io.ebean.annotation.DbJson; import com.fasterxml.jackson.databind.JsonNode; +import io.ebean.annotation.DbJson; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java index 844ab3569..527dcdfd0 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java @@ -1,8 +1,8 @@ package org.tests.model.json; +import com.fasterxml.jackson.databind.JsonNode; import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -import com.fasterxml.jackson.databind.JsonNode; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java index d0f7016a3..f8f8392dc 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java @@ -1,7 +1,7 @@ package org.tests.model.json; -import io.ebean.annotation.DbJsonB; import com.fasterxml.jackson.databind.JsonNode; +import io.ebean.annotation.DbJsonB; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java index 8acd2c016..c8b2939e3 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java @@ -1,8 +1,8 @@ package org.tests.model.json; +import com.fasterxml.jackson.databind.JsonNode; import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -import com.fasterxml.jackson.databind.JsonNode; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java b/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java index 37e805412..614758a1c 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java @@ -1,13 +1,11 @@ package org.tests.model.json; +import com.fasterxml.jackson.databind.JsonNode; import io.ebean.annotation.DbArray; import io.ebean.annotation.DbJson; import javax.persistence.Entity; import javax.persistence.Id; - -import com.fasterxml.jackson.databind.JsonNode; - import java.util.*; import static io.ebean.annotation.MutationDetection.SOURCE; @@ -25,35 +23,35 @@ public class EBasicOldValue { @DbJson(mutationDetection = SOURCE) Set longSet = new LinkedHashSet<>(); - + @DbJson(mutationDetection = SOURCE) Set intSet = new LinkedHashSet<>(); - + @DbJson(mutationDetection = SOURCE) List stringList = new ArrayList<>(); @DbJson(mutationDetection = SOURCE) List longList = new ArrayList<>(); - + @DbJson(mutationDetection = SOURCE) List intList = new ArrayList<>(); - + @DbJson(mutationDetection = SOURCE) Map objectMap = new LinkedHashMap<>(); @DbJson(mutationDetection = SOURCE) Map longMap = new LinkedHashMap<>(); - + @DbJson(mutationDetection = SOURCE) Map intMap = new LinkedHashMap<>(); @DbJson(mutationDetection = SOURCE) JsonNode jsonNode; - + @DbArray() List stringArr = new ArrayList<>(); - - + + public Long getId() { return id; } @@ -141,15 +139,15 @@ public class EBasicOldValue { public void setIntMap(Map intMap) { this.intMap = intMap; } - + public JsonNode getJsonNode() { return jsonNode; } - + public void setJsonNode(JsonNode jsonNode) { this.jsonNode = jsonNode; } - + public List getStringArr() { return stringArr; } diff --git a/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java index d15c36d49..ff591d427 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java @@ -1,12 +1,12 @@ package org.tests.model.lazywithcache; +import io.ebean.annotation.Cache; + import javax.persistence.Basic; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.Id; -import io.ebean.annotation.Cache; - /** * Class with @Cache and lazy load property. * @@ -16,15 +16,15 @@ import io.ebean.annotation.Cache; @Entity @Cache(enableQueryCache = true) public class ChildWithCache { - + @Id Long id; String name; - + @Basic(fetch = FetchType.LAZY) String address; - + public Long getId() { return id; } @@ -32,7 +32,7 @@ public class ChildWithCache { public void setId(Long id) { this.id = id; } - + public String getName() { return name; } @@ -40,11 +40,11 @@ public class ChildWithCache { public void setName(String name) { this.name = name; } - + public void setAddress(String address) { this.address = address; } - + public String getAddress() { return address; } diff --git a/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java index aa6c04542..380f82c5d 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java @@ -1,9 +1,8 @@ package org.tests.model.lazywithcache; -import org.junit.jupiter.api.Test; - import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java b/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java index 93c374d03..65930791f 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java @@ -1,15 +1,10 @@ package org.tests.model.lazywithid; -import java.util.List; - -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; - import io.ebean.common.BeanList; +import javax.persistence.*; +import java.util.List; + @Entity public class Tune { diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java b/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java index 3dba93d6b..2f51929df 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java @@ -1,11 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java index 2e86cb9df..28e7636a4 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java @@ -1,11 +1,11 @@ package org.tests.model.m2m; +import io.ebean.annotation.Index; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToOne; -import io.ebean.annotation.Index; - @Entity @Index(unique = true, columnNames = { "from_id", "to_id" }) @Index(unique = true, columnNames = { "to_id", "from_id" }) diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java index 3f9a8d347..edbd87cc0 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java @@ -1,15 +1,10 @@ package org.tests.model.m2m; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; - import io.ebean.annotation.Identity; import io.ebean.annotation.Platform; import io.ebean.annotation.Where; +import javax.persistence.*; import java.util.List; @Identity(start = 1000) diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java index 02e751024..e4710130c 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java @@ -1,11 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/Permission.java b/ebean-test/src/test/java/org/tests/model/m2m/Permission.java index 517a56882..2bf201542 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/Permission.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/Permission.java @@ -2,11 +2,7 @@ package org.tests.model.m2m; import io.ebean.annotation.Cache; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/Role.java b/ebean-test/src/test/java/org/tests/model/m2m/Role.java index 0a2b13703..1b32e7ef9 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/Role.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/Role.java @@ -1,13 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java b/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java index 9a740f54a..32db7e352 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java @@ -1,12 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java index 62e5e64a7..0525c0896 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java @@ -1,14 +1,13 @@ package org.tests.model.m2m; -import static org.assertj.core.api.Assertions.assertThat; - -import java.util.List; - -import org.junit.jupiter.api.Test; - import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; /** * Tests M2M with complex where queries. diff --git a/ebean-test/src/test/java/org/tests/model/m2o/Empl.java b/ebean-test/src/test/java/org/tests/model/m2o/Empl.java index 6341bd725..bf9b5b2c7 100644 --- a/ebean-test/src/test/java/org/tests/model/m2o/Empl.java +++ b/ebean-test/src/test/java/org/tests/model/m2o/Empl.java @@ -1,10 +1,6 @@ package org.tests.model.m2o; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java index 1ac972597..f93459556 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java @@ -2,7 +2,6 @@ package org.tests.model.nofk; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import org.junit.jupiter.api.BeforeEach; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java index 767a5b86f..e27df52db 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java @@ -2,7 +2,6 @@ package org.tests.model.nofk; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.SqlRow; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java index 744b1fd6c..108c91a94 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java @@ -3,11 +3,7 @@ package org.tests.model.onetoone; import io.ebean.annotation.Identity; import io.ebean.annotation.IdentityGenerated; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.*; @Identity(generated = IdentityGenerated.BY_DEFAULT) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java index 43e968ef0..d9a694476 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java @@ -1,10 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import javax.persistence.*; @Entity public class OtoBMaster { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java index 50f5efad6..49d6eb502 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java @@ -1,10 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class OtoCust { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java index 33adbd04a..3c1cbc193 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java @@ -1,11 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class OtoPrime { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java index 95e5f947c..6dea4f146 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java @@ -2,11 +2,7 @@ package org.tests.model.onetoone; import io.ebean.Finder; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class OtoSdMaster { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java index 0a87366fa..df14dee01 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java @@ -1,10 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java index a8da23578..e4371304f 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java @@ -2,11 +2,7 @@ package org.tests.model.onetoone; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java index dabab0825..58a9b06a9 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java @@ -1,12 +1,12 @@ package org.tests.model.onetoone; +import org.tests.model.BaseModel; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.OneToOne; import javax.persistence.Table; -import org.tests.model.BaseModel; - @Entity @Table(name = "oto_user_model") public class OtoUser extends BaseModel { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java index 65dd701b0..9b21ba440 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java @@ -1,10 +1,10 @@ package org.tests.model.onetoone; +import org.tests.model.BaseModel; + import javax.persistence.Entity; import javax.persistence.Table; -import org.tests.model.BaseModel; - @Entity @Table(name = "oto_user_model_optional") public class OtoUserOptional extends BaseModel { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java index 01b3cca80..a15ba6a15 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java @@ -4,7 +4,6 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; - import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java b/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java index 2a1e032dc..d131ed6d8 100644 --- a/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java +++ b/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java @@ -1,14 +1,7 @@ package org.tests.model.orderentity; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java b/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java index d1d40961c..eb8543c64 100644 --- a/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java +++ b/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java @@ -1,13 +1,7 @@ package org.tests.model.orderentity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.math.BigDecimal; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java index cd443a84c..96384d261 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java @@ -2,13 +2,8 @@ package org.tests.model.orphanremoval; import io.ebean.annotation.Cache; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.util.List; @Cache diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java index 09338bdda..9565a6a42 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java @@ -2,13 +2,8 @@ package org.tests.model.orphanremoval; import io.ebean.annotation.Cache; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.util.List; @Cache diff --git a/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java b/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java index 76c229d92..de541ec3c 100644 --- a/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java +++ b/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java @@ -1,12 +1,6 @@ package org.tests.model.prnt; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class MPrinter { diff --git a/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java b/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java index 9d6657043..3bef094f5 100644 --- a/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java +++ b/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java @@ -1,11 +1,6 @@ package org.tests.model.prnt; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class MPrinterState { diff --git a/ebean-test/src/test/java/org/tests/model/pview/Pview.java b/ebean-test/src/test/java/org/tests/model/pview/Pview.java index e3445c396..a985fb76c 100644 --- a/ebean-test/src/test/java/org/tests/model/pview/Pview.java +++ b/ebean-test/src/test/java/org/tests/model/pview/Pview.java @@ -1,15 +1,6 @@ package org.tests.model.pview; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/pview/Wview.java b/ebean-test/src/test/java/org/tests/model/pview/Wview.java index 364b73bf0..10f8b6237 100644 --- a/ebean-test/src/test/java/org/tests/model/pview/Wview.java +++ b/ebean-test/src/test/java/org/tests/model/pview/Wview.java @@ -1,12 +1,7 @@ package org.tests.model.pview; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java b/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java index fa96461c1..80cbd64c8 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java @@ -3,7 +3,6 @@ package org.tests.model.selfref; import javax.persistence.Column; import javax.persistence.Id; import javax.persistence.MappedSuperclass; - import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java b/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java index 3be5e7674..2efff0071 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java @@ -1,13 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.HashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java index 0e94da293..7999dcb80 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java @@ -1,11 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java index 73e7aab1c..f29430aed 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java @@ -1,10 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "self_ref_customer") diff --git a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java index 09a6ab1dc..2e054e5ad 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java @@ -1,11 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/site/Site.java b/ebean-test/src/test/java/org/tests/model/site/Site.java index ce5c12594..1b950f821 100644 --- a/ebean-test/src/test/java/org/tests/model/site/Site.java +++ b/ebean-test/src/test/java/org/tests/model/site/Site.java @@ -2,12 +2,7 @@ package org.tests.model.site; import io.ebean.Model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java index 249f6dfea..1c50b91dc 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java @@ -1,10 +1,6 @@ package org.tests.model.softdelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java index 3ecd9b044..6de682429 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java @@ -2,11 +2,7 @@ package org.tests.model.softdelete; import io.ebean.annotation.SoftDelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class ESoftDelOneA { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java index fbc3f9964..8b9ce71e7 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java @@ -2,7 +2,10 @@ package org.tests.model.softdelete; import io.ebean.annotation.SoftDelete; -import javax.persistence.*; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java index a65cc75c1..608343d56 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java @@ -2,7 +2,10 @@ package org.tests.model.softdelete; import io.ebean.annotation.SoftDelete; -import javax.persistence.*; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; @Entity public class ESoftDelY { diff --git a/ebean-test/src/test/java/org/tests/model/survey/Category.java b/ebean-test/src/test/java/org/tests/model/survey/Category.java index c31b63550..9cbeca792 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Category.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Category.java @@ -1,12 +1,6 @@ package org.tests.model.survey; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import javax.persistence.*; import java.util.List; @Entity @@ -41,7 +35,7 @@ public class Category { public void setSequenceNumber(int number) { this.sequenceNumber = number; } - + public int getSequenceNumber() { return sequenceNumber; } diff --git a/ebean-test/src/test/java/org/tests/model/survey/Group.java b/ebean-test/src/test/java/org/tests/model/survey/Group.java index dcbc3fe83..5b1fb9e99 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Group.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Group.java @@ -1,13 +1,6 @@ package org.tests.model.survey; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; @@ -44,7 +37,7 @@ public class Group { public void setSequenceNumber(int number) { this.sequenceNumber = number; } - + public int getSequenceNumber() { return sequenceNumber; } diff --git a/ebean-test/src/test/java/org/tests/model/survey/Survey.java b/ebean-test/src/test/java/org/tests/model/survey/Survey.java index 645ca9a50..328dd2ab2 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Survey.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Survey.java @@ -1,10 +1,6 @@ package org.tests.model.survey; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java b/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java index f69ad23fe..896d5a147 100644 --- a/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java +++ b/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java @@ -2,12 +2,7 @@ package org.tests.model.tevent; import io.ebean.annotation.Aggregation; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java b/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java index 2397279cd..2596dbcba 100644 --- a/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java +++ b/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java @@ -6,21 +6,7 @@ import javax.persistence.Id; import javax.persistence.Version; import java.nio.file.Path; import java.sql.Date; -import java.time.DayOfWeek; -import java.time.Duration; -import java.time.Instant; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.Month; -import java.time.MonthDay; -import java.time.OffsetDateTime; -import java.time.Period; -import java.time.Year; -import java.time.YearMonth; -import java.time.ZoneId; -import java.time.ZoneOffset; -import java.time.ZonedDateTime; +import java.time.*; @Entity public class SomeNewTypesBean { diff --git a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java index 7fa10caea..dd28ae184 100644 --- a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java +++ b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java @@ -4,11 +4,7 @@ import io.ebean.Finder; import io.ebean.Model; import io.ebean.annotation.SoftDelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import javax.persistence.*; import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/version/VersionChild.java b/ebean-test/src/test/java/org/tests/model/version/VersionChild.java index 03e4725b1..26223b801 100644 --- a/ebean-test/src/test/java/org/tests/model/version/VersionChild.java +++ b/ebean-test/src/test/java/org/tests/model/version/VersionChild.java @@ -1,12 +1,6 @@ package org.tests.model.version; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/version/VersionParent.java b/ebean-test/src/test/java/org/tests/model/version/VersionParent.java index 288992225..fdcce6782 100644 --- a/ebean-test/src/test/java/org/tests/model/version/VersionParent.java +++ b/ebean-test/src/test/java/org/tests/model/version/VersionParent.java @@ -1,11 +1,6 @@ package org.tests.model.version; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Version; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java b/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java index 8a38ef15c..1700e0f2d 100644 --- a/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java +++ b/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java @@ -4,11 +4,7 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.View; import org.tests.model.basic.Order; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import javax.persistence.*; @Cache(enableQueryCache = true) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/zero/WithZero.java b/ebean-test/src/test/java/org/tests/model/zero/WithZero.java index 460478d16..3f961f85e 100644 --- a/ebean-test/src/test/java/org/tests/model/zero/WithZero.java +++ b/ebean-test/src/test/java/org/tests/model/zero/WithZero.java @@ -1,10 +1,6 @@ package org.tests.model.zero; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import javax.persistence.*; @Entity public class WithZero { diff --git a/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java b/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java index 610e747c8..c6ea43821 100644 --- a/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java +++ b/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java @@ -1,11 +1,6 @@ package org.tests.model.zero; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java b/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java index 15b117bd0..76f23c86a 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java +++ b/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java @@ -1,12 +1,11 @@ package org.tests.o2m; +import io.ebean.annotation.Where; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Version; - -import io.ebean.annotation.Where; - import java.util.List; import static javax.persistence.CascadeType.ALL; diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java index 9ca312ce8..c1d7b40b6 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java @@ -8,9 +8,7 @@ import org.junit.jupiter.api.Test; import java.util.UUID; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestOneToManyOnlyBean extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java index 5e63429b3..e60142a8f 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java @@ -3,7 +3,6 @@ package org.tests.o2m; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; - import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java index 496782f2b..4e335aa0c 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java @@ -1,11 +1,6 @@ package org.tests.o2m.jointable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java index 66a2e3474..5782c220f 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java @@ -1,12 +1,6 @@ package org.tests.o2m.jointable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java index 06a4b79eb..db64e6be2 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java @@ -1,11 +1,6 @@ package org.tests.o2m.jointable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java index eb22888d3..9413f6cfd 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java @@ -3,7 +3,6 @@ package org.tests.o2m.jointable; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.config.dbplatform.IdType; - import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.o2m.jointable.inheritance.ClassA; diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java index e86bd344c..ee58d1964 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java @@ -2,7 +2,6 @@ package org.tests.o2m.jointable; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java index 08d3bbf54..2b62d81bf 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java @@ -2,12 +2,7 @@ package org.tests.o2m.jointable.inheritance; import org.tests.o2m.jointable.JtMonkey; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; +import javax.persistence.*; import java.util.List; @Inheritance diff --git a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java index 6e35c1e17..b5b18eb6d 100644 --- a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java +++ b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java @@ -1,10 +1,6 @@ package org.tests.o2m.lazy; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java index 52d428d07..8195d1757 100644 --- a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java +++ b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java @@ -1,11 +1,6 @@ package org.tests.o2m.lazy; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java b/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java index 47a2f6ed5..4e1751cab 100644 --- a/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java +++ b/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java @@ -1,11 +1,6 @@ package org.tests.order; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java b/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java index b98e9f2eb..19ea3481c 100644 --- a/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java +++ b/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java @@ -2,12 +2,7 @@ package org.tests.order; import io.ebean.annotation.Index; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.MappedSuperclass; +import javax.persistence.*; @Entity @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java index 0a5eaeed9..aa4971107 100644 --- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java +++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java @@ -3,8 +3,8 @@ package org.tests.persistencecontext; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; -import org.tests.model.basic.EBasic; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasic; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java index ef94d337b..235976ee4 100644 --- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java +++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java @@ -2,7 +2,6 @@ package org.tests.persistencecontext; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java index f1658ada9..81aed21f8 100644 --- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java +++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java @@ -2,10 +2,10 @@ package org.tests.persistencecontext; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashSet; diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java index 62faa4694..67fc1d549 100644 --- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java +++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java @@ -1,10 +1,6 @@ package org.tests.persistencecontext; -import io.ebean.BaseTestCase; -import io.ebean.Database; -import io.ebean.DatabaseFactory; -import io.ebean.PersistenceContextScope; -import io.ebean.Query; +import io.ebean.*; import io.ebean.config.ContainerConfig; import io.ebean.config.DatabaseConfig; import io.ebeaninternal.api.SpiEbeanServer; diff --git a/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java b/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java index a2c930ee5..52a3dd791 100644 --- a/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java +++ b/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java @@ -6,16 +6,16 @@ import io.ebean.Query; import io.ebean.bean.ObjectGraphNode; import io.ebean.bean.ObjectGraphOrigin; import io.ebeaninternal.api.SpiQuery; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThat; import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; + public class TestAutofetchTuneWithJoin extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java b/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java index 2fcf67d61..d12e052ff 100644 --- a/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java +++ b/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java @@ -3,8 +3,8 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.tests.model.basic.Customer; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Customer; import static org.junit.jupiter.api.Assertions.fail; diff --git a/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java b/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java index 92d3de1d3..0328af33f 100644 --- a/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java +++ b/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java @@ -4,8 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Query; -import org.tests.model.basic.MyLobSize; import org.junit.jupiter.api.Test; +import org.tests.model.basic.MyLobSize; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/query/TestIContains.java b/ebean-test/src/test/java/org/tests/query/TestIContains.java index 346fe17a9..c014aace4 100644 --- a/ebean-test/src/test/java/org/tests/query/TestIContains.java +++ b/ebean-test/src/test/java/org/tests/query/TestIContains.java @@ -1,14 +1,10 @@ package org.tests.query; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java b/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java index e593402f6..52442979c 100644 --- a/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java +++ b/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java @@ -2,9 +2,9 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java b/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java index d33edf7bb..4fa4d5685 100644 --- a/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java +++ b/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java @@ -3,11 +3,11 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java b/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java index 4d10df1be..0b51c347d 100644 --- a/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java +++ b/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java @@ -1,15 +1,10 @@ package org.tests.query; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MyAdHoc; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestMyAdHocSqlSelect extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java b/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java index 139a762c1..47db41e2c 100644 --- a/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java +++ b/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java @@ -3,10 +3,10 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.concurrent.atomic.AtomicInteger; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java index 004b58021..aa1592787 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java @@ -4,11 +4,11 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.OrderShipment; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java index 683c926c6..cf840ba25 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java @@ -2,12 +2,8 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.Contact; -import org.tests.model.basic.ContactNote; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.ResetBasicData; import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java index 1142cf761..f47d9da52 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java @@ -2,8 +2,8 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.MUser; import org.junit.jupiter.api.Test; +import org.tests.model.basic.MUser; public class TestQueryFilterManyOnM2M extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java index 042082dcb..de9b567df 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java @@ -2,14 +2,9 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; import io.ebean.Query; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.OrderDetail; -import org.tests.model.basic.Product; -import org.tests.model.basic.ResetBasicData; import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java index e0aee3b11..7864838ff 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java @@ -2,11 +2,10 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.sql.Date; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java index 0af842ade..9dce80a77 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java @@ -6,8 +6,8 @@ import io.ebean.Query; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.bean.PersistenceContext; -import io.ebeaninternal.api.SpiTransaction; import io.ebean.test.LoggedSql; +import io.ebeaninternal.api.SpiTransaction; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,7 +18,6 @@ import org.tests.model.basic.ResetBasicData; import org.tests.o2m.OmBasicChild; import org.tests.o2m.OmBasicParent; -import javax.persistence.PersistenceException; import java.util.List; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java index c7a2dbb98..d444d54e0 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java @@ -2,7 +2,6 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; import io.ebean.Query; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java index 57a04439c..2a05cb16d 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java @@ -4,9 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.FutureList; import io.ebean.Transaction; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; import java.util.concurrent.TimeUnit; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java index e9e4637db..b3c229f71 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java @@ -4,8 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.FetchConfig; import io.ebean.PagedList; -import org.assertj.core.util.Lists; import io.ebean.test.LoggedSql; +import org.assertj.core.util.Lists; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java b/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java index 7af8308af..77a3088cc 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java @@ -3,10 +3,10 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java b/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java index ff3a7b1a6..f93a9e450 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java @@ -3,11 +3,10 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import org.tests.model.m2m.Role; -import org.junit.jupiter.api.Test; - import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java b/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java index 0c75084b6..fa478dd20 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java @@ -2,11 +2,10 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java b/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java index 6fe7a9771..171df676f 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java @@ -2,10 +2,10 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java b/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java index fb3a03d44..a67aaec76 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java @@ -3,9 +3,9 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java b/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java index 7432639a8..c48c11f87 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java @@ -3,9 +3,9 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java b/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java index c9f5c8bb3..f98a0c04d 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java @@ -6,8 +6,6 @@ import io.ebean.Query; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; -import static org.assertj.core.api.Assertions.assertThat; - public class TestQueryOrderById extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java b/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java index f00a6d282..1d41c026e 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java @@ -2,9 +2,9 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java b/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java index 2d5187d6f..fb1fac598 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java @@ -3,9 +3,9 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java b/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java index bb1a9f94a..5b0e4c931 100644 --- a/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java +++ b/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java @@ -2,10 +2,10 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java b/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java index a81957b7e..8b2ed0939 100644 --- a/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java +++ b/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java @@ -2,10 +2,9 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; public class TestThreeLevelQueryJoin extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java b/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java index 255bf18d3..ebb5ce146 100644 --- a/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java +++ b/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java @@ -2,7 +2,6 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.Expr; import io.ebean.Query; import io.ebean.annotation.ForPlatform; diff --git a/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java b/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java index 2c0487e6b..2595c5bfb 100644 --- a/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java +++ b/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java @@ -5,11 +5,7 @@ import io.ebean.DB; import io.ebean.ProfileLocation; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Address; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.OrderDetail; -import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.*; import java.util.List; import java.util.Random; diff --git a/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java b/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java index 9038bb56f..53d8f95e8 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java +++ b/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java @@ -1,10 +1,6 @@ package org.tests.query.cache; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import javax.persistence.*; import javax.validation.constraints.NotNull; @Entity @@ -45,4 +41,4 @@ public class AclContainerRelation { this.aclEntry = aclEntry; } -} \ No newline at end of file +} diff --git a/ebean-test/src/test/java/org/tests/query/cache/Contract.java b/ebean-test/src/test/java/org/tests/query/cache/Contract.java index 795fbb466..344a09be6 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/Contract.java +++ b/ebean-test/src/test/java/org/tests/query/cache/Contract.java @@ -1,12 +1,7 @@ package org.tests.query.cache; import javax.annotation.Nonnull; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/cache/Position.java b/ebean-test/src/test/java/org/tests/query/cache/Position.java index 3d1060fd4..288582d0d 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/Position.java +++ b/ebean-test/src/test/java/org/tests/query/cache/Position.java @@ -1,10 +1,6 @@ package org.tests.query.cache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Table(name = "e_position") diff --git a/ebean-test/src/test/java/org/tests/query/cancel/SlowDownEBasic.java b/ebean-test/src/test/java/org/tests/query/cancel/SlowDownEBasic.java index 7a56f46d5..bace1ccb9 100644 --- a/ebean-test/src/test/java/org/tests/query/cancel/SlowDownEBasic.java +++ b/ebean-test/src/test/java/org/tests/query/cancel/SlowDownEBasic.java @@ -1,14 +1,13 @@ package org.tests.query.cancel; +import io.ebean.DB; +import io.ebean.Transaction; +import org.h2.api.Trigger; + import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; -import org.h2.api.Trigger; - -import io.ebean.DB; -import io.ebean.Transaction; - /** * Class to artificially slow down selects on 'e_basic' table */ diff --git a/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java index dfb1ab580..eb065149e 100644 --- a/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java +++ b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java @@ -1,9 +1,13 @@ package org.tests.query.cancel; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.jupiter.api.Assertions.assertThrows; +import io.ebean.*; +import io.ebean.annotation.ForPlatform; +import io.ebean.annotation.Platform; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasic; +import javax.persistence.PersistenceException; import java.sql.SQLException; import java.util.UUID; import java.util.concurrent.ExecutionException; @@ -11,20 +15,9 @@ import java.util.concurrent.Future; import java.util.function.Consumer; import java.util.function.Function; -import javax.persistence.PersistenceException; - -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.tests.model.basic.EBasic; - -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.DtoQuery; -import io.ebean.Query; -import io.ebean.QueryIterator; -import io.ebean.SqlQuery; -import io.ebean.annotation.ForPlatform; -import io.ebean.annotation.Platform; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Tests, if all kind of queries are cancelable. There are two ways how to diff --git a/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java b/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java index 6a174e792..9291cde2e 100644 --- a/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java +++ b/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java @@ -6,10 +6,10 @@ import io.ebean.Database; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.EAddress; import org.tests.model.embedded.EInvoice; import org.tests.model.embedded.EInvoice.State; -import org.junit.jupiter.api.Test; import java.util.Date; diff --git a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java index af7d6cdf0..85e43db88 100644 --- a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java +++ b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java @@ -3,13 +3,7 @@ package org.tests.query.finder; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.meta.MetaQueryMetric; -import io.ebean.meta.MetaQueryPlan; -import io.ebean.meta.MetaTimedMetric; -import io.ebean.meta.QueryPlanInit; -import io.ebean.meta.QueryPlanRequest; -import io.ebean.meta.ServerMetrics; -import io.ebean.meta.SortMetric; +import io.ebean.meta.*; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java index 2dab70e77..7d417f1ed 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java @@ -5,10 +5,10 @@ import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.el.ElPropertyValue; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java index eaeceb7aa..76e5952d0 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java @@ -3,9 +3,9 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java b/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java index 4a841a1bb..ade9da0e7 100644 --- a/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java +++ b/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java @@ -3,12 +3,8 @@ package org.tests.query.lazy; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.ProfileLocation; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.OrderDetail; -import org.tests.model.basic.Product; -import org.tests.model.basic.ResetBasicData; import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java index 3f032cf9d..6d09bf18c 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java @@ -4,9 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.OrderBy; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java index 4d32e02ab..9d7f1780b 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java @@ -6,11 +6,7 @@ import io.ebean.Query; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Customer; -import org.tests.model.basic.MRole; -import org.tests.model.basic.MUser; -import org.tests.model.basic.MUserType; -import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.*; import java.util.List; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java index bd23305c3..f97b20167 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java @@ -3,8 +3,8 @@ package org.tests.query.orderby; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.tests.model.basic.Customer; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Customer; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java index 42c165202..b85867d7f 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java @@ -3,9 +3,9 @@ package org.tests.query.orderby; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java index f88d014f9..9a399d344 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java @@ -3,11 +3,11 @@ package org.tests.query.orderby; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import io.ebean.test.LoggedSql; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import io.ebean.test.LoggedSql; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java b/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java index e32bcff15..9ca47f36c 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java @@ -2,9 +2,9 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java b/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java index 7c56986f5..cc2a58594 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java @@ -1,12 +1,12 @@ package org.tests.query.other; +import com.sun.management.HotSpotDiagnosticMXBean; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Disabled; -import org.tests.model.basic.EBasic; -import com.sun.management.HotSpotDiagnosticMXBean; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasic; import javax.management.MBeanServer; import java.io.File; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java b/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java index 13784f672..7ea317f94 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java @@ -3,9 +3,9 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java b/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java index e832dfdcc..1109e3043 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java @@ -4,9 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.ExpressionList; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java b/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java index f775c5944..b52522de9 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java @@ -2,10 +2,9 @@ package org.tests.query.other; import io.ebean.DB; import io.ebean.TransactionalTestCase; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java b/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java index 50b101ce0..c0f3deff8 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java @@ -6,10 +6,10 @@ import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java b/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java index 48ed870b2..052165d16 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java @@ -2,9 +2,9 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java index c830b9c10..8f64e0836 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java @@ -5,9 +5,9 @@ import io.ebean.DB; import io.ebean.Query; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java index 1d9b592ac..153e3c120 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java @@ -3,10 +3,10 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.tests.model.basic.Order; -import org.tests.model.basic.ResetBasicData; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java index 6b3ad1a7f..735bddddd 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java @@ -1,11 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; -import io.ebean.CountDistinctOrder; -import io.ebean.CountedValue; -import io.ebean.DB; -import io.ebean.DB; -import io.ebean.Query; +import io.ebean.*; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; @@ -15,11 +10,7 @@ import org.tests.inherit.Data; import org.tests.inherit.EUncle; import org.tests.lazyforeignkeys.MainEntity; import org.tests.lazyforeignkeys.MainEntityRelation; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.ResetBasicData; -import org.tests.model.basic.VwCustomer; +import org.tests.model.basic.*; import org.tests.o2m.OmBasicParent; import java.sql.Date; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java b/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java index 74e53f13f..483b85998 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java @@ -2,8 +2,8 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.selfref.SelfParent; import org.junit.jupiter.api.Test; +import org.tests.model.selfref.SelfParent; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java b/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java index 20e0fc7a9..c3eb3a2bd 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java @@ -1,12 +1,8 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Expression; -import io.ebean.Query; -import org.tests.model.basic.Customer; +import io.ebean.*; import org.junit.jupiter.api.Test; +import org.tests.model.basic.Customer; public class TestSubQueryBinding extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java index 3daf1a4f5..71501faa7 100644 --- a/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java +++ b/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java @@ -1,10 +1,6 @@ package org.tests.query.sqlquery; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.RowMapper; -import io.ebean.SqlQuery; -import io.ebean.SqlRow; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.meta.MetaTimedMetric; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java b/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java index 2e188921e..c6c541de7 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java @@ -1,14 +1,10 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java index 5a8b8e39f..9b9540003 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java @@ -1,13 +1,9 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java index 645bdaf46..d61d4c8e4 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java @@ -1,13 +1,9 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.CustomerAggregate; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java index 1d7ae564f..dcc81e2da 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java @@ -4,12 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; -import org.tests.model.basic.Customer; -import org.tests.model.basic.EBasic; -import org.tests.model.basic.Order; -import org.tests.model.basic.OrderDetail; -import org.tests.model.basic.ResetBasicData; import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.util.List; import java.util.Random; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java index f229009b1..e40fe30bd 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java @@ -1,19 +1,12 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.CallableSql; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; -import io.ebean.Transaction; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.sql.SQLException; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java index ae8ca158e..ac27ba981 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java @@ -1,13 +1,6 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.FetchConfig; -import io.ebean.FutureRowCount; -import io.ebean.PagedList; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java index 4149ecd8a..aa8048769 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java @@ -1,15 +1,11 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java index 813e6d917..8e477055c 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java @@ -1,15 +1,10 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.FetchConfig; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java index 19a8a181e..404b12861 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java @@ -2,14 +2,13 @@ package org.tests.rawsql; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.FetchConfig; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java index 06b5ddae6..59a2bfa81 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java @@ -1,13 +1,9 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; -import io.ebean.Transaction; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java index d29a2be12..b3e879e71 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java +++ b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java @@ -2,12 +2,11 @@ package org.tests.rawsql.inherit; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.inherit.ChildA; import org.tests.inherit.ChildB; import org.tests.inherit.Data; import org.tests.inherit.Parent; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java index 38ea00f63..0369ba346 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java +++ b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java @@ -6,19 +6,12 @@ import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.tests.inherit.ChildA; -import org.tests.inherit.ChildB; -import org.tests.inherit.Data; -import org.tests.inherit.EUncle; -import org.tests.inherit.Parent; -import org.tests.inherit.ParentAggregate; +import org.tests.inherit.*; import java.util.ArrayList; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class ParentRawSqlTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java index 978902d6d..f73ce824b 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java +++ b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java @@ -1,6 +1,9 @@ package org.tests.rawsql.nativesql; -import io.ebean.*; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.DB; +import io.ebean.Query; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java b/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java index 66682b272..2b1a2740d 100644 --- a/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java +++ b/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java @@ -18,11 +18,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.EBasicChangeLog; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicInteger; diff --git a/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java b/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java index fcb5b6d1b..078839f6a 100644 --- a/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java +++ b/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java @@ -1,14 +1,12 @@ package org.tests.refresh; -import io.ebean.DB; import io.ebean.DB; import io.ebean.SqlRow; import io.ebean.TransactionalTestCase; - +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java index b17942ad3..061475a40 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java @@ -2,13 +2,8 @@ package org.tests.singleTableInheritance; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.singleTableInheritance.model.PalletLocation; -import org.tests.singleTableInheritance.model.PalletLocationExternal; -import org.tests.singleTableInheritance.model.Warehouse; -import org.tests.singleTableInheritance.model.Zone; -import org.tests.singleTableInheritance.model.ZoneExternal; -import org.tests.singleTableInheritance.model.ZoneInternal; import org.junit.jupiter.api.Test; +import org.tests.singleTableInheritance.model.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java index 51aafc413..694246b5b 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java @@ -1,15 +1,6 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import javax.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java index 58b935c49..b79e59950 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java @@ -1,14 +1,6 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java index 0c27f7742..f0f820ded 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java @@ -1,13 +1,6 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; +import javax.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java index e454438cc..4d5fd67af 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java @@ -1,11 +1,6 @@ package org.tests.softdelete; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Query; -import io.ebean.SqlQuery; -import io.ebean.SqlRow; -import io.ebean.Transaction; +import io.ebean.*; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.softdelete.EBasicNoSDChild; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java index 472ff8cb9..992ada21a 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java @@ -3,9 +3,9 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import org.junit.jupiter.api.Test; import org.tests.model.softdelete.ESoftDelBook; import org.tests.model.softdelete.ESoftDelUser; -import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java index 1fd0d7091..45d44dd82 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java @@ -2,10 +2,10 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.softdelete.ESoftDelRole; -import org.tests.model.softdelete.ESoftDelUser; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.softdelete.ESoftDelRole; +import org.tests.model.softdelete.ESoftDelUser; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java index 1a275dc60..f5650673b 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java @@ -2,11 +2,10 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; -import io.ebean.test.LoggedSql; -import org.tests.model.softdelete.ESoftDelMid; import io.ebean.Finder; +import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; +import org.tests.model.softdelete.ESoftDelMid; import org.tests.model.softdelete.ESoftDelY; import org.tests.model.softdelete.ESoftDelZ; diff --git a/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java b/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java index 4d7d4188c..17a211de7 100644 --- a/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java +++ b/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java @@ -2,7 +2,6 @@ package org.tests.sp; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; import org.tests.sp.model.car.Car; diff --git a/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java b/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java index c6e8d68ca..a45108d28 100644 --- a/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java +++ b/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java @@ -1,13 +1,8 @@ package org.tests.sp.model; +import javax.persistence.*; import java.io.Serializable; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; - @MappedSuperclass public abstract class IdEntity implements Serializable { private static final long serialVersionUID = 7804145008732783678L; diff --git a/ebean-test/src/test/java/org/tests/sp/model/car/Car.java b/ebean-test/src/test/java/org/tests/sp/model/car/Car.java index d742444d2..415dcecba 100644 --- a/ebean-test/src/test/java/org/tests/sp/model/car/Car.java +++ b/ebean-test/src/test/java/org/tests/sp/model/car/Car.java @@ -2,12 +2,7 @@ package org.tests.sp.model.car; import org.tests.sp.model.IdEntity; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import javax.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java index 4b8279bae..c955939d5 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java @@ -5,9 +5,9 @@ import io.ebean.DB; import io.ebean.text.PathProperties; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java index 656391b05..08f171196 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java @@ -7,8 +7,6 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.SomeEnum; import org.tests.model.basic.SomeEnumBean; -import java.io.IOException; - import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonSomeEnumWithToString extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java index 6cf13502f..5c1f02cd3 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java @@ -3,14 +3,8 @@ package org.tests.text.json; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; -import org.tests.model.basic.Car; -import org.tests.model.basic.CarAccessory; -import org.tests.model.basic.CarFuse; -import org.tests.model.basic.Trip; -import org.tests.model.basic.Truck; -import org.tests.model.basic.Vehicle; -import org.tests.model.basic.VehicleDriver; import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/timezone/TimezoneTests.java b/ebean-test/src/test/java/org/tests/timezone/TimezoneTests.java index 8f455c0f7..67c700fbc 100644 --- a/ebean-test/src/test/java/org/tests/timezone/TimezoneTests.java +++ b/ebean-test/src/test/java/org/tests/timezone/TimezoneTests.java @@ -5,11 +5,7 @@ import io.ebean.Transaction; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Timestamp; +import java.sql.*; import java.util.Calendar; import java.util.TimeZone; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java b/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java index 6b58c8486..639b52c69 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java @@ -2,11 +2,9 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.config.dbplatform.IdType; - import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.m2m.MnyB; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java index d533dcdfb..2fcb01543 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java @@ -3,17 +3,16 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import org.tests.model.m2m.MnyB; -import org.tests.model.m2m.MnyC; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.tests.model.m2m.MnyB; +import org.tests.model.m2m.MnyC; import javax.persistence.PersistenceException; import java.util.List; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestBeanStateReset extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java b/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java index 124f32bc5..a4b4ee099 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java @@ -3,13 +3,11 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiTransaction; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.*; public class TestDeleteFromPersistenceContext extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java b/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java index b24a87dda..be3b6557b 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java @@ -1,10 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.DataIntegrityException; -import io.ebean.Transaction; -import io.ebean.TxScope; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java b/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java index a69b91087..ecab276e9 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java @@ -2,9 +2,9 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.BBookmark; import org.tests.model.basic.BBookmarkUser; -import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java index 093f360eb..58b4c68c5 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java @@ -1,16 +1,12 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Transaction; -import io.ebean.TxScope; -import org.tests.model.basic.Country; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Product; +import io.ebean.*; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.tests.model.basic.Country; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Product; public class TestNestedBeginRequired extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java index 17afc712f..6f91cf2fd 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java @@ -1,17 +1,13 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Transaction; -import io.ebean.TxScope; +import io.ebean.*; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; import org.tests.model.basic.Product; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class TestNestedBeginRequiredWithFailure extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java index 62d726ca9..b7c7fd3e0 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java @@ -1,16 +1,12 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Transaction; -import io.ebean.TxScope; -import org.tests.model.basic.Country; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Product; +import io.ebean.*; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.tests.model.basic.Country; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Product; public class TestNestedBeginRequiresNew extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java index 2755f81a1..927d3380a 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java @@ -1,16 +1,12 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Transaction; -import io.ebean.TxScope; -import org.tests.model.basic.Country; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Product; +import io.ebean.*; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.tests.model.basic.Country; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Product; public class TestNestedBeginRequiresNewWithFailure extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java index ffa089eb1..44e8f7299 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java @@ -1,11 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.PersistenceContextScope; -import io.ebean.Transaction; -import io.ebean.TxScope; +import io.ebean.*; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java b/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java index ef990e899..7b993e92d 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java @@ -6,10 +6,10 @@ import io.ebean.Database; import io.ebean.Transaction; import io.ebean.bean.PersistenceContext; import io.ebeaninternal.api.SpiTransaction; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java b/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java index 1573e65fa..946fcda03 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java @@ -2,8 +2,8 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.EBasic; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasic; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java index 60c2d9bd1..e2511c543 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java @@ -1,8 +1,8 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import io.ebean.DuplicateKeyException; import io.ebean.DB; +import io.ebean.DuplicateKeyException; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java index 14b9c1f7e..b530252f8 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java @@ -9,9 +9,7 @@ import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.*; public class TestTransactionalNotSupports extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java index 3fedd0ab5..a3c367dc3 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java @@ -9,9 +9,7 @@ import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.*; public class TestTransactionalRequired extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java index 67aed59d6..3e38e2d0c 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java @@ -1,10 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.Database; -import io.ebean.Transaction; -import io.ebean.TxScope; +import io.ebean.*; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; import org.junit.jupiter.api.Test; @@ -14,10 +10,7 @@ import org.slf4j.LoggerFactory; import java.sql.Connection; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.*; public class TestTransactionalRequiresNew extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java b/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java index 0aeb45f26..3a2d3e83d 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java +++ b/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java @@ -14,7 +14,6 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -import static org.junit.jupiter.api.Assertions.assertTrue; /** * It shows the issue that the user record does NOT rolback when there is an exception thrown diff --git a/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java index 44adc4e48..ed0cfb175 100644 --- a/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java +++ b/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java @@ -1,10 +1,11 @@ package org.tests.transparentpersist; import io.ebean.*; -import io.ebean.annotation.*; +import io.ebean.annotation.Transactional; +import io.ebean.annotation.TxOption; +import io.ebean.test.LoggedSql; import io.ebeaninternal.api.SpiBeanTypeManager; import io.ebeaninternal.api.SpiTransaction; -import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java b/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java index 07578ed6c..904ae2350 100644 --- a/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java +++ b/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java @@ -1,12 +1,12 @@ package org.tests.types; +import org.tests.model.BaseModel; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; import javax.validation.constraints.Size; -import org.tests.model.BaseModel; - @Entity public class PasswordStoreModel extends BaseModel { private static final long serialVersionUID = 1L; diff --git a/ebean-test/src/test/java/org/tests/types/TestFileType.java b/ebean-test/src/test/java/org/tests/types/TestFileType.java index c99b57c2e..39dc9e528 100644 --- a/ebean-test/src/test/java/org/tests/types/TestFileType.java +++ b/ebean-test/src/test/java/org/tests/types/TestFileType.java @@ -11,10 +11,7 @@ import java.io.IOException; import java.io.PrintStream; import java.net.URL; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestFileType extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java b/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java index a027ab056..6518e2919 100644 --- a/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java +++ b/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java @@ -3,8 +3,8 @@ package org.tests.types; import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; -import org.tests.model.types.SomeFileBean; import org.junit.jupiter.api.Test; +import org.tests.model.types.SomeFileBean; import java.io.File; import java.net.URL; diff --git a/ebean-test/src/test/java/org/tests/types/TestHstore.java b/ebean-test/src/test/java/org/tests/types/TestHstore.java index a9ce5d365..e852a6955 100644 --- a/ebean-test/src/test/java/org/tests/types/TestHstore.java +++ b/ebean-test/src/test/java/org/tests/types/TestHstore.java @@ -2,12 +2,10 @@ package org.tests.types; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.ForPlatform; -import io.ebean.annotation.Platform; -import org.tests.model.json.EBasicHstore; -import org.assertj.core.api.Assertions; import io.ebean.test.LoggedSql; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicHstore; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/types/TestNewTypes.java b/ebean-test/src/test/java/org/tests/types/TestNewTypes.java index fb8fb0e00..35732801e 100644 --- a/ebean-test/src/test/java/org/tests/types/TestNewTypes.java +++ b/ebean-test/src/test/java/org/tests/types/TestNewTypes.java @@ -9,26 +9,12 @@ import org.tests.model.types.SomeNewTypesBean; import java.io.File; import java.nio.file.Paths; -import java.time.DayOfWeek; -import java.time.Duration; -import java.time.Instant; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.Month; -import java.time.MonthDay; -import java.time.OffsetDateTime; -import java.time.Period; -import java.time.Year; -import java.time.YearMonth; -import java.time.ZoneId; -import java.time.ZonedDateTime; +import java.time.*; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; public class TestNewTypes extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java b/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java index f4f0c9522..daa493385 100644 --- a/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java +++ b/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java @@ -2,9 +2,9 @@ package org.tests.unidirectional; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.UTDetail; import org.tests.model.basic.UTMaster; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java b/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java index ac21a2642..915df69e0 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java @@ -1,12 +1,12 @@ package org.tests.unitinternal; import io.ebean.BaseTestCase; -import io.ebean.bean.EntityBean; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; public class TestEqualsOnEnhanced extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java b/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java index ccce09fd8..668be5317 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java @@ -3,9 +3,9 @@ package org.tests.unitinternal; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ENullCollection; import org.tests.model.basic.ENullCollectionDetail; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java b/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java index 6f3f084ff..3f65621b6 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java @@ -5,11 +5,7 @@ import io.ebean.OrderBy; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * Test the OrderBy object and especially its parsing. diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java b/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java index a7a42cdbb..fcfcb5aef 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java @@ -3,12 +3,12 @@ package org.tests.unitinternal; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import org.tests.model.basic.EBasicVer; -import org.tests.model.basic.xtra.DummyDao; -import org.tests.model.basic.xtra.OptimisticLockExceptionThrowingDao; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.tests.model.basic.EBasicVer; +import org.tests.model.basic.xtra.DummyDao; +import org.tests.model.basic.xtra.OptimisticLockExceptionThrowingDao; import javax.persistence.OptimisticLockException; diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java b/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java index 9f7a56f32..c580d23cf 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java @@ -3,9 +3,9 @@ package org.tests.unitinternal; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EVanillaCollection; import org.tests.model.basic.EVanillaCollectionDetail; -import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java b/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java index 410eac1cb..3bc09dae3 100644 --- a/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java @@ -2,10 +2,10 @@ package org.tests.update; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.EEmbDatePeriod; import org.tests.model.embedded.EEmbInner; import org.tests.model.embedded.EEmbOuter; -import org.junit.jupiter.api.Test; import java.util.Date; diff --git a/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java b/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java index 502ddbb34..009283e11 100644 --- a/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java @@ -4,9 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; +import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; -import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java b/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java index 3b1b845d3..49d6f7222 100644 --- a/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java +++ b/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java @@ -2,8 +2,8 @@ package org.tests.update; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.tests.model.basic.EBasicVer; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicVer; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java index dfc78d1f3..0aad43977 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java @@ -1,10 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.DuplicateKeyException; -import io.ebean.SqlUpdate; -import io.ebean.Transaction; +import io.ebean.*; import org.junit.jupiter.api.Test; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java index 8397615f9..9cd59bf23 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java @@ -2,7 +2,6 @@ package org.tests.update; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; diff --git a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java index ab60472c9..e8243bdd1 100644 --- a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java @@ -10,11 +10,7 @@ import org.tests.model.basic.EBasic; import org.tests.model.basic.EBasic.Status; import javax.persistence.EntityNotFoundException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; +import java.util.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; diff --git a/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java b/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java index b6feec344..978ef0589 100644 --- a/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java +++ b/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java @@ -2,7 +2,6 @@ package org.tests.update; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.DB; import io.ebean.SqlRow; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java b/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java index bf6a52680..0af27a760 100644 --- a/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java +++ b/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java @@ -2,9 +2,9 @@ package org.tests.update; import io.ebean.BaseTestCase; import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; import org.tests.model.basic.EBasic.Status; -import org.junit.jupiter.api.Test; public class TestUpdatePartialNoVer extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/update/objects/Child.java b/ebean-test/src/test/java/org/tests/update/objects/Child.java index b8a91a2b7..87166bfda 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/Child.java +++ b/ebean-test/src/test/java/org/tests/update/objects/Child.java @@ -1,10 +1,6 @@ package org.tests.update.objects; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "e_save_test_d") diff --git a/ebean-test/src/test/java/org/tests/update/objects/Parent.java b/ebean-test/src/test/java/org/tests/update/objects/Parent.java index bdcfa58f9..6a582a981 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/Parent.java +++ b/ebean-test/src/test/java/org/tests/update/objects/Parent.java @@ -1,11 +1,6 @@ package org.tests.update.objects; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "e_save_test_c") diff --git a/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java b/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java index 2e5806657..71fb72816 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java +++ b/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java @@ -1,11 +1,6 @@ package org.tests.update.objects; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "e_save_test_a") diff --git a/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java b/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java index 63b358645..cbd32a7fb 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java +++ b/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java @@ -1,11 +1,6 @@ package org.tests.update.objects; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import javax.persistence.*; @Entity @Table(name = "e_save_test_b")