#919 - io.ebean package initial

src/test/java/com/avaje/tests/basic/TestManyOneInterface.java

@@ -1,31 +0,0 @@
-package com.avaje.tests.basic;
-
-import com.avaje.ebean.BaseTestCase;
-import com.avaje.ebean.Ebean;
-import com.avaje.tests.model.basic.ResetBasicData;
-import com.avaje.tests.model.interfaces.Address;
-import com.avaje.tests.model.interfaces.IAddress;
-import com.avaje.tests.model.interfaces.IPerson;
-import com.avaje.tests.model.interfaces.Person;
-import org.junit.Test;
-
-public class TestManyOneInterface extends BaseTestCase {
-
-  @Test
-  public void test() {
-
-    ResetBasicData.reset();
-
-    IAddress a = new Address();
-
-    IPerson p = new Person();
-
-    p.setDefaultAddress(a);
-
-    Ebean.save(a);
-    Ebean.save(p);
-
-    //Assert.assertTrue();
-
-  }
-}

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

@@ -1,8 +1,8 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
-import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
-import com.avaje.tests.model.basic.Country;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
+import org.tests.model.basic.Country;
 import org.avaje.agentloader.AgentLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/test/java/io/ebean/ColumnMappingTest.java

@@ -1,5 +1,6 @@
-package com.avaje.ebean;
+package io.ebean;
 
+import io.ebean.RawSql;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -62,4 +63,4 @@ public class ColumnMappingTest {
     assertThat(key).isNotEqualTo(key1);
     assertThat(key.hashCode()).isNotEqualTo(key1.hashCode());
   }
-}
+}

src/test/java/io/ebean/ColumnTest.java

@@ -1,6 +1,7 @@
-package com.avaje.ebean;
+package io.ebean;
 
 
+import io.ebean.RawSql;
 import org.junit.Test;
 
 import static org.assertj.core.api.StrictAssertions.assertThat;

src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java

@@ -1,12 +1,13 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.ebean.config.CurrentTenantProvider;
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebean.config.TenantDataSourceProvider;
-import com.avaje.ebean.config.TenantMode;
-import com.avaje.ebean.config.TenantSchemaProvider;
-import com.avaje.ebean.config.dbplatform.mysql.MySqlPlatform;
-import com.avaje.ebean.config.dbplatform.postgres.PostgresPlatform;
+import io.ebean.EbeanServerFactory;
+import io.ebean.config.CurrentTenantProvider;
+import io.ebean.config.ServerConfig;
+import io.ebean.config.TenantDataSourceProvider;
+import io.ebean.config.TenantMode;
+import io.ebean.config.TenantSchemaProvider;
+import io.ebean.config.dbplatform.mysql.MySqlPlatform;
+import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import org.junit.Test;
 import org.mockito.Mockito;
 

src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java

@@ -1,8 +1,10 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebean.event.ServerConfigStartup;
-import com.avaje.tests.model.basic.UTDetail;
+import io.ebean.EbeanServer;
+import io.ebean.EbeanServerFactory;
+import io.ebean.config.ServerConfig;
+import io.ebean.event.ServerConfigStartup;
+import org.tests.model.basic.UTDetail;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -65,4 +67,4 @@ public class EbeanServerFactory_ServerConfigStart_Test {
       calledWithConfig = serverConfig;
     }
   }
-}
+}

src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java

@@ -1,6 +1,9 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.tests.model.basic.EBasicVer;
+import io.ebean.Ebean;
+import io.ebean.EbeanServer;
+import io.ebean.Transaction;
+import org.tests.model.basic.EBasicVer;
 import org.avaje.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -116,4 +119,4 @@ public class EbeanServer_deleteAllByIdTest {
   private EBasicVer bean(String name) {
     return new EBasicVer(name);
   }
-}
+}

src/test/java/io/ebean/EbeanServer_deleteByIdTest.java

@@ -1,6 +1,9 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.tests.model.basic.EBasicVer;
+import io.ebean.Ebean;
+import io.ebean.EbeanServer;
+import io.ebean.Transaction;
+import org.tests.model.basic.EBasicVer;
 import org.avaje.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -87,4 +90,4 @@ public class EbeanServer_deleteByIdTest {
   private EBasicVer bean(String name) {
     return new EBasicVer(name);
   }
-}
+}

src/test/java/io/ebean/EbeanServer_deleteTest.java

@@ -1,6 +1,9 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.tests.model.basic.EBasicVer;
+import io.ebean.Ebean;
+import io.ebean.EbeanServer;
+import io.ebean.Transaction;
+import org.tests.model.basic.EBasicVer;
 import org.avaje.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
@@ -50,4 +53,4 @@ public class EbeanServer_deleteTest {
   private EBasicVer bean(String name) {
     return new EBasicVer(name);
   }
-}
+}

src/test/java/io/ebean/EbeanServer_eqlTest.java

@@ -1,7 +1,7 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.ResetBasicData;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
 import org.junit.Test;
 
 import javax.persistence.PersistenceException;

src/test/java/io/ebean/EbeanServer_refresh.java

@@ -1,8 +1,10 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.tests.model.basic.EBasic;
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.ResetBasicData;
+import io.ebean.Ebean;
+import io.ebean.EbeanServer;
+import org.tests.model.basic.EBasic;
+import org.tests.model.basic.Order;
+import org.tests.model.basic.ResetBasicData;
 import org.junit.Test;
 
 import java.util.ArrayList;

src/test/java/io/ebean/EbeanServer_saveAllTest.java

@@ -1,6 +1,6 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.tests.model.basic.EBasicVer;
+import org.tests.model.basic.EBasicVer;
 import org.avaje.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 

src/test/java/io/ebean/FetchConfigTest.java

@@ -1,5 +1,6 @@
-package com.avaje.ebean;
+package io.ebean;
 
+import io.ebean.FetchConfig;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -165,4 +166,4 @@ public class FetchConfigTest {
     assertThat(v1).isEqualTo(v2);
     assertThat(v1.hashCode()).isEqualTo(v2.hashCode());
   }
-}
+}

src/test/java/io/ebean/MyCurrentUserProvider.java

@@ -1,6 +1,6 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.ebean.config.CurrentUserProvider;
+import io.ebean.config.CurrentUserProvider;
 
 /**
  * Returns the current user typically from a Thread local or similar context.

src/test/java/io/ebean/PrimaryServerTest.java

@@ -1,5 +1,6 @@
-package com.avaje.ebean;
+package io.ebean;
 
+import io.ebean.PrimaryServer;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -32,4 +33,4 @@ public class PrimaryServerTest {
     Properties properties = PrimaryServer.getProperties();
     assertTrue(!properties.isEmpty());
   }
-}
+}

src/test/java/io/ebean/PropertyTest.java

@@ -1,5 +1,6 @@
-package com.avaje.ebean;
+package io.ebean;
 
+import io.ebean.OrderBy;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

src/test/java/io/ebean/RawSqlKeyTest.java

@@ -1,6 +1,8 @@
-package com.avaje.ebean;
+package io.ebean;
 
 
+import io.ebean.RawSql;
+import io.ebean.RawSqlBuilder;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

src/test/java/io/ebean/SqlRowBooleanTest.java

@@ -1,5 +1,8 @@
-package com.avaje.ebean;
+package io.ebean;
 
+import io.ebean.Ebean;
+import io.ebean.SqlQuery;
+import io.ebean.SqlRow;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -16,4 +19,4 @@ public class SqlRowBooleanTest {
 
     assertThat(value).isTrue();
   }
-}
+}

src/test/java/io/ebean/TestDirtyProperties.java

@@ -1,10 +1,10 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebean.bean.EntityBeanIntercept;
-import com.avaje.ebeaninternal.server.core.DefaultBeanState;
-import com.avaje.tests.model.embedded.EMain;
-import com.avaje.tests.model.embedded.Eembeddable;
+import io.ebean.bean.EntityBean;
+import io.ebean.bean.EntityBeanIntercept;
+import io.ebeaninternal.server.core.DefaultBeanState;
+import org.tests.model.embedded.EMain;
+import org.tests.model.embedded.Eembeddable;
 import org.junit.Assert;
 import org.junit.Test;
 

src/test/java/io/ebean/TestFilterWithEnum.java

@@ -1,7 +1,7 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.ResetBasicData;
+import org.tests.model.basic.Order;
+import org.tests.model.basic.ResetBasicData;
 import org.junit.Assert;
 import org.junit.Test;
 

src/test/java/io/ebean/TestPropertyChangeListener.java

@@ -1,7 +1,7 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.ResetBasicData;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
 import org.junit.Assert;
 import org.junit.Test;
 

src/test/java/io/ebean/TestRawSqlBuilder.java

@@ -1,9 +1,9 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.ebean.RawSql.Sql;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.ResetBasicData;
-import com.avaje.tests.model.rawsql.ERawSqlAggBean;
+import io.ebean.RawSql.Sql;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
+import org.tests.model.rawsql.ERawSqlAggBean;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

src/test/java/io/ebean/TestRawSqlBuilderDistinct.java

@@ -1,6 +1,7 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.ebean.RawSql.Sql;
+import io.ebean.RawSql.Sql;
+import io.ebean.RawSqlBuilder;
 import junit.framework.TestCase;
 import org.junit.Assert;
 

src/test/java/io/ebean/TestRawSqlColumnParsing.java

@@ -1,7 +1,8 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.ebean.RawSql.ColumnMapping;
-import com.avaje.ebean.RawSql.ColumnMapping.Column;
+import io.ebean.DRawSqlColumnsParser;
+import io.ebean.RawSql.ColumnMapping;
+import io.ebean.RawSql.ColumnMapping.Column;
 import junit.framework.TestCase;
 
 import java.util.Map;

src/test/java/io/ebean/TestUnsetLoadedProperties.java

@@ -1,7 +1,7 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.ebean.bean.EntityBean;
-import com.avaje.tests.model.converstation.User;
+import io.ebean.bean.EntityBean;
+import org.tests.model.converstation.User;
 import org.avaje.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 

src/test/java/io/ebean/TextExpressionListTest.java

@@ -1,9 +1,10 @@
-package com.avaje.ebean;
+package io.ebean;
 
 
-import com.avaje.ebean.search.Match;
-import com.avaje.ebean.search.MultiMatch;
-import com.avaje.tests.model.basic.Order;
+import io.ebean.Ebean;
+import io.ebean.search.Match;
+import io.ebean.search.MultiMatch;
+import org.tests.model.basic.Order;
 import org.junit.Test;
 
 public class TextExpressionListTest {

src/test/java/io/ebean/TxScopeTest.java

@@ -1,6 +1,7 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.ebean.config.PersistBatch;
+import io.ebean.PersistBatch;
+import io.ebean.TxScope;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

src/test/java/io/ebean/UpdateQueryTest.java

@@ -1,7 +1,7 @@
-package com.avaje.ebean;
+package io.ebean;
 
-import com.avaje.tests.model.basic.Country;
-import com.avaje.tests.model.basic.Customer;
+import org.tests.model.basic.Country;
+import org.tests.model.basic.Customer;
 import org.junit.Test;
 
 import java.sql.Timestamp;

src/test/java/io/ebean/bean/EntityBeanInterceptTest.java

@@ -1,10 +1,10 @@
-package com.avaje.ebean.bean;
+package io.ebean.bean;
 
-import com.avaje.ebean.BaseTestCase;
-import com.avaje.ebean.Ebean;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.EBasic;
-import com.avaje.tests.model.basic.ResetBasicData;
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.EBasic;
+import org.tests.model.basic.ResetBasicData;
 import org.junit.Test;
 
 import java.sql.Date;

src/test/java/io/ebean/common/BeanListTest.java

@@ -1,6 +1,6 @@
-package com.avaje.ebean.common;
+package io.ebean.common;
 
-import com.avaje.ebean.bean.BeanCollection;
+import io.ebean.bean.BeanCollection;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 

src/test/java/io/ebean/common/BeanMapTest.java

@@ -1,6 +1,6 @@
-package com.avaje.ebean.common;
+package io.ebean.common;
 
-import com.avaje.ebean.bean.BeanCollection;
+import io.ebean.bean.BeanCollection;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 

src/test/java/io/ebean/common/BeanSetTest.java

@@ -1,6 +1,6 @@
-package com.avaje.ebean.common;
+package io.ebean.common;
 
-import com.avaje.ebean.bean.BeanCollection;
+import io.ebean.bean.BeanCollection;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 
@@ -230,4 +230,4 @@ public class BeanSetTest {
     assertThat(set.getModifyRemovals()).containsExactly(object1);
   }
 
-}
+}

src/test/java/io/ebean/config/DbConstraintNamingTest.java

@@ -1,4 +1,4 @@
-package com.avaje.ebean.config;
+package io.ebean.config;
 
 import org.junit.Test;
 
@@ -70,4 +70,4 @@ public class DbConstraintNamingTest {
     assertThat(naming.lowerColumnName("SCH.FOO_BAR")).isEqualTo("SCH.FOO_BAR");
   }
 
-}
+}

src/test/java/io/ebean/config/DbMigrationConfigTest.java

@@ -1,4 +1,4 @@
-package com.avaje.ebean.config;
+package io.ebean.config;
 
 import org.junit.Test;
 

src/test/java/io/ebean/config/DocStoreConfigTest.java

@@ -1,6 +1,6 @@
-package com.avaje.ebean.config;
+package io.ebean.config;
 
-import com.avaje.ebean.annotation.DocStoreMode;
+import io.ebean.annotation.DocStoreMode;
 import org.junit.Test;
 
 import java.util.Properties;
@@ -65,4 +65,4 @@ public class DocStoreConfigTest {
     assertTrue(config.isCreate());
     assertFalse(config.isDropCreate());
   }
-}
+}

src/test/java/io/ebean/config/MatchingNamingConventionTest.java

@@ -1,4 +1,4 @@
-package com.avaje.ebean.config;
+package io.ebean.config;
 
 import org.junit.Test;
 

src/test/java/io/ebean/config/PropertiesWrapperTest.java

@@ -1,5 +1,6 @@
-package com.avaje.ebean.config;
+package io.ebean.config;
 
+import io.ebean.Platform;
 import org.junit.Test;
 
 import java.util.Properties;

src/test/java/io/ebean/config/PropertyMapTest.java

@@ -1,4 +1,4 @@
-package com.avaje.ebean.config;
+package io.ebean.config;
 
 import org.junit.Test;
 
@@ -20,4 +20,4 @@ public class PropertyMapTest {
     assertEquals(home, map.eval("${HOME}"));
   }
 
-}
+}

src/test/java/io/ebean/config/ServerConfigTest.java

@@ -1,5 +1,6 @@
-package com.avaje.ebean.config;
+package io.ebean.config;
 
+import io.ebean.PersistBatch;
 import org.junit.Test;
 
 import java.util.Properties;

src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java

@@ -1,4 +1,4 @@
-package com.avaje.ebean.config;
+package io.ebean.config;
 
 import org.junit.Test;
 

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

@@ -1,4 +1,4 @@
-package com.avaje.ebean.config.dbplatform;
+package io.ebean.config.dbplatform;
 
 import org.junit.Test;
 

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

@@ -1,4 +1,4 @@
-package com.avaje.ebean.config.dbplatform;
+package io.ebean.config.dbplatform;
 
 import org.junit.Test;
 

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

@@ -1,9 +1,9 @@
-package com.avaje.ebean.config.dbplatform;
+package io.ebean.config.dbplatform;
 
-import com.avaje.ebean.config.DbTypeConfig;
-import com.avaje.ebean.config.Platform;
-import com.avaje.ebean.config.dbplatform.h2.H2Platform;
-import com.avaje.ebean.config.dbplatform.postgres.PostgresPlatform;
+import io.ebean.config.DbTypeConfig;
+import io.ebean.Platform;
+import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

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

@@ -1,4 +1,4 @@
-package com.avaje.ebean.config.dbplatform;
+package io.ebean.config.dbplatform;
 
 import org.junit.Test;
 

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

@@ -1,4 +1,4 @@
-package com.avaje.ebean.config.dbplatform;
+package io.ebean.config.dbplatform;
 
 import org.junit.Test;
 

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

@@ -1,6 +1,6 @@
-package com.avaje.ebean.config.dbplatform;
+package io.ebean.config.dbplatform;
 
-import com.avaje.ebean.config.dbplatform.postgres.PostgresPlatform;
+import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

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

@@ -1,7 +1,7 @@
-package com.avaje.ebean.config.dbplatform;
+package io.ebean.config.dbplatform;
 
-import com.avaje.ebean.config.dbplatform.h2.H2Platform;
-import com.avaje.ebean.dbmigration.ddlgeneration.platform.PlatformDdl;
+import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.dbmigration.ddlgeneration.platform.PlatformDdl;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

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

@@ -1,7 +1,7 @@
-package com.avaje.ebean.config.dbplatform;
+package io.ebean.config.dbplatform;
 
 
-import com.avaje.ebean.config.dbplatform.mysql.MySqlHistorySupport;
+import io.ebean.config.dbplatform.mysql.MySqlHistorySupport;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

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

@@ -1,9 +1,9 @@
-package com.avaje.ebean.config.dbplatform;
+package io.ebean.config.dbplatform;
 
-import com.avaje.ebean.config.DbTypeConfig;
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebean.config.dbplatform.mysql.MySqlPlatform;
-import com.avaje.ebean.dbmigration.ddlgeneration.platform.PlatformDdl;
+import io.ebean.config.DbTypeConfig;
+import io.ebean.config.ServerConfig;
+import io.ebean.config.dbplatform.mysql.MySqlPlatform;
+import io.ebean.dbmigration.ddlgeneration.platform.PlatformDdl;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

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

@@ -1,9 +1,9 @@
-package com.avaje.ebean.config.dbplatform;
+package io.ebean.config.dbplatform;
 
-import com.avaje.ebean.config.DbTypeConfig;
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebean.config.dbplatform.oracle.OraclePlatform;
-import com.avaje.ebean.dbmigration.ddlgeneration.platform.PlatformDdl;
+import io.ebean.config.DbTypeConfig;
+import io.ebean.config.ServerConfig;
+import io.ebean.config.dbplatform.oracle.OraclePlatform;
+import io.ebean.dbmigration.ddlgeneration.platform.PlatformDdl;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

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

@@ -1,6 +1,6 @@
-package com.avaje.ebean.config.dbplatform;
+package io.ebean.config.dbplatform;
 
-import com.avaje.ebean.config.dbplatform.postgres.PostgresHistorySupport;
+import io.ebean.config.dbplatform.postgres.PostgresHistorySupport;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

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

@@ -1,8 +1,8 @@
-package com.avaje.ebean.config.dbplatform;
+package io.ebean.config.dbplatform;
 
-import com.avaje.ebean.config.DbTypeConfig;
-import com.avaje.ebean.config.dbplatform.postgres.PostgresPlatform;
-import com.avaje.ebean.dbmigration.ddlgeneration.platform.PlatformDdl;
+import io.ebean.config.DbTypeConfig;
+import io.ebean.config.dbplatform.postgres.PostgresPlatform;
+import io.ebean.dbmigration.ddlgeneration.platform.PlatformDdl;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

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

@@ -1,6 +1,6 @@
-package com.avaje.ebean.dbmigration;
+package io.ebean.dbmigration;
 
-import com.avaje.ebean.BaseTestCase;
+import io.ebean.BaseTestCase;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/test/java/io/ebean/dbmigration/ddlgeneration/BaseDdlHandlerTest.java

@@ -1,13 +1,13 @@
-package com.avaje.ebean.dbmigration.ddlgeneration;
+package io.ebean.dbmigration.ddlgeneration;
 
-import com.avaje.ebean.BaseTestCase;
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebean.config.dbplatform.h2.H2Platform;
-import com.avaje.ebean.config.dbplatform.postgres.PostgresPlatform;
-import com.avaje.ebean.dbmigration.migration.ChangeSet;
-import com.avaje.ebean.dbmigration.model.CurrentModel;
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.config.ServerConfig;
+import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.config.dbplatform.postgres.PostgresPlatform;
+import io.ebean.dbmigration.migration.ChangeSet;
+import io.ebean.dbmigration.model.CurrentModel;
+import io.ebeaninternal.api.SpiEbeanServer;
 import org.junit.Ignore;
 import org.junit.Test;
 

src/test/java/io/ebean/dbmigration/ddlgeneration/Helper.java

@@ -1,11 +1,11 @@
-package com.avaje.ebean.dbmigration.ddlgeneration;
+package io.ebean.dbmigration.ddlgeneration;
 
-import com.avaje.ebean.dbmigration.migration.AddColumn;
-import com.avaje.ebean.dbmigration.migration.ChangeSet;
-import com.avaje.ebean.dbmigration.migration.CreateTable;
-import com.avaje.ebean.dbmigration.migration.DropColumn;
-import com.avaje.ebean.dbmigration.migration.Migration;
-import com.avaje.ebean.dbmigration.migrationreader.MigrationXmlReader;
+import io.ebean.dbmigration.migration.AddColumn;
+import io.ebean.dbmigration.migration.ChangeSet;
+import io.ebean.dbmigration.migration.CreateTable;
+import io.ebean.dbmigration.migration.DropColumn;
+import io.ebean.dbmigration.migration.Migration;
+import io.ebean.dbmigration.migrationreader.MigrationXmlReader;
 
 import java.io.IOException;
 import java.io.InputStream;

src/test/java/io/ebean/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java

@@ -1,15 +1,15 @@
-package com.avaje.ebean.dbmigration.ddlgeneration.platform;
+package io.ebean.dbmigration.ddlgeneration.platform;
 
 
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebean.config.dbplatform.h2.H2Platform;
-import com.avaje.ebean.config.dbplatform.oracle.OraclePlatform;
-import com.avaje.ebean.dbmigration.ddlgeneration.DdlWrite;
-import com.avaje.ebean.dbmigration.ddlgeneration.Helper;
-import com.avaje.ebean.dbmigration.migration.AddTableComment;
-import com.avaje.ebean.dbmigration.migration.AlterColumn;
-import com.avaje.ebean.dbmigration.migration.Column;
-import com.avaje.ebean.dbmigration.migration.CreateTable;
+import io.ebean.config.ServerConfig;
+import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.config.dbplatform.oracle.OraclePlatform;
+import io.ebean.dbmigration.ddlgeneration.DdlWrite;
+import io.ebean.dbmigration.ddlgeneration.Helper;
+import io.ebean.dbmigration.migration.AddTableComment;
+import io.ebean.dbmigration.migration.AlterColumn;
+import io.ebean.dbmigration.migration.Column;
+import io.ebean.dbmigration.migration.CreateTable;
 import org.junit.Test;
 
 import java.io.IOException;

src/test/java/io/ebean/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java

@@ -1,6 +1,6 @@
-package com.avaje.ebean.dbmigration.ddlgeneration.platform;
+package io.ebean.dbmigration.ddlgeneration.platform;
 
-import com.avaje.ebean.config.DbConstraintNormalise;
+import io.ebean.config.DbConstraintNormalise;
 import org.junit.Test;
 
 import static org.assertj.core.api.StrictAssertions.assertThat;
@@ -27,4 +27,4 @@ public class DbNameNormaliseTest {
 
     assertThat(normalise.trimQuotes("`fo_o`")).isEqualTo("fo_o");
   }
-}
+}

src/test/java/io/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java

@@ -1,12 +1,12 @@
-package com.avaje.ebean.dbmigration.ddlgeneration.platform;
+package io.ebean.dbmigration.ddlgeneration.platform;
 
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.config.dbplatform.h2.H2Platform;
-import com.avaje.ebean.dbmigration.ddlgeneration.DdlWrite;
-import com.avaje.ebean.dbmigration.model.CurrentModel;
-import com.avaje.ebean.dbmigration.model.MConfiguration;
-import com.avaje.ebean.dbmigration.model.ModelContainer;
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
+import io.ebean.Ebean;
+import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.dbmigration.ddlgeneration.DdlWrite;
+import io.ebean.dbmigration.model.CurrentModel;
+import io.ebean.dbmigration.model.MConfiguration;
+import io.ebean.dbmigration.model.ModelContainer;
+import io.ebeaninternal.api.SpiEbeanServer;
 import org.junit.Test;
 
 import static org.assertj.core.api.StrictAssertions.assertThat;

src/test/java/io/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java

@@ -1,4 +1,4 @@
-package com.avaje.ebean.dbmigration.ddlgeneration.platform;
+package io.ebean.dbmigration.ddlgeneration.platform;
 
 import org.junit.Test;
 
@@ -29,4 +29,4 @@ public class HistoryTableUpdateTest {
     assertThat(upd.description()).isEqualTo("[add two, include five, exclude six, drop four]");
   }
 
-}
+}

src/test/java/io/ebean/dbmigration/ddlgeneration/platform/IndexSetTest.java

@@ -1,6 +1,6 @@
-package com.avaje.ebean.dbmigration.ddlgeneration.platform;
+package io.ebean.dbmigration.ddlgeneration.platform;
 
-import com.avaje.ebean.dbmigration.ddlgeneration.platform.util.IndexSet;
+import io.ebean.dbmigration.ddlgeneration.platform.util.IndexSet;
 import org.junit.Test;
 
 import static org.junit.Assert.assertFalse;

src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java

@@ -1,11 +1,11 @@
-package com.avaje.ebean.dbmigration.ddlgeneration.platform;
+package io.ebean.dbmigration.ddlgeneration.platform;
 
-import com.avaje.ebean.config.dbplatform.h2.H2Platform;
-import com.avaje.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
-import com.avaje.ebean.config.dbplatform.mysql.MySqlPlatform;
-import com.avaje.ebean.config.dbplatform.oracle.OraclePlatform;
-import com.avaje.ebean.config.dbplatform.postgres.PostgresPlatform;
-import com.avaje.ebean.dbmigration.migration.AlterColumn;
+import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
+import io.ebean.config.dbplatform.mysql.MySqlPlatform;
+import io.ebean.config.dbplatform.oracle.OraclePlatform;
+import io.ebean.config.dbplatform.postgres.PostgresPlatform;
+import io.ebean.dbmigration.migration.AlterColumn;
 import org.junit.Test;
 
 import static org.junit.Assert.*;

src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java

@@ -1,10 +1,10 @@
-package com.avaje.ebean.dbmigration.ddlgeneration.platform;
+package io.ebean.dbmigration.ddlgeneration.platform;
 
-import com.avaje.ebean.config.dbplatform.h2.H2Platform;
-import com.avaje.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
-import com.avaje.ebean.config.dbplatform.mysql.MySqlPlatform;
-import com.avaje.ebean.config.dbplatform.oracle.OraclePlatform;
-import com.avaje.ebean.config.dbplatform.postgres.PostgresPlatform;
+import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
+import io.ebean.config.dbplatform.mysql.MySqlPlatform;
+import io.ebean.config.dbplatform.oracle.OraclePlatform;
+import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java

@@ -1,9 +1,9 @@
-package com.avaje.ebean.dbmigration.ddlgeneration.platform;
+package io.ebean.dbmigration.ddlgeneration.platform;
 
-import com.avaje.ebean.config.dbplatform.DbPlatformTypeMapping;
-import com.avaje.ebean.config.dbplatform.h2.H2Platform;
-import com.avaje.ebean.config.dbplatform.postgres.PostgresPlatform;
-import com.avaje.ebean.dbmigration.ddlgeneration.platform.util.PlatformTypeConverter;
+import io.ebean.config.dbplatform.DbPlatformTypeMapping;
+import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.config.dbplatform.postgres.PostgresPlatform;
+import io.ebean.dbmigration.ddlgeneration.platform.util.PlatformTypeConverter;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

src/test/java/io/ebean/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java

@@ -1,4 +1,4 @@
-package com.avaje.ebean.dbmigration.ddlgeneration.platform.util;
+package io.ebean.dbmigration.ddlgeneration.platform.util;
 
 import org.junit.Test;
 

src/test/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java

@@ -1,6 +1,6 @@
-package com.avaje.ebean.dbmigration.migrationreader;
+package io.ebean.dbmigration.migrationreader;
 
-import com.avaje.ebean.dbmigration.migration.Migration;
+import io.ebean.dbmigration.migration.Migration;
 import org.junit.Test;
 
 import java.io.File;

src/test/java/io/ebean/dbmigration/model/EntryTest.java

@@ -1,7 +1,7 @@
-package com.avaje.ebean.dbmigration.model;
+package io.ebean.dbmigration.model;
 
-import com.avaje.ebean.dbmigration.migration.ChangeSet;
-import com.avaje.ebean.dbmigration.migration.DropColumn;
+import io.ebean.dbmigration.migration.ChangeSet;
+import io.ebean.dbmigration.migration.DropColumn;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 

src/test/java/io/ebean/dbmigration/model/MColumnTest.java

@@ -1,6 +1,6 @@
-package com.avaje.ebean.dbmigration.model;
+package io.ebean.dbmigration.model;
 
-import com.avaje.ebean.dbmigration.migration.AlterColumn;
+import io.ebean.dbmigration.migration.AlterColumn;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 

src/test/java/io/ebean/dbmigration/model/MTableTest.java

@@ -1,11 +1,11 @@
-package com.avaje.ebean.dbmigration.model;
+package io.ebean.dbmigration.model;
 
-import com.avaje.ebean.dbmigration.migration.AddColumn;
-import com.avaje.ebean.dbmigration.migration.AddHistoryTable;
-import com.avaje.ebean.dbmigration.migration.AlterColumn;
-import com.avaje.ebean.dbmigration.migration.DropColumn;
-import com.avaje.ebean.dbmigration.migration.DropHistoryTable;
-import com.avaje.ebean.dbmigration.migration.DropTable;
+import io.ebean.dbmigration.migration.AddColumn;
+import io.ebean.dbmigration.migration.AddHistoryTable;
+import io.ebean.dbmigration.migration.AlterColumn;
+import io.ebean.dbmigration.migration.DropColumn;
+import io.ebean.dbmigration.migration.DropHistoryTable;
+import io.ebean.dbmigration.migration.DropTable;
 import org.junit.Test;
 
 import java.util.List;

src/test/java/io/ebean/dbmigration/model/MigrationVersionTest.java

@@ -1,4 +1,4 @@
-package com.avaje.ebean.dbmigration.model;
+package io.ebean.dbmigration.model;
 
 import org.junit.Test;
 

src/test/java/io/ebean/dbmigration/model/ModelContainerApplyTest.java

@@ -1,11 +1,11 @@
-package com.avaje.ebean.dbmigration.model;
+package io.ebean.dbmigration.model;
 
-import com.avaje.ebean.dbmigration.migration.AddColumn;
-import com.avaje.ebean.dbmigration.migration.ChangeSet;
-import com.avaje.ebean.dbmigration.migration.CreateTable;
-import com.avaje.ebean.dbmigration.migration.DropColumn;
-import com.avaje.ebean.dbmigration.migration.Migration;
-import com.avaje.ebean.dbmigration.migrationreader.MigrationXmlReader;
+import io.ebean.dbmigration.migration.AddColumn;
+import io.ebean.dbmigration.migration.ChangeSet;
+import io.ebean.dbmigration.migration.CreateTable;
+import io.ebean.dbmigration.migration.DropColumn;
+import io.ebean.dbmigration.migration.Migration;
+import io.ebean.dbmigration.migrationreader.MigrationXmlReader;
 import org.junit.Test;
 
 import java.util.List;
@@ -38,4 +38,4 @@ public class ModelContainerApplyTest {
     assertThat(foo.isWithHistory()).isEqualTo(false);
     assertThat(foo.allColumns()).extracting("name").contains("col1", "col3", "added_to_foo");
   }
-}
+}

src/test/java/io/ebean/dbmigration/model/ModelContainerTest.java

@@ -1,8 +1,8 @@
-package com.avaje.ebean.dbmigration.model;
+package io.ebean.dbmigration.model;
 
 
-import com.avaje.ebean.dbmigration.migration.Migration;
-import com.avaje.ebean.dbmigration.migrationreader.MigrationXmlReader;
+import io.ebean.dbmigration.migration.Migration;
+import io.ebean.dbmigration.migrationreader.MigrationXmlReader;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 

src/test/java/io/ebean/dbmigration/model/ModelDiffTest.java

@@ -1,4 +1,4 @@
-package com.avaje.ebean.dbmigration.model;
+package io.ebean.dbmigration.model;
 
 import org.junit.Test;
 
@@ -24,4 +24,4 @@ public class ModelDiffTest {
     assertThat(tab.allHistoryColumns(true)).contains("status");
     assertThat(tab.allColumns()).extracting("name").doesNotContain("status");
   }
-}
+}

src/test/java/io/ebean/dbmigration/model/PendingDropsTest.java

@@ -1,8 +1,8 @@
-package com.avaje.ebean.dbmigration.model;
+package io.ebean.dbmigration.model;
 
-import com.avaje.ebean.dbmigration.migration.ChangeSet;
-import com.avaje.ebean.dbmigration.migration.DropColumn;
-import com.avaje.ebean.dbmigration.migration.Migration;
+import io.ebean.dbmigration.migration.ChangeSet;
+import io.ebean.dbmigration.migration.DropColumn;
+import io.ebean.dbmigration.migration.Migration;
 import org.junit.Test;
 
 import java.util.ArrayList;

src/test/java/io/ebean/dbmigration/model/build/ModelBuildBeanVisitorTest.java

@@ -1,14 +1,14 @@
-package com.avaje.ebean.dbmigration.model.build;
+package io.ebean.dbmigration.model.build;
 
 
-import com.avaje.ebean.BaseTestCase;
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.config.DbConstraintNaming;
-import com.avaje.ebean.dbmigration.ddlgeneration.platform.DefaultConstraintMaxLength;
-import com.avaje.ebean.dbmigration.model.MTable;
-import com.avaje.ebean.dbmigration.model.ModelContainer;
-import com.avaje.ebean.dbmigration.model.visitor.VisitAllUsing;
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.config.DbConstraintNaming;
+import io.ebean.dbmigration.ddlgeneration.platform.DefaultConstraintMaxLength;
+import io.ebean.dbmigration.model.MTable;
+import io.ebean.dbmigration.model.ModelContainer;
+import io.ebean.dbmigration.model.visitor.VisitAllUsing;
+import io.ebeaninternal.api.SpiEbeanServer;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

src/test/java/io/ebean/dbmigration/model/build/ModelBuild_compoundKeyTest.java

@@ -1,20 +1,20 @@
-package com.avaje.ebean.dbmigration.model.build;
+package io.ebean.dbmigration.model.build;
 
 
-import com.avaje.ebean.BaseTestCase;
-import com.avaje.ebean.EbeanServerFactory;
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebean.dbmigration.ddlgeneration.Helper;
-import com.avaje.ebean.dbmigration.migration.Migration;
-import com.avaje.ebean.dbmigration.migrationreader.MigrationXmlReader;
-import com.avaje.ebean.dbmigration.model.CurrentModel;
-import com.avaje.ebean.dbmigration.model.MTable;
-import com.avaje.ebean.dbmigration.model.ModelContainer;
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
-import com.avaje.tests.model.basic.CKeyAssoc;
-import com.avaje.tests.model.basic.CKeyDetail;
-import com.avaje.tests.model.basic.CKeyParent;
-import com.avaje.tests.model.basic.CKeyParentId;
+import io.ebean.BaseTestCase;
+import io.ebean.EbeanServerFactory;
+import io.ebean.config.ServerConfig;
+import io.ebean.dbmigration.ddlgeneration.Helper;
+import io.ebean.dbmigration.migration.Migration;
+import io.ebean.dbmigration.migrationreader.MigrationXmlReader;
+import io.ebean.dbmigration.model.CurrentModel;
+import io.ebean.dbmigration.model.MTable;
+import io.ebean.dbmigration.model.ModelContainer;
+import io.ebeaninternal.api.SpiEbeanServer;
+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.Test;
 
 import java.io.IOException;
@@ -84,4 +84,4 @@ public class ModelBuild_compoundKeyTest extends BaseTestCase {
 
     assertThat(createDdl).isEqualTo(apply);
   }
-}
+}

src/test/java/io/ebean/dbmigration/model/build/ModelBuild_explicitSequencesTest.java

@@ -1,14 +1,14 @@
-package com.avaje.ebean.dbmigration.model.build;
+package io.ebean.dbmigration.model.build;
 
 
-import com.avaje.ebean.BaseTestCase;
-import com.avaje.ebean.EbeanServerFactory;
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebean.dbmigration.ddlgeneration.Helper;
-import com.avaje.ebean.dbmigration.model.CurrentModel;
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
-import com.avaje.tests.model.basic.Person;
-import com.avaje.tests.model.basic.Phone;
+import io.ebean.BaseTestCase;
+import io.ebean.EbeanServerFactory;
+import io.ebean.config.ServerConfig;
+import io.ebean.dbmigration.ddlgeneration.Helper;
+import io.ebean.dbmigration.model.CurrentModel;
+import io.ebeaninternal.api.SpiEbeanServer;
+import org.tests.model.basic.Person;
+import org.tests.model.basic.Phone;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -62,4 +62,4 @@ public class ModelBuild_explicitSequencesTest extends BaseTestCase {
   }
 
 
-}
+}

src/test/java/io/ebean/event/BeanFindControllerTest.java

@@ -1,13 +1,13 @@
-package com.avaje.ebean.event;
+package io.ebean.event;
 
-import com.avaje.ebean.BaseTestCase;
-import com.avaje.ebean.EbeanServer;
-import com.avaje.ebean.EbeanServerFactory;
-import com.avaje.ebean.bean.BeanCollection;
-import com.avaje.ebean.common.BeanList;
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.tests.model.basic.EBasic;
-import com.avaje.tests.model.basic.ECustomId;
+import io.ebean.BaseTestCase;
+import io.ebean.EbeanServer;
+import io.ebean.EbeanServerFactory;
+import io.ebean.bean.BeanCollection;
+import io.ebean.common.BeanList;
+import io.ebean.config.ServerConfig;
+import org.tests.model.basic.EBasic;
+import org.tests.model.basic.ECustomId;
 import org.example.ModUuidGenerator;
 import org.junit.Test;
 

src/test/java/io/ebean/event/BeanPersistControllerTest.java

@@ -1,10 +1,10 @@
-package com.avaje.ebean.event;
+package io.ebean.event;
 
 
-import com.avaje.ebean.EbeanServer;
-import com.avaje.ebean.EbeanServerFactory;
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.tests.model.basic.EBasicVer;
+import io.ebean.EbeanServer;
+import io.ebean.EbeanServerFactory;
+import io.ebean.config.ServerConfig;
+import org.tests.model.basic.EBasicVer;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -139,4 +139,4 @@ public class BeanPersistControllerTest {
     }
   }
 
-}
+}

src/test/java/io/ebean/event/BeanPostLoadTest.java

@@ -1,13 +1,13 @@
-package com.avaje.ebean.event;
+package io.ebean.event;
 
 
-import com.avaje.ebean.BaseTestCase;
-import com.avaje.ebean.BeanState;
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.EbeanServer;
-import com.avaje.ebean.EbeanServerFactory;
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.tests.model.basic.EBasicVer;
+import io.ebean.BaseTestCase;
+import io.ebean.BeanState;
+import io.ebean.Ebean;
+import io.ebean.EbeanServer;
+import io.ebean.EbeanServerFactory;
+import io.ebean.config.ServerConfig;
+import org.tests.model.basic.EBasicVer;
 import org.junit.Test;
 
 import java.util.ArrayList;

src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java

@@ -1,4 +1,4 @@
-package com.avaje.ebean.event.readaudit;
+package io.ebean.event.readaudit;
 
 
 import org.junit.Test;
@@ -18,4 +18,4 @@ public class ReadAuditQueryPlanTest {
     assertNotEquals(plan1, new ReadAuditQueryPlan("org.Bean", "notQueryKey", "select id from foo"));
     assertNotEquals(plan1, new ReadAuditQueryPlan("org.NotBean", "queryKey", "select id from foo"));
   }
-}
+}

src/test/java/io/ebean/json/EJsonTests.java

@@ -1,8 +1,8 @@
-package com.avaje.ebean.json;
+package io.ebean.json;
 
-import com.avaje.ebean.text.json.EJson;
-import com.avaje.ebeaninternal.server.type.ModifyAwareMap;
-import com.avaje.ebeaninternal.server.type.ModifyAwareOwner;
+import io.ebean.text.json.EJson;
+import io.ebeaninternal.server.type.ModifyAwareMap;
+import io.ebeaninternal.server.type.ModifyAwareOwner;
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import org.junit.Test;

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

@@ -1,20 +1,20 @@
-package com.avaje.ebean.plugin;
+package io.ebean.plugin;
 
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.EbeanServer;
-import com.avaje.ebean.FetchPath;
-import com.avaje.ebean.Query;
-import com.avaje.ebean.text.PathProperties;
-import com.avaje.ebeaninternal.api.SpiQuery;
-import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail;
-import com.avaje.tests.inheritance.Stockforecast;
-import com.avaje.tests.model.basic.Car;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.OrderDetail;
-import com.avaje.tests.model.basic.Person;
-import com.avaje.tests.model.basic.Product;
-import com.avaje.tests.model.basic.Vehicle;
+import io.ebean.Ebean;
+import io.ebean.EbeanServer;
+import io.ebean.FetchPath;
+import io.ebean.Query;
+import io.ebean.text.PathProperties;
+import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.server.querydefn.OrmQueryDetail;
+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.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

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

@@ -1,9 +1,9 @@
-package com.avaje.ebean.plugin;
+package io.ebean.plugin;
 
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.EbeanServer;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.Order;
+import io.ebean.Ebean;
+import io.ebean.EbeanServer;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.Order;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

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

@@ -1,9 +1,9 @@
-package com.avaje.ebean.plugin;
+package io.ebean.plugin;
 
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.EbeanServer;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.Order;
+import io.ebean.Ebean;
+import io.ebean.EbeanServer;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.Order;
 import org.junit.Test;
 
 import static org.assertj.core.api.StrictAssertions.assertThat;
@@ -53,4 +53,4 @@ public class PropertyTest {
     assertThat(beanType(Order.class).getProperty("customer").getName()).isEqualTo("customer");
     assertThat(beanType(Order.class).getProperty("details").getName()).isEqualTo("details");
   }
-}
+}

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

@@ -1,8 +1,8 @@
-package com.avaje.ebean.plugin;
+package io.ebean.plugin;
 
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.EbeanServer;
-import com.avaje.tests.model.basic.Customer;
+import io.ebean.Ebean;
+import io.ebean.EbeanServer;
+import org.tests.model.basic.Customer;
 import org.junit.Test;
 
 import java.util.List;

src/test/java/io/ebean/server/type/MyDayOfWeek.java

@@ -1,6 +1,6 @@
-package com.avaje.ebean.server.type;
+package io.ebean.server.type;
 
-import com.avaje.ebean.annotation.EnumValue;
+import io.ebean.annotation.EnumValue;
 
 /**
  * Enum test when DB CHAR column used with spaces.

src/test/java/io/ebean/server/type/MyEnum.java

@@ -1,6 +1,6 @@
-package com.avaje.ebean.server.type;
+package io.ebean.server.type;
 
-import com.avaje.ebean.annotation.EnumValue;
+import io.ebean.annotation.EnumValue;
 
 /**
  * Enum with method overrides (and hence multiple actual classes).

src/test/java/io/ebean/server/type/TestTypeManager.java

@@ -1,14 +1,14 @@
-package com.avaje.ebean.server.type;
+package io.ebean.server.type;
 
-import com.avaje.ebean.BaseTestCase;
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebean.config.dbplatform.h2.H2Platform;
-import com.avaje.ebeaninternal.server.core.bootup.BootupClasses;
-import com.avaje.ebeaninternal.server.type.DefaultTypeManager;
-import com.avaje.ebeaninternal.server.type.RsetDataReader;
-import com.avaje.ebeaninternal.server.type.ScalarType;
-import com.avaje.tests.model.ivo.Money;
-import com.avaje.tests.model.ivo.converter.MoneyTypeConverter;
+import io.ebean.BaseTestCase;
+import io.ebean.config.ServerConfig;
+import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebeaninternal.server.core.bootup.BootupClasses;
+import io.ebeaninternal.server.type.DefaultTypeManager;
+import io.ebeaninternal.server.type.RsetDataReader;
+import io.ebeaninternal.server.type.ScalarType;
+import org.tests.model.ivo.Money;
+import org.tests.model.ivo.converter.MoneyTypeConverter;
 import org.junit.Assert;
 import org.junit.Test;
 

src/test/java/io/ebean/text/PathPropertiesTests.java

@@ -1,6 +1,6 @@
-package com.avaje.ebean.text;
+package io.ebean.text;
 
-import com.avaje.ebean.FetchPath;
+import io.ebean.FetchPath;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

src/test/java/io/ebean/text/json/JsonBeanReaderTest.java

@@ -1,9 +1,9 @@
-package com.avaje.ebean.text.json;
+package io.ebean.text.json;
 
-import com.avaje.ebean.BaseTestCase;
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.bean.PersistenceContext;
-import com.avaje.tests.model.basic.Customer;
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebean.bean.PersistenceContext;
+import org.tests.model.basic.Customer;
 import com.fasterxml.jackson.core.JsonParser;
 import org.junit.Test;
 
@@ -85,4 +85,4 @@ public class JsonBeanReaderTest extends BaseTestCase {
     assertThat(pc.get(Customer.class, 42)).isSameAs(customer);
   }
 
-}
+}

src/test/java/io/ebean/text/json/JsonContextTest.java

@@ -1,12 +1,12 @@
-package com.avaje.ebean.text.json;
+package io.ebean.text.json;
 
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.EbeanServer;
-import com.avaje.ebean.text.PathProperties;
-import com.avaje.tests.model.basic.Contact;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.ResetBasicData;
+import io.ebean.Ebean;
+import io.ebean.EbeanServer;
+import io.ebean.text.PathProperties;
+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 com.fasterxml.jackson.core.JsonGenerator;
 import org.junit.Test;
 

src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java

@@ -1,6 +1,6 @@
-package com.avaje.ebean.text.json;
+package io.ebean.text.json;
 
-import com.avaje.ebean.FetchPath;
+import io.ebean.FetchPath;
 import org.junit.Test;
 
 import java.util.Set;

src/test/java/io/ebean/util/CamelCaseHelperTest.java

@@ -1,4 +1,4 @@
-package com.avaje.ebean.util;
+package io.ebean.util;
 
 import org.junit.Test;
 

src/test/java/io/ebeaninternal/api/BindParamsTest.java

@@ -1,4 +1,4 @@
-package com.avaje.ebeaninternal.api;
+package io.ebeaninternal.api;
 
 import org.junit.Test;
 
@@ -37,4 +37,4 @@ public class BindParamsTest {
     assertTrue(bindParams.isSameBindHash());
   }
 
-}
+}

src/test/java/io/ebeaninternal/api/HashQueryPlanBuilderTest.java

@@ -1,4 +1,4 @@
-package com.avaje.ebeaninternal.api;
+package io.ebeaninternal.api;
 
 
 import org.junit.Test;

src/test/java/io/ebeaninternal/api/HashQueryPlanTest.java

@@ -1,4 +1,4 @@
-package com.avaje.ebeaninternal.api;
+package io.ebeaninternal.api;
 
 
 import org.junit.Test;

src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java

@@ -1,23 +1,49 @@
-package com.avaje.ebeaninternal.api;
+package io.ebeaninternal.api;
 
-import com.avaje.ebean.*;
-import com.avaje.ebean.bean.BeanCollection;
-import com.avaje.ebean.bean.CallStack;
-import com.avaje.ebean.bean.EntityBeanIntercept;
-import com.avaje.ebean.bean.ObjectGraphNode;
-import com.avaje.ebean.cache.ServerCacheManager;
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebean.config.dbplatform.DatabasePlatform;
-import com.avaje.ebean.event.readaudit.ReadAuditLogger;
-import com.avaje.ebean.event.readaudit.ReadAuditPrepare;
-import com.avaje.ebean.meta.MetaInfoManager;
-import com.avaje.ebean.plugin.SpiServer;
-import com.avaje.ebean.text.csv.CsvReader;
-import com.avaje.ebean.text.json.JsonContext;
-import com.avaje.ebeaninternal.server.core.timezone.DataTimeZone;
-import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
-import com.avaje.ebeaninternal.server.query.CQuery;
-import com.avaje.ebeaninternal.server.transaction.RemoteTransactionEvent;
+import io.ebean.AutoTune;
+import io.ebean.BackgroundExecutor;
+import io.ebean.BeanState;
+import io.ebean.CallableSql;
+import io.ebean.DocumentStore;
+import io.ebean.ExpressionFactory;
+import io.ebean.Filter;
+import io.ebean.FutureIds;
+import io.ebean.FutureList;
+import io.ebean.FutureRowCount;
+import io.ebean.PagedList;
+import io.ebean.PersistenceContextScope;
+import io.ebean.Query;
+import io.ebean.QueryIterator;
+import io.ebean.SqlQuery;
+import io.ebean.SqlRow;
+import io.ebean.SqlUpdate;
+import io.ebean.Transaction;
+import io.ebean.TransactionCallback;
+import io.ebean.TxCallable;
+import io.ebean.TxRunnable;
+import io.ebean.TxScope;
+import io.ebean.Update;
+import io.ebean.UpdateQuery;
+import io.ebean.ValuePair;
+import io.ebean.Version;
+import io.ebean.bean.BeanCollection;
+import io.ebean.bean.CallStack;
+import io.ebean.bean.EntityBeanIntercept;
+import io.ebean.bean.ObjectGraphNode;
+import io.ebean.cache.ServerCacheManager;
+import io.ebean.config.ServerConfig;
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.event.readaudit.ReadAuditLogger;
+import io.ebean.event.readaudit.ReadAuditPrepare;
+import io.ebean.meta.MetaInfoManager;
+import io.ebean.plugin.SpiServer;
+import io.ebean.text.csv.CsvReader;
+import io.ebean.text.json.JsonContext;
+import io.ebeaninternal.server.core.timezone.DataTimeZone;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.query.CQuery;
+import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
+import io.ebean.TxIsolation;
 
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;

src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java

@@ -1,4 +1,4 @@
-package com.avaje.ebeaninternal.extraddl.model;
+package io.ebeaninternal.extraddl.model;
 
 import org.junit.Test;
 
@@ -44,4 +44,4 @@ public class ExtraDdlXmlReaderTest {
     assertThat(ddl).doesNotContain(" -- oracle only script");
   }
 
-}
+}

src/test/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReaderTest.java

@@ -1,6 +1,6 @@
-package com.avaje.ebeaninternal.server.autotune.service;
+package io.ebeaninternal.server.autotune.service;
 
-import com.avaje.ebeaninternal.server.autotune.model.Autotune;
+import io.ebeaninternal.server.autotune.model.Autotune;
 import org.junit.Test;
 
 import java.io.File;
@@ -28,4 +28,4 @@ public class AutoTuneXmlReaderTest {
     assertThat(tuneInfo.getOrigin()).isNotEmpty();
   }
 
-}
+}

src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java

@@ -1,18 +1,18 @@
-package com.avaje.ebeaninternal.server.cache;
+package io.ebeaninternal.server.cache;
 
-import com.avaje.ebean.BaseTestCase;
-import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebean.bean.PersistenceContext;
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
-import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
-import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne;
-import com.avaje.ebeaninternal.server.transaction.DefaultPersistenceContext;
-import com.avaje.tests.model.basic.Address;
-import com.avaje.tests.model.basic.Country;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.Customer.Status;
-import com.avaje.tests.model.embedded.EAddress;
-import com.avaje.tests.model.embedded.EPerson;
+import io.ebean.BaseTestCase;
+import io.ebean.bean.EntityBean;
+import io.ebean.bean.PersistenceContext;
+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.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.Test;
 
 import java.sql.Timestamp;