1476 - Query plan capture, initial wip capturing bind params (#1477)

* 1476 - Query plan capture, initial wip capturing bind params

* No effective change - Reset test default db to H2

* #1476 - Query plan capture, initial wip capturing bind params #1477

Update with consumer

* #1476 - Query plan capture, initial wip capturing bind params #1477

Update with query plan request

* #1476 - Query plan capture, initial wip capturing bind params #1477

Extract interface

* #1476 - Query plan capture, initial wip capturing bind params #1477

Extract interface

src/test/java/io/ebean/BaseTestCase.java

@@ -13,7 +13,6 @@ import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory;
-
 import org.avaje.agentloader.AgentLoader;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -148,7 +147,7 @@ public abstract class BaseTestCase {
   public boolean isMySql() {
     return Platform.MYSQL == platform();
   }
-  
+
   public boolean isHana() {
     return Platform.HANA == platform();
   }
@@ -160,7 +159,7 @@ public abstract class BaseTestCase {
   public boolean isPlatformOrderNullsSupport() {
     return isH2() || isPostgres();
   }
-  
+
   public boolean isPersistBatchOnCascade() {
     return spiEbeanServer().getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
   }
@@ -217,7 +216,7 @@ public abstract class BaseTestCase {
       assertThat(sql).contains(containsIn+" not in ");
     }
   }
-  
+
   /**
    * Platform specific CONCAT clause.
    */

src/test/java/io/ebean/DtoQueryFromOrmTest.java

@@ -3,7 +3,6 @@ package io.ebean;
 import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaQueryMetric;
 import io.ebean.meta.MetaTimedMetric;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;

src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java

@@ -1,12 +1,11 @@
 package io.ebean.config.dbplatform;
 
+import io.ebean.config.dbplatform.hana.HanaHistorySupport;
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import org.junit.Test;
-
-import io.ebean.config.dbplatform.hana.HanaHistorySupport;
-
 public class HanaHistorySupportTest {
 
   private HanaHistorySupport support = new HanaHistorySupport();
@@ -24,7 +23,7 @@ public class HanaHistorySupportTest {
     String asOfViewSuffix = support.getAsOfViewSuffix("_with_history");
     assertEquals(asOfViewSuffix, " for system_time as of ?");
   }
-  
+
   @Test
   public void getVersionsBetweenSuffix() {
 

src/test/java/io/ebean/plugin/ExpressionPathTest.java

@@ -2,10 +2,10 @@ package io.ebean.plugin;
 
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java

@@ -9,7 +9,6 @@ import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.migration.ddl.DdlRunner;
 import io.ebeaninternal.dbmigration.ddlgeneration.Helper;
-
 import org.junit.Test;
 
 import javax.persistence.PersistenceException;

src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaDdlTest.java

@@ -1,14 +1,13 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.junit.Test;
-
 import io.ebean.config.dbplatform.hana.HanaPlatform;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
 import io.ebeaninternal.dbmigration.migration.Column;
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
 
 public class HanaDdlTest {
 

src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java

@@ -1,12 +1,11 @@
 package io.ebeaninternal.server.expression.platform;
 
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.expression.DefaultExpressionRequest;
 import io.ebeaninternal.server.expression.Op;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
 
 public class HanaDbExpressionTest {
   private HanaDbExpression expression = new HanaDbExpression();
@@ -54,13 +53,13 @@ public class HanaDbExpressionTest {
     String concat = expression.concat("property0", "separator", "property1", "suffix");
     assertEquals("concat(property0, 'separator'||property1||'suffix')", concat);
   }
-  
+
   @Test
   public void testConcatNullSuffix() {
     String concat = expression.concat("property0", "separator", "property1", null);
     assertEquals("concat(property0, 'separator'||property1)", concat);
   }
-  
+
   @Test
   public void testJson() {
     SpiExpressionRequest request = new DefaultExpressionRequest(null);

src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java

@@ -2,7 +2,7 @@ package io.ebeaninternal.server.query;
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 public class SqlTreeBuilderTest {
 

src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java

@@ -6,12 +6,12 @@ import io.ebean.EbeanServer;
 import io.ebean.Query;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
-import org.tests.model.basic.Address;
-import org.tests.model.basic.Customer;
-import org.tests.model.basic.ResetBasicData;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.Address;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
 
 import java.util.List;
 import java.util.Set;

src/test/java/org/tests/basic/MainDbBoolean.java

@@ -6,11 +6,11 @@ import io.ebean.Query;
 import io.ebean.SqlRow;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
+import io.ebean.datasource.DataSourceConfig;
+import org.junit.Assert;
 import org.tests.model.basic.TOne;
 import org.tests.model.basic.TSDetail;
 import org.tests.model.basic.TSMaster;
-import io.ebean.datasource.DataSourceConfig;
-import org.junit.Assert;
 
 import java.util.List;
 

src/test/java/org/tests/basic/TestErrorBindLog.java

@@ -2,9 +2,9 @@ package org.tests.basic;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import org.tests.model.basic.Order;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.Order;
 
 import javax.persistence.PersistenceException;
 

src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java

@@ -2,11 +2,11 @@ package org.tests.basic;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.junit.Assert;
+import org.junit.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.List;
 

src/test/java/org/tests/basic/TestTransient.java

@@ -3,10 +3,10 @@ package org.tests.basic;
 import io.ebean.BaseTestCase;
 import io.ebean.BeanState;
 import io.ebean.Ebean;
-import org.tests.model.basic.Customer;
-import org.tests.model.basic.ResetBasicData;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
 
 public class TestTransient extends BaseTestCase {
 

src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java

@@ -6,8 +6,8 @@ import io.ebean.EbeanServer;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.Transactional;
-import org.tests.model.basic.Customer;
 import org.junit.Test;
+import org.tests.model.basic.Customer;
 
 import static org.junit.Assert.assertNotNull;
 

src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java

@@ -2,11 +2,11 @@ package org.tests.batchload;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.junit.Assert;
+import org.junit.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.List;
 

src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java

@@ -2,11 +2,11 @@ package org.tests.batchload;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.junit.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.Test;
 
 public class TestEmptyManyLazyLoad extends BaseTestCase {
 

src/test/java/org/tests/batchload/TestSecondQueryNoRows.java

@@ -3,9 +3,9 @@ package org.tests.batchload;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.FetchConfig;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

src/test/java/org/tests/cache/TestBeanCache.java

@@ -2,10 +2,10 @@ package org.tests.cache;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import org.tests.model.basic.Country;
-import org.tests.model.basic.OCachedBean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.tests.model.basic.Country;
+import org.tests.model.basic.OCachedBean;
 
 import java.util.List;
 

src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java

@@ -2,10 +2,10 @@ package org.tests.cache;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;

src/test/java/org/tests/changelog/TestChangeLog.java

@@ -1,5 +1,7 @@
 package org.tests.changelog;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.ebean.BaseTestCase;
 import io.ebean.EbeanServerFactory;
 import io.ebean.annotation.ChangeLog;
@@ -13,12 +15,10 @@ import io.ebean.event.changelog.ChangeLogRegister;
 import io.ebean.event.changelog.ChangeSet;
 import io.ebean.event.changelog.ChangeType;
 import io.ebeaninternal.api.SpiEbeanServer;
-import org.tests.model.basic.EBasicChangeLog;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.tests.model.basic.EBasicChangeLog;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;

src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java

@@ -4,10 +4,10 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.Transaction;
-import org.tests.model.basic.Product;
-import org.tests.model.basic.ResetBasicData;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.Product;
+import org.tests.model.basic.ResetBasicData;
 
 import java.util.Arrays;
 

src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java

@@ -2,18 +2,17 @@ package org.tests.inheritance.cache;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
 import org.tests.model.basic.cache.CInhOne;
 import org.tests.model.basic.cache.CInhRef;
 import org.tests.model.basic.cache.CInhRoot;
 import org.tests.model.basic.cache.CInhTwo;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.ebeantest.LoggedSqlCollector;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestInheritanceRefCache extends BaseTestCase {
 

src/test/java/org/tests/json/TestDbJson_Jackson.java

@@ -1,20 +1,17 @@
 package org.tests.json;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.StrictAssertions.assertThat;
-
-import java.io.IOException;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
 import org.junit.Test;
 import org.tests.model.json.EBasicJsonJackson;
 import org.tests.model.json.EBasicJsonJackson2;
 import org.tests.model.json.LongJacksonType;
 import org.tests.model.json.StringJacksonType;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
 
-import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDbJson_Jackson extends BaseTestCase {
 

src/test/java/org/tests/json/TestDbJson_Jackson2.java

@@ -1,19 +1,16 @@
 package org.tests.json;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.StrictAssertions.assertThat;
-
-import java.io.IOException;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
 import org.junit.Test;
 import org.tests.model.json.EBasicJsonJackson2;
 import org.tests.model.json.LongJacksonType;
 import org.tests.model.json.StringJacksonType;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
 
-import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestDbJson_Jackson2 extends BaseTestCase {
 

src/test/java/org/tests/merge/TestMergeM2M.java

@@ -28,16 +28,16 @@ public class TestMergeM2M extends BaseTestCase {
     Ebean.save(group4);
     Ebean.save(group5);
 
-    MMachine machine = new MMachine("mac1");
-    machine.getGroups().add(group1);
-    machine.getGroups().add(group2);
-    machine.getGroups().add(group3);
+    MMachine m0 = new MMachine("mac1");
+    m0.getGroups().add(group1);
+    m0.getGroups().add(group2);
+    m0.getGroups().add(group3);
 
     MergeOptions options = new MergeOptionsBuilder().addPath("groups").build();
 
     LoggedSqlCollector.start();
 
-    Ebean.merge(machine, options);
+    Ebean.merge(m0, options);
 
     List<String> sql = LoggedSqlCollector.current();
     if (isPersistBatchOnCascade()) {
@@ -55,13 +55,15 @@ public class TestMergeM2M extends BaseTestCase {
       assertThat(sql.get(4)).contains("insert into mmachine_mgroup");
     }
 
-    machine.setName("mac1-mod");
-    machine.getGroups().remove(group2);
-    machine.getGroups().remove(group3);
-    machine.getGroups().add(group4);
-    machine.getGroups().add(group5);
+    MMachine m1 = new MMachine("mac1");
+    m1.setId(m0.getId());
+    m1.setName("mac1-mod");
+    m1.getGroups().remove(group2);
+    m1.getGroups().remove(group3);
+    m1.getGroups().add(group4);
+    m1.getGroups().add(group5);
 
-    Ebean.merge(machine, options);
+    Ebean.merge(m1, options);
 
     sql = LoggedSqlCollector.current();
     assertThat(sql).hasSize(4);

src/test/java/org/tests/model/array/TestDbArray_asSet.java

@@ -5,7 +5,6 @@ import io.ebean.Ebean;
 import io.ebean.Query;
 import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 

src/test/java/org/tests/model/array/TestDbArray_basic.java

@@ -1,7 +1,13 @@
 package org.tests.model.array;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.Query;
+import io.ebean.SqlRow;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -10,15 +16,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
-import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
-
-import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.Query;
-import io.ebean.SqlRow;
-import io.ebean.annotation.IgnorePlatform;
-import io.ebean.annotation.Platform;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
 
 public class TestDbArray_basic extends BaseTestCase {
 

src/test/java/org/tests/model/basic/CKeyParent.java

@@ -2,7 +2,6 @@ package org.tests.model.basic;
 
 import io.ebean.annotation.Cache;
 
-import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;

src/test/java/org/tests/model/basic/ResetBasicData.java

@@ -5,7 +5,6 @@ import io.ebean.EbeanServer;
 import org.tests.model.basic.Order.Status;
 
 import java.sql.Date;
-import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 

src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java

@@ -10,7 +10,6 @@ import io.ebean.cache.ServerCacheStatistics;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 

src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java

@@ -3,7 +3,6 @@ package org.tests.model.elementcollection;
 import io.ebean.Ebean;
 import io.ebean.annotation.PersistBatch;
 import io.ebeaninternal.api.SpiEbeanServer;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -90,7 +89,7 @@ public class TestElementCollectionBasicCache {
 
     LoggedSqlCollector.stop();
   }
-  
+
   public boolean isPersistBatchOnCascade() {
     return ((SpiEbeanServer) Ebean.getDefaultServer()).getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
   }

src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java

@@ -2,7 +2,6 @@ package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 

src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java

@@ -3,7 +3,6 @@ package org.tests.model.elementcollection;
 import io.ebean.Ebean;
 import io.ebean.annotation.PersistBatch;
 import io.ebeaninternal.api.SpiEbeanServer;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -95,7 +94,7 @@ public class TestElementCollectionBasicMapCache {
 
     LoggedSqlCollector.stop();
   }
-  
+
   public boolean isPersistBatchOnCascade() {
     return ((SpiEbeanServer) Ebean.getDefaultServer()).getDatabasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
   }

src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java

@@ -2,7 +2,6 @@ package org.tests.model.elementcollection;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 

src/test/java/org/tests/model/json/EBasicJsonJackson.java

@@ -1,14 +1,12 @@
 package org.tests.model.json;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.ebean.annotation.DbJson;
 import io.ebean.annotation.DbJsonB;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Version;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;

src/test/java/org/tests/model/json/EBasicJsonJackson2.java

@@ -1,14 +1,12 @@
 package org.tests.model.json;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.ebean.annotation.DbJson;
 import io.ebean.annotation.DbJsonB;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Version;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;

src/test/java/org/tests/model/nofk/EFile2NoFk.java

@@ -1,17 +1,13 @@
 package org.tests.model.nofk;
 
-import java.util.List;
+import io.ebean.annotation.Formula;
+import io.ebean.annotation.Index;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.Size;
 
-import io.ebean.annotation.DbForeignKey;
-import io.ebean.annotation.Formula;
-import io.ebean.annotation.Index;
-
 @Entity
 public class EFile2NoFk {
 

src/test/java/org/tests/model/nofk/EFileNoFk.java

@@ -1,14 +1,13 @@
 package org.tests.model.nofk;
 
-import java.util.List;
+import io.ebean.annotation.DbForeignKey;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.Size;
-
-import io.ebean.annotation.DbForeignKey;
+import java.util.List;
 
 @Entity
 public class EFileNoFk {

src/test/java/org/tests/model/nofk/EUserNoFk.java

@@ -1,10 +1,9 @@
 package org.tests.model.nofk;
 
-import java.util.List;
-
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
+import java.util.List;
 
 @Entity
 public class EUserNoFk {

src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java

@@ -1,15 +1,14 @@
 package org.tests.model.nofk;
 
-import java.util.List;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-
 import io.ebean.annotation.Formula;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.SoftDelete;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import java.util.List;
+
 @Entity
 public class EUserNoFkSoftDel {
 

src/test/java/org/tests/model/nofk/Test2NoFk.java

@@ -4,13 +4,11 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
-
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.List;
-
 import javax.persistence.EntityNotFoundException;
+import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;

src/test/java/org/tests/model/nofk/TestNoFk.java

@@ -5,16 +5,12 @@ import io.ebean.Ebean;
 import io.ebean.SqlRow;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
-import io.ebean.plugin.BeanType;
-import io.ebean.plugin.Property;
-
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import java.util.List;
-
 import javax.persistence.EntityNotFoundException;
+import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;

src/test/java/org/tests/model/uuidsibling/USibChild.java

@@ -4,13 +4,13 @@ import io.ebean.Finder;
 import io.ebean.Model;
 import io.ebean.annotation.SoftDelete;
 
-import java.io.Serializable;
-import java.util.UUID;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
+import java.io.Serializable;
+import java.util.UUID;
 
 @Entity
 public class USibChild extends Model  implements Serializable {

src/test/java/org/tests/model/uuidsibling/USibChildSibling.java

@@ -4,11 +4,10 @@ import io.ebean.Finder;
 import io.ebean.Model;
 import io.ebean.annotation.SoftDelete;
 
-import java.io.Serializable;
-
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
+import java.io.Serializable;
 
 @Entity
 public class USibChildSibling extends Model implements Serializable {

src/test/java/org/tests/model/uuidsibling/USibParent.java

@@ -4,12 +4,12 @@ import io.ebean.Finder;
 import io.ebean.Model;
 import io.ebean.annotation.SoftDelete;
 
-import java.io.Serializable;
-import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
+import java.io.Serializable;
+import java.util.List;
 
 @Entity
 public class USibParent extends Model implements Serializable {

src/test/java/org/tests/model/view/TestViewBaseEntity.java

@@ -3,10 +3,10 @@ package org.tests.model.view;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.junit.Test;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.OrderDetail;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import java.util.List;
 

src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java

@@ -2,7 +2,6 @@ package org.tests.o2m.jointable;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 

src/test/java/org/tests/query/TestOuterJoin.java

@@ -1,19 +1,17 @@
 package org.tests.query;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
-
-import java.util.List;
-
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebeantest.LoggedSql;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
 
-import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebeantest.LoggedSql;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests if outer joins are correctly used.

src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java

@@ -2,10 +2,10 @@ package org.tests.query;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import org.tests.model.basic.Customer;
-import org.tests.model.basic.ResetBasicData;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
 
 import java.util.List;
 

src/test/java/org/tests/query/TestQueryFindIterate.java

@@ -5,8 +5,8 @@ import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.Query;
 import io.ebean.QueryIterator;
-import io.ebean.plugin.SpiServer;
 import io.ebean.datasource.DataSourcePool;
+import io.ebean.plugin.SpiServer;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Customer;

src/test/java/org/tests/query/TestQueryFindPagedList.java

@@ -3,10 +3,10 @@ package org.tests.query;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.PagedList;
-import org.tests.model.basic.Order;
-import org.tests.model.basic.ResetBasicData;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
+import org.tests.model.basic.Order;
+import org.tests.model.basic.ResetBasicData;
 
 import javax.persistence.PersistenceException;
 import java.util.List;
@@ -16,7 +16,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class TestQueryFindPagedList extends BaseTestCase {
 

src/test/java/org/tests/query/aggregation/TestAggregationCount.java

@@ -1,12 +1,8 @@
 package org.tests.query.aggregation;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.StrictAssertions.assertThat;
-
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.util.List;
-
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.Query;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -17,9 +13,11 @@ import org.tests.model.basic.ResetBasicData;
 import org.tests.model.tevent.TEventMany;
 import org.tests.model.tevent.TEventOne;
 
-import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
-import io.ebean.Query;
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestAggregationCount extends BaseTestCase {
 

src/test/java/org/tests/query/finder/TestCustomerFinder.java

@@ -5,7 +5,9 @@ import io.ebean.Ebean;
 import io.ebean.Transaction;
 import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaOrmQueryMetric;
+import io.ebean.meta.MetaQueryPlan;
 import io.ebean.meta.MetaTimedMetric;
+import io.ebean.meta.QueryPlanRequest;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
@@ -163,6 +165,14 @@ public class TestCustomerFinder extends BaseTestCase {
     for (MetaTimedMetric txnTimed : basic.getTimedMetrics()) {
       System.out.println(txnTimed);
     }
+
+    QueryPlanRequest request = new QueryPlanRequest();
+
+    List<MetaQueryPlan> plans = server().getMetaInfoManager().collectQueryPlans(request);
+    for (MetaQueryPlan plan : plans) {
+      System.out.println(plan);
+    }
+
   }
 
 }

src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java

@@ -3,13 +3,13 @@ package org.tests.query.orderby;
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Query;
+import org.junit.Assert;
+import org.junit.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.junit.Assert;
-import org.junit.Test;
 
 import java.util.List;
 import java.util.Set;

src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java

@@ -2,10 +2,9 @@ package org.tests.query.other;
 
 import io.ebean.Ebean;
 import io.ebean.TransactionalTestCase;
-
+import org.junit.Test;
 import org.tests.model.basic.MNonEnum;
 import org.tests.model.basic.MNonUpdPropEntity;
-import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/org/tests/text/csv/TestCsvReader.java

@@ -3,9 +3,9 @@ package org.tests.text.csv;
 import io.ebean.Ebean;
 import io.ebean.TransactionalTestCase;
 import io.ebean.text.csv.CsvReader;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import java.io.File;
 import java.io.FileReader;

src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java

@@ -5,16 +5,16 @@ import io.ebean.EbeanServer;
 import io.ebean.TransactionalTestCase;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.csv.DefaultCsvCallback;
-import org.tests.model.basic.Customer;
 import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import org.tests.model.basic.Customer;
 
 import java.io.File;
 import java.io.FileReader;
 import java.net.URL;
 import java.util.Locale;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestCsvReaderWithCallback extends TransactionalTestCase {
 
   @Test

src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java

@@ -4,9 +4,9 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.text.json.JsonContext;
 import io.ebean.util.StringHelper;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import java.io.IOException;
 

src/test/java/org/tests/types/TestPeriodType.java

@@ -2,8 +2,8 @@ package org.tests.types;
 
 import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
-import org.tests.model.types.SomePeriodBean;
 import org.junit.Test;
+import org.tests.model.types.SomePeriodBean;
 
 import java.sql.Date;
 import java.time.LocalDate;

src/test/java/org/tests/unitinternal/HelloMain.java

@@ -3,11 +3,11 @@ package org.tests.unitinternal;
 import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
 import io.ebean.config.ServerConfig;
-import org.tests.model.basic.TOne;
-import org.avaje.agentloader.AgentLoader;
 import io.ebean.datasource.DataSourceConfig;
+import org.avaje.agentloader.AgentLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.tests.model.basic.TOne;
 
 import java.io.File;
 

src/test/java/org/tests/update/TestUpdatePartial.java

@@ -4,8 +4,8 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
-import org.tests.model.basic.Customer;
 import org.junit.Test;
+import org.tests.model.basic.Customer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;