#2361 - Tidy tests only, organise imports

2024-04-21 10:51:47 +00:00 · 2021-09-09 11:29:05 +12:00
parent 1696caadd4
commit 7a327cb644
626 changed files with 854 additions and 2475 deletions
@@ -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 {

@@ -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;
@@ -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;

@@ -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;

@@ -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;
@@ -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;
@@ -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 {

@@ -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;
@@ -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 {

@@ -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;
@@ -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 {

@@ -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;

@@ -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 {

@@ -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;
@@ -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 {

@@ -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;
@@ -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.*;

@@ -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.*;
@@ -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;

@@ -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 {
@@ -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;

@@ -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;

@@ -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 {

@@ -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 {

@@ -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;

@@ -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 {

@@ -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 {

@@ -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.*;
@@ -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;

@@ -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;
@@ -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 {

@@ -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;
@@ -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.*;
@@ -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;

@@ -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.*;

@@ -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;
@@ -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 {
@@ -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;

@@ -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 {

@@ -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;

@@ -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 {

@@ -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;
@@ -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;

@@ -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 {

@@ -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;
@@ -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;

@@ -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 {

@@ -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 {

@@ -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.*;
@@ -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 {

@@ -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;

@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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 {

@@ -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;

@@ -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.*;
@@ -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;
@@ -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;

@@ -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;

@@ -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 {

@@ -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 {

@@ -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;

@@ -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 {

@@ -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
@@ -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;

@@ -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 {

@@ -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;

@@ -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
 *
@@ -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
@@ -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")
@@ -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
@@ -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;
 }
@@ -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
@@ -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")
@@ -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")
@@ -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")
@@ -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")
@@ -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<EBasic> basics;

@@ -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;

@@ -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
@@ -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")
@@ -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
@@ -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
@@ -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
@@ -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")
@@ -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")
@@ -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")
@@ -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")
@@ -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;
 }
@@ -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<MtmMaster> getMasters() {
    return masters;
  }
-  
+
  public void setMasters(List<MtmMaster> masters) {
    this.masters = masters;
  }
@@ -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<MtmChild> getChildren() {
    return children;
  }
-  
+
  public void setChildren(List<MtmChild> children) {
    this.children = children;
  }
@@ -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")
@@ -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
@@ -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")
@@ -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
@@ -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;
 }
@@ -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
--- a/Show More
+++ b/Show More