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