diff --git a/pom.xml b/pom.xml index 1cb39eb29..139957c1b 100644 --- a/pom.xml +++ b/pom.xml @@ -38,11 +38,11 @@ 2.1.3 - - org.avaje.ebean - ebean-annotation - 1.5 - + + + + + org.avaje @@ -65,7 +65,7 @@ org.avaje avaje-classpath-scanner - 2.2.1 + 2.2.2-SNAPSHOT @@ -162,9 +162,9 @@ - org.avaje.ebean + io.ebean ebean-agent - 8.1.1 + 10.1.1-SNAPSHOT test @@ -227,9 +227,9 @@ - org.avaje.ebean + io.ebean ebean-maven-plugin - 8.1.1 + 10.1.1-SNAPSHOT test @@ -283,11 +283,11 @@ maven-javadoc-plugin 2.9.1 - Ebean 9 - src/main/java/com/avaje/ebean/overview.html + Ebean 10 + src/main/java/io/ebean/overview.html 1.8 org.avaje.doclet.PygmentsDoclet - com.avaje.ebeaninternal.*:com.avaje.ebean.util:com.avaje.ebean.dbmigration.ddlgeneration:com.avaje.ebean.dbmigration.migration:com.avaje.ebean.dbmigration.migrationreader:com.avaje.ebean.dbmigration.model + io.ebeaninternal.*:com.avaje.ebean.util:io.ebean.dbmigration.ddlgeneration:io.ebean.dbmigration.migration:io.ebean.dbmigration.migrationreader:io.ebean.dbmigration.model org.avaje pygments-doclet diff --git a/src/main/java/com/avaje/ebeaninternal/api/package-info.java b/src/main/java/com/avaje/ebeaninternal/api/package-info.java deleted file mode 100644 index de61459f3..000000000 --- a/src/main/java/com/avaje/ebeaninternal/api/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.avaje.ebeaninternal.api; \ No newline at end of file diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneServiceFactory.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneServiceFactory.java deleted file mode 100644 index 8da0a6ffb..000000000 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneServiceFactory.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.avaje.ebeaninternal.server.autotune.service; - -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.autotune.AutoTuneService; - -public class AutoTuneServiceFactory { - - public static AutoTuneService create(SpiEbeanServer server, ServerConfig serverConfig) { - - return new DefaultAutoTuneService(server, serverConfig); - } - -} diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/package-info.java b/src/main/java/com/avaje/ebeaninternal/server/cache/package-info.java deleted file mode 100644 index b72997ba7..000000000 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.avaje.ebeaninternal.server.cache; \ No newline at end of file diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/package-info.java b/src/main/java/com/avaje/ebeaninternal/server/el/package-info.java deleted file mode 100644 index 5040e1ac6..000000000 --- a/src/main/java/com/avaje/ebeaninternal/server/el/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.avaje.ebeaninternal.server.el; \ No newline at end of file diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/package-info.java b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/package-info.java deleted file mode 100644 index 4e75032d8..000000000 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.avaje.ebeaninternal.server.loadcontext; \ No newline at end of file diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/package-info.java b/src/main/java/com/avaje/ebeaninternal/server/query/package-info.java deleted file mode 100644 index c78134345..000000000 --- a/src/main/java/com/avaje/ebeaninternal/server/query/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.avaje.ebeaninternal.server.query; \ No newline at end of file diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/package-info.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/package-info.java deleted file mode 100644 index 6394f99e4..000000000 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.avaje.ebeaninternal.server.querydefn; \ No newline at end of file diff --git a/src/main/java/com/avaje/ebeaninternal/server/text/csv/package-info.java b/src/main/java/com/avaje/ebeaninternal/server/text/csv/package-info.java deleted file mode 100644 index f55270085..000000000 --- a/src/main/java/com/avaje/ebeaninternal/server/text/csv/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.avaje.ebeaninternal.server.text.csv; \ No newline at end of file diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/package-info.java b/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/package-info.java deleted file mode 100644 index 65eaf21f6..000000000 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Mapping for document store integration. - */ -package com.avaje.ebeanservice.docstore.api.mapping; \ No newline at end of file diff --git a/src/main/java/com/avaje/ebean/AutoTune.java b/src/main/java/io/ebean/AutoTune.java similarity index 96% rename from src/main/java/com/avaje/ebean/AutoTune.java rename to src/main/java/io/ebean/AutoTune.java index dc34f7b09..6aed5c1b5 100644 --- a/src/main/java/com/avaje/ebean/AutoTune.java +++ b/src/main/java/io/ebean/AutoTune.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; /** * Administrative control of AutoTune during runtime. diff --git a/src/main/java/com/avaje/ebean/BackgroundExecutor.java b/src/main/java/io/ebean/BackgroundExecutor.java similarity index 98% rename from src/main/java/com/avaje/ebean/BackgroundExecutor.java rename to src/main/java/io/ebean/BackgroundExecutor.java index 8f2afbf64..b88f8b658 100644 --- a/src/main/java/com/avaje/ebean/BackgroundExecutor.java +++ b/src/main/java/io/ebean/BackgroundExecutor.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/avaje/ebean/BeanState.java b/src/main/java/io/ebean/BeanState.java similarity index 99% rename from src/main/java/com/avaje/ebean/BeanState.java rename to src/main/java/io/ebean/BeanState.java index 7972abbd4..36f7477b4 100644 --- a/src/main/java/com/avaje/ebean/BeanState.java +++ b/src/main/java/io/ebean/BeanState.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import java.beans.PropertyChangeListener; import java.util.Map; diff --git a/src/main/java/com/avaje/ebean/CallableSql.java b/src/main/java/io/ebean/CallableSql.java similarity index 97% rename from src/main/java/com/avaje/ebean/CallableSql.java rename to src/main/java/io/ebean/CallableSql.java index edeb670a0..0ff90d181 100644 --- a/src/main/java/com/avaje/ebean/CallableSql.java +++ b/src/main/java/io/ebean/CallableSql.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import java.sql.CallableStatement; import java.sql.SQLException; @@ -73,8 +73,8 @@ import java.sql.SQLException; * } * } * - * @see com.avaje.ebean.SqlUpdate - * @see com.avaje.ebean.Ebean#execute(CallableSql) + * @see SqlUpdate + * @see Ebean#execute(CallableSql) */ public interface CallableSql { diff --git a/src/main/java/com/avaje/ebean/DRawSqlColumnsParser.java b/src/main/java/io/ebean/DRawSqlColumnsParser.java similarity index 97% rename from src/main/java/com/avaje/ebean/DRawSqlColumnsParser.java rename to src/main/java/io/ebean/DRawSqlColumnsParser.java index 6cb9d14ce..3848d4131 100644 --- a/src/main/java/com/avaje/ebean/DRawSqlColumnsParser.java +++ b/src/main/java/io/ebean/DRawSqlColumnsParser.java @@ -1,6 +1,6 @@ -package com.avaje.ebean; +package io.ebean; -import com.avaje.ebean.RawSql.ColumnMapping; +import io.ebean.RawSql.ColumnMapping; import javax.persistence.PersistenceException; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebean/DRawSqlParser.java b/src/main/java/io/ebean/DRawSqlParser.java similarity index 98% rename from src/main/java/com/avaje/ebean/DRawSqlParser.java rename to src/main/java/io/ebean/DRawSqlParser.java index a212c795c..83325f6b7 100644 --- a/src/main/java/com/avaje/ebean/DRawSqlParser.java +++ b/src/main/java/io/ebean/DRawSqlParser.java @@ -1,7 +1,7 @@ -package com.avaje.ebean; +package io.ebean; -import com.avaje.ebean.RawSql.Sql; -import com.avaje.ebeaninternal.server.querydefn.SimpleTextParser; +import io.ebean.RawSql.Sql; +import io.ebeaninternal.server.querydefn.SimpleTextParser; /** * Parses sql-select queries to try and determine the location where WHERE and diff --git a/src/main/java/com/avaje/ebean/DocStoreQueueEntry.java b/src/main/java/io/ebean/DocStoreQueueEntry.java similarity index 98% rename from src/main/java/com/avaje/ebean/DocStoreQueueEntry.java rename to src/main/java/io/ebean/DocStoreQueueEntry.java index 88ff882fd..9d631ce19 100644 --- a/src/main/java/com/avaje/ebean/DocStoreQueueEntry.java +++ b/src/main/java/io/ebean/DocStoreQueueEntry.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; /** * Bean holding the details to update the document store. diff --git a/src/main/java/com/avaje/ebean/DocumentStore.java b/src/main/java/io/ebean/DocumentStore.java similarity index 99% rename from src/main/java/com/avaje/ebean/DocumentStore.java rename to src/main/java/io/ebean/DocumentStore.java index 15c43881d..68bb8a765 100644 --- a/src/main/java/com/avaje/ebean/DocumentStore.java +++ b/src/main/java/io/ebean/DocumentStore.java @@ -1,6 +1,6 @@ -package com.avaje.ebean; +package io.ebean; -import com.avaje.ebeanservice.docstore.api.DocQueryRequest; +import io.ebeanservice.docstore.api.DocQueryRequest; import org.jetbrains.annotations.Nullable; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java similarity index 99% rename from src/main/java/com/avaje/ebean/Ebean.java rename to src/main/java/io/ebean/Ebean.java index 74aea15a6..48132a90c 100644 --- a/src/main/java/com/avaje/ebean/Ebean.java +++ b/src/main/java/io/ebean/Ebean.java @@ -1,9 +1,9 @@ -package com.avaje.ebean; +package io.ebean; -import com.avaje.ebean.cache.ServerCacheManager; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.text.csv.CsvReader; -import com.avaje.ebean.text.json.JsonContext; +import io.ebean.cache.ServerCacheManager; +import io.ebean.config.ServerConfig; +import io.ebean.text.csv.CsvReader; +import io.ebean.text.json.JsonContext; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java similarity index 99% rename from src/main/java/com/avaje/ebean/EbeanServer.java rename to src/main/java/io/ebean/EbeanServer.java index 8281d2813..45421246e 100644 --- a/src/main/java/com/avaje/ebean/EbeanServer.java +++ b/src/main/java/io/ebean/EbeanServer.java @@ -1,11 +1,11 @@ -package com.avaje.ebean; +package io.ebean; -import com.avaje.ebean.cache.ServerCacheManager; -import com.avaje.ebean.config.ServerConfig; -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 io.ebean.cache.ServerCacheManager; +import io.ebean.config.ServerConfig; +import io.ebean.meta.MetaInfoManager; +import io.ebean.plugin.SpiServer; +import io.ebean.text.csv.CsvReader; +import io.ebean.text.json.JsonContext; import org.jetbrains.annotations.Nullable; import javax.persistence.NonUniqueResultException; @@ -907,7 +907,7 @@ public interface EbeanServer { * @param query the query to execute the row count on * @param transaction the transaction (can be null). * @return a Future object for the row count query - * @see com.avaje.ebean.Query#findFutureCount() + * @see Query#findFutureCount() */ FutureRowCount findFutureCount(Query query, Transaction transaction); @@ -922,7 +922,7 @@ public interface EbeanServer { * @param query the query to execute the fetch Id's on * @param transaction the transaction (can be null). * @return a Future object for the list of Id's - * @see com.avaje.ebean.Query#findFutureIds() + * @see Query#findFutureIds() */ FutureIds findFutureIds(Query query, Transaction transaction); diff --git a/src/main/java/com/avaje/ebean/EbeanServerFactory.java b/src/main/java/io/ebean/EbeanServerFactory.java similarity index 93% rename from src/main/java/com/avaje/ebean/EbeanServerFactory.java rename to src/main/java/io/ebean/EbeanServerFactory.java index bcc9a2062..a915b26f3 100644 --- a/src/main/java/com/avaje/ebean/EbeanServerFactory.java +++ b/src/main/java/io/ebean/EbeanServerFactory.java @@ -1,9 +1,9 @@ -package com.avaje.ebean; +package io.ebean; -import com.avaje.ebean.common.SpiContainer; -import com.avaje.ebean.config.ContainerConfig; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebeaninternal.server.lib.ShutdownManager; +import io.ebean.common.SpiContainer; +import io.ebean.config.ContainerConfig; +import io.ebean.config.ServerConfig; +import io.ebeaninternal.server.lib.ShutdownManager; import javax.persistence.PersistenceException; import java.lang.reflect.Constructor; @@ -30,7 +30,7 @@ import java.util.Properties; public class EbeanServerFactory { - private static final String DEFAULT_CONTAINER = "com.avaje.ebeaninternal.server.core.DefaultContainer"; + private static final String DEFAULT_CONTAINER = "io.ebeaninternal.server.core.DefaultContainer"; private static SpiContainer container; diff --git a/src/main/java/com/avaje/ebean/ExampleExpression.java b/src/main/java/io/ebean/ExampleExpression.java similarity index 98% rename from src/main/java/com/avaje/ebean/ExampleExpression.java rename to src/main/java/io/ebean/ExampleExpression.java index 6561ed76f..21e40fd35 100644 --- a/src/main/java/com/avaje/ebean/ExampleExpression.java +++ b/src/main/java/io/ebean/ExampleExpression.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; /** * Query by Example expression. diff --git a/src/main/java/com/avaje/ebean/Expr.java b/src/main/java/io/ebean/Expr.java similarity index 99% rename from src/main/java/com/avaje/ebean/Expr.java rename to src/main/java/io/ebean/Expr.java index 41718174e..08c828fc8 100644 --- a/src/main/java/com/avaje/ebean/Expr.java +++ b/src/main/java/io/ebean/Expr.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import java.util.Collection; import java.util.Map; diff --git a/src/main/java/com/avaje/ebean/Expression.java b/src/main/java/io/ebean/Expression.java similarity index 80% rename from src/main/java/com/avaje/ebean/Expression.java rename to src/main/java/io/ebean/Expression.java index 306bccb93..98534c067 100644 --- a/src/main/java/com/avaje/ebean/Expression.java +++ b/src/main/java/io/ebean/Expression.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; /** * An expression that is part of a WHERE or HAVING clause. diff --git a/src/main/java/com/avaje/ebean/ExpressionFactory.java b/src/main/java/io/ebean/ExpressionFactory.java similarity index 97% rename from src/main/java/com/avaje/ebean/ExpressionFactory.java rename to src/main/java/io/ebean/ExpressionFactory.java index afa89b7b8..9ca504ce6 100644 --- a/src/main/java/com/avaje/ebean/ExpressionFactory.java +++ b/src/main/java/io/ebean/ExpressionFactory.java @@ -1,10 +1,10 @@ -package com.avaje.ebean; +package io.ebean; -import com.avaje.ebean.search.Match; -import com.avaje.ebean.search.MultiMatch; -import com.avaje.ebean.search.TextCommonTerms; -import com.avaje.ebean.search.TextQueryString; -import com.avaje.ebean.search.TextSimple; +import io.ebean.search.Match; +import io.ebean.search.MultiMatch; +import io.ebean.search.TextCommonTerms; +import io.ebean.search.TextQueryString; +import io.ebean.search.TextSimple; import java.util.Collection; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java similarity index 99% rename from src/main/java/com/avaje/ebean/ExpressionList.java rename to src/main/java/io/ebean/ExpressionList.java index 62f4c5d2e..336b86f3b 100644 --- a/src/main/java/com/avaje/ebean/ExpressionList.java +++ b/src/main/java/io/ebean/ExpressionList.java @@ -1,10 +1,10 @@ -package com.avaje.ebean; +package io.ebean; -import com.avaje.ebean.search.Match; -import com.avaje.ebean.search.MultiMatch; -import com.avaje.ebean.search.TextCommonTerms; -import com.avaje.ebean.search.TextQueryString; -import com.avaje.ebean.search.TextSimple; +import io.ebean.search.Match; +import io.ebean.search.MultiMatch; +import io.ebean.search.TextCommonTerms; +import io.ebean.search.TextQueryString; +import io.ebean.search.TextSimple; import org.jetbrains.annotations.Nullable; import javax.persistence.NonUniqueResultException; diff --git a/src/main/java/com/avaje/ebean/FetchConfig.java b/src/main/java/io/ebean/FetchConfig.java similarity index 99% rename from src/main/java/com/avaje/ebean/FetchConfig.java rename to src/main/java/io/ebean/FetchConfig.java index fad86a69c..6e6d14517 100644 --- a/src/main/java/com/avaje/ebean/FetchConfig.java +++ b/src/main/java/io/ebean/FetchConfig.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import java.io.Serializable; diff --git a/src/main/java/com/avaje/ebean/FetchPath.java b/src/main/java/io/ebean/FetchPath.java similarity index 96% rename from src/main/java/com/avaje/ebean/FetchPath.java rename to src/main/java/io/ebean/FetchPath.java index 71aa83a09..4a4002d59 100644 --- a/src/main/java/com/avaje/ebean/FetchPath.java +++ b/src/main/java/io/ebean/FetchPath.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import java.util.Set; diff --git a/src/main/java/com/avaje/ebean/Filter.java b/src/main/java/io/ebean/Filter.java similarity index 99% rename from src/main/java/com/avaje/ebean/Filter.java rename to src/main/java/io/ebean/Filter.java index f8e1aab16..5a9ebf593 100644 --- a/src/main/java/com/avaje/ebean/Filter.java +++ b/src/main/java/io/ebean/Filter.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/avaje/ebean/Finder.java b/src/main/java/io/ebean/Finder.java similarity index 99% rename from src/main/java/com/avaje/ebean/Finder.java rename to src/main/java/io/ebean/Finder.java index b904ec891..f2f771daa 100644 --- a/src/main/java/com/avaje/ebean/Finder.java +++ b/src/main/java/io/ebean/Finder.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/avaje/ebean/FutureIds.java b/src/main/java/io/ebean/FutureIds.java similarity index 94% rename from src/main/java/com/avaje/ebean/FutureIds.java rename to src/main/java/io/ebean/FutureIds.java index fb280b349..92177a5c3 100644 --- a/src/main/java/com/avaje/ebean/FutureIds.java +++ b/src/main/java/io/ebean/FutureIds.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import java.util.List; import java.util.concurrent.Future; diff --git a/src/main/java/com/avaje/ebean/FutureList.java b/src/main/java/io/ebean/FutureList.java similarity index 98% rename from src/main/java/com/avaje/ebean/FutureList.java rename to src/main/java/io/ebean/FutureList.java index 34301d446..e6d4c6620 100644 --- a/src/main/java/com/avaje/ebean/FutureList.java +++ b/src/main/java/io/ebean/FutureList.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import javax.persistence.PersistenceException; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/FutureRowCount.java b/src/main/java/io/ebean/FutureRowCount.java similarity index 92% rename from src/main/java/com/avaje/ebean/FutureRowCount.java rename to src/main/java/io/ebean/FutureRowCount.java index 959846796..7273db798 100644 --- a/src/main/java/com/avaje/ebean/FutureRowCount.java +++ b/src/main/java/io/ebean/FutureRowCount.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import java.util.concurrent.Future; diff --git a/src/main/java/com/avaje/ebean/Junction.java b/src/main/java/io/ebean/Junction.java similarity index 99% rename from src/main/java/com/avaje/ebean/Junction.java rename to src/main/java/io/ebean/Junction.java index 8437f53e6..c2a76f196 100644 --- a/src/main/java/com/avaje/ebean/Junction.java +++ b/src/main/java/io/ebean/Junction.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; /** * Represents a Conjunction or a Disjunction. diff --git a/src/main/java/com/avaje/ebean/LikeType.java b/src/main/java/io/ebean/LikeType.java similarity index 95% rename from src/main/java/com/avaje/ebean/LikeType.java rename to src/main/java/io/ebean/LikeType.java index b9588ab2c..5ddbcbef6 100644 --- a/src/main/java/com/avaje/ebean/LikeType.java +++ b/src/main/java/io/ebean/LikeType.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; /** * Used to specify the type of like matching used. @@ -32,4 +32,4 @@ public enum LikeType { *

*/ EQUAL_TO -} \ No newline at end of file +} diff --git a/src/main/java/com/avaje/ebean/Model.java b/src/main/java/io/ebean/Model.java similarity index 99% rename from src/main/java/com/avaje/ebean/Model.java rename to src/main/java/io/ebean/Model.java index 1fbd81f44..6bead3e98 100644 --- a/src/main/java/com/avaje/ebean/Model.java +++ b/src/main/java/io/ebean/Model.java @@ -1,6 +1,6 @@ -package com.avaje.ebean; +package io.ebean; -import com.avaje.ebean.bean.EntityBean; +import io.ebean.bean.EntityBean; import javax.persistence.MappedSuperclass; diff --git a/src/main/java/com/avaje/ebean/OrderBy.java b/src/main/java/io/ebean/OrderBy.java similarity index 99% rename from src/main/java/com/avaje/ebean/OrderBy.java rename to src/main/java/io/ebean/OrderBy.java index 1634fba0a..373574fd4 100644 --- a/src/main/java/com/avaje/ebean/OrderBy.java +++ b/src/main/java/io/ebean/OrderBy.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebean/PagedList.java b/src/main/java/io/ebean/PagedList.java similarity index 99% rename from src/main/java/com/avaje/ebean/PagedList.java rename to src/main/java/io/ebean/PagedList.java index 253641784..be820cb06 100644 --- a/src/main/java/com/avaje/ebean/PagedList.java +++ b/src/main/java/io/ebean/PagedList.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import java.util.List; import java.util.concurrent.Future; diff --git a/src/main/java/io/ebean/PersistBatch.java b/src/main/java/io/ebean/PersistBatch.java new file mode 100644 index 000000000..82d7689de --- /dev/null +++ b/src/main/java/io/ebean/PersistBatch.java @@ -0,0 +1,58 @@ +package io.ebean; + +/** + * Defines the mode for JDBC batch processing. + *

+ * Used both at a per transaction basis and per request basis. + *

+ * + * 
{@code
+ *
+ *   // set full jdbc batch as default
+ *   serverConfig.setPersistBatch(PersistBatch.ALL);
+ *
+ *
+ *   // set full jdbc batch per transaction
+ *   transaction.setBatch(PersistBatch.ALL);
+ *
+ * }
+ * + */ +public enum PersistBatch { + + /** + * Do not use JDBC Batch mode. + */ + NONE(false), + + /** + * Use JDBC Batch mode on Inserts. + */ + INSERT(true), + + /** + * Use JDBC Batch mode on Inserts, Updates and Deletes. + */ + ALL(true), + + /** + * You should not use this value explicitly. It should only used on the Transactional annotation + * to indicate that the value should inherit from the ServerConfig setting. + */ + INHERIT(false); + + + final boolean forInsert; + + PersistBatch(boolean forInsert) { + this.forInsert = forInsert; + } + + /** + * Return true if persist cascade should use JDBC batch for inserts. + */ + public boolean forInsert() { + return forInsert; + } + +} diff --git a/src/main/java/com/avaje/ebean/PersistenceContextScope.java b/src/main/java/io/ebean/PersistenceContextScope.java similarity index 85% rename from src/main/java/com/avaje/ebean/PersistenceContextScope.java rename to src/main/java/io/ebean/PersistenceContextScope.java index d3389a2e0..daacd264e 100644 --- a/src/main/java/com/avaje/ebean/PersistenceContextScope.java +++ b/src/main/java/io/ebean/PersistenceContextScope.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; /** * Defines the scope for PersistenceContext. @@ -6,8 +6,8 @@ package com.avaje.ebean; * Ebean has traditionally used Transaction scope for the PersistenceContext. This is used to change the scope to * use (by default) and explicitly set the scope to use for an individual query. * - * @see com.avaje.ebean.config.ServerConfig#setPersistenceContextScope(PersistenceContextScope) - * @see com.avaje.ebean.Query#setPersistenceContextScope(PersistenceContextScope) + * @see io.ebean.config.ServerConfig#setPersistenceContextScope(PersistenceContextScope) + * @see Query#setPersistenceContextScope(PersistenceContextScope) */ public enum PersistenceContextScope { diff --git a/src/main/java/com/avaje/ebean/PersistenceIOException.java b/src/main/java/io/ebean/PersistenceIOException.java similarity index 94% rename from src/main/java/com/avaje/ebean/PersistenceIOException.java rename to src/main/java/io/ebean/PersistenceIOException.java index bef4da6da..f70563252 100644 --- a/src/main/java/com/avaje/ebean/PersistenceIOException.java +++ b/src/main/java/io/ebean/PersistenceIOException.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import javax.persistence.PersistenceException; diff --git a/src/main/java/io/ebean/Platform.java b/src/main/java/io/ebean/Platform.java new file mode 100644 index 000000000..caf0f0eca --- /dev/null +++ b/src/main/java/io/ebean/Platform.java @@ -0,0 +1,58 @@ +package io.ebean; + +/** + * Built in supported platforms. + */ +public enum Platform { + + /** + * Generic base platform configured via properties or code. + */ + GENERIC, + + /** + * DB2. + */ + DB2, + + /** + * H2. + */ + H2, + + /** + * HsqlDB. + */ + HSQLDB, + + /** + * Postgres. + */ + POSTGRES, + + /** + * MySql. + */ + MYSQL, + + /** + * Oracle. + */ + ORACLE, + + /** + * SQLAnywhere. + */ + SQLANYWHERE, + + /** + * SQLite. + */ + SQLITE, + + /** + * Microsoft SQL Server. + */ + SQLSERVER; + +} diff --git a/src/main/java/com/avaje/ebean/PrimaryServer.java b/src/main/java/io/ebean/PrimaryServer.java similarity index 96% rename from src/main/java/com/avaje/ebean/PrimaryServer.java rename to src/main/java/io/ebean/PrimaryServer.java index 21df767dc..9383e5c7f 100644 --- a/src/main/java/com/avaje/ebean/PrimaryServer.java +++ b/src/main/java/io/ebean/PrimaryServer.java @@ -1,6 +1,6 @@ -package com.avaje.ebean; +package io.ebean; -import com.avaje.ebean.config.PropertyMap; +import io.ebean.config.PropertyMap; import java.util.Properties; diff --git a/src/main/java/com/avaje/ebean/Query.java b/src/main/java/io/ebean/Query.java similarity index 99% rename from src/main/java/com/avaje/ebean/Query.java rename to src/main/java/io/ebean/Query.java index 4c84f0542..118b01262 100644 --- a/src/main/java/com/avaje/ebean/Query.java +++ b/src/main/java/io/ebean/Query.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import org.jetbrains.annotations.Nullable; @@ -243,7 +243,7 @@ public interface Query { /** * Specify the PersistenceContextScope to use for this query. *

- * When this is not set the 'default' configured on {@link com.avaje.ebean.config.ServerConfig#setPersistenceContextScope(PersistenceContextScope)} + * When this is not set the 'default' configured on {@link io.ebean.config.ServerConfig#setPersistenceContextScope(PersistenceContextScope)} * is used - this value defaults to {@link PersistenceContextScope#TRANSACTION}. *

* Note that the same persistence Context is used for subsequent lazy loading and query join queries. diff --git a/src/main/java/com/avaje/ebean/QueryIterator.java b/src/main/java/io/ebean/QueryIterator.java similarity index 98% rename from src/main/java/com/avaje/ebean/QueryIterator.java rename to src/main/java/io/ebean/QueryIterator.java index 4f714e7bd..46f27dc6c 100644 --- a/src/main/java/com/avaje/ebean/QueryIterator.java +++ b/src/main/java/io/ebean/QueryIterator.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import java.util.Iterator; diff --git a/src/main/java/com/avaje/ebean/RawSql.java b/src/main/java/io/ebean/RawSql.java similarity index 99% rename from src/main/java/com/avaje/ebean/RawSql.java rename to src/main/java/io/ebean/RawSql.java index cd201abd4..53879c8d7 100644 --- a/src/main/java/com/avaje/ebean/RawSql.java +++ b/src/main/java/io/ebean/RawSql.java @@ -1,6 +1,6 @@ -package com.avaje.ebean; +package io.ebean; -import com.avaje.ebean.util.CamelCaseHelper; +import io.ebean.util.CamelCaseHelper; import java.io.Serializable; import java.sql.ResultSet; diff --git a/src/main/java/com/avaje/ebean/RawSqlBuilder.java b/src/main/java/io/ebean/RawSqlBuilder.java similarity index 97% rename from src/main/java/com/avaje/ebean/RawSqlBuilder.java rename to src/main/java/io/ebean/RawSqlBuilder.java index 0c4e1ed3c..cc05bdfdb 100644 --- a/src/main/java/com/avaje/ebean/RawSqlBuilder.java +++ b/src/main/java/io/ebean/RawSqlBuilder.java @@ -1,7 +1,7 @@ -package com.avaje.ebean; +package io.ebean; -import com.avaje.ebean.RawSql.ColumnMapping; -import com.avaje.ebean.RawSql.Sql; +import io.ebean.RawSql.ColumnMapping; +import io.ebean.RawSql.Sql; import java.sql.ResultSet; diff --git a/src/main/java/com/avaje/ebean/SqlQuery.java b/src/main/java/io/ebean/SqlQuery.java similarity index 99% rename from src/main/java/com/avaje/ebean/SqlQuery.java rename to src/main/java/io/ebean/SqlQuery.java index d513d65ac..514dde3d9 100644 --- a/src/main/java/com/avaje/ebean/SqlQuery.java +++ b/src/main/java/io/ebean/SqlQuery.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/SqlRow.java b/src/main/java/io/ebean/SqlRow.java similarity index 99% rename from src/main/java/com/avaje/ebean/SqlRow.java rename to src/main/java/io/ebean/SqlRow.java index ffb1f949a..22fe00f40 100644 --- a/src/main/java/com/avaje/ebean/SqlRow.java +++ b/src/main/java/io/ebean/SqlRow.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import java.io.Serializable; import java.math.BigDecimal; @@ -165,4 +165,4 @@ public interface SqlRow extends Serializable, Map { */ Collection values(); -} \ No newline at end of file +} diff --git a/src/main/java/com/avaje/ebean/SqlUpdate.java b/src/main/java/io/ebean/SqlUpdate.java similarity index 98% rename from src/main/java/com/avaje/ebean/SqlUpdate.java rename to src/main/java/io/ebean/SqlUpdate.java index 720d74159..1f8401eed 100644 --- a/src/main/java/com/avaje/ebean/SqlUpdate.java +++ b/src/main/java/io/ebean/SqlUpdate.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; /** * A SqlUpdate for executing insert update or delete statements. @@ -50,7 +50,7 @@ public interface SqlUpdate { * {@link Transaction#setBatchSize(int)}. *

* - * @see com.avaje.ebean.Ebean#execute(SqlUpdate) + * @see Ebean#execute(SqlUpdate) */ int execute(); diff --git a/src/main/java/com/avaje/ebean/Transaction.java b/src/main/java/io/ebean/Transaction.java similarity index 97% rename from src/main/java/com/avaje/ebean/Transaction.java rename to src/main/java/io/ebean/Transaction.java index ee453f159..ffcb8df78 100644 --- a/src/main/java/com/avaje/ebean/Transaction.java +++ b/src/main/java/io/ebean/Transaction.java @@ -1,9 +1,8 @@ -package com.avaje.ebean; +package io.ebean; -import com.avaje.ebean.annotation.DocStoreMode; -import com.avaje.ebean.config.DocStoreConfig; -import com.avaje.ebean.config.PersistBatch; -import com.avaje.ebean.config.ServerConfig; +import io.ebean.annotation.DocStoreMode; +import io.ebean.config.DocStoreConfig; +import io.ebean.config.ServerConfig; import javax.persistence.PersistenceException; import javax.persistence.RollbackException; @@ -324,7 +323,7 @@ public interface Transaction extends Closeable { *

* * @param persistBatchMode the batch mode to use for this transaction - * @see com.avaje.ebean.config.ServerConfig#setPersistBatch(com.avaje.ebean.config.PersistBatch) + * @see io.ebean.config.ServerConfig#setPersistBatch(PersistBatch) */ void setBatch(PersistBatch persistBatchMode); @@ -345,7 +344,7 @@ public interface Transaction extends Closeable { *

* * @param batchOnCascadeMode the batch mode to use per save(), insert(), update() or delete() - * @see com.avaje.ebean.config.ServerConfig#setPersistBatchOnCascade(com.avaje.ebean.config.PersistBatch) + * @see io.ebean.config.ServerConfig#setPersistBatchOnCascade(PersistBatch) */ void setBatchOnCascade(PersistBatch batchOnCascadeMode); diff --git a/src/main/java/com/avaje/ebean/TransactionCallback.java b/src/main/java/io/ebean/TransactionCallback.java similarity index 97% rename from src/main/java/com/avaje/ebean/TransactionCallback.java rename to src/main/java/io/ebean/TransactionCallback.java index 449cd33a7..e29ebc239 100644 --- a/src/main/java/com/avaje/ebean/TransactionCallback.java +++ b/src/main/java/io/ebean/TransactionCallback.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; /** * Provides a callback that can be registered with a Transaction. diff --git a/src/main/java/com/avaje/ebean/TransactionCallbackAdapter.java b/src/main/java/io/ebean/TransactionCallbackAdapter.java similarity index 97% rename from src/main/java/com/avaje/ebean/TransactionCallbackAdapter.java rename to src/main/java/io/ebean/TransactionCallbackAdapter.java index 6ba299e31..679a90906 100644 --- a/src/main/java/com/avaje/ebean/TransactionCallbackAdapter.java +++ b/src/main/java/io/ebean/TransactionCallbackAdapter.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; /** * Adapter that can be extended for easier implementation of TransactionCallback. diff --git a/src/main/java/com/avaje/ebean/TxCallable.java b/src/main/java/io/ebean/TxCallable.java similarity index 97% rename from src/main/java/com/avaje/ebean/TxCallable.java rename to src/main/java/io/ebean/TxCallable.java index 3e4128b7a..fc73bf3d2 100644 --- a/src/main/java/com/avaje/ebean/TxCallable.java +++ b/src/main/java/io/ebean/TxCallable.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; /** * Execute a TxCallable in a Transaction scope. diff --git a/src/main/java/io/ebean/TxIsolation.java b/src/main/java/io/ebean/TxIsolation.java new file mode 100644 index 000000000..b46d2d439 --- /dev/null +++ b/src/main/java/io/ebean/TxIsolation.java @@ -0,0 +1,100 @@ +package io.ebean; + +import java.sql.Connection; + +/** + * The Transaction Isolation levels. + *

+ * These match those of java.sql.Connection with the addition of DEFAULT which + * implies the configured default of the DataSource. + *

+ *

+ * This can be used with TxScope to define transactional scopes to execute + * method within. + *

+ * + * @see TxScope + */ +public enum TxIsolation { + + /** + * Read Committed Isolation level. This is typically the default for most + * configurations. + */ + READ_COMMITED(Connection.TRANSACTION_READ_COMMITTED), + + /** + * Read uncommitted Isolation level. + */ + READ_UNCOMMITTED(Connection.TRANSACTION_READ_UNCOMMITTED), + + /** + * Repeatable Read Isolation level. + */ + REPEATABLE_READ(Connection.TRANSACTION_REPEATABLE_READ), + + /** + * Serializable Isolation level. + */ + SERIALIZABLE(Connection.TRANSACTION_SERIALIZABLE), + + /** + * No Isolation level. + */ + NONE(Connection.TRANSACTION_NONE), + + /** + * The default isolation level. This typically means the default that the + * DataSource is using or configured to use. + */ + DEFAULT(-1); + + final int level; + + TxIsolation(int level) { + this.level = level; + } + + /** + * Return the level as per java.sql.Connection. + *

+ * Note that -1 denotes the default isolation level. + *

+ */ + public int getLevel() { + return level; + } + + /** + * Return the TxIsolation given the java.sql.Connection isolation level. + *

+ * Note that -1 denotes the default isolation level. + *

+ */ + public static TxIsolation fromLevel(int connectionIsolationLevel) { + + switch (connectionIsolationLevel) { + case Connection.TRANSACTION_READ_UNCOMMITTED: + return TxIsolation.READ_UNCOMMITTED; + + case Connection.TRANSACTION_READ_COMMITTED: + return TxIsolation.READ_COMMITED; + + case Connection.TRANSACTION_REPEATABLE_READ: + return TxIsolation.REPEATABLE_READ; + + case Connection.TRANSACTION_SERIALIZABLE: + return TxIsolation.SERIALIZABLE; + + case Connection.TRANSACTION_NONE: + return TxIsolation.NONE; + + case -1: + return TxIsolation.DEFAULT; + + default: + throw new RuntimeException("Unknown isolation level " + connectionIsolationLevel); + } + + } +} diff --git a/src/main/java/com/avaje/ebean/TxRunnable.java b/src/main/java/io/ebean/TxRunnable.java similarity index 96% rename from src/main/java/com/avaje/ebean/TxRunnable.java rename to src/main/java/io/ebean/TxRunnable.java index 2ae3009a2..d40c4325d 100644 --- a/src/main/java/com/avaje/ebean/TxRunnable.java +++ b/src/main/java/io/ebean/TxRunnable.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; /** * Execute a TxRunnable in a Transaction scope. diff --git a/src/main/java/com/avaje/ebean/TxScope.java b/src/main/java/io/ebean/TxScope.java similarity index 99% rename from src/main/java/com/avaje/ebean/TxScope.java rename to src/main/java/io/ebean/TxScope.java index 300e7b696..745391636 100644 --- a/src/main/java/com/avaje/ebean/TxScope.java +++ b/src/main/java/io/ebean/TxScope.java @@ -1,6 +1,4 @@ -package com.avaje.ebean; - -import com.avaje.ebean.config.PersistBatch; +package io.ebean; import java.util.ArrayList; diff --git a/src/main/java/io/ebean/TxType.java b/src/main/java/io/ebean/TxType.java new file mode 100644 index 000000000..906662181 --- /dev/null +++ b/src/main/java/io/ebean/TxType.java @@ -0,0 +1,50 @@ +package io.ebean; + +/** + * Used to define the transactional scope for executing a method. Matches the + * types defined in the EJB TransactionAttributeType. + *

+ * Used with the Transactional annotation and the {@link TxScope} with + * {@link Ebean#execute(TxScope, TxCallable)} and + * {@link Ebean#execute(TxScope, TxRunnable)}. + *

+ * + * @see TxScope + */ +public enum TxType { + + /** + * Uses an existing transaction and if none exists will starts a new + * Transaction. This is the default. + */ + REQUIRED, + + /** + * A transaction MUST already have been started. Throws + * TransactionRequiredException. + */ + MANDATORY, + + /** + * Uses the existing transaction if one exists, otherwise the method does not + * run with a transaction. Used this with caution. + */ + SUPPORTS, + + /** + * Always start a new transaction. Suspend an existing once if required. + */ + REQUIRES_NEW, + + /** + * Suspends an existing transaction if required. Method runs without a + * transaction. + */ + NOT_SUPPORTED, + + /** + * If there is an existing transaction throws an Exception. Method runs + * without a transaction. + */ + NEVER +} diff --git a/src/main/java/com/avaje/ebean/Update.java b/src/main/java/io/ebean/Update.java similarity index 99% rename from src/main/java/com/avaje/ebean/Update.java rename to src/main/java/io/ebean/Update.java index cbebb6c2c..637fb2c8c 100644 --- a/src/main/java/com/avaje/ebean/Update.java +++ b/src/main/java/io/ebean/Update.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; /** * An Insert Update or Delete statement. diff --git a/src/main/java/com/avaje/ebean/UpdateQuery.java b/src/main/java/io/ebean/UpdateQuery.java similarity index 99% rename from src/main/java/com/avaje/ebean/UpdateQuery.java rename to src/main/java/io/ebean/UpdateQuery.java index 1245644cd..98bb7b610 100644 --- a/src/main/java/com/avaje/ebean/UpdateQuery.java +++ b/src/main/java/io/ebean/UpdateQuery.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; /** * An update query typically intended to perform a bulk update of many rows that match the query. diff --git a/src/main/java/com/avaje/ebean/ValuePair.java b/src/main/java/io/ebean/ValuePair.java similarity index 97% rename from src/main/java/com/avaje/ebean/ValuePair.java rename to src/main/java/io/ebean/ValuePair.java index 8b3480449..38c6efa88 100644 --- a/src/main/java/com/avaje/ebean/ValuePair.java +++ b/src/main/java/io/ebean/ValuePair.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; /** * Holds two values as the result of a difference comparison. diff --git a/src/main/java/com/avaje/ebean/Version.java b/src/main/java/io/ebean/Version.java similarity index 98% rename from src/main/java/com/avaje/ebean/Version.java rename to src/main/java/io/ebean/Version.java index 525dfb148..c00aa576d 100644 --- a/src/main/java/com/avaje/ebean/Version.java +++ b/src/main/java/io/ebean/Version.java @@ -1,4 +1,4 @@ -package com.avaje.ebean; +package io.ebean; import java.sql.Timestamp; import java.util.Map; diff --git a/src/main/java/io/ebean/annotation/Aggregation.java b/src/main/java/io/ebean/annotation/Aggregation.java new file mode 100644 index 000000000..0d5800ed9 --- /dev/null +++ b/src/main/java/io/ebean/annotation/Aggregation.java @@ -0,0 +1,50 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Specify a property to be an aggregation formula. + *

+ * The aggregation formula should be a sum, count, avg, min or max. + * By default aggregation properties are treated as transient and not + * included in a query. To populate the aggregation property it must be + * explicitly included in the select(). + *

+ *

+ *

Example:

+ * 
{@code
+ *
+ * @Aggregation("count(details)")
+ * Long totalCount;
+ *
+ * @Aggregation("sum(details.quantity*details.unitPrice)")
+ * Long totalAmount;
+ *
+ * }
+ *

+ *

Example query

+ * 
{@code
+ *
+ *  List list = Ebean.find(TEventOne.class)
+ *       .select("name, totalCount, totalUnits, totalAmount")
+ *       .where()
+ *         .startsWith("logs.description", "a")
+ *       .having()
+ *         .ge("count", 1)
+ *       .orderBy().asc("name")
+ *       .findList();
+ *
+ * }
+ */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface Aggregation { + + /** + * Aggregation formula using sum, count, avg, min, max. + */ + String value(); +} diff --git a/src/main/java/io/ebean/annotation/Cache.java b/src/main/java/io/ebean/annotation/Cache.java new file mode 100644 index 000000000..3a6985fa3 --- /dev/null +++ b/src/main/java/io/ebean/annotation/Cache.java @@ -0,0 +1,63 @@ +package io.ebean.annotation; + +import io.ebean.Query; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Specify the default cache use specific entity type. + */ +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface Cache { + + /** + * Set this to true to enable the use of query cache. + *

+ * By default query caching is disabled as the query cache invalidates + * frequently and so it is typically used for specific bean types and cases. + *

+ */ + boolean enableQueryCache() default false; + + /** + * Set this to false to disable the use of bean cache. + *

+ * By default bean caching is expected so this defaults to true. We might + * set this to false on a bean type that we want to use query caching but no + * bean caching (and this is expected to be a rare case). + *

+ *

+ * When bean caching is enabled by default "find by id" and "find by unique natural key" + * queries will try to use the bean cache. We use {@link Query#setUseCache(boolean)} + * with false for the case when we do NOT want to use the bean cache. + *

+ */ + boolean enableBeanCache() default true; + + /** + * Specify the property that is a natural unique identifier for the bean. + *

+ * When a findUnique() query is used with this property as the sole expression + * then there will be a lookup into the L2 natural key cache. + *

+ */ + String naturalKey() default ""; + + /** + * When set to true the beans returned from a query will default to be + * readOnly. + *

+ * If the bean is readOnly and has no relationships then it may be sharable. + *

+ *

+ * If you try to modify a readOnly bean it will throw an + * IllegalStateException. + *

+ */ + boolean readOnly() default false; + +} diff --git a/src/main/java/io/ebean/annotation/CacheBeanTuning.java b/src/main/java/io/ebean/annotation/CacheBeanTuning.java new file mode 100644 index 000000000..846ca8f6c --- /dev/null +++ b/src/main/java/io/ebean/annotation/CacheBeanTuning.java @@ -0,0 +1,56 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Cache tuning hints for the L2 bean cache of a specific entity type. + *

+ * Note that this is not useful when distributed L2 bean caches are used like + * ElasticSearch, Hazelcast, Ignite etc. + *

+ */ +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface CacheBeanTuning { + + /** + * The maximum size for the cache. + *

+ * This defaults to 0 which means unlimited. + *

+ */ + int maxSize() default 0; + + /** + * The maximum time (in seconds) that a cache entry is allowed to stay in the + * cache when it has not been accessed. + *

+ * This defaults to 0 which means unlimited. + *

+ */ + int maxIdleSecs() default 0; + + /** + * The maximum time (in seconds) a cache entry is allowed to stay in the + * cache. + *

+ * This is not generally required as the cache entries are automatically + * evicted when related data changes are committed. + *

+ *

+ * This defaults to 0 which means unlimited. + *

+ */ + int maxSecsToLive() default 0; + + /** + * The frequency (in seconds) that cache trimming should occur. + *

+ * This is a hint for cache implementations that use background cache trimming. + *

+ */ + int trimFrequency() default 0; +} diff --git a/src/main/java/io/ebean/annotation/CacheQueryTuning.java b/src/main/java/io/ebean/annotation/CacheQueryTuning.java new file mode 100644 index 000000000..f458a9190 --- /dev/null +++ b/src/main/java/io/ebean/annotation/CacheQueryTuning.java @@ -0,0 +1,55 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Specify cache tuning for query caching on a specific entity type. + *

+ * If this is not specified then the system default settings are used. + *

+ */ +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface CacheQueryTuning { + + /** + * The maximum size for the cache. + *

+ * This defaults to 0 which means unlimited. + *

+ */ + int maxSize() default 0; + + /** + * The maximum time (in seconds) that a cache entry is allowed to stay in the + * cache when it has not been accessed. + *

+ * This defaults to 0 which means unlimited. + *

+ */ + int maxIdleSecs() default 0; + + /** + * The maximum time (in seconds) a cache entry is allowed to stay in the + * cache. + *

+ * This is not generally required as the cache entries are automatically + * evicted when related data changes are committed. + *

+ *

+ * This defaults to 0 which means unlimited. + *

+ */ + int maxSecsToLive() default 0; + + /** + * The frequency (in seconds) that cache trimming should occur. + *

+ * This is a hint for cache implementations that use background cache trimming. + *

+ */ + int trimFrequency() default 0; +} diff --git a/src/main/java/io/ebean/annotation/ChangeLog.java b/src/main/java/io/ebean/annotation/ChangeLog.java new file mode 100644 index 000000000..578bb077d --- /dev/null +++ b/src/main/java/io/ebean/annotation/ChangeLog.java @@ -0,0 +1,34 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Marks an entity bean as being included in the change logging. + */ +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface ChangeLog { + + /** + * Specify if inserts should be explicitly Included or Excluded. + *

+ * If not defined explicitly then the server default behaviour defined + * on ServerConfig is used. + *

+ */ + ChangeLogInsertMode inserts() default ChangeLogInsertMode.DEFAULT; + + /** + * When specified only include update requests that have at least one + * of the given properties as a dirty property. + *

+ * This provides a way to filter requests to include in the change log such that + * only updates that include at least one of the given properties is included + * in the change log. + *

+ */ + String[] updatesThatInclude() default {}; +} diff --git a/src/main/java/io/ebean/annotation/ChangeLogInsertMode.java b/src/main/java/io/ebean/annotation/ChangeLogInsertMode.java new file mode 100644 index 000000000..1ff0c50fb --- /dev/null +++ b/src/main/java/io/ebean/annotation/ChangeLogInsertMode.java @@ -0,0 +1,22 @@ +package io.ebean.annotation; + +/** + * The mode used to determine if inserts should be included or not for a given bean type. + */ +public enum ChangeLogInsertMode { + + /** + * Use the default behaviour as defined on ServerConfig. + */ + DEFAULT, + + /** + * Include inserts in the change log. + */ + INCLUDE, + + /** + * Exclude inserts in the change log. + */ + EXCLUDE +} diff --git a/src/main/java/io/ebean/annotation/CreatedTimestamp.java b/src/main/java/io/ebean/annotation/CreatedTimestamp.java new file mode 100644 index 000000000..99f2ac216 --- /dev/null +++ b/src/main/java/io/ebean/annotation/CreatedTimestamp.java @@ -0,0 +1,38 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * For a timestamp property that is set to the datetime when the entity is + * created/inserted. + *

+ * This is effectively an alias for @WhenCreated which was added as it hints + * towards a better naming convention (WhenCreated, WhenModified). + *

+ *

+ * An alternative to using this annotation would be to use insertable=false, + * updateable=false with @Column and have the DB insert the current time + * (default value on the DB column is SYSTIME etc). + *

+ *

+ * The downside to this approach is that the inserted entity does not have the + * timestamp value after the insert has occurred. You need to fetch the entity + * back to get the inserted timestamp if you want to used it. + *

+ *

+ *

Example:

+ * 
{@code
+ *
+ *   @CreatedTimestamp
+ *   Timestamp whenCreated;
+ *
+ * }
+ */ +@Target({ElementType.FIELD, ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface CreatedTimestamp { + +} diff --git a/src/main/java/io/ebean/annotation/DbArray.java b/src/main/java/io/ebean/annotation/DbArray.java new file mode 100644 index 000000000..912c2cb3e --- /dev/null +++ b/src/main/java/io/ebean/annotation/DbArray.java @@ -0,0 +1,40 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Specify a collection property that will be stored into a DB ARRAY type. + *

+ * If the target database does not support ARRAY type (so not Postgres) + * then the collection will be stored in JSON format into a VARCHAR column. + *

+ *

+ *

Example:

+ * 
{@code
+ *
+ * // Store as ARRAY of UUID on Postgres
+ * @DbArray
+ * List uids = new ArrayList<>();
+ *
+ * // Store as ARRAY on Postgres
+ * @DbArray
+ * List phoneNumbers = new ArrayList<>();
+ *
+ * // Store as ARRAY of INTEGER on Postgres
+ * @DbArray
+ * List someLongs = new ArrayList<>();
+ *
+ * }
+ */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface DbArray { + + /** + * For VARCHAR storage specify the column length (defaults to 1000). + */ + int length() default 0; +} diff --git a/src/main/java/io/ebean/annotation/DbComment.java b/src/main/java/io/ebean/annotation/DbComment.java new file mode 100644 index 000000000..4f9472ee6 --- /dev/null +++ b/src/main/java/io/ebean/annotation/DbComment.java @@ -0,0 +1,19 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * A database table or column comment. + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE}) +public @interface DbComment { + + /** + * The database table or column comment. + */ + String value(); +} diff --git a/src/main/java/io/ebean/annotation/DbEnumType.java b/src/main/java/io/ebean/annotation/DbEnumType.java new file mode 100644 index 000000000..48dfd127d --- /dev/null +++ b/src/main/java/io/ebean/annotation/DbEnumType.java @@ -0,0 +1,17 @@ +package io.ebean.annotation; + +/** + * Specify the DB storage type used to with @DbEnumValue. + */ +public enum DbEnumType { + + /** + * Store values as database INTEGER. + */ + INTEGER, + + /** + * Store values as database VARCHAR. + */ + VARCHAR +} diff --git a/src/main/java/io/ebean/annotation/DbEnumValue.java b/src/main/java/io/ebean/annotation/DbEnumValue.java new file mode 100644 index 000000000..67f24c455 --- /dev/null +++ b/src/main/java/io/ebean/annotation/DbEnumValue.java @@ -0,0 +1,44 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Specify a method on an Enum that returns the value that should be stored in the DB. + *

+ * This is the preferred option for mapping Enum's to DB values (preferred over the JPA + * standard @Enumerated and Ebean's @EnumValue annotations). + *

+ *

Example:

+ * 
{@code
+ *
+ *   public enum Status {
+ *     NEW("N"),
+ *     ACTIVE("A"),
+ *     INACTIVE("I");
+ *
+ *     String dbValue;
+ *     Status(String dbValue) {
+ *       this.dbValue = dbValue;
+ *     }
+ *
+ *     @DbEnumValue
+ *     public String getValue() {
+ *       return dbValue;
+ *     }
+ *   }
+ *
+ * }
+ */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface DbEnumValue { + + /** + * Specify the database type used to store the values (VARCHAR or INTEGER). + */ + DbEnumType storage() default DbEnumType.VARCHAR; + +} diff --git a/src/main/java/io/ebean/annotation/DbHstore.java b/src/main/java/io/ebean/annotation/DbHstore.java new file mode 100644 index 000000000..c59073e89 --- /dev/null +++ b/src/main/java/io/ebean/annotation/DbHstore.java @@ -0,0 +1,30 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Used for mapping a Map type property to Postgres HSTORE data type. + *

+ * The Map property should have keys and values of type String. + *

+ *

+ *

Example:

+ * 
{@code
+ *
+ *   @DbHstore
+ *   Map tags;
+ *
+ * }
+ */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface DbHstore { + + /** + * For VARCHAR storage specify the column length (defaults to 1000). + */ + int length() default 0; +} diff --git a/src/main/java/io/ebean/annotation/DbJson.java b/src/main/java/io/ebean/annotation/DbJson.java new file mode 100644 index 000000000..5c8ebe665 --- /dev/null +++ b/src/main/java/io/ebean/annotation/DbJson.java @@ -0,0 +1,44 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Specify a property holding JSON content. + *

+ * By default the content will be stored in a DB Clob except on Postgres where DB JSON type is used. + *

+ *

Example:

+ * 
{@code
+ *
+ * // Store as JSON on Postgres or Clob on other databases
+ * @DbJson
+ * Map content;
+ *
+ * }
+ *

+ *

Example with JSONB storage

+ * 
{@code
+ *
+ * // Store as JSONB on Postgres or Clob on other databases
+ * @DbJson(storage = DbJsonType.JSONB)
+ * Map content;
+ *
+ * }
+ */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface DbJson { + + /** + * Specify the database type used to store the JSON content. + */ + DbJsonType storage() default DbJsonType.JSON; + + /** + * For VARCHAR storage specify the column length (defaults to 3000). + */ + int length() default 0; +} diff --git a/src/main/java/io/ebean/annotation/DbJsonB.java b/src/main/java/io/ebean/annotation/DbJsonB.java new file mode 100644 index 000000000..da7ffe0de --- /dev/null +++ b/src/main/java/io/ebean/annotation/DbJsonB.java @@ -0,0 +1,43 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Specify a property holding JSON content. + *

+ * The content will be stored on Postgres using it's JSONB type and as Clob for other databases. + *

+ *

+ * This is equivalent to using @DbJson(storage = DbJsonType.JSONB) + *

+ *

+ *

Example:

+ * 
{@code
+ *
+ * // Store as JSONB on Postgres or Clob on other databases
+ * @DbJsonB
+ * Map content;
+ *
+ * }
+ *

+ *

Equivalent to:

+ * 
{@code
+ *
+ * // Store as JSONB on Postgres or Clob on other databases
+ * @DbJson(storage = DbJsonType.JSONB)
+ * Map content;
+ *
+ * }
+ */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface DbJsonB { + + /** + * For VARCHAR storage specify the column length. + */ + int length() default 0; +} diff --git a/src/main/java/io/ebean/annotation/DbJsonType.java b/src/main/java/io/ebean/annotation/DbJsonType.java new file mode 100644 index 000000000..84d6bea7b --- /dev/null +++ b/src/main/java/io/ebean/annotation/DbJsonType.java @@ -0,0 +1,32 @@ +package io.ebean.annotation; + +/** + * Specify the DB storage type used to store JSON content. + */ +public enum DbJsonType { + + /** + * Store as JSON on Postgres and for other databases store as CLOB. + */ + JSON, + + /** + * Store as JSONB on Postgres and for other databases store as CLOB. + */ + JSONB, + + /** + * Store as database VARCHAR. + */ + VARCHAR, + + /** + * Store as database CLOB. + */ + CLOB, + + /** + * Store as database BLOB. + */ + BLOB +} diff --git a/src/main/java/io/ebean/annotation/DocCode.java b/src/main/java/io/ebean/annotation/DocCode.java new file mode 100644 index 000000000..cf922e2cb --- /dev/null +++ b/src/main/java/io/ebean/annotation/DocCode.java @@ -0,0 +1,32 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Used to indicate that a particular string property should be treated as a 'code' and not analysed for text searching. + *

+ * By default all Id properties and all Enum properties are treated as 'code' and not analysed. + *

+ */ +@Target({ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface DocCode { + + /** + * Set to true to have the property additionally stored separately from _source. + */ + boolean store() default false; + + /** + * Set a boost value specific to this property. + */ + float boost() default 1; + + /** + * Set a value to use instead of null. + */ + String nullValue() default ""; +} diff --git a/src/main/java/io/ebean/annotation/DocEmbedded.java b/src/main/java/io/ebean/annotation/DocEmbedded.java new file mode 100644 index 000000000..967c9e4f3 --- /dev/null +++ b/src/main/java/io/ebean/annotation/DocEmbedded.java @@ -0,0 +1,36 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Specify the property is included in the parent document store index. + * 
{@code
+ *
+ *
+ * @DocStore
+ * @Entity @Table(name = "o_order")
+ * public class Order {
+ *
+ *   ...
+ *   // include some customer details including
+ *   // nested billingAddress
+ *   @DocEmbedded(doc = "id,status,name,billingAddress(*,country(*)")
+ *   @ManyToOne
+ *   Customer customer;
+ *
+ *
+ * }
+ */ +@Target({ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface DocEmbedded { + + /** + * The properties on the embedded bean to include in the index. + */ + String doc() default ""; + +} diff --git a/src/main/java/io/ebean/annotation/DocMapping.java b/src/main/java/io/ebean/annotation/DocMapping.java new file mode 100644 index 000000000..ec3848af3 --- /dev/null +++ b/src/main/java/io/ebean/annotation/DocMapping.java @@ -0,0 +1,24 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Specify the entity type maps to a document store (like ElasticSearch). + */ +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface DocMapping { + + /** + * The property name the mapping applies to. + */ + String name(); + + /** + * Mapping options. + */ + DocProperty options(); +} diff --git a/src/main/java/io/ebean/annotation/DocProperty.java b/src/main/java/io/ebean/annotation/DocProperty.java new file mode 100644 index 000000000..1f75529a0 --- /dev/null +++ b/src/main/java/io/ebean/annotation/DocProperty.java @@ -0,0 +1,110 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Specify the entity type maps to a document store (like ElasticSearch). + */ +@Target({ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface DocProperty { + + /** + * Set this to true to indicate that this property should be un-analysed. + */ + boolean code() default false; + + /** + * Set this to true to get an additional un-analysed 'raw' field to use for sorting etc. + */ + boolean sortable() default false; + + /** + * Set to true to have the property additionally stored separately from _source. + */ + boolean store() default false; + + /** + * Set a boost value specific to this property. + */ + float boost() default 1; + + /** + * Set a value to use instead of null. + */ + String nullValue() default ""; + + /** + * Set this to false to exclude this from the _all property. + */ + boolean includeInAll() default true; + + /** + * The analyzer to use. + */ + String analyzer() default ""; + + /** + * The analyzer to use for searches. + */ + String searchAnalyzer() default ""; + + /** + * The index options for this property. + */ + Option options() default Option.DEFAULT; + + /** + * Set this to false such that doc values are not stored separately for this property. + */ + boolean docValues() default true; + + /** + * Set a copyTo field. + */ + String copyTo() default ""; + + /** + * Set to false to disable the field from indexing, it will only be get/set in _source. + */ + boolean enabled() default true; + + /** + * Set to false such that norms are not stored. + */ + boolean norms() default true; + + /** + * Index options for a property. + */ + enum Option { + + /** + * Only index the doc number. + */ + DOCS, + + /** + * Doc number and term frequencies are indexed. + */ + FREQS, + + /** + * Doc number, term frequencies and term positions are indexed. + */ + POSITIONS, + + /** + * Doc number, term frequencies, term positions and start/end offsets are indexed. + */ + OFFSETS, + + /** + * Use the default which means analysed string properties use POSITIONS as the default and all other types use DOCS. + */ + DEFAULT + } +} diff --git a/src/main/java/io/ebean/annotation/DocSortable.java b/src/main/java/io/ebean/annotation/DocSortable.java new file mode 100644 index 000000000..4b02f8170 --- /dev/null +++ b/src/main/java/io/ebean/annotation/DocSortable.java @@ -0,0 +1,34 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Used to indicate that a particular string property should support sorting. What this typically means is that + * for ElasticSearch an additional 'raw' field is added that stores the un-analysed value. This un-analysed value + * can be used for sorting etc and the original field used for text searching. + *

+ * For example, customer name and product name are good candidates for marking with @DocSortable. + *

+ */ +@Target({ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface DocSortable { + + /** + * Set to true to have the property additionally stored separately from _source. + */ + boolean store() default false; + + /** + * Set a boost value specific to this property. + */ + float boost() default 1; + + /** + * Set a value to use instead of null. + */ + String nullValue() default ""; +} diff --git a/src/main/java/io/ebean/annotation/DocStore.java b/src/main/java/io/ebean/annotation/DocStore.java new file mode 100644 index 000000000..6fbfa5402 --- /dev/null +++ b/src/main/java/io/ebean/annotation/DocStore.java @@ -0,0 +1,97 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Specify the entity type maps to a document store (like ElasticSearch). + */ +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface DocStore { + + /** + * A unique Id used when queuing reindex events. + */ + String queueId() default ""; + + /** + * The ElasticSearch index name. If left unspecified the short name of the bean type is used. + */ + String indexName() default ""; + + /** + * The ElasticSearch index type. If left unspecified the short name of the bean type is used. + */ + String indexType() default ""; + + /** + * Set to false to disable the "_all" index. + */ + boolean enableAll() default true; + + /** + * Set the refresh interval for the index. + */ + String refreshInterval() default ""; + + /** + * The number of shards this index should use. + */ + int shards() default 0; + + /** + * The number of replicas this index should use. + */ + int replicas() default 0; + + /** + * Additional mapping that can be defined on the properties. + */ + DocMapping[] mapping() default {}; + + /** + * Specify the behavior when bean Insert, Update, Delete events occur. + */ + DocStoreMode persist() default DocStoreMode.DEFAULT; + + /** + * Specify the behavior when bean Insert occurs. + */ + DocStoreMode insert() default DocStoreMode.DEFAULT; + + /** + * Specify the behavior when bean Update occurs. + */ + DocStoreMode update() default DocStoreMode.DEFAULT; + + /** + * Specify the behavior when bean Delete occurs. + */ + DocStoreMode delete() default DocStoreMode.DEFAULT; + + /** + * Specify to include only some properties in the doc store document. + *

+ * If this is left as default then all scalar properties are included, + * all @ManyToOne properties are included with just the nested id property + * and no @OneToMany properties are included. + *

+ *

+ * Note that typically DocStoreEmbedded is used on @ManyToOne and @OneToMany + * properties to indicate what part of the nested document should be included. + *

+ *

Example:

+ * 
{@code
+   *
+   * // only include the customer id and name
+   * @DocStore(doc = "id,name")
+   * @Entity @Table(name = "o_order")
+   * public class Customer {
+   *
+   * }
+ */ + String doc() default ""; +} diff --git a/src/main/java/io/ebean/annotation/DocStoreMode.java b/src/main/java/io/ebean/annotation/DocStoreMode.java new file mode 100644 index 000000000..8e5a3c879 --- /dev/null +++ b/src/main/java/io/ebean/annotation/DocStoreMode.java @@ -0,0 +1,38 @@ +package io.ebean.annotation; + +/** + * Defines the behavior options when a Insert, Update or Delete event occurs + * on a bean with an associated ElasticSearch index. + *

+ * For some indexes or some transactions it can be beneficial to queue the event + * for later processing rather than look to update ElasticSearch at that time. + *

+ */ +public enum DocStoreMode { + + /** + * Add the event to the queue for processing later (delaying the update to the document store). + */ + QUEUE, + + /** + * Update the document store when transaction succeeds. + */ + UPDATE, + + /** + * Ignore the event and not update the document store. + *

+ * This can be used on a index or for a transaction where you want to have more + * manual programmatic control over the updating of the document store. Say you want to + * IGNORE on a particular transaction and instead manually queue a bulk update. + *

+ */ + IGNORE, + + /** + * The actual mode of QUEUE, UPDATE or IGNORE is set from the default configuration. + */ + DEFAULT + +} diff --git a/src/main/java/io/ebean/annotation/Draft.java b/src/main/java/io/ebean/annotation/Draft.java new file mode 100644 index 000000000..0adb7fcd8 --- /dev/null +++ b/src/main/java/io/ebean/annotation/Draft.java @@ -0,0 +1,19 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Marks a boolean property on a @Draftable bean that indicates if the bean instance is a 'draft' or 'live' bean. + * The property is transient and has no underlying DB column. + *

+ * For beans returned from an asDraft() query this property will be set to true. + *

+ */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface Draft { + +} diff --git a/src/main/java/io/ebean/annotation/DraftDirty.java b/src/main/java/io/ebean/annotation/DraftDirty.java new file mode 100644 index 000000000..32eef35b2 --- /dev/null +++ b/src/main/java/io/ebean/annotation/DraftDirty.java @@ -0,0 +1,20 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Marks a boolean property on a @Draftable bean that only exists on the 'draft' table + * and is used to detect when a draft has unpublished changes. + *

+ * This property will automatically have it's value set to true when a draft is saved and + * automatically have it's value set to false when the bean is published. + *

+ */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface DraftDirty { + +} diff --git a/src/main/java/io/ebean/annotation/DraftOnly.java b/src/main/java/io/ebean/annotation/DraftOnly.java new file mode 100644 index 000000000..40f4094f1 --- /dev/null +++ b/src/main/java/io/ebean/annotation/DraftOnly.java @@ -0,0 +1,19 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Marks a property on a @Draftable bean that only exists on the 'draft' and not the 'live' table. + *

+ * Typically this would be used on a property that is used as part of application 'workflow' such as + * a publish workflow status or when publish timestamp. + *

+ */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface DraftOnly { + +} diff --git a/src/main/java/io/ebean/annotation/DraftReset.java b/src/main/java/io/ebean/annotation/DraftReset.java new file mode 100644 index 000000000..e86f2dea6 --- /dev/null +++ b/src/main/java/io/ebean/annotation/DraftReset.java @@ -0,0 +1,19 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Marks a property on a @Draftable bean that is set to null on the 'draft bean' on publish. + *

+ * This is expected to be put on properties that get 'reset' or 'cleared' after a publish. + * These properties might represent a publish comment or publish timestamp. + *

+ */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface DraftReset { + +} diff --git a/src/main/java/io/ebean/annotation/Draftable.java b/src/main/java/io/ebean/annotation/Draftable.java new file mode 100644 index 000000000..ad216b8c2 --- /dev/null +++ b/src/main/java/io/ebean/annotation/Draftable.java @@ -0,0 +1,29 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Used to indicate an entity bean that has 'draftable' support. + *

+ * This means that a second set of tables is created to hold draft versions of + * the rows and that these can then be published which effectively copies/transfers + * the values from the 'draft' table to the 'live' table. + *

+ *

+ * Ebean Query supports 'find as draft' which builds the resulting object graph using + * the draft tables. This object graph is typically edited, approved in some application + * specific manor and then published. + *

+ *

+ * EbeanServer has a publish method which transfers/copies the draft object graph to + * the 'live' tables. + *

+ */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface Draftable { + +} diff --git a/src/main/java/io/ebean/annotation/DraftableElement.java b/src/main/java/io/ebean/annotation/DraftableElement.java new file mode 100644 index 000000000..e9e3cbe95 --- /dev/null +++ b/src/main/java/io/ebean/annotation/DraftableElement.java @@ -0,0 +1,20 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Used to indicate an entity bean that has 'draftable' support but it not a 'top level' + * (or root level) bean but instead child related to another @Draftable entity bean. + *

+ * Relationships to @DraftableElements (@OneToMany, @ManyToMany etc) are automatically + * deemed to have Cascade.ALL for save and delete (as well as orphan removal mode). + *

+ */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface DraftableElement { + +} diff --git a/src/main/java/io/ebean/annotation/EbeanDDL.java b/src/main/java/io/ebean/annotation/EbeanDDL.java new file mode 100644 index 000000000..29d70aa26 --- /dev/null +++ b/src/main/java/io/ebean/annotation/EbeanDDL.java @@ -0,0 +1,12 @@ +package io.ebean.annotation; + +import javax.validation.constraints.NotNull; + +/** + * special validation group for @NotNull annotation to enforce NOT NULL generation on DDL. + * Normally if you put the {@link NotNull} annotation on a property, Ebean will only generate a + * NOT NULL in DDL if you do not change the validation-groups! + */ +public interface EbeanDDL { + +} diff --git a/src/main/java/io/ebean/annotation/Encrypted.java b/src/main/java/io/ebean/annotation/Encrypted.java new file mode 100644 index 000000000..695a2bfd1 --- /dev/null +++ b/src/main/java/io/ebean/annotation/Encrypted.java @@ -0,0 +1,24 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Specify that the property is stored in encrypted form. + */ +@Target({ElementType.FIELD, ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface Encrypted { + + /** + * When true try to use DB encryption rather than local java encryption. + */ + boolean dbEncryption() default true; + + /** + * Used to specify the DB column length. + */ + int dbLength() default 0; +} diff --git a/src/main/java/io/ebean/annotation/EnumValue.java b/src/main/java/io/ebean/annotation/EnumValue.java new file mode 100644 index 000000000..017d0007a --- /dev/null +++ b/src/main/java/io/ebean/annotation/EnumValue.java @@ -0,0 +1,47 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Enables you to specify a value to use to persist for an enum value. + * 
{@code
+ *
+ * public enum Status {
+ *
+ *   @EnumValue("N")
+ *   NEW,
+ *
+ *   @EnumValue("A")
+ *   ACTIVE,
+ *
+ *   @EnumValue("I")
+ *   INACTIVE,
+ * }
+ *
+ * }
+ *

+ * This is an alternative to using the JPA standard approach or Ebean's + * {@link DbEnumValue} annotation. + *

+ *

+ * Note that if all the EnumValue values are parsable as Integers then Ebean + * will persist and fetch them as integers - otherwise they will be persisted + * and fetched as strings. + *

+ */ +@Target({ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface EnumValue { + + /** + * Specify the value to persist for a specific enum value. + *

+ * If all the values are parsable as Integers then Ebean will persist and + * fetch them as integers rather than strings. + *

+ */ + String value(); +} diff --git a/src/main/java/io/ebean/annotation/Expose.java b/src/main/java/io/ebean/annotation/Expose.java new file mode 100644 index 000000000..74bc76418 --- /dev/null +++ b/src/main/java/io/ebean/annotation/Expose.java @@ -0,0 +1,28 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/* + Copied from gson!!! + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface Expose { + + /** + * If {@code true}, the field marked with this annotation is written out in the JSON while + * serializing. If {@code false}, the field marked with this annotation is skipped from the + * serialized output. Defaults to {@code true}. + */ + boolean serialize() default true; + + /** + * If {@code true}, the field marked with this annotation is deserialized from the JSON. + * If {@code false}, the field marked with this annotation is skipped during deserialization. + * Defaults to {@code true}. + */ + boolean deserialize() default true; +} diff --git a/src/main/java/com/avaje/ebean/annotation/Formula.java b/src/main/java/io/ebean/annotation/Formula.java similarity index 95% rename from src/main/java/com/avaje/ebean/annotation/Formula.java rename to src/main/java/io/ebean/annotation/Formula.java index cbd3d4180..95c7d32cb 100644 --- a/src/main/java/com/avaje/ebean/annotation/Formula.java +++ b/src/main/java/io/ebean/annotation/Formula.java @@ -1,7 +1,8 @@ -package com.avaje.ebean.annotation; +package io.ebean.annotation; -import com.avaje.ebean.Query; -import com.avaje.ebean.config.Platform; +import io.ebean.Query; +import io.ebean.FetchConfig; +import io.ebean.Platform; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; @@ -22,7 +23,7 @@ import java.lang.annotation.Target; * You may also put use the Transient annotation with the Formula annotation. * The effect of the Transient annotation in this case is that the formula will * NOT be included in queries by default - you have to explicitly include - * it via {@link Query#select(String)} or {@link Query#fetch(String, String, com.avaje.ebean.FetchConfig)}. + * it via {@link Query#select(String)} or {@link Query#fetch(String, String, FetchConfig)}. * You may want to do this if the Formula is relatively expensive and only want * it included in the query when you explicitly state it. *

diff --git a/src/main/java/io/ebean/annotation/History.java b/src/main/java/io/ebean/annotation/History.java new file mode 100644 index 000000000..e98ff6449 --- /dev/null +++ b/src/main/java/io/ebean/annotation/History.java @@ -0,0 +1,19 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Marks an entity bean as having history support. + *

+ * In Postgres for example this means there is an associated history table which is + * typically automatically populated via database triggers. + *

+ */ +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface History { + +} diff --git a/src/main/java/io/ebean/annotation/HistoryExclude.java b/src/main/java/io/ebean/annotation/HistoryExclude.java new file mode 100644 index 000000000..68da21993 --- /dev/null +++ b/src/main/java/io/ebean/annotation/HistoryExclude.java @@ -0,0 +1,25 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Marks a property as being excluded from history. + *

+ * This means the property values are not maintained in the history table. Typically this + * would be placed on relatively large properties (Clobs, Blobs, large varchar columns etc) + * that are considered not interesting enough to maintain history on excluding them reduces + * underlying database costs. + *

+ *

+ * When placed on a ManyToMany this means that the intersection table does not have history + * support. + *

+ */ +@Target({ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface HistoryExclude { + +} diff --git a/src/main/java/io/ebean/annotation/Index.java b/src/main/java/io/ebean/annotation/Index.java new file mode 100644 index 000000000..2cbad0eb0 --- /dev/null +++ b/src/main/java/io/ebean/annotation/Index.java @@ -0,0 +1,38 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Repeatable; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * An annotation for declaring an index. + * + * @author rvbiljouw + */ +@Target({ElementType.TYPE, ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +@Repeatable(Indices.class) +public @interface Index { + + /** + * Name of the index. If left blank a name is derived using the built in naming convention. + */ + String name() default ""; + + /** + * If set true indicates this is a unique index. + */ + boolean unique() default false; + + /** + * When placed on the class (rather than field) you can specify the columns + * to include in the index in order. + *

+ * Wnen placed on a field, and columnNames are specified, the field-column has to be included. + * You can use "${fa}" for alias + */ + String[] columnNames() default {}; + +} diff --git a/src/main/java/io/ebean/annotation/Indices.java b/src/main/java/io/ebean/annotation/Indices.java new file mode 100644 index 000000000..7947caefc --- /dev/null +++ b/src/main/java/io/ebean/annotation/Indices.java @@ -0,0 +1,21 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * An annotation for declaring multiple indices at class or field level. + * + * @author Roland Praml, FOCONIS AG + */ +@Target({ElementType.TYPE, ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface Indices { + + /** + * Array with {@link Index} definitions. + */ + Index[] value() default {}; +} diff --git a/src/main/java/io/ebean/annotation/JsonIgnore.java b/src/main/java/io/ebean/annotation/JsonIgnore.java new file mode 100644 index 000000000..ba81dc5e5 --- /dev/null +++ b/src/main/java/io/ebean/annotation/JsonIgnore.java @@ -0,0 +1,32 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Similar to Jackson JsonIgnore but provides the option to just ignore serialize or deserialize. + *

+ * This provides the same features as Expose but from the opposite perspective which is probably + * more common and more familiar to Jackson users. + *

+ */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface JsonIgnore { + + /** + * If {@code true}, the field marked with this annotation is written out in the JSON while + * serializing. If {@code false}, the field marked with this annotation is skipped from the + * serialized output. Defaults to {@code false}. + */ + boolean serialize() default false; + + /** + * If {@code true}, the field marked with this annotation is deserialized from the JSON. + * If {@code false}, the field marked with this annotation is skipped during deserialization. + * Defaults to {@code false}. + */ + boolean deserialize() default false; +} diff --git a/src/main/java/io/ebean/annotation/PostSoftDelete.java b/src/main/java/io/ebean/annotation/PostSoftDelete.java new file mode 100644 index 000000000..fb66b8147 --- /dev/null +++ b/src/main/java/io/ebean/annotation/PostSoftDelete.java @@ -0,0 +1,15 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Marks a method as executing after a Soft Delete. + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface PostSoftDelete { + +} diff --git a/src/main/java/io/ebean/annotation/PreSoftDelete.java b/src/main/java/io/ebean/annotation/PreSoftDelete.java new file mode 100644 index 000000000..3d4bf2629 --- /dev/null +++ b/src/main/java/io/ebean/annotation/PreSoftDelete.java @@ -0,0 +1,15 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Marks a method as executing prior to a Soft Delete. + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface PreSoftDelete { + +} diff --git a/src/main/java/io/ebean/annotation/PrivateOwned.java b/src/main/java/io/ebean/annotation/PrivateOwned.java new file mode 100644 index 000000000..a5d1b6941 --- /dev/null +++ b/src/main/java/io/ebean/annotation/PrivateOwned.java @@ -0,0 +1,34 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Specify that the elements of a OneToMany are private owned. + *

+ * This means that if they are removed from the List/Set/Map they will be + * deleted when their parent object is saved. + *

+ *

+ * This could also be described as deleting orphans - in that beans removed from + * the List/Set/Map will be deleted automatically when the parent bean is saved. + * They are considered 'orphans' when they have been removed from the collection + * in that they are no longer associated/linked to their parent bean. + *

+ */ +@Target({ElementType.FIELD, ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface PrivateOwned { + + /** + * Set this to false if you don't want cascade REMOVE on this relationship. + *

+ * That is, by default PrivateOwned implicitly adds a cascade REMOVE to the + * relationship and if you don't want that you need to set this to false. + *

+ */ + boolean cascadeRemove() default true; + +} diff --git a/src/main/java/io/ebean/annotation/ReadAudit.java b/src/main/java/io/ebean/annotation/ReadAudit.java new file mode 100644 index 000000000..e92828750 --- /dev/null +++ b/src/main/java/io/ebean/annotation/ReadAudit.java @@ -0,0 +1,15 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Marks an entity bean as being included in read auditing. + */ +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface ReadAudit { + +} diff --git a/src/main/java/io/ebean/annotation/SoftDelete.java b/src/main/java/io/ebean/annotation/SoftDelete.java new file mode 100644 index 000000000..4747864a3 --- /dev/null +++ b/src/main/java/io/ebean/annotation/SoftDelete.java @@ -0,0 +1,25 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Used to indicate a property on an entity bean used to control 'soft delete' + * (also known as 'logical delete'). + *

+ * The property should be of type boolean. + *

+ * 
{@code
+ *
+ * @SoftDelete
+ * boolean deleted;
+ *
+ * }
+ */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface SoftDelete { + +} diff --git a/src/main/java/io/ebean/annotation/Sql.java b/src/main/java/io/ebean/annotation/Sql.java new file mode 100644 index 000000000..7deb51515 --- /dev/null +++ b/src/main/java/io/ebean/annotation/Sql.java @@ -0,0 +1,18 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Mark and entity bean that is used solely via RawSql. + *

+ * This means the entity bean has no base table specified (via @Table). + *

+ */ +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface Sql { + +} diff --git a/src/main/java/io/ebean/annotation/TenantId.java b/src/main/java/io/ebean/annotation/TenantId.java new file mode 100644 index 000000000..c51a1c0e2 --- /dev/null +++ b/src/main/java/io/ebean/annotation/TenantId.java @@ -0,0 +1,22 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Marks a property as mapping to the "Tenant Id" when using Partition based multi-tenancy support. + *

+ * TenantId properties are automatically considered - not null and insert only. + *

+ *

+ * Ebean automatically populates the Tenant Id value via a CurrentTenantIdProvider implementation that is + * registered with Ebean via ServerConfig. + *

+ */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface TenantId { + +} diff --git a/src/main/java/com/avaje/ebean/annotation/Transactional.java b/src/main/java/io/ebean/annotation/Transactional.java similarity index 94% rename from src/main/java/com/avaje/ebean/annotation/Transactional.java rename to src/main/java/io/ebean/annotation/Transactional.java index db998ad94..02a807321 100644 --- a/src/main/java/com/avaje/ebean/annotation/Transactional.java +++ b/src/main/java/io/ebean/annotation/Transactional.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.annotation; +package io.ebean.annotation; -import com.avaje.ebean.TxIsolation; -import com.avaje.ebean.TxType; -import com.avaje.ebean.config.PersistBatch; +import io.ebean.TxIsolation; +import io.ebean.TxType; +import io.ebean.PersistBatch; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -20,7 +20,7 @@ import java.lang.annotation.Target; *
    *
  • EJB's javax.ejb.TransactionAttribute
    • *
  • Spring's org.springframework.transaction.annotation.Transactional
    • - *
  • and this one, Ebean's own com.avaje.ebean.annotation.Transactional
    • + *
  • and this one, Ebean's own Transactional
    • *
* Spring created their one because the EJB annotation does not support features * such as isolation level and specifying rollbackOn, noRollbackOn exceptions. diff --git a/src/main/java/io/ebean/annotation/UnmappedJson.java b/src/main/java/io/ebean/annotation/UnmappedJson.java new file mode 100644 index 000000000..6f05bea99 --- /dev/null +++ b/src/main/java/io/ebean/annotation/UnmappedJson.java @@ -0,0 +1,30 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Marks a Map property on a bean that unmapped JSON properties go into. + *

+ * This property is considered transient (not mapped to a DB column) unlike @DbJson but will be + * written to JSON output (unless it also annotated with @JsonIgnore). + *

+ *

+ * Being JSON read and written means that in a document store only (ElasticSearch only) case it can hold + * all top level unmapped properties. + *

+ *

Example:

+ * 
{@code
+ *
+ * @UnmappedJson
+ * Map unmapped;
+ *
+ * }
+ */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface UnmappedJson { + +} diff --git a/src/main/java/io/ebean/annotation/UpdateMode.java b/src/main/java/io/ebean/annotation/UpdateMode.java new file mode 100644 index 000000000..ef5ed81ed --- /dev/null +++ b/src/main/java/io/ebean/annotation/UpdateMode.java @@ -0,0 +1,34 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Specify the update mode for the specific entity type. + *

+ * Control whether all 'loaded' properties are included in an Update or whether + * just properties that have changed will be included in the update. + *

+ *

+ * Note that the default can be set via ebean.properties. + *

+ *

+ * 

+ * ## Set to update all loaded properties
+ * ebean.updateChangesOnly=false
+ *
+ */ +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface UpdateMode { + + /** + * Set to false if you want to include all the 'loaded' properties in the + * update. Otherwise, just the properties that have changed will be included + * in the update. + */ + boolean updateChangesOnly() default true; + +} diff --git a/src/main/java/io/ebean/annotation/UpdatedTimestamp.java b/src/main/java/io/ebean/annotation/UpdatedTimestamp.java new file mode 100644 index 000000000..f1b84a47d --- /dev/null +++ b/src/main/java/io/ebean/annotation/UpdatedTimestamp.java @@ -0,0 +1,20 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * For a timestamp property that is set to the datetime when the entity was last + * updated. + *

+ * This is effectively an alias for @WhenModified which was added as it hints + * towards a better naming convention (WhenCreated, WhenModified). + *

+ */ +@Target({ElementType.FIELD, ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface UpdatedTimestamp { + +} diff --git a/src/main/java/io/ebean/annotation/View.java b/src/main/java/io/ebean/annotation/View.java new file mode 100644 index 000000000..161abf4d8 --- /dev/null +++ b/src/main/java/io/ebean/annotation/View.java @@ -0,0 +1,38 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Annotate an entity bean with @View to indicates the bean is based on a view. + *

+ * As such typically the view is defined in extra-ddl.xml using + * create or replace view .... + *

+ *

+ * When using extra-ddl.xml Ebean will run the resulting DDL script after the + * create-all DDL (which is typically used during development) and for + * DB Migration will copy the scripts as repeatable migration scripts that + * will be run by FlywayDb (or Ebean's own migration runner) when their MD5 hash changes. + *

+ */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface View { + + /** + * The name of the view this entity bean is based on. + */ + String name(); + + /** + * Tables this view is dependent on. + *

+ * This is used with l2 caching to invalidate the query cache. Changes to these + * tables invalidate the query cache for the entity based on this view. + *

+ */ + String[] dependentTables() default {}; +} diff --git a/src/main/java/io/ebean/annotation/WhenCreated.java b/src/main/java/io/ebean/annotation/WhenCreated.java new file mode 100644 index 000000000..df79999db --- /dev/null +++ b/src/main/java/io/ebean/annotation/WhenCreated.java @@ -0,0 +1,38 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * For a timestamp property that is set to the datetime when the entity is + * created/inserted. + *

+ * This is effectively an alias for @CreatedTimestamp and added to hint + * towards a better naming convention (WhenCreated, WhenModified). + *

+ *

+ * An alternative to using this annotation would be to use insertable=false, + * updateable=false with @Column and have the DB insert the current time + * (default value on the DB column is SYSTIME etc). + *

+ *

+ * The downside to this approach is that the inserted entity does not have the + * timestamp value after the insert has occurred. You need to fetch the entity + * back to get the inserted timestamp if you want to used it. + *

+ *

+ *

Example:

+ * 
{@code
+ *
+ *   @WhenCreated
+ *   Timestamp whenCreated;
+ *
+ * }
+ */ +@Target({ElementType.FIELD, ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface WhenCreated { + +} diff --git a/src/main/java/io/ebean/annotation/WhenModified.java b/src/main/java/io/ebean/annotation/WhenModified.java new file mode 100644 index 000000000..fbf1843b2 --- /dev/null +++ b/src/main/java/io/ebean/annotation/WhenModified.java @@ -0,0 +1,19 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * For a timestamp property that is set to the datetime when the entity was last modified. + *

+ * This is effectively an alias for @UpdatedTimestamp and added to hint + * towards a better naming convention (WhenCreated, WhenModified). + *

+ */ +@Target({ElementType.FIELD, ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface WhenModified { + +} diff --git a/src/main/java/com/avaje/ebean/annotation/Where.java b/src/main/java/io/ebean/annotation/Where.java similarity index 95% rename from src/main/java/com/avaje/ebean/annotation/Where.java rename to src/main/java/io/ebean/annotation/Where.java index aa4bfa874..47482b2f3 100644 --- a/src/main/java/com/avaje/ebean/annotation/Where.java +++ b/src/main/java/io/ebean/annotation/Where.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.annotation; +package io.ebean.annotation; -import com.avaje.ebean.config.Platform; +import io.ebean.Platform; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; diff --git a/src/main/java/io/ebean/annotation/WhoCreated.java b/src/main/java/io/ebean/annotation/WhoCreated.java new file mode 100644 index 000000000..70afef90c --- /dev/null +++ b/src/main/java/io/ebean/annotation/WhoCreated.java @@ -0,0 +1,28 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Mapped onto a entity bean property that represents the user id of + * who created the entity> + *

+ * To use this annotation you need to implement CurrentUserProvider. + * The type of the bean property should match the type returned by + * CurrentUserProvider. + *

+ *

Example:

+ * 
{@code
+ *
+ *   @WhoCreated
+ *   String whoCreated;
+ *
+ * }
+ */ +@Target({ElementType.FIELD, ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface WhoCreated { + +} diff --git a/src/main/java/io/ebean/annotation/WhoModified.java b/src/main/java/io/ebean/annotation/WhoModified.java new file mode 100644 index 000000000..9ff742e44 --- /dev/null +++ b/src/main/java/io/ebean/annotation/WhoModified.java @@ -0,0 +1,28 @@ +package io.ebean.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Mapped onto a entity bean property that represents the user id of + * who last modified the entity> + *

+ * To use this annotation you need to implement CurrentUserProvider. + * The type of the bean property should match the type returned by + * CurrentUserProvider. + *

+ *

Example:

+ * 
{@code
+ *
+ *   @WhoModified
+ *   String whoModified;
+ *
+ * }
+ */ +@Target({ElementType.FIELD, ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface WhoModified { + +} diff --git a/src/main/java/io/ebean/annotation/package.html b/src/main/java/io/ebean/annotation/package.html new file mode 100644 index 000000000..a3cb62253 --- /dev/null +++ b/src/main/java/io/ebean/annotation/package.html @@ -0,0 +1,14 @@ + + + + Extra deployment annotations + + +Extra deployment annotations + +

+ Extra deployment annotations for entity beans. +

+ + + diff --git a/src/main/java/com/avaje/ebean/bean/BeanCollection.java b/src/main/java/io/ebean/bean/BeanCollection.java similarity index 98% rename from src/main/java/com/avaje/ebean/bean/BeanCollection.java rename to src/main/java/io/ebean/bean/BeanCollection.java index aec02a5d3..31d546407 100644 --- a/src/main/java/com/avaje/ebean/bean/BeanCollection.java +++ b/src/main/java/io/ebean/bean/BeanCollection.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.bean; +package io.ebean.bean; -import com.avaje.ebean.ExpressionList; +import io.ebean.ExpressionList; import java.io.Serializable; import java.util.Collection; diff --git a/src/main/java/com/avaje/ebean/bean/BeanCollectionAdd.java b/src/main/java/io/ebean/bean/BeanCollectionAdd.java similarity index 92% rename from src/main/java/com/avaje/ebean/bean/BeanCollectionAdd.java rename to src/main/java/io/ebean/bean/BeanCollectionAdd.java index 55a3804eb..c0a16cc9b 100644 --- a/src/main/java/com/avaje/ebean/bean/BeanCollectionAdd.java +++ b/src/main/java/io/ebean/bean/BeanCollectionAdd.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.bean; +package io.ebean.bean; /** * Interface to define the addition of a bean to the underlying collection. diff --git a/src/main/java/com/avaje/ebean/bean/BeanCollectionLoader.java b/src/main/java/io/ebean/bean/BeanCollectionLoader.java similarity index 92% rename from src/main/java/com/avaje/ebean/bean/BeanCollectionLoader.java rename to src/main/java/io/ebean/bean/BeanCollectionLoader.java index 1c80a0437..fce7d7037 100644 --- a/src/main/java/com/avaje/ebean/bean/BeanCollectionLoader.java +++ b/src/main/java/io/ebean/bean/BeanCollectionLoader.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.bean; +package io.ebean.bean; /** * Loads a entity bean collection. diff --git a/src/main/java/com/avaje/ebean/bean/BeanLoader.java b/src/main/java/io/ebean/bean/BeanLoader.java similarity index 91% rename from src/main/java/com/avaje/ebean/bean/BeanLoader.java rename to src/main/java/io/ebean/bean/BeanLoader.java index 9f6605064..b4e004568 100644 --- a/src/main/java/com/avaje/ebean/bean/BeanLoader.java +++ b/src/main/java/io/ebean/bean/BeanLoader.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.bean; +package io.ebean.bean; /** * Loads a entity bean. diff --git a/src/main/java/com/avaje/ebean/bean/CallStack.java b/src/main/java/io/ebean/bean/CallStack.java similarity index 99% rename from src/main/java/com/avaje/ebean/bean/CallStack.java rename to src/main/java/io/ebean/bean/CallStack.java index 04ae39414..16d8b7aac 100644 --- a/src/main/java/com/avaje/ebean/bean/CallStack.java +++ b/src/main/java/io/ebean/bean/CallStack.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.bean; +package io.ebean.bean; import java.io.Serializable; import java.util.Arrays; diff --git a/src/main/java/com/avaje/ebean/bean/EnhancedTransactional.java b/src/main/java/io/ebean/bean/EnhancedTransactional.java similarity index 81% rename from src/main/java/com/avaje/ebean/bean/EnhancedTransactional.java rename to src/main/java/io/ebean/bean/EnhancedTransactional.java index ad46caeff..41bc1ddcd 100644 --- a/src/main/java/com/avaje/ebean/bean/EnhancedTransactional.java +++ b/src/main/java/io/ebean/bean/EnhancedTransactional.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.bean; +package io.ebean.bean; /** * Marker interface for classes enhanced to support Transactional methods. diff --git a/src/main/java/com/avaje/ebean/bean/EntityBean.java b/src/main/java/io/ebean/bean/EntityBean.java similarity index 98% rename from src/main/java/com/avaje/ebean/bean/EntityBean.java rename to src/main/java/io/ebean/bean/EntityBean.java index 4fd4f226a..cbf49ef19 100644 --- a/src/main/java/com/avaje/ebean/bean/EntityBean.java +++ b/src/main/java/io/ebean/bean/EntityBean.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.bean; +package io.ebean.bean; import java.beans.PropertyChangeListener; import java.io.Serializable; diff --git a/src/main/java/com/avaje/ebean/bean/EntityBeanIntercept.java b/src/main/java/io/ebean/bean/EntityBeanIntercept.java similarity index 99% rename from src/main/java/com/avaje/ebean/bean/EntityBeanIntercept.java rename to src/main/java/io/ebean/bean/EntityBeanIntercept.java index 359fd794d..7d9b03425 100644 --- a/src/main/java/com/avaje/ebean/bean/EntityBeanIntercept.java +++ b/src/main/java/io/ebean/bean/EntityBeanIntercept.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.bean; +package io.ebean.bean; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.ValuePair; +import io.ebean.Ebean; +import io.ebean.ValuePair; import javax.persistence.EntityNotFoundException; import javax.persistence.PersistenceException; diff --git a/src/main/java/com/avaje/ebean/bean/NodeUsageCollector.java b/src/main/java/io/ebean/bean/NodeUsageCollector.java similarity index 98% rename from src/main/java/com/avaje/ebean/bean/NodeUsageCollector.java rename to src/main/java/io/ebean/bean/NodeUsageCollector.java index 6eb6333ac..535f1092f 100644 --- a/src/main/java/com/avaje/ebean/bean/NodeUsageCollector.java +++ b/src/main/java/io/ebean/bean/NodeUsageCollector.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.bean; +package io.ebean.bean; import java.lang.ref.WeakReference; import java.util.LinkedHashSet; diff --git a/src/main/java/com/avaje/ebean/bean/NodeUsageListener.java b/src/main/java/io/ebean/bean/NodeUsageListener.java similarity index 92% rename from src/main/java/com/avaje/ebean/bean/NodeUsageListener.java rename to src/main/java/io/ebean/bean/NodeUsageListener.java index 682a99629..bfa2c1892 100644 --- a/src/main/java/com/avaje/ebean/bean/NodeUsageListener.java +++ b/src/main/java/io/ebean/bean/NodeUsageListener.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.bean; +package io.ebean.bean; /** * Collects the profile information. diff --git a/src/main/java/com/avaje/ebean/bean/ObjectGraphNode.java b/src/main/java/io/ebean/bean/ObjectGraphNode.java similarity index 98% rename from src/main/java/com/avaje/ebean/bean/ObjectGraphNode.java rename to src/main/java/io/ebean/bean/ObjectGraphNode.java index 13947b941..828705463 100644 --- a/src/main/java/com/avaje/ebean/bean/ObjectGraphNode.java +++ b/src/main/java/io/ebean/bean/ObjectGraphNode.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.bean; +package io.ebean.bean; import java.io.Serializable; diff --git a/src/main/java/com/avaje/ebean/bean/ObjectGraphOrigin.java b/src/main/java/io/ebean/bean/ObjectGraphOrigin.java similarity index 98% rename from src/main/java/com/avaje/ebean/bean/ObjectGraphOrigin.java rename to src/main/java/io/ebean/bean/ObjectGraphOrigin.java index fc31407fc..a5f6ea752 100644 --- a/src/main/java/com/avaje/ebean/bean/ObjectGraphOrigin.java +++ b/src/main/java/io/ebean/bean/ObjectGraphOrigin.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.bean; +package io.ebean.bean; import java.io.Serializable; diff --git a/src/main/java/com/avaje/ebean/bean/PersistenceContext.java b/src/main/java/io/ebean/bean/PersistenceContext.java similarity index 98% rename from src/main/java/com/avaje/ebean/bean/PersistenceContext.java rename to src/main/java/io/ebean/bean/PersistenceContext.java index 6e67034e2..1ece57962 100644 --- a/src/main/java/com/avaje/ebean/bean/PersistenceContext.java +++ b/src/main/java/io/ebean/bean/PersistenceContext.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.bean; +package io.ebean.bean; /** * Holds entity beans by there type and id. diff --git a/src/main/java/com/avaje/ebean/bean/PersistenceContextUtil.java b/src/main/java/io/ebean/bean/PersistenceContextUtil.java similarity index 93% rename from src/main/java/com/avaje/ebean/bean/PersistenceContextUtil.java rename to src/main/java/io/ebean/bean/PersistenceContextUtil.java index d3f2402fb..ef168afe1 100644 --- a/src/main/java/com/avaje/ebean/bean/PersistenceContextUtil.java +++ b/src/main/java/io/ebean/bean/PersistenceContextUtil.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.bean; +package io.ebean.bean; import javax.persistence.Entity; diff --git a/src/main/java/com/avaje/ebean/bean/PreGetterCallback.java b/src/main/java/io/ebean/bean/PreGetterCallback.java similarity index 89% rename from src/main/java/com/avaje/ebean/bean/PreGetterCallback.java rename to src/main/java/io/ebean/bean/PreGetterCallback.java index 8faecec22..8bcbb6ce1 100644 --- a/src/main/java/com/avaje/ebean/bean/PreGetterCallback.java +++ b/src/main/java/io/ebean/bean/PreGetterCallback.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.bean; +package io.ebean.bean; /** * A callback that can be registered to fire on getter method calls. diff --git a/src/main/java/com/avaje/ebean/bean/package.html b/src/main/java/io/ebean/bean/package.html similarity index 100% rename from src/main/java/com/avaje/ebean/bean/package.html rename to src/main/java/io/ebean/bean/package.html diff --git a/src/main/java/com/avaje/ebean/cache/ServerCache.java b/src/main/java/io/ebean/cache/ServerCache.java similarity index 97% rename from src/main/java/com/avaje/ebean/cache/ServerCache.java rename to src/main/java/io/ebean/cache/ServerCache.java index ca6e84e3e..363c61d84 100644 --- a/src/main/java/com/avaje/ebean/cache/ServerCache.java +++ b/src/main/java/io/ebean/cache/ServerCache.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.cache; +package io.ebean.cache; /** * Represents part of the "L2" server side cache. diff --git a/src/main/java/com/avaje/ebean/cache/ServerCacheFactory.java b/src/main/java/io/ebean/cache/ServerCacheFactory.java similarity index 90% rename from src/main/java/com/avaje/ebean/cache/ServerCacheFactory.java rename to src/main/java/io/ebean/cache/ServerCacheFactory.java index 01310c4ee..2ba1c4ed8 100644 --- a/src/main/java/com/avaje/ebean/cache/ServerCacheFactory.java +++ b/src/main/java/io/ebean/cache/ServerCacheFactory.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.cache; +package io.ebean.cache; /** * Defines method for constructing caches for beans and queries. diff --git a/src/main/java/com/avaje/ebean/cache/ServerCacheManager.java b/src/main/java/io/ebean/cache/ServerCacheManager.java similarity index 97% rename from src/main/java/com/avaje/ebean/cache/ServerCacheManager.java rename to src/main/java/io/ebean/cache/ServerCacheManager.java index 36d586601..1ee97f7a3 100644 --- a/src/main/java/com/avaje/ebean/cache/ServerCacheManager.java +++ b/src/main/java/io/ebean/cache/ServerCacheManager.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.cache; +package io.ebean.cache; /** * The cache service for server side caching of beans and query results. diff --git a/src/main/java/com/avaje/ebean/cache/ServerCacheOptions.java b/src/main/java/io/ebean/cache/ServerCacheOptions.java similarity index 95% rename from src/main/java/com/avaje/ebean/cache/ServerCacheOptions.java rename to src/main/java/io/ebean/cache/ServerCacheOptions.java index 106dbf4e0..6d32089c1 100644 --- a/src/main/java/com/avaje/ebean/cache/ServerCacheOptions.java +++ b/src/main/java/io/ebean/cache/ServerCacheOptions.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.cache; +package io.ebean.cache; -import com.avaje.ebean.annotation.CacheBeanTuning; -import com.avaje.ebean.annotation.CacheQueryTuning; +import io.ebean.annotation.CacheBeanTuning; +import io.ebean.annotation.CacheQueryTuning; /** * Options for controlling a cache. diff --git a/src/main/java/com/avaje/ebean/cache/ServerCachePlugin.java b/src/main/java/io/ebean/cache/ServerCachePlugin.java similarity index 71% rename from src/main/java/com/avaje/ebean/cache/ServerCachePlugin.java rename to src/main/java/io/ebean/cache/ServerCachePlugin.java index 2fe635d1c..86990d2fd 100644 --- a/src/main/java/com/avaje/ebean/cache/ServerCachePlugin.java +++ b/src/main/java/io/ebean/cache/ServerCachePlugin.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.cache; +package io.ebean.cache; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.config.ServerConfig; +import io.ebean.BackgroundExecutor; +import io.ebean.config.ServerConfig; /** * The plugin interface that creates a ServerCacheFactory. diff --git a/src/main/java/com/avaje/ebean/cache/ServerCacheStatistics.java b/src/main/java/io/ebean/cache/ServerCacheStatistics.java similarity index 99% rename from src/main/java/com/avaje/ebean/cache/ServerCacheStatistics.java rename to src/main/java/io/ebean/cache/ServerCacheStatistics.java index 56a2a412a..a6b1d2edc 100644 --- a/src/main/java/com/avaje/ebean/cache/ServerCacheStatistics.java +++ b/src/main/java/io/ebean/cache/ServerCacheStatistics.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.cache; +package io.ebean.cache; /** * The statistics collected per cache. diff --git a/src/main/java/com/avaje/ebean/cache/ServerCacheType.java b/src/main/java/io/ebean/cache/ServerCacheType.java similarity index 93% rename from src/main/java/com/avaje/ebean/cache/ServerCacheType.java rename to src/main/java/io/ebean/cache/ServerCacheType.java index c5e27ef22..1e78885c8 100644 --- a/src/main/java/com/avaje/ebean/cache/ServerCacheType.java +++ b/src/main/java/io/ebean/cache/ServerCacheType.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.cache; +package io.ebean.cache; /** * The type of L2 caches. diff --git a/src/main/java/com/avaje/ebean/cache/package.html b/src/main/java/io/ebean/cache/package.html similarity index 100% rename from src/main/java/com/avaje/ebean/cache/package.html rename to src/main/java/io/ebean/cache/package.html diff --git a/src/main/java/com/avaje/ebean/common/AbstractBeanCollection.java b/src/main/java/io/ebean/common/AbstractBeanCollection.java similarity index 95% rename from src/main/java/com/avaje/ebean/common/AbstractBeanCollection.java rename to src/main/java/io/ebean/common/AbstractBeanCollection.java index 2512a126d..dee22048e 100644 --- a/src/main/java/com/avaje/ebean/common/AbstractBeanCollection.java +++ b/src/main/java/io/ebean/common/AbstractBeanCollection.java @@ -1,10 +1,10 @@ -package com.avaje.ebean.common; +package io.ebean.common; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.ExpressionList; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.BeanCollectionLoader; -import com.avaje.ebean.bean.EntityBean; +import io.ebean.Ebean; +import io.ebean.ExpressionList; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.BeanCollectionLoader; +import io.ebean.bean.EntityBean; import javax.persistence.PersistenceException; import java.util.Set; diff --git a/src/main/java/com/avaje/ebean/common/BeanList.java b/src/main/java/io/ebean/common/BeanList.java similarity index 98% rename from src/main/java/com/avaje/ebean/common/BeanList.java rename to src/main/java/io/ebean/common/BeanList.java index c5616a1e2..28d9d1a65 100644 --- a/src/main/java/com/avaje/ebean/common/BeanList.java +++ b/src/main/java/io/ebean/common/BeanList.java @@ -1,9 +1,9 @@ -package com.avaje.ebean.common; +package io.ebean.common; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.BeanCollectionAdd; -import com.avaje.ebean.bean.BeanCollectionLoader; -import com.avaje.ebean.bean.EntityBean; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.BeanCollectionAdd; +import io.ebean.bean.BeanCollectionLoader; +import io.ebean.bean.EntityBean; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebean/common/BeanMap.java b/src/main/java/io/ebean/common/BeanMap.java similarity index 97% rename from src/main/java/com/avaje/ebean/common/BeanMap.java rename to src/main/java/io/ebean/common/BeanMap.java index 232d23a84..f9270bda2 100644 --- a/src/main/java/com/avaje/ebean/common/BeanMap.java +++ b/src/main/java/io/ebean/common/BeanMap.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.common; +package io.ebean.common; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.BeanCollectionLoader; -import com.avaje.ebean.bean.EntityBean; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.BeanCollectionLoader; +import io.ebean.bean.EntityBean; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/com/avaje/ebean/common/BeanSet.java b/src/main/java/io/ebean/common/BeanSet.java similarity index 97% rename from src/main/java/com/avaje/ebean/common/BeanSet.java rename to src/main/java/io/ebean/common/BeanSet.java index f7b780681..ab4972b36 100644 --- a/src/main/java/com/avaje/ebean/common/BeanSet.java +++ b/src/main/java/io/ebean/common/BeanSet.java @@ -1,9 +1,9 @@ -package com.avaje.ebean.common; +package io.ebean.common; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.BeanCollectionAdd; -import com.avaje.ebean.bean.BeanCollectionLoader; -import com.avaje.ebean.bean.EntityBean; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.BeanCollectionAdd; +import io.ebean.bean.BeanCollectionLoader; +import io.ebean.bean.EntityBean; import java.io.Serializable; import java.util.Collection; diff --git a/src/main/java/com/avaje/ebean/common/ModifyCollection.java b/src/main/java/io/ebean/common/ModifyCollection.java similarity index 97% rename from src/main/java/com/avaje/ebean/common/ModifyCollection.java rename to src/main/java/io/ebean/common/ModifyCollection.java index 041476768..a71bea54a 100644 --- a/src/main/java/com/avaje/ebean/common/ModifyCollection.java +++ b/src/main/java/io/ebean/common/ModifyCollection.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 java.util.Collection; import java.util.Iterator; diff --git a/src/main/java/com/avaje/ebean/common/ModifyHolder.java b/src/main/java/io/ebean/common/ModifyHolder.java similarity index 98% rename from src/main/java/com/avaje/ebean/common/ModifyHolder.java rename to src/main/java/io/ebean/common/ModifyHolder.java index 9a9180810..51971dc13 100644 --- a/src/main/java/com/avaje/ebean/common/ModifyHolder.java +++ b/src/main/java/io/ebean/common/ModifyHolder.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.common; +package io.ebean.common; import java.io.Serializable; import java.util.Collection; diff --git a/src/main/java/com/avaje/ebean/common/ModifyIterator.java b/src/main/java/io/ebean/common/ModifyIterator.java similarity index 92% rename from src/main/java/com/avaje/ebean/common/ModifyIterator.java rename to src/main/java/io/ebean/common/ModifyIterator.java index 08e7a30c7..fbb8045d7 100644 --- a/src/main/java/com/avaje/ebean/common/ModifyIterator.java +++ b/src/main/java/io/ebean/common/ModifyIterator.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 java.util.Iterator; diff --git a/src/main/java/com/avaje/ebean/common/ModifyList.java b/src/main/java/io/ebean/common/ModifyList.java similarity index 96% rename from src/main/java/com/avaje/ebean/common/ModifyList.java rename to src/main/java/io/ebean/common/ModifyList.java index 112670dd1..f9dcbad75 100644 --- a/src/main/java/com/avaje/ebean/common/ModifyList.java +++ b/src/main/java/io/ebean/common/ModifyList.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 java.util.Collection; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/common/ModifyListIterator.java b/src/main/java/io/ebean/common/ModifyListIterator.java similarity index 94% rename from src/main/java/com/avaje/ebean/common/ModifyListIterator.java rename to src/main/java/io/ebean/common/ModifyListIterator.java index d6155b6af..36dd7b3bd 100644 --- a/src/main/java/com/avaje/ebean/common/ModifyListIterator.java +++ b/src/main/java/io/ebean/common/ModifyListIterator.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 java.util.ListIterator; diff --git a/src/main/java/com/avaje/ebean/common/ModifySet.java b/src/main/java/io/ebean/common/ModifySet.java similarity index 87% rename from src/main/java/com/avaje/ebean/common/ModifySet.java rename to src/main/java/io/ebean/common/ModifySet.java index 8cacde77d..1a0a2e1bf 100644 --- a/src/main/java/com/avaje/ebean/common/ModifySet.java +++ b/src/main/java/io/ebean/common/ModifySet.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 java.util.Set; diff --git a/src/main/java/com/avaje/ebean/common/SpiContainer.java b/src/main/java/io/ebean/common/SpiContainer.java similarity index 86% rename from src/main/java/com/avaje/ebean/common/SpiContainer.java rename to src/main/java/io/ebean/common/SpiContainer.java index 2715576de..7e7833634 100644 --- a/src/main/java/com/avaje/ebean/common/SpiContainer.java +++ b/src/main/java/io/ebean/common/SpiContainer.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.common; +package io.ebean.common; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.config.ServerConfig; +import io.ebean.EbeanServer; +import io.ebean.config.ServerConfig; /** * Creates the EbeanServer implementations. This is used internally by the EbeanServerFactory and is not currently diff --git a/src/main/java/com/avaje/ebean/common/package.html b/src/main/java/io/ebean/common/package.html similarity index 100% rename from src/main/java/com/avaje/ebean/common/package.html rename to src/main/java/io/ebean/common/package.html diff --git a/src/main/java/com/avaje/ebean/config/AbstractNamingConvention.java b/src/main/java/io/ebean/config/AbstractNamingConvention.java similarity index 98% rename from src/main/java/com/avaje/ebean/config/AbstractNamingConvention.java rename to src/main/java/io/ebean/config/AbstractNamingConvention.java index 3f836a709..9d77a42e9 100644 --- a/src/main/java/com/avaje/ebean/config/AbstractNamingConvention.java +++ b/src/main/java/io/ebean/config/AbstractNamingConvention.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.config; +package io.ebean.config; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DatabasePlatform; import javax.persistence.DiscriminatorValue; import javax.persistence.Inheritance; diff --git a/src/main/java/com/avaje/ebean/config/AutoTuneConfig.java b/src/main/java/io/ebean/config/AutoTuneConfig.java similarity index 99% rename from src/main/java/com/avaje/ebean/config/AutoTuneConfig.java rename to src/main/java/io/ebean/config/AutoTuneConfig.java index 71373c575..1bedca17e 100644 --- a/src/main/java/com/avaje/ebean/config/AutoTuneConfig.java +++ b/src/main/java/io/ebean/config/AutoTuneConfig.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * Defines the AutoTune behaviour for a EbeanServer. diff --git a/src/main/java/com/avaje/ebean/config/AutoTuneMode.java b/src/main/java/io/ebean/config/AutoTuneMode.java similarity index 91% rename from src/main/java/com/avaje/ebean/config/AutoTuneMode.java rename to src/main/java/io/ebean/config/AutoTuneMode.java index 071b7fe42..f1ccc2a38 100644 --- a/src/main/java/com/avaje/ebean/config/AutoTuneMode.java +++ b/src/main/java/io/ebean/config/AutoTuneMode.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.config; +package io.ebean.config; -import com.avaje.ebean.Query; +import io.ebean.Query; /** * The mode for determining if AutoTune will be used for a given query when @@ -29,4 +29,4 @@ public enum AutoTuneMode { */ DEFAULT_ONIFEMPTY -} \ No newline at end of file +} diff --git a/src/main/java/com/avaje/ebean/config/ClassLoadConfig.java b/src/main/java/io/ebean/config/ClassLoadConfig.java similarity index 99% rename from src/main/java/com/avaje/ebean/config/ClassLoadConfig.java rename to src/main/java/io/ebean/config/ClassLoadConfig.java index a76547c4f..ace902e48 100644 --- a/src/main/java/com/avaje/ebean/config/ClassLoadConfig.java +++ b/src/main/java/io/ebean/config/ClassLoadConfig.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebean/config/ContainerConfig.java b/src/main/java/io/ebean/config/ContainerConfig.java similarity index 97% rename from src/main/java/com/avaje/ebean/config/ContainerConfig.java rename to src/main/java/io/ebean/config/ContainerConfig.java index c8f243645..faaa49df8 100644 --- a/src/main/java/com/avaje/ebean/config/ContainerConfig.java +++ b/src/main/java/io/ebean/config/ContainerConfig.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; import java.util.Properties; diff --git a/src/main/java/com/avaje/ebean/config/CurrentTenantProvider.java b/src/main/java/io/ebean/config/CurrentTenantProvider.java similarity index 86% rename from src/main/java/com/avaje/ebean/config/CurrentTenantProvider.java rename to src/main/java/io/ebean/config/CurrentTenantProvider.java index 251abf471..682f4401d 100644 --- a/src/main/java/com/avaje/ebean/config/CurrentTenantProvider.java +++ b/src/main/java/io/ebean/config/CurrentTenantProvider.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * Provides the Tenant Id for the current request based on the current user. diff --git a/src/main/java/com/avaje/ebean/config/CurrentUserProvider.java b/src/main/java/io/ebean/config/CurrentUserProvider.java similarity index 92% rename from src/main/java/com/avaje/ebean/config/CurrentUserProvider.java rename to src/main/java/io/ebean/config/CurrentUserProvider.java index 7de4a361f..87387c3d1 100644 --- a/src/main/java/com/avaje/ebean/config/CurrentUserProvider.java +++ b/src/main/java/io/ebean/config/CurrentUserProvider.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * Provides the current user in order to support 'Who created', 'Who modified' and other audit features. diff --git a/src/main/java/com/avaje/ebean/config/CustomDbTypeMapping.java b/src/main/java/io/ebean/config/CustomDbTypeMapping.java similarity index 92% rename from src/main/java/com/avaje/ebean/config/CustomDbTypeMapping.java rename to src/main/java/io/ebean/config/CustomDbTypeMapping.java index ae6a7d244..c65f75525 100644 --- a/src/main/java/com/avaje/ebean/config/CustomDbTypeMapping.java +++ b/src/main/java/io/ebean/config/CustomDbTypeMapping.java @@ -1,6 +1,7 @@ -package com.avaje.ebean.config; +package io.ebean.config; -import com.avaje.ebean.config.dbplatform.DbType; +import io.ebean.config.dbplatform.DbType; +import io.ebean.Platform; /** * Custom mappings for DB types that override the default. diff --git a/src/main/java/com/avaje/ebean/config/DbConstraintNaming.java b/src/main/java/io/ebean/config/DbConstraintNaming.java similarity index 99% rename from src/main/java/com/avaje/ebean/config/DbConstraintNaming.java rename to src/main/java/io/ebean/config/DbConstraintNaming.java index 2fab40df1..d94b74caf 100644 --- a/src/main/java/com/avaje/ebean/config/DbConstraintNaming.java +++ b/src/main/java/io/ebean/config/DbConstraintNaming.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * Naming convention used for constraint names. diff --git a/src/main/java/com/avaje/ebean/config/DbConstraintNormalise.java b/src/main/java/io/ebean/config/DbConstraintNormalise.java similarity index 98% rename from src/main/java/com/avaje/ebean/config/DbConstraintNormalise.java rename to src/main/java/io/ebean/config/DbConstraintNormalise.java index 7a4ac320c..44af6bccd 100644 --- a/src/main/java/com/avaje/ebean/config/DbConstraintNormalise.java +++ b/src/main/java/io/ebean/config/DbConstraintNormalise.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * Used to normalise table and column names which means stripping out diff --git a/src/main/java/com/avaje/ebean/config/DbMigrationConfig.java b/src/main/java/io/ebean/config/DbMigrationConfig.java similarity index 99% rename from src/main/java/com/avaje/ebean/config/DbMigrationConfig.java rename to src/main/java/io/ebean/config/DbMigrationConfig.java index b32ff9206..ed9c28ba2 100644 --- a/src/main/java/com/avaje/ebean/config/DbMigrationConfig.java +++ b/src/main/java/io/ebean/config/DbMigrationConfig.java @@ -1,7 +1,6 @@ -package com.avaje.ebean.config; +package io.ebean.config; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.dbmigration.DbMigration; +import io.ebean.Platform; import org.avaje.dbmigration.MigrationConfig; import org.avaje.dbmigration.MigrationRunner; import org.slf4j.Logger; diff --git a/src/main/java/com/avaje/ebean/config/DbTypeConfig.java b/src/main/java/io/ebean/config/DbTypeConfig.java similarity index 95% rename from src/main/java/com/avaje/ebean/config/DbTypeConfig.java rename to src/main/java/io/ebean/config/DbTypeConfig.java index 64c45ade4..e05c8039b 100644 --- a/src/main/java/com/avaje/ebean/config/DbTypeConfig.java +++ b/src/main/java/io/ebean/config/DbTypeConfig.java @@ -1,7 +1,8 @@ -package com.avaje.ebean.config; +package io.ebean.config; -import com.avaje.ebean.config.dbplatform.DbType; -import com.avaje.ebean.config.dbplatform.IdType; +import io.ebean.config.dbplatform.DbType; +import io.ebean.config.dbplatform.IdType; +import io.ebean.Platform; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/config/DocStoreConfig.java b/src/main/java/io/ebean/config/DocStoreConfig.java similarity index 97% rename from src/main/java/com/avaje/ebean/config/DocStoreConfig.java rename to src/main/java/io/ebean/config/DocStoreConfig.java index 5efd8ab3b..72626d7d0 100644 --- a/src/main/java/com/avaje/ebean/config/DocStoreConfig.java +++ b/src/main/java/io/ebean/config/DocStoreConfig.java @@ -1,6 +1,7 @@ -package com.avaje.ebean.config; +package io.ebean.config; -import com.avaje.ebean.annotation.DocStoreMode; +import io.ebean.Transaction; +import io.ebean.annotation.DocStoreMode; /** * Configuration for the Document store integration (e.g. ElasticSearch). @@ -161,7 +162,7 @@ public class DocStoreConfig { /** * Set the default batch size to use for calls to the Bulk API. *

- * The batch size can be set on a transaction via {@link com.avaje.ebean.Transaction#setDocStoreBatchSize(int)}. + * The batch size can be set on a transaction via {@link Transaction#setDocStoreBatchSize(int)}. *

*/ public void setBulkBatchSize(int bulkBatchSize) { diff --git a/src/main/java/com/avaje/ebean/config/EncryptDeploy.java b/src/main/java/io/ebean/config/EncryptDeploy.java similarity index 98% rename from src/main/java/com/avaje/ebean/config/EncryptDeploy.java rename to src/main/java/io/ebean/config/EncryptDeploy.java index a6a776289..91ad8f7ee 100644 --- a/src/main/java/com/avaje/ebean/config/EncryptDeploy.java +++ b/src/main/java/io/ebean/config/EncryptDeploy.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * Define the encryption options for a bean property. diff --git a/src/main/java/com/avaje/ebean/config/EncryptDeployManager.java b/src/main/java/io/ebean/config/EncryptDeployManager.java similarity index 88% rename from src/main/java/com/avaje/ebean/config/EncryptDeployManager.java rename to src/main/java/io/ebean/config/EncryptDeployManager.java index 38d702f98..78823bed7 100644 --- a/src/main/java/com/avaje/ebean/config/EncryptDeployManager.java +++ b/src/main/java/io/ebean/config/EncryptDeployManager.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * Programmatically define which database columns are encrypted. diff --git a/src/main/java/com/avaje/ebean/config/EncryptKey.java b/src/main/java/io/ebean/config/EncryptKey.java similarity index 90% rename from src/main/java/com/avaje/ebean/config/EncryptKey.java rename to src/main/java/io/ebean/config/EncryptKey.java index 5fd142152..b5d72c662 100644 --- a/src/main/java/com/avaje/ebean/config/EncryptKey.java +++ b/src/main/java/io/ebean/config/EncryptKey.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * Represents the key used for encryption. diff --git a/src/main/java/com/avaje/ebean/config/EncryptKeyManager.java b/src/main/java/io/ebean/config/EncryptKeyManager.java similarity index 93% rename from src/main/java/com/avaje/ebean/config/EncryptKeyManager.java rename to src/main/java/io/ebean/config/EncryptKeyManager.java index 43dd90ab8..dac0cfd21 100644 --- a/src/main/java/com/avaje/ebean/config/EncryptKeyManager.java +++ b/src/main/java/io/ebean/config/EncryptKeyManager.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * Determine keys used for encryption and decryption. diff --git a/src/main/java/com/avaje/ebean/config/Encryptor.java b/src/main/java/io/ebean/config/Encryptor.java similarity index 95% rename from src/main/java/com/avaje/ebean/config/Encryptor.java rename to src/main/java/io/ebean/config/Encryptor.java index e696e544c..82bb887aa 100644 --- a/src/main/java/com/avaje/ebean/config/Encryptor.java +++ b/src/main/java/io/ebean/config/Encryptor.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * Used for Java side encryption of properties when DB encryption is not used. diff --git a/src/main/java/com/avaje/ebean/config/ExternalTransactionManager.java b/src/main/java/io/ebean/config/ExternalTransactionManager.java similarity index 92% rename from src/main/java/com/avaje/ebean/config/ExternalTransactionManager.java rename to src/main/java/io/ebean/config/ExternalTransactionManager.java index 160928959..73db96d7e 100644 --- a/src/main/java/com/avaje/ebean/config/ExternalTransactionManager.java +++ b/src/main/java/io/ebean/config/ExternalTransactionManager.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * Provides awareness of externally managed transactions. diff --git a/src/main/java/com/avaje/ebean/config/IdGenerator.java b/src/main/java/io/ebean/config/IdGenerator.java similarity index 93% rename from src/main/java/com/avaje/ebean/config/IdGenerator.java rename to src/main/java/io/ebean/config/IdGenerator.java index 6a5b68a0d..e894b6ba6 100644 --- a/src/main/java/com/avaje/ebean/config/IdGenerator.java +++ b/src/main/java/io/ebean/config/IdGenerator.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * A customer Id generator that can be registered with Ebean and diff --git a/src/main/java/com/avaje/ebean/config/JsonConfig.java b/src/main/java/io/ebean/config/JsonConfig.java similarity index 95% rename from src/main/java/com/avaje/ebean/config/JsonConfig.java rename to src/main/java/io/ebean/config/JsonConfig.java index 06129c4db..bb745cac7 100644 --- a/src/main/java/com/avaje/ebean/config/JsonConfig.java +++ b/src/main/java/io/ebean/config/JsonConfig.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * Configuration for JSON features. diff --git a/src/main/java/com/avaje/ebean/config/MatchingNamingConvention.java b/src/main/java/io/ebean/config/MatchingNamingConvention.java similarity index 97% rename from src/main/java/com/avaje/ebean/config/MatchingNamingConvention.java rename to src/main/java/io/ebean/config/MatchingNamingConvention.java index 7b622c83f..d351631e6 100644 --- a/src/main/java/com/avaje/ebean/config/MatchingNamingConvention.java +++ b/src/main/java/io/ebean/config/MatchingNamingConvention.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * The JPA naming convention where column names match property names and table diff --git a/src/main/java/com/avaje/ebean/config/NamingConvention.java b/src/main/java/io/ebean/config/NamingConvention.java similarity index 97% rename from src/main/java/com/avaje/ebean/config/NamingConvention.java rename to src/main/java/io/ebean/config/NamingConvention.java index 36363cd08..c5a0a2b86 100644 --- a/src/main/java/com/avaje/ebean/config/NamingConvention.java +++ b/src/main/java/io/ebean/config/NamingConvention.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.config; +package io.ebean.config; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DatabasePlatform; /** * Defines the naming convention for converting between logical property diff --git a/src/main/java/com/avaje/ebean/config/PropertiesWrapper.java b/src/main/java/io/ebean/config/PropertiesWrapper.java similarity index 99% rename from src/main/java/com/avaje/ebean/config/PropertiesWrapper.java rename to src/main/java/io/ebean/config/PropertiesWrapper.java index 4bda1c763..61ff55f94 100644 --- a/src/main/java/com/avaje/ebean/config/PropertiesWrapper.java +++ b/src/main/java/io/ebean/config/PropertiesWrapper.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; import java.util.Properties; diff --git a/src/main/java/com/avaje/ebean/config/PropertyExpression.java b/src/main/java/io/ebean/config/PropertyExpression.java similarity index 99% rename from src/main/java/com/avaje/ebean/config/PropertyExpression.java rename to src/main/java/io/ebean/config/PropertyExpression.java index 64c9f88c9..fbfea2d20 100644 --- a/src/main/java/com/avaje/ebean/config/PropertyExpression.java +++ b/src/main/java/io/ebean/config/PropertyExpression.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebean/config/PropertyMap.java b/src/main/java/io/ebean/config/PropertyMap.java similarity index 99% rename from src/main/java/com/avaje/ebean/config/PropertyMap.java rename to src/main/java/io/ebean/config/PropertyMap.java index 3c9482953..eb8069b00 100644 --- a/src/main/java/com/avaje/ebean/config/PropertyMap.java +++ b/src/main/java/io/ebean/config/PropertyMap.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; import java.io.Serializable; import java.util.LinkedHashMap; diff --git a/src/main/java/com/avaje/ebean/config/PropertyMapLoader.java b/src/main/java/io/ebean/config/PropertyMapLoader.java similarity index 99% rename from src/main/java/com/avaje/ebean/config/PropertyMapLoader.java rename to src/main/java/io/ebean/config/PropertyMapLoader.java index b237b38c4..c9724f061 100644 --- a/src/main/java/com/avaje/ebean/config/PropertyMapLoader.java +++ b/src/main/java/io/ebean/config/PropertyMapLoader.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebean/config/ScalarTypeConverter.java b/src/main/java/io/ebean/config/ScalarTypeConverter.java similarity index 96% rename from src/main/java/com/avaje/ebean/config/ScalarTypeConverter.java rename to src/main/java/io/ebean/config/ScalarTypeConverter.java index a0fbb1d47..8594e494c 100644 --- a/src/main/java/com/avaje/ebean/config/ScalarTypeConverter.java +++ b/src/main/java/io/ebean/config/ScalarTypeConverter.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * Used to convert between a value object and a known scalar type. The value @@ -11,7 +11,7 @@ package com.avaje.ebean.config; *

*

* This is an easier alternative to implementing the - * com.avaje.ebean.server.type.ScalarType interface. + * io.ebean.server.type.ScalarType interface. *

*

* Note that Ebean will automatically try to detect Immutable Scalar Value diff --git a/src/main/java/com/avaje/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java similarity index 97% rename from src/main/java/com/avaje/ebean/config/ServerConfig.java rename to src/main/java/io/ebean/config/ServerConfig.java index 9c83fb8ac..123b8b880 100644 --- a/src/main/java/com/avaje/ebean/config/ServerConfig.java +++ b/src/main/java/io/ebean/config/ServerConfig.java @@ -1,28 +1,31 @@ -package com.avaje.ebean.config; +package io.ebean.config; -import com.avaje.ebean.EbeanServerFactory; -import com.avaje.ebean.PersistenceContextScope; -import com.avaje.ebean.annotation.Encrypted; -import com.avaje.ebean.cache.ServerCacheManager; -import com.avaje.ebean.cache.ServerCachePlugin; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.DbEncrypt; -import com.avaje.ebean.config.dbplatform.DbType; -import com.avaje.ebean.event.BeanFindController; -import com.avaje.ebean.event.BeanPersistController; -import com.avaje.ebean.event.BeanPersistListener; -import com.avaje.ebean.event.BeanPostConstructListener; -import com.avaje.ebean.event.BeanPostLoad; -import com.avaje.ebean.event.BeanQueryAdapter; -import com.avaje.ebean.event.BulkTableEventListener; -import com.avaje.ebean.event.ServerConfigStartup; -import com.avaje.ebean.event.changelog.ChangeLogListener; -import com.avaje.ebean.event.changelog.ChangeLogPrepare; -import com.avaje.ebean.event.changelog.ChangeLogRegister; -import com.avaje.ebean.event.readaudit.ReadAuditLogger; -import com.avaje.ebean.event.readaudit.ReadAuditPrepare; -import com.avaje.ebean.meta.MetaInfoManager; +import io.ebean.EbeanServerFactory; +import io.ebean.PersistenceContextScope; +import io.ebean.Query; +import io.ebean.Transaction; +import io.ebean.annotation.Encrypted; +import io.ebean.cache.ServerCachePlugin; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbEncrypt; +import io.ebean.config.dbplatform.DbType; +import io.ebean.event.BeanFindController; +import io.ebean.event.BeanPersistController; +import io.ebean.event.BeanPersistListener; +import io.ebean.event.BeanPostConstructListener; +import io.ebean.event.BeanPostLoad; +import io.ebean.event.BeanQueryAdapter; +import io.ebean.event.BulkTableEventListener; +import io.ebean.event.ServerConfigStartup; +import io.ebean.event.changelog.ChangeLogListener; +import io.ebean.event.changelog.ChangeLogPrepare; +import io.ebean.event.changelog.ChangeLogRegister; +import io.ebean.event.readaudit.ReadAuditLogger; +import io.ebean.event.readaudit.ReadAuditPrepare; +import io.ebean.meta.MetaInfoManager; import com.fasterxml.jackson.core.JsonFactory; +import io.ebean.PersistBatch; +import io.ebean.Platform; import org.avaje.datasource.DataSourceConfig; import org.avaje.dbmigration.MigrationRunner; @@ -775,7 +778,7 @@ public class ServerConfig { * You can also set the batch size on the transaction. *

* - * @see com.avaje.ebean.Transaction#setBatchSize(int) + * @see Transaction#setBatchSize(int) */ public void setPersistBatchSize(int persistBatchSize) { this.persistBatchSize = persistBatchSize; @@ -1571,7 +1574,7 @@ public class ServerConfig { *

* 

{@code
    * # set via ebean.properties
-   * ebean.encryptKeyManager=com.avaje.tests.basic.encrypt.BasicEncyptKeyManager
+   * ebean.encryptKeyManager=org.avaje.tests.basic.encrypt.BasicEncyptKeyManager
    * }
*/ public void setEncryptKeyManager(EncryptKeyManager encryptKeyManager) { @@ -1941,7 +1944,7 @@ public class ServerConfig { * * } * - * @see com.avaje.ebean.Transaction#setSkipCache(boolean) + * @see Transaction#setSkipCache(boolean) */ public boolean isSkipCacheAfterWrite() { return skipCacheAfterWrite; @@ -1981,7 +1984,7 @@ public class ServerConfig { * This mode can be explicitly set per transaction. *

* - * @see com.avaje.ebean.Transaction#setUpdateAllLoadedProperties(boolean) + * @see Transaction#setUpdateAllLoadedProperties(boolean) */ public void setUpdateAllPropertiesInBatch(boolean updateAllPropertiesInBatch) { this.updateAllPropertiesInBatch = updateAllPropertiesInBatch; @@ -2307,11 +2310,11 @@ public class ServerConfig { /** * Return the default PersistenceContextScope to be used if one is not explicitly set on a query. *

- * The PersistenceContextScope can specified on each query via {@link com.avaje.ebean - * .Query#setPersistenceContextScope(com.avaje.ebean.PersistenceContextScope)}. If it + * The PersistenceContextScope can specified on each query via {@link io.ebean + * .Query#setPersistenceContextScope(io.ebean.PersistenceContextScope)}. If it * is not set on the query this default scope is used. * - * @see com.avaje.ebean.Query#setPersistenceContextScope(com.avaje.ebean.PersistenceContextScope) + * @see Query#setPersistenceContextScope(PersistenceContextScope) */ public PersistenceContextScope getPersistenceContextScope() { // if somehow null return TRANSACTION scope @@ -2323,11 +2326,11 @@ public class ServerConfig { *

* This defaults to {@link PersistenceContextScope#TRANSACTION}. *

- * The PersistenceContextScope can specified on each query via {@link com.avaje.ebean - * .Query#setPersistenceContextScope(com.avaje.ebean.PersistenceContextScope)}. If it + * The PersistenceContextScope can specified on each query via {@link io.ebean + * .Query#setPersistenceContextScope(io.ebean.PersistenceContextScope)}. If it * is not set on the query this scope is used. * - * @see com.avaje.ebean.Query#setPersistenceContextScope(com.avaje.ebean.PersistenceContextScope) + * @see Query#setPersistenceContextScope(PersistenceContextScope) */ public void setPersistenceContextScope(PersistenceContextScope persistenceContextScope) { this.persistenceContextScope = persistenceContextScope; diff --git a/src/main/java/com/avaje/ebean/config/TableName.java b/src/main/java/io/ebean/config/TableName.java similarity index 99% rename from src/main/java/com/avaje/ebean/config/TableName.java rename to src/main/java/io/ebean/config/TableName.java index 8d3007011..c75e89329 100644 --- a/src/main/java/com/avaje/ebean/config/TableName.java +++ b/src/main/java/io/ebean/config/TableName.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * TableName holds catalog, schema and table name. diff --git a/src/main/java/com/avaje/ebean/config/TenantDataSourceProvider.java b/src/main/java/io/ebean/config/TenantDataSourceProvider.java similarity index 91% rename from src/main/java/com/avaje/ebean/config/TenantDataSourceProvider.java rename to src/main/java/io/ebean/config/TenantDataSourceProvider.java index f4ac0b442..fdb895caf 100644 --- a/src/main/java/com/avaje/ebean/config/TenantDataSourceProvider.java +++ b/src/main/java/io/ebean/config/TenantDataSourceProvider.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; import javax.sql.DataSource; diff --git a/src/main/java/com/avaje/ebean/config/TenantMode.java b/src/main/java/io/ebean/config/TenantMode.java similarity index 95% rename from src/main/java/com/avaje/ebean/config/TenantMode.java rename to src/main/java/io/ebean/config/TenantMode.java index bda074ff0..808d93044 100644 --- a/src/main/java/com/avaje/ebean/config/TenantMode.java +++ b/src/main/java/io/ebean/config/TenantMode.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * The mode to use for multi-tenancy. diff --git a/src/main/java/com/avaje/ebean/config/TenantSchemaProvider.java b/src/main/java/io/ebean/config/TenantSchemaProvider.java similarity index 91% rename from src/main/java/com/avaje/ebean/config/TenantSchemaProvider.java rename to src/main/java/io/ebean/config/TenantSchemaProvider.java index 44303cc74..7e1fc58b5 100644 --- a/src/main/java/com/avaje/ebean/config/TenantSchemaProvider.java +++ b/src/main/java/io/ebean/config/TenantSchemaProvider.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config; +package io.ebean.config; /** * For multi-tenancy via DB SCHEMA supply the schema given the tenantId. diff --git a/src/main/java/com/avaje/ebean/config/UnderscoreNamingConvention.java b/src/main/java/io/ebean/config/UnderscoreNamingConvention.java similarity index 97% rename from src/main/java/com/avaje/ebean/config/UnderscoreNamingConvention.java rename to src/main/java/io/ebean/config/UnderscoreNamingConvention.java index ee6e52829..4a5041d53 100644 --- a/src/main/java/com/avaje/ebean/config/UnderscoreNamingConvention.java +++ b/src/main/java/io/ebean/config/UnderscoreNamingConvention.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.config; +package io.ebean.config; -import com.avaje.ebean.util.CamelCaseHelper; +import io.ebean.util.CamelCaseHelper; /** * Converts between Camel Case and Underscore based names for both table and diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/AbstractDbEncrypt.java b/src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java similarity index 97% rename from src/main/java/com/avaje/ebean/config/dbplatform/AbstractDbEncrypt.java rename to src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java index 2c23a3b42..4e5f2072e 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/AbstractDbEncrypt.java +++ b/src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/BasicSqlAnsiLimiter.java b/src/main/java/io/ebean/config/dbplatform/BasicSqlAnsiLimiter.java similarity index 92% rename from src/main/java/com/avaje/ebean/config/dbplatform/BasicSqlAnsiLimiter.java rename to src/main/java/io/ebean/config/dbplatform/BasicSqlAnsiLimiter.java index dc5bc8b2f..378f029fb 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/BasicSqlAnsiLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/BasicSqlAnsiLimiter.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; /** * Adds ANSI based OFFSET FETCH NEXT clauses to a SQL query. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/BasicSqlLimitOffset.java b/src/main/java/io/ebean/config/dbplatform/BasicSqlLimitOffset.java similarity index 94% rename from src/main/java/com/avaje/ebean/config/dbplatform/BasicSqlLimitOffset.java rename to src/main/java/io/ebean/config/dbplatform/BasicSqlLimitOffset.java index c473e5acd..bf2f8557f 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/BasicSqlLimitOffset.java +++ b/src/main/java/io/ebean/config/dbplatform/BasicSqlLimitOffset.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; /** * Adds LIMIT OFFSET clauses to a SQL query. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/BasicSqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/BasicSqlLimiter.java similarity index 83% rename from src/main/java/com/avaje/ebean/config/dbplatform/BasicSqlLimiter.java rename to src/main/java/io/ebean/config/dbplatform/BasicSqlLimiter.java index 4b1bfd19b..a8d6058ae 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/BasicSqlLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/BasicSqlLimiter.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; /** * Simple SQL limiter for use with SqlQuery. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java similarity index 96% rename from src/main/java/com/avaje/ebean/config/dbplatform/DatabasePlatform.java rename to src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java index 8e67f5266..7872ad6c4 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/DatabasePlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java @@ -1,14 +1,14 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.Query; -import com.avaje.ebean.config.CustomDbTypeMapping; -import com.avaje.ebean.config.DbTypeConfig; -import com.avaje.ebean.config.PersistBatch; -import com.avaje.ebean.config.Platform; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlHandler; -import com.avaje.ebean.dbmigration.ddlgeneration.platform.PlatformDdl; +import io.ebean.BackgroundExecutor; +import io.ebean.Query; +import io.ebean.config.CustomDbTypeMapping; +import io.ebean.config.DbTypeConfig; +import io.ebean.PersistBatch; +import io.ebean.Platform; +import io.ebean.config.ServerConfig; +import io.ebean.dbmigration.ddlgeneration.DdlHandler; +import io.ebean.dbmigration.ddlgeneration.platform.PlatformDdl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbDefaultValue.java b/src/main/java/io/ebean/config/dbplatform/DbDefaultValue.java similarity index 96% rename from src/main/java/com/avaje/ebean/config/dbplatform/DbDefaultValue.java rename to src/main/java/io/ebean/config/dbplatform/DbDefaultValue.java index 049e699bc..ccd6fb505 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/DbDefaultValue.java +++ b/src/main/java/io/ebean/config/dbplatform/DbDefaultValue.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbEncrypt.java b/src/main/java/io/ebean/config/dbplatform/DbEncrypt.java similarity index 95% rename from src/main/java/com/avaje/ebean/config/dbplatform/DbEncrypt.java rename to src/main/java/io/ebean/config/dbplatform/DbEncrypt.java index 129bc2c0b..06d4db9aa 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/DbEncrypt.java +++ b/src/main/java/io/ebean/config/dbplatform/DbEncrypt.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; /** * Defines DB encryption support for encrypting and decrypting data using DB diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbEncryptFunction.java b/src/main/java/io/ebean/config/dbplatform/DbEncryptFunction.java similarity index 87% rename from src/main/java/com/avaje/ebean/config/dbplatform/DbEncryptFunction.java rename to src/main/java/io/ebean/config/dbplatform/DbEncryptFunction.java index d3feea74a..93859ab6d 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/DbEncryptFunction.java +++ b/src/main/java/io/ebean/config/dbplatform/DbEncryptFunction.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; public interface DbEncryptFunction { diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbHistorySupport.java b/src/main/java/io/ebean/config/dbplatform/DbHistorySupport.java similarity index 98% rename from src/main/java/com/avaje/ebean/config/dbplatform/DbHistorySupport.java rename to src/main/java/io/ebean/config/dbplatform/DbHistorySupport.java index f9dc35fdd..960a5aefb 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/DbHistorySupport.java +++ b/src/main/java/io/ebean/config/dbplatform/DbHistorySupport.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; /** * History support for the database platform. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbIdentity.java b/src/main/java/io/ebean/config/dbplatform/DbIdentity.java similarity index 97% rename from src/main/java/com/avaje/ebean/config/dbplatform/DbIdentity.java rename to src/main/java/io/ebean/config/dbplatform/DbIdentity.java index 442493059..2b53acb20 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/DbIdentity.java +++ b/src/main/java/io/ebean/config/dbplatform/DbIdentity.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; -import com.avaje.ebean.dbmigration.migration.IdentityType; +import io.ebean.dbmigration.migration.IdentityType; /** * Defines the identity/sequence behaviour for the database. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformType.java b/src/main/java/io/ebean/config/dbplatform/DbPlatformType.java similarity index 98% rename from src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformType.java rename to src/main/java/io/ebean/config/dbplatform/DbPlatformType.java index aec57b745..52a4491e6 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformType.java +++ b/src/main/java/io/ebean/config/dbplatform/DbPlatformType.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; /** * Represents a DB type with name, length, precision, and scale. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeLookup.java b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeLookup.java similarity index 96% rename from src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeLookup.java rename to src/main/java/io/ebean/config/dbplatform/DbPlatformTypeLookup.java index ca9c39341..762c40e7d 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeLookup.java +++ b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeLookup.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeMapping.java b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java similarity index 98% rename from src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeMapping.java rename to src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java index 27b90996b..ec2cb6bd6 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeMapping.java +++ b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; -import com.avaje.ebean.config.ServerConfig; +import io.ebean.config.ServerConfig; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeParser.java b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeParser.java similarity index 96% rename from src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeParser.java rename to src/main/java/io/ebean/config/dbplatform/DbPlatformTypeParser.java index ec0d440b5..b1e37decf 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeParser.java +++ b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeParser.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; /** * Parse raw column definitions into DbPlatformType like "decimal(18,6)" and "varchar(20) and "json". diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbStandardHistorySupport.java b/src/main/java/io/ebean/config/dbplatform/DbStandardHistorySupport.java similarity index 93% rename from src/main/java/com/avaje/ebean/config/dbplatform/DbStandardHistorySupport.java rename to src/main/java/io/ebean/config/dbplatform/DbStandardHistorySupport.java index b2935d4d3..59c0b18ea 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/DbStandardHistorySupport.java +++ b/src/main/java/io/ebean/config/dbplatform/DbStandardHistorySupport.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; /** * SQL2011 based history support using 'as of timestamp' type clause appended as part of the the from or join clause. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbType.java b/src/main/java/io/ebean/config/dbplatform/DbType.java similarity index 97% rename from src/main/java/com/avaje/ebean/config/dbplatform/DbType.java rename to src/main/java/io/ebean/config/dbplatform/DbType.java index d2164be86..f967db9ca 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/DbType.java +++ b/src/main/java/io/ebean/config/dbplatform/DbType.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbViewHistorySupport.java b/src/main/java/io/ebean/config/dbplatform/DbViewHistorySupport.java similarity index 98% rename from src/main/java/com/avaje/ebean/config/dbplatform/DbViewHistorySupport.java rename to src/main/java/io/ebean/config/dbplatform/DbViewHistorySupport.java index fdabd33d9..e6b4ce24f 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/DbViewHistorySupport.java +++ b/src/main/java/io/ebean/config/dbplatform/DbViewHistorySupport.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; /** * Database view based implementation of DbHistorySupport. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/ExtraDbTypes.java b/src/main/java/io/ebean/config/dbplatform/ExtraDbTypes.java similarity index 95% rename from src/main/java/com/avaje/ebean/config/dbplatform/ExtraDbTypes.java rename to src/main/java/io/ebean/config/dbplatform/ExtraDbTypes.java index d4aa01f6d..f05ce865c 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/ExtraDbTypes.java +++ b/src/main/java/io/ebean/config/dbplatform/ExtraDbTypes.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; /** * Integer codes for the extra types beyond java.sql.Types. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/IdType.java b/src/main/java/io/ebean/config/dbplatform/IdType.java similarity index 95% rename from src/main/java/com/avaje/ebean/config/dbplatform/IdType.java rename to src/main/java/io/ebean/config/dbplatform/IdType.java index 228f7b1f9..1bb1fa432 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/IdType.java +++ b/src/main/java/io/ebean/config/dbplatform/IdType.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; /** * The types of Identity generation that can be defined. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/LimitOffsetSqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java similarity index 95% rename from src/main/java/com/avaje/ebean/config/dbplatform/LimitOffsetSqlLimiter.java rename to src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java index de60acc86..f80bc6cc5 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/LimitOffsetSqlLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; /** * Adds LIMIT OFFSET clauses to a SQL query. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/PlatformIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/PlatformIdGenerator.java similarity index 93% rename from src/main/java/com/avaje/ebean/config/dbplatform/PlatformIdGenerator.java rename to src/main/java/io/ebean/config/dbplatform/PlatformIdGenerator.java index 08b427e23..f6b3b6ff7 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/PlatformIdGenerator.java +++ b/src/main/java/io/ebean/config/dbplatform/PlatformIdGenerator.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; -import com.avaje.ebean.Transaction; +import io.ebean.Transaction; /** * Generates unique id's for objects. This occurs prior to the actual insert. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/RowNumberSqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/RowNumberSqlLimiter.java similarity index 97% rename from src/main/java/com/avaje/ebean/config/dbplatform/RowNumberSqlLimiter.java rename to src/main/java/io/ebean/config/dbplatform/RowNumberSqlLimiter.java index 43bfbcd56..c325a6c08 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/RowNumberSqlLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/RowNumberSqlLimiter.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; /** * Adds the ROW_NUMBER() OVER function to a query. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/RownumSqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/RownumSqlLimiter.java similarity index 97% rename from src/main/java/com/avaje/ebean/config/dbplatform/RownumSqlLimiter.java rename to src/main/java/io/ebean/config/dbplatform/RownumSqlLimiter.java index e24c07a19..086fac277 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/RownumSqlLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/RownumSqlLimiter.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; /** * Add ROWNUM column etc around SQL query to limit results. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/SequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java similarity index 97% rename from src/main/java/com/avaje/ebean/config/dbplatform/SequenceIdGenerator.java rename to src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java index 0f5053bca..2511b8b61 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/SequenceIdGenerator.java +++ b/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.Transaction; +import io.ebean.BackgroundExecutor; +import io.ebean.Transaction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/SimpleSequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java similarity index 96% rename from src/main/java/com/avaje/ebean/config/dbplatform/SimpleSequenceIdGenerator.java rename to src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java index 1ddbbee15..0437f46e7 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/SimpleSequenceIdGenerator.java +++ b/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; -import com.avaje.ebean.Transaction; +import io.ebean.Transaction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/SqlLimitRequest.java b/src/main/java/io/ebean/config/dbplatform/SqlLimitRequest.java similarity index 90% rename from src/main/java/com/avaje/ebean/config/dbplatform/SqlLimitRequest.java rename to src/main/java/io/ebean/config/dbplatform/SqlLimitRequest.java index d8d8d1f49..992644c2b 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/SqlLimitRequest.java +++ b/src/main/java/io/ebean/config/dbplatform/SqlLimitRequest.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; -import com.avaje.ebean.Query; +import io.ebean.Query; /** * The request object for the query that can have sql limiting applied to it diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/SqlLimitResponse.java b/src/main/java/io/ebean/config/dbplatform/SqlLimitResponse.java similarity index 93% rename from src/main/java/com/avaje/ebean/config/dbplatform/SqlLimitResponse.java rename to src/main/java/io/ebean/config/dbplatform/SqlLimitResponse.java index 084a5612c..495c875e8 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/SqlLimitResponse.java +++ b/src/main/java/io/ebean/config/dbplatform/SqlLimitResponse.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; /** * The resulting SQL from a SqlLimit process. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/SqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/SqlLimiter.java similarity index 89% rename from src/main/java/com/avaje/ebean/config/dbplatform/SqlLimiter.java rename to src/main/java/io/ebean/config/dbplatform/SqlLimiter.java index a5ab3944b..7ba61428a 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/SqlLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/SqlLimiter.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform; +package io.ebean.config.dbplatform; /** * Adds SQL limiting to a query (such as LIMIT OFFSET). diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/db2/DB2Platform.java b/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java similarity index 72% rename from src/main/java/com/avaje/ebean/config/dbplatform/db2/DB2Platform.java rename to src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java index 0503bfb8b..58b86c027 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/db2/DB2Platform.java +++ b/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java @@ -1,12 +1,12 @@ -package com.avaje.ebean.config.dbplatform.db2; +package io.ebean.config.dbplatform.db2; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.config.Platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.config.dbplatform.DbType; -import com.avaje.ebean.config.dbplatform.PlatformIdGenerator; -import com.avaje.ebean.dbmigration.ddlgeneration.platform.DB2Ddl; +import io.ebean.BackgroundExecutor; +import io.ebean.Platform; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbType; +import io.ebean.config.dbplatform.PlatformIdGenerator; +import io.ebean.dbmigration.ddlgeneration.platform.DB2Ddl; import javax.sql.DataSource; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java similarity index 83% rename from src/main/java/com/avaje/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java rename to src/main/java/io/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java index 7523f7c45..43daa34d7 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java +++ b/src/main/java/io/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.config.dbplatform.db2; +package io.ebean.config.dbplatform.db2; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.config.dbplatform.SequenceIdGenerator; +import io.ebean.BackgroundExecutor; +import io.ebean.config.dbplatform.SequenceIdGenerator; import javax.sql.DataSource; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/db2/Db2SqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/db2/Db2SqlLimiter.java similarity index 73% rename from src/main/java/com/avaje/ebean/config/dbplatform/db2/Db2SqlLimiter.java rename to src/main/java/io/ebean/config/dbplatform/db2/Db2SqlLimiter.java index 9c5b5a486..d8ae313ed 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/db2/Db2SqlLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/db2/Db2SqlLimiter.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.config.dbplatform.db2; +package io.ebean.config.dbplatform.db2; -import com.avaje.ebean.config.dbplatform.SqlLimitRequest; -import com.avaje.ebean.config.dbplatform.SqlLimitResponse; -import com.avaje.ebean.config.dbplatform.SqlLimiter; +import io.ebean.config.dbplatform.SqlLimitRequest; +import io.ebean.config.dbplatform.SqlLimitResponse; +import io.ebean.config.dbplatform.SqlLimiter; public class Db2SqlLimiter implements SqlLimiter { diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/h2/H2DbEncrypt.java b/src/main/java/io/ebean/config/dbplatform/h2/H2DbEncrypt.java similarity index 88% rename from src/main/java/com/avaje/ebean/config/dbplatform/h2/H2DbEncrypt.java rename to src/main/java/io/ebean/config/dbplatform/h2/H2DbEncrypt.java index 53be57dc8..e4c00972a 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/h2/H2DbEncrypt.java +++ b/src/main/java/io/ebean/config/dbplatform/h2/H2DbEncrypt.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.config.dbplatform.h2; +package io.ebean.config.dbplatform.h2; -import com.avaje.ebean.config.dbplatform.AbstractDbEncrypt; -import com.avaje.ebean.config.dbplatform.DbEncryptFunction; +import io.ebean.config.dbplatform.AbstractDbEncrypt; +import io.ebean.config.dbplatform.DbEncryptFunction; /** * H2 encryption support via encrypt decrypt function. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/h2/H2HistorySupport.java b/src/main/java/io/ebean/config/dbplatform/h2/H2HistorySupport.java similarity index 51% rename from src/main/java/com/avaje/ebean/config/dbplatform/h2/H2HistorySupport.java rename to src/main/java/io/ebean/config/dbplatform/h2/H2HistorySupport.java index 5cb1662ad..9669d58ff 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/h2/H2HistorySupport.java +++ b/src/main/java/io/ebean/config/dbplatform/h2/H2HistorySupport.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.config.dbplatform.h2; +package io.ebean.config.dbplatform.h2; -import com.avaje.ebean.config.dbplatform.DbViewHistorySupport; +import io.ebean.config.dbplatform.DbViewHistorySupport; /** * Runtime support for @History with H2. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/h2/H2HistoryTrigger.java b/src/main/java/io/ebean/config/dbplatform/h2/H2HistoryTrigger.java similarity index 98% rename from src/main/java/com/avaje/ebean/config/dbplatform/h2/H2HistoryTrigger.java rename to src/main/java/io/ebean/config/dbplatform/h2/H2HistoryTrigger.java index 830471c2c..3afa3a422 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/h2/H2HistoryTrigger.java +++ b/src/main/java/io/ebean/config/dbplatform/h2/H2HistoryTrigger.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform.h2; +package io.ebean.config.dbplatform.h2; import org.h2.api.Trigger; import org.slf4j.Logger; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/h2/H2Platform.java b/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java similarity index 73% rename from src/main/java/com/avaje/ebean/config/dbplatform/h2/H2Platform.java rename to src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java index d2647b57e..0bbdc2bba 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/h2/H2Platform.java +++ b/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java @@ -1,13 +1,13 @@ -package com.avaje.ebean.config.dbplatform.h2; +package io.ebean.config.dbplatform.h2; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.config.Platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.config.dbplatform.DbType; -import com.avaje.ebean.config.dbplatform.IdType; -import com.avaje.ebean.config.dbplatform.PlatformIdGenerator; -import com.avaje.ebean.dbmigration.ddlgeneration.platform.H2Ddl; +import io.ebean.BackgroundExecutor; +import io.ebean.Platform; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbType; +import io.ebean.config.dbplatform.IdType; +import io.ebean.config.dbplatform.PlatformIdGenerator; +import io.ebean.dbmigration.ddlgeneration.platform.H2Ddl; import javax.sql.DataSource; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java similarity index 83% rename from src/main/java/com/avaje/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java rename to src/main/java/io/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java index 07c435aec..ab4482614 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java +++ b/src/main/java/io/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.config.dbplatform.h2; +package io.ebean.config.dbplatform.h2; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.config.dbplatform.SequenceIdGenerator; +import io.ebean.BackgroundExecutor; +import io.ebean.config.dbplatform.SequenceIdGenerator; import javax.sql.DataSource; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java b/src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java similarity index 56% rename from src/main/java/com/avaje/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java rename to src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java index cc8eda7e6..e345b46b7 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java @@ -1,15 +1,15 @@ -package com.avaje.ebean.config.dbplatform.hsqldb; +package io.ebean.config.dbplatform.hsqldb; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.config.Platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.config.dbplatform.DbType; -import com.avaje.ebean.config.dbplatform.IdType; -import com.avaje.ebean.config.dbplatform.PlatformIdGenerator; -import com.avaje.ebean.config.dbplatform.h2.H2DbEncrypt; -import com.avaje.ebean.config.dbplatform.h2.H2SequenceIdGenerator; -import com.avaje.ebean.dbmigration.ddlgeneration.platform.HsqldbDdl; +import io.ebean.BackgroundExecutor; +import io.ebean.Platform; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbType; +import io.ebean.config.dbplatform.IdType; +import io.ebean.config.dbplatform.PlatformIdGenerator; +import io.ebean.config.dbplatform.h2.H2DbEncrypt; +import io.ebean.config.dbplatform.h2.H2SequenceIdGenerator; +import io.ebean.dbmigration.ddlgeneration.platform.HsqldbDdl; import javax.sql.DataSource; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/mysql/MySqlBlob.java b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlBlob.java similarity index 86% rename from src/main/java/com/avaje/ebean/config/dbplatform/mysql/MySqlBlob.java rename to src/main/java/io/ebean/config/dbplatform/mysql/MySqlBlob.java index 9f50d53a7..fe25f41c8 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/mysql/MySqlBlob.java +++ b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlBlob.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.config.dbplatform.mysql; +package io.ebean.config.dbplatform.mysql; -import com.avaje.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbPlatformType; /** * Support for blob, mediumblob or longblob selection based on the deployment diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/mysql/MySqlClob.java b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlClob.java similarity index 86% rename from src/main/java/com/avaje/ebean/config/dbplatform/mysql/MySqlClob.java rename to src/main/java/io/ebean/config/dbplatform/mysql/MySqlClob.java index fb06c15b9..2d3e48e11 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/mysql/MySqlClob.java +++ b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlClob.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.config.dbplatform.mysql; +package io.ebean.config.dbplatform.mysql; -import com.avaje.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbPlatformType; /** * Support for text, mediumtext or longtext selection based on the deployment diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java similarity index 84% rename from src/main/java/com/avaje/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java rename to src/main/java/io/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java index 355f8d203..6dc3f2e60 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java +++ b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.config.dbplatform.mysql; +package io.ebean.config.dbplatform.mysql; -import com.avaje.ebean.config.dbplatform.AbstractDbEncrypt; -import com.avaje.ebean.config.dbplatform.DbEncryptFunction; +import io.ebean.config.dbplatform.AbstractDbEncrypt; +import io.ebean.config.dbplatform.DbEncryptFunction; /** * MySql aes_encrypt aes_decrypt based encryption support. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/mysql/MySqlHistorySupport.java b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlHistorySupport.java similarity index 51% rename from src/main/java/com/avaje/ebean/config/dbplatform/mysql/MySqlHistorySupport.java rename to src/main/java/io/ebean/config/dbplatform/mysql/MySqlHistorySupport.java index 8a06b24a3..53ebd8d4e 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/mysql/MySqlHistorySupport.java +++ b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlHistorySupport.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.config.dbplatform.mysql; +package io.ebean.config.dbplatform.mysql; -import com.avaje.ebean.config.dbplatform.DbViewHistorySupport; +import io.ebean.config.dbplatform.DbViewHistorySupport; /** * Runtime support for @History with MySql. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/mysql/MySqlPlatform.java b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java similarity index 79% rename from src/main/java/com/avaje/ebean/config/dbplatform/mysql/MySqlPlatform.java rename to src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java index ee5e9ac6a..c032a3867 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/mysql/MySqlPlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java @@ -1,13 +1,13 @@ -package com.avaje.ebean.config.dbplatform.mysql; +package io.ebean.config.dbplatform.mysql; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.config.Platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.config.dbplatform.DbType; -import com.avaje.ebean.config.dbplatform.IdType; -import com.avaje.ebean.config.dbplatform.PlatformIdGenerator; -import com.avaje.ebean.dbmigration.ddlgeneration.platform.MySqlDdl; +import io.ebean.BackgroundExecutor; +import io.ebean.Platform; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbType; +import io.ebean.config.dbplatform.IdType; +import io.ebean.config.dbplatform.PlatformIdGenerator; +import io.ebean.dbmigration.ddlgeneration.platform.MySqlDdl; import javax.sql.DataSource; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/oracle/OracleDbEncrypt.java b/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbEncrypt.java similarity index 95% rename from src/main/java/com/avaje/ebean/config/dbplatform/oracle/OracleDbEncrypt.java rename to src/main/java/io/ebean/config/dbplatform/oracle/OracleDbEncrypt.java index 0f4c18d1f..bdfc5562b 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/oracle/OracleDbEncrypt.java +++ b/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbEncrypt.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.config.dbplatform.oracle; +package io.ebean.config.dbplatform.oracle; -import com.avaje.ebean.config.dbplatform.AbstractDbEncrypt; -import com.avaje.ebean.config.dbplatform.DbEncryptFunction; +import io.ebean.config.dbplatform.AbstractDbEncrypt; +import io.ebean.config.dbplatform.DbEncryptFunction; /** * Oracle encryption support. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/oracle/OracleDbHistorySupport.java b/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbHistorySupport.java similarity index 87% rename from src/main/java/com/avaje/ebean/config/dbplatform/oracle/OracleDbHistorySupport.java rename to src/main/java/io/ebean/config/dbplatform/oracle/OracleDbHistorySupport.java index 43cec229e..54e6c46ea 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/oracle/OracleDbHistorySupport.java +++ b/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbHistorySupport.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.config.dbplatform.oracle; +package io.ebean.config.dbplatform.oracle; -import com.avaje.ebean.config.dbplatform.DbStandardHistorySupport; +import io.ebean.config.dbplatform.DbStandardHistorySupport; /** * Oracle Total recall based history support. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/oracle/OraclePlatform.java b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java similarity index 78% rename from src/main/java/com/avaje/ebean/config/dbplatform/oracle/OraclePlatform.java rename to src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java index 4c321bd4a..b1458f8e0 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/oracle/OraclePlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java @@ -1,15 +1,15 @@ -package com.avaje.ebean.config.dbplatform.oracle; +package io.ebean.config.dbplatform.oracle; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.config.Platform; -import com.avaje.ebean.config.dbplatform.BasicSqlAnsiLimiter; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.config.dbplatform.DbType; -import com.avaje.ebean.config.dbplatform.IdType; -import com.avaje.ebean.config.dbplatform.PlatformIdGenerator; -import com.avaje.ebean.config.dbplatform.RownumSqlLimiter; -import com.avaje.ebean.dbmigration.ddlgeneration.platform.Oracle10Ddl; +import io.ebean.BackgroundExecutor; +import io.ebean.Platform; +import io.ebean.config.dbplatform.BasicSqlAnsiLimiter; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbType; +import io.ebean.config.dbplatform.IdType; +import io.ebean.config.dbplatform.PlatformIdGenerator; +import io.ebean.config.dbplatform.RownumSqlLimiter; +import io.ebean.dbmigration.ddlgeneration.platform.Oracle10Ddl; import javax.sql.DataSource; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java similarity index 79% rename from src/main/java/com/avaje/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java rename to src/main/java/io/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java index aee6b3508..b5bc283b7 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java +++ b/src/main/java/io/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.config.dbplatform.oracle; +package io.ebean.config.dbplatform.oracle; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.config.dbplatform.SequenceIdGenerator; +import io.ebean.BackgroundExecutor; +import io.ebean.config.dbplatform.SequenceIdGenerator; import javax.sql.DataSource; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/package.html b/src/main/java/io/ebean/config/dbplatform/package.html similarity index 100% rename from src/main/java/com/avaje/ebean/config/dbplatform/package.html rename to src/main/java/io/ebean/config/dbplatform/package.html diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/postgres/Postgres8Platform.java b/src/main/java/io/ebean/config/dbplatform/postgres/Postgres8Platform.java similarity index 81% rename from src/main/java/com/avaje/ebean/config/dbplatform/postgres/Postgres8Platform.java rename to src/main/java/io/ebean/config/dbplatform/postgres/Postgres8Platform.java index ad971d1b1..d8bffb775 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/postgres/Postgres8Platform.java +++ b/src/main/java/io/ebean/config/dbplatform/postgres/Postgres8Platform.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.config.dbplatform.postgres; +package io.ebean.config.dbplatform.postgres; -import com.avaje.ebean.config.dbplatform.IdType; +import io.ebean.config.dbplatform.IdType; /** * Postgres v8.3 specific platform. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/postgres/PostgresDbEncrypt.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresDbEncrypt.java similarity index 84% rename from src/main/java/com/avaje/ebean/config/dbplatform/postgres/PostgresDbEncrypt.java rename to src/main/java/io/ebean/config/dbplatform/postgres/PostgresDbEncrypt.java index 35daa691a..a4e36f699 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/postgres/PostgresDbEncrypt.java +++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresDbEncrypt.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.config.dbplatform.postgres; +package io.ebean.config.dbplatform.postgres; -import com.avaje.ebean.config.dbplatform.AbstractDbEncrypt; -import com.avaje.ebean.config.dbplatform.DbEncryptFunction; +import io.ebean.config.dbplatform.AbstractDbEncrypt; +import io.ebean.config.dbplatform.DbEncryptFunction; /** * Postgres pgp_sym_encrypt pgp_sym_decrypt based encryption support. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/postgres/PostgresHistorySupport.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresHistorySupport.java similarity index 90% rename from src/main/java/com/avaje/ebean/config/dbplatform/postgres/PostgresHistorySupport.java rename to src/main/java/io/ebean/config/dbplatform/postgres/PostgresHistorySupport.java index 940e7696d..d4aed03e5 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/postgres/PostgresHistorySupport.java +++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresHistorySupport.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.config.dbplatform.postgres; +package io.ebean.config.dbplatform.postgres; -import com.avaje.ebean.config.dbplatform.DbViewHistorySupport; +import io.ebean.config.dbplatform.DbViewHistorySupport; /** * Postgres support for history features. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/postgres/PostgresPlatform.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java similarity index 84% rename from src/main/java/com/avaje/ebean/config/dbplatform/postgres/PostgresPlatform.java rename to src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java index 9f7d9c3b8..d94839f73 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/postgres/PostgresPlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java @@ -1,15 +1,15 @@ -package com.avaje.ebean.config.dbplatform.postgres; +package io.ebean.config.dbplatform.postgres; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.config.Platform; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.config.dbplatform.DbType; -import com.avaje.ebean.config.dbplatform.IdType; -import com.avaje.ebean.config.dbplatform.PlatformIdGenerator; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlHandler; -import com.avaje.ebean.dbmigration.ddlgeneration.platform.PostgresDdl; +import io.ebean.BackgroundExecutor; +import io.ebean.Platform; +import io.ebean.config.ServerConfig; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbType; +import io.ebean.config.dbplatform.IdType; +import io.ebean.config.dbplatform.PlatformIdGenerator; +import io.ebean.dbmigration.ddlgeneration.DdlHandler; +import io.ebean.dbmigration.ddlgeneration.platform.PostgresDdl; import javax.sql.DataSource; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java similarity index 80% rename from src/main/java/com/avaje/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java rename to src/main/java/io/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java index 77c619077..e55334e35 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java +++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.config.dbplatform.postgres; +package io.ebean.config.dbplatform.postgres; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.config.dbplatform.SequenceIdGenerator; +import io.ebean.BackgroundExecutor; +import io.ebean.config.dbplatform.SequenceIdGenerator; import javax.sql.DataSource; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/sqlanywhere/SqlAnywhereLimiter.java b/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywhereLimiter.java similarity index 79% rename from src/main/java/com/avaje/ebean/config/dbplatform/sqlanywhere/SqlAnywhereLimiter.java rename to src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywhereLimiter.java index 805027994..d07011808 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/sqlanywhere/SqlAnywhereLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywhereLimiter.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.config.dbplatform.sqlanywhere; +package io.ebean.config.dbplatform.sqlanywhere; -import com.avaje.ebean.config.dbplatform.SqlLimitRequest; -import com.avaje.ebean.config.dbplatform.SqlLimitResponse; -import com.avaje.ebean.config.dbplatform.SqlLimiter; +import io.ebean.config.dbplatform.SqlLimitRequest; +import io.ebean.config.dbplatform.SqlLimitResponse; +import io.ebean.config.dbplatform.SqlLimiter; /** * Use top xx and start at xx to limit sql results. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java similarity index 80% rename from src/main/java/com/avaje/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java rename to src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java index d55120531..f04790fa6 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java @@ -1,10 +1,10 @@ -package com.avaje.ebean.config.dbplatform.sqlanywhere; +package io.ebean.config.dbplatform.sqlanywhere; -import com.avaje.ebean.config.Platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.config.dbplatform.DbType; -import com.avaje.ebean.config.dbplatform.IdType; +import io.ebean.Platform; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbType; +import io.ebean.config.dbplatform.IdType; /** * Sybase SQL Anywhere specific platform. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/sqlite/SQLitePlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java similarity index 67% rename from src/main/java/com/avaje/ebean/config/dbplatform/sqlite/SQLitePlatform.java rename to src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java index 75ce97590..07e07dcd1 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/sqlite/SQLitePlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java @@ -1,11 +1,11 @@ -package com.avaje.ebean.config.dbplatform.sqlite; +package io.ebean.config.dbplatform.sqlite; -import com.avaje.ebean.config.Platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.config.dbplatform.DbType; -import com.avaje.ebean.config.dbplatform.IdType; -import com.avaje.ebean.dbmigration.ddlgeneration.platform.SQLiteDdl; +import io.ebean.Platform; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbType; +import io.ebean.config.dbplatform.IdType; +import io.ebean.dbmigration.ddlgeneration.platform.SQLiteDdl; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/sqlserver/SqlServer2005Platform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005Platform.java similarity index 81% rename from src/main/java/com/avaje/ebean/config/dbplatform/sqlserver/SqlServer2005Platform.java rename to src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005Platform.java index d8d4f6168..0473e9d3f 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/sqlserver/SqlServer2005Platform.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005Platform.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.config.dbplatform.sqlserver; +package io.ebean.config.dbplatform.sqlserver; /** * SQL Server platform using the older ROW_NUMBER() mechanism. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/sqlserver/SqlServer2005SqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005SqlLimiter.java similarity index 89% rename from src/main/java/com/avaje/ebean/config/dbplatform/sqlserver/SqlServer2005SqlLimiter.java rename to src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005SqlLimiter.java index 4d98787d2..6970e973f 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/sqlserver/SqlServer2005SqlLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005SqlLimiter.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.config.dbplatform.sqlserver; +package io.ebean.config.dbplatform.sqlserver; -import com.avaje.ebean.config.dbplatform.SqlLimitRequest; -import com.avaje.ebean.config.dbplatform.SqlLimitResponse; -import com.avaje.ebean.config.dbplatform.SqlLimiter; +import io.ebean.config.dbplatform.SqlLimitRequest; +import io.ebean.config.dbplatform.SqlLimitResponse; +import io.ebean.config.dbplatform.SqlLimiter; /** * Use top and row_number() function to limit sql results. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/sqlserver/SqlServer2012SqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2012SqlLimiter.java similarity index 83% rename from src/main/java/com/avaje/ebean/config/dbplatform/sqlserver/SqlServer2012SqlLimiter.java rename to src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2012SqlLimiter.java index 10b717a83..a79cbbef2 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/sqlserver/SqlServer2012SqlLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2012SqlLimiter.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.config.dbplatform.sqlserver; +package io.ebean.config.dbplatform.sqlserver; -import com.avaje.ebean.config.dbplatform.SqlLimitRequest; -import com.avaje.ebean.config.dbplatform.SqlLimitResponse; -import com.avaje.ebean.config.dbplatform.SqlLimiter; +import io.ebean.config.dbplatform.SqlLimitRequest; +import io.ebean.config.dbplatform.SqlLimitResponse; +import io.ebean.config.dbplatform.SqlLimiter; /** * Use ANSI offset rows syntax or top n. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/sqlserver/SqlServerBasicSqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasicSqlLimiter.java similarity index 84% rename from src/main/java/com/avaje/ebean/config/dbplatform/sqlserver/SqlServerBasicSqlLimiter.java rename to src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasicSqlLimiter.java index 6ae371f3d..64494f34d 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/sqlserver/SqlServerBasicSqlLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasicSqlLimiter.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.config.dbplatform.sqlserver; +package io.ebean.config.dbplatform.sqlserver; -import com.avaje.ebean.config.dbplatform.BasicSqlLimiter; +import io.ebean.config.dbplatform.BasicSqlLimiter; /** * SQL Server 2012 style limiter for raw sql. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java similarity index 80% rename from src/main/java/com/avaje/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java rename to src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java index 890b0b4bd..e71f76770 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java @@ -1,12 +1,12 @@ -package com.avaje.ebean.config.dbplatform.sqlserver; +package io.ebean.config.dbplatform.sqlserver; -import com.avaje.ebean.config.PersistBatch; -import com.avaje.ebean.config.Platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.config.dbplatform.DbType; -import com.avaje.ebean.config.dbplatform.IdType; -import com.avaje.ebean.dbmigration.ddlgeneration.platform.MsSqlServerDdl; +import io.ebean.PersistBatch; +import io.ebean.Platform; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbType; +import io.ebean.config.dbplatform.IdType; +import io.ebean.dbmigration.ddlgeneration.platform.MsSqlServerDdl; /** * Microsoft SQL Server platform. diff --git a/src/main/java/com/avaje/ebean/config/package.html b/src/main/java/io/ebean/config/package.html similarity index 100% rename from src/main/java/com/avaje/ebean/config/package.html rename to src/main/java/io/ebean/config/package.html diff --git a/src/main/java/com/avaje/ebean/dbmigration/DbMigration.java b/src/main/java/io/ebean/dbmigration/DbMigration.java similarity index 91% rename from src/main/java/com/avaje/ebean/dbmigration/DbMigration.java rename to src/main/java/io/ebean/dbmigration/DbMigration.java index dd3a7d70a..b595b41c8 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/DbMigration.java +++ b/src/main/java/io/ebean/dbmigration/DbMigration.java @@ -1,33 +1,33 @@ -package com.avaje.ebean.dbmigration; +package io.ebean.dbmigration; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.config.DbConstraintNaming; -import com.avaje.ebean.config.DbMigrationConfig; -import com.avaje.ebean.config.Platform; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.dbplatform.db2.DB2Platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -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.config.dbplatform.sqlite.SQLitePlatform; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlWrite; -import com.avaje.ebean.dbmigration.migration.Migration; -import com.avaje.ebean.dbmigration.migrationreader.MigrationXmlWriter; -import com.avaje.ebean.dbmigration.model.CurrentModel; -import com.avaje.ebean.dbmigration.model.MConfiguration; -import com.avaje.ebean.dbmigration.model.MigrationModel; -import com.avaje.ebean.dbmigration.model.MigrationVersion; -import com.avaje.ebean.dbmigration.model.ModelContainer; -import com.avaje.ebean.dbmigration.model.ModelDiff; -import com.avaje.ebean.dbmigration.model.PlatformDdlWriter; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.extraddl.model.DdlScript; -import com.avaje.ebeaninternal.extraddl.model.ExtraDdl; -import com.avaje.ebeaninternal.extraddl.model.ExtraDdlXmlReader; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.config.DbConstraintNaming; +import io.ebean.config.DbMigrationConfig; +import io.ebean.Platform; +import io.ebean.config.ServerConfig; +import io.ebean.config.dbplatform.db2.DB2Platform; +import io.ebean.config.dbplatform.DatabasePlatform; +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.config.dbplatform.sqlite.SQLitePlatform; +import io.ebean.dbmigration.ddlgeneration.DdlWrite; +import io.ebean.dbmigration.migration.Migration; +import io.ebean.dbmigration.migrationreader.MigrationXmlWriter; +import io.ebean.dbmigration.model.CurrentModel; +import io.ebean.dbmigration.model.MConfiguration; +import io.ebean.dbmigration.model.MigrationModel; +import io.ebean.dbmigration.model.MigrationVersion; +import io.ebean.dbmigration.model.ModelContainer; +import io.ebean.dbmigration.model.ModelDiff; +import io.ebean.dbmigration.model.PlatformDdlWriter; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.extraddl.model.DdlScript; +import io.ebeaninternal.extraddl.model.ExtraDdl; +import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebean/dbmigration/DbOffline.java b/src/main/java/io/ebean/dbmigration/DbOffline.java similarity index 96% rename from src/main/java/com/avaje/ebean/dbmigration/DbOffline.java rename to src/main/java/io/ebean/dbmigration/DbOffline.java index fb25efb57..767342bc7 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/DbOffline.java +++ b/src/main/java/io/ebean/dbmigration/DbOffline.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.dbmigration; +package io.ebean.dbmigration; -import com.avaje.ebean.config.Platform; +import io.ebean.Platform; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebean/dbmigration/DdlGenerator.java b/src/main/java/io/ebean/dbmigration/DdlGenerator.java similarity index 95% rename from src/main/java/com/avaje/ebean/dbmigration/DdlGenerator.java rename to src/main/java/io/ebean/dbmigration/DdlGenerator.java index b5afad733..5d887c978 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/DdlGenerator.java +++ b/src/main/java/io/ebean/dbmigration/DdlGenerator.java @@ -1,10 +1,10 @@ -package com.avaje.ebean.dbmigration; +package io.ebean.dbmigration; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.dbmigration.model.CurrentModel; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.extraddl.model.ExtraDdlXmlReader; +import io.ebean.Transaction; +import io.ebean.config.ServerConfig; +import io.ebean.dbmigration.model.CurrentModel; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader; import org.avaje.dbmigration.ddl.DdlRunner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/BaseDdlHandler.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/BaseDdlHandler.java similarity index 78% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/BaseDdlHandler.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/BaseDdlHandler.java index c1e27faf0..350df1db9 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/BaseDdlHandler.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/BaseDdlHandler.java @@ -1,19 +1,19 @@ -package com.avaje.ebean.dbmigration.ddlgeneration; +package io.ebean.dbmigration.ddlgeneration; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.dbmigration.ddlgeneration.platform.BaseTableDdl; -import com.avaje.ebean.dbmigration.ddlgeneration.platform.PlatformDdl; -import com.avaje.ebean.dbmigration.migration.AddColumn; -import com.avaje.ebean.dbmigration.migration.AddHistoryTable; -import com.avaje.ebean.dbmigration.migration.AddTableComment; -import com.avaje.ebean.dbmigration.migration.AlterColumn; -import com.avaje.ebean.dbmigration.migration.ChangeSet; -import com.avaje.ebean.dbmigration.migration.CreateIndex; -import com.avaje.ebean.dbmigration.migration.CreateTable; -import com.avaje.ebean.dbmigration.migration.DropColumn; -import com.avaje.ebean.dbmigration.migration.DropHistoryTable; -import com.avaje.ebean.dbmigration.migration.DropIndex; -import com.avaje.ebean.dbmigration.migration.DropTable; +import io.ebean.config.ServerConfig; +import io.ebean.dbmigration.ddlgeneration.platform.BaseTableDdl; +import io.ebean.dbmigration.ddlgeneration.platform.PlatformDdl; +import io.ebean.dbmigration.migration.AddColumn; +import io.ebean.dbmigration.migration.AddHistoryTable; +import io.ebean.dbmigration.migration.AddTableComment; +import io.ebean.dbmigration.migration.AlterColumn; +import io.ebean.dbmigration.migration.ChangeSet; +import io.ebean.dbmigration.migration.CreateIndex; +import io.ebean.dbmigration.migration.CreateTable; +import io.ebean.dbmigration.migration.DropColumn; +import io.ebean.dbmigration.migration.DropHistoryTable; +import io.ebean.dbmigration.migration.DropIndex; +import io.ebean.dbmigration.migration.DropTable; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/ColumnDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/ColumnDdl.java similarity index 69% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/ColumnDdl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/ColumnDdl.java index ade0ee159..0da9bca71 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/ColumnDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/ColumnDdl.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.dbmigration.ddlgeneration; +package io.ebean.dbmigration.ddlgeneration; -import com.avaje.ebean.dbmigration.migration.AddColumn; -import com.avaje.ebean.dbmigration.migration.AlterColumn; -import com.avaje.ebean.dbmigration.migration.DropColumn; +import io.ebean.dbmigration.migration.AddColumn; +import io.ebean.dbmigration.migration.AlterColumn; +import io.ebean.dbmigration.migration.DropColumn; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/DdlBuffer.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/DdlBuffer.java similarity index 90% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/DdlBuffer.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/DdlBuffer.java index 813baee8a..12f470e73 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/DdlBuffer.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/DdlBuffer.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.dbmigration.ddlgeneration; +package io.ebean.dbmigration.ddlgeneration; -import com.avaje.ebean.dbmigration.model.MConfiguration; +import io.ebean.dbmigration.model.MConfiguration; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/DdlHandler.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/DdlHandler.java similarity index 59% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/DdlHandler.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/DdlHandler.java index 0285fa47e..f3db078d9 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/DdlHandler.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/DdlHandler.java @@ -1,16 +1,16 @@ -package com.avaje.ebean.dbmigration.ddlgeneration; +package io.ebean.dbmigration.ddlgeneration; -import com.avaje.ebean.dbmigration.migration.AddColumn; -import com.avaje.ebean.dbmigration.migration.AddHistoryTable; -import com.avaje.ebean.dbmigration.migration.AddTableComment; -import com.avaje.ebean.dbmigration.migration.AlterColumn; -import com.avaje.ebean.dbmigration.migration.ChangeSet; -import com.avaje.ebean.dbmigration.migration.CreateIndex; -import com.avaje.ebean.dbmigration.migration.CreateTable; -import com.avaje.ebean.dbmigration.migration.DropColumn; -import com.avaje.ebean.dbmigration.migration.DropHistoryTable; -import com.avaje.ebean.dbmigration.migration.DropIndex; -import com.avaje.ebean.dbmigration.migration.DropTable; +import io.ebean.dbmigration.migration.AddColumn; +import io.ebean.dbmigration.migration.AddHistoryTable; +import io.ebean.dbmigration.migration.AddTableComment; +import io.ebean.dbmigration.migration.AlterColumn; +import io.ebean.dbmigration.migration.ChangeSet; +import io.ebean.dbmigration.migration.CreateIndex; +import io.ebean.dbmigration.migration.CreateTable; +import io.ebean.dbmigration.migration.DropColumn; +import io.ebean.dbmigration.migration.DropHistoryTable; +import io.ebean.dbmigration.migration.DropIndex; +import io.ebean.dbmigration.migration.DropTable; import java.io.IOException; @@ -42,4 +42,4 @@ public interface DdlHandler { void generate(DdlWrite writer, DropIndex dropIndex) throws IOException; void generateExtra(DdlWrite write) throws IOException; -} \ No newline at end of file +} diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/DdlWrite.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/DdlWrite.java similarity index 90% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/DdlWrite.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/DdlWrite.java index 40a8208a5..a616b7efe 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/DdlWrite.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/DdlWrite.java @@ -1,9 +1,9 @@ -package com.avaje.ebean.dbmigration.ddlgeneration; +package io.ebean.dbmigration.ddlgeneration; -import com.avaje.ebean.dbmigration.ddlgeneration.platform.BaseDdlBuffer; -import com.avaje.ebean.dbmigration.model.MConfiguration; -import com.avaje.ebean.dbmigration.model.MTable; -import com.avaje.ebean.dbmigration.model.ModelContainer; +import io.ebean.dbmigration.ddlgeneration.platform.BaseDdlBuffer; +import io.ebean.dbmigration.model.MConfiguration; +import io.ebean.dbmigration.model.MTable; +import io.ebean.dbmigration.model.ModelContainer; /** * Write context holding the buffers for both apply and rollback DDL. diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/TableDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/TableDdl.java similarity index 70% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/TableDdl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/TableDdl.java index ba080cae2..4e6339e27 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/TableDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/TableDdl.java @@ -1,15 +1,15 @@ -package com.avaje.ebean.dbmigration.ddlgeneration; +package io.ebean.dbmigration.ddlgeneration; -import com.avaje.ebean.dbmigration.migration.AddColumn; -import com.avaje.ebean.dbmigration.migration.AddHistoryTable; -import com.avaje.ebean.dbmigration.migration.AddTableComment; -import com.avaje.ebean.dbmigration.migration.AlterColumn; -import com.avaje.ebean.dbmigration.migration.CreateIndex; -import com.avaje.ebean.dbmigration.migration.CreateTable; -import com.avaje.ebean.dbmigration.migration.DropColumn; -import com.avaje.ebean.dbmigration.migration.DropHistoryTable; -import com.avaje.ebean.dbmigration.migration.DropIndex; -import com.avaje.ebean.dbmigration.migration.DropTable; +import io.ebean.dbmigration.migration.AddColumn; +import io.ebean.dbmigration.migration.AddHistoryTable; +import io.ebean.dbmigration.migration.AddTableComment; +import io.ebean.dbmigration.migration.AlterColumn; +import io.ebean.dbmigration.migration.CreateIndex; +import io.ebean.dbmigration.migration.CreateTable; +import io.ebean.dbmigration.migration.DropColumn; +import io.ebean.dbmigration.migration.DropHistoryTable; +import io.ebean.dbmigration.migration.DropIndex; +import io.ebean.dbmigration.migration.DropTable; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java similarity index 91% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java index 1379db92b..138d15cc2 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlBuffer; -import com.avaje.ebean.dbmigration.model.MConfiguration; +import io.ebean.dbmigration.ddlgeneration.DdlBuffer; +import io.ebean.dbmigration.model.MConfiguration; import java.io.IOException; import java.io.StringWriter; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java similarity index 95% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java index 344ba3320..c4da60015 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java @@ -1,28 +1,28 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.config.DbConstraintNaming; -import com.avaje.ebean.config.NamingConvention; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.dbplatform.IdType; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlBuffer; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlWrite; -import com.avaje.ebean.dbmigration.ddlgeneration.TableDdl; -import com.avaje.ebean.dbmigration.ddlgeneration.platform.util.IndexSet; -import com.avaje.ebean.dbmigration.migration.AddColumn; -import com.avaje.ebean.dbmigration.migration.AddHistoryTable; -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.CreateIndex; -import com.avaje.ebean.dbmigration.migration.CreateTable; -import com.avaje.ebean.dbmigration.migration.DropColumn; -import com.avaje.ebean.dbmigration.migration.DropHistoryTable; -import com.avaje.ebean.dbmigration.migration.DropIndex; -import com.avaje.ebean.dbmigration.migration.DropTable; -import com.avaje.ebean.dbmigration.migration.ForeignKey; -import com.avaje.ebean.dbmigration.migration.UniqueConstraint; -import com.avaje.ebean.dbmigration.model.MTable; -import com.avaje.ebean.util.StringHelper; +import io.ebean.config.DbConstraintNaming; +import io.ebean.config.NamingConvention; +import io.ebean.config.ServerConfig; +import io.ebean.config.dbplatform.IdType; +import io.ebean.dbmigration.ddlgeneration.DdlBuffer; +import io.ebean.dbmigration.ddlgeneration.DdlWrite; +import io.ebean.dbmigration.ddlgeneration.TableDdl; +import io.ebean.dbmigration.ddlgeneration.platform.util.IndexSet; +import io.ebean.dbmigration.migration.AddColumn; +import io.ebean.dbmigration.migration.AddHistoryTable; +import io.ebean.dbmigration.migration.AddTableComment; +import io.ebean.dbmigration.migration.AlterColumn; +import io.ebean.dbmigration.migration.Column; +import io.ebean.dbmigration.migration.CreateIndex; +import io.ebean.dbmigration.migration.CreateTable; +import io.ebean.dbmigration.migration.DropColumn; +import io.ebean.dbmigration.migration.DropHistoryTable; +import io.ebean.dbmigration.migration.DropIndex; +import io.ebean.dbmigration.migration.DropTable; +import io.ebean.dbmigration.migration.ForeignKey; +import io.ebean.dbmigration.migration.UniqueConstraint; +import io.ebean.dbmigration.model.MTable; +import io.ebean.util.StringHelper; import java.io.IOException; import java.math.BigInteger; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DB2Ddl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DB2Ddl.java similarity index 64% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DB2Ddl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DB2Ddl.java index 5be552eb4..9dae8e8a6 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DB2Ddl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DB2Ddl.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DatabasePlatform; /** * DB2 platform specific DDL. diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java similarity index 95% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java index 9d3e844ee..87e3e6c4b 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java @@ -1,13 +1,13 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.config.DbConstraintNaming; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlBuffer; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlWrite; -import com.avaje.ebean.dbmigration.migration.AddHistoryTable; -import com.avaje.ebean.dbmigration.migration.DropHistoryTable; -import com.avaje.ebean.dbmigration.model.MColumn; -import com.avaje.ebean.dbmigration.model.MTable; +import io.ebean.config.DbConstraintNaming; +import io.ebean.config.ServerConfig; +import io.ebean.dbmigration.ddlgeneration.DdlBuffer; +import io.ebean.dbmigration.ddlgeneration.DdlWrite; +import io.ebean.dbmigration.migration.AddHistoryTable; +import io.ebean.dbmigration.migration.DropHistoryTable; +import io.ebean.dbmigration.model.MColumn; +import io.ebean.dbmigration.model.MTable; import java.io.IOException; import java.util.Collection; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java similarity index 87% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java index 41ddd2f0a..0206edf43 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlBuffer; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlWrite; +import io.ebean.dbmigration.ddlgeneration.DdlBuffer; +import io.ebean.dbmigration.ddlgeneration.DdlWrite; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java similarity index 86% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java index f7a2940c7..d41795317 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.config.DbConstraintNaming; -import com.avaje.ebean.dbmigration.ddlgeneration.platform.util.VowelRemover; +import io.ebean.config.DbConstraintNaming; +import io.ebean.dbmigration.ddlgeneration.platform.util.VowelRemover; /** * Default implementation used to truncate or shorten db constraint names as required. diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2Ddl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/H2Ddl.java similarity index 62% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2Ddl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/H2Ddl.java index 7e261d8ff..4e5e0e4bb 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2Ddl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/H2Ddl.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DatabasePlatform; /** * H2 platform specific DDL. diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdl.java similarity index 84% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdl.java index c19d57d88..7705dd248 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdl.java @@ -1,9 +1,9 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.config.dbplatform.h2.H2HistoryTrigger; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlBuffer; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlWrite; -import com.avaje.ebean.dbmigration.model.MTable; +import io.ebean.config.dbplatform.h2.H2HistoryTrigger; +import io.ebean.dbmigration.ddlgeneration.DdlBuffer; +import io.ebean.dbmigration.ddlgeneration.DdlWrite; +import io.ebean.dbmigration.model.MTable; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java similarity index 96% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java index c72e18f7a..33d5e873a 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HsqldbDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/HsqldbDdl.java similarity index 67% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HsqldbDdl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/HsqldbDdl.java index 28a3b701c..e79e9b9b3 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HsqldbDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/HsqldbDdl.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DatabasePlatform; /** * Hsqldb platform specific DDL. diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MsSqlServerDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MsSqlServerDdl.java similarity index 93% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MsSqlServerDdl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MsSqlServerDdl.java index 73eca28c5..f46fb6ae2 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MsSqlServerDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MsSqlServerDdl.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlBuffer; -import com.avaje.ebean.dbmigration.migration.AlterColumn; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.dbmigration.ddlgeneration.DdlBuffer; +import io.ebean.dbmigration.migration.AlterColumn; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java similarity index 89% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java index df23acd9d..7dfac3e8e 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java @@ -1,10 +1,10 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlBuffer; -import com.avaje.ebean.dbmigration.migration.AlterColumn; -import com.avaje.ebean.dbmigration.migration.Column; -import com.avaje.ebeaninternal.server.lib.util.StringHelper; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.dbmigration.ddlgeneration.DdlBuffer; +import io.ebean.dbmigration.migration.AlterColumn; +import io.ebean.dbmigration.migration.Column; +import io.ebeaninternal.server.lib.util.StringHelper; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java similarity index 91% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java index 81f727a66..969407757 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlBuffer; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlWrite; -import com.avaje.ebean.dbmigration.model.MTable; +import io.ebean.dbmigration.ddlgeneration.DdlBuffer; +import io.ebean.dbmigration.ddlgeneration.DdlWrite; +import io.ebean.dbmigration.model.MTable; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/NoHistorySupportDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/NoHistorySupportDdl.java similarity index 71% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/NoHistorySupportDdl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/NoHistorySupportDdl.java index 2e9913b4d..ccb812eed 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/NoHistorySupportDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/NoHistorySupportDdl.java @@ -1,10 +1,10 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlWrite; -import com.avaje.ebean.dbmigration.migration.AddHistoryTable; -import com.avaje.ebean.dbmigration.migration.DropHistoryTable; -import com.avaje.ebean.dbmigration.model.MTable; +import io.ebean.config.ServerConfig; +import io.ebean.dbmigration.ddlgeneration.DdlWrite; +import io.ebean.dbmigration.migration.AddHistoryTable; +import io.ebean.dbmigration.migration.DropHistoryTable; +import io.ebean.dbmigration.model.MTable; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/Oracle10Ddl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/Oracle10Ddl.java similarity index 83% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/Oracle10Ddl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/Oracle10Ddl.java index 8037459fe..d79c1b72d 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/Oracle10Ddl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/Oracle10Ddl.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DatabasePlatform; /** * Oracle platform specific DDL. diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl.java similarity index 93% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl.java index 6e177483c..c8af9346a 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl.java @@ -1,22 +1,22 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.config.DbConstraintNaming; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.DbDefaultValue; -import com.avaje.ebean.config.dbplatform.DbIdentity; -import com.avaje.ebean.config.dbplatform.IdType; -import com.avaje.ebean.dbmigration.ddlgeneration.BaseDdlHandler; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlBuffer; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlHandler; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlWrite; -import com.avaje.ebean.dbmigration.ddlgeneration.platform.util.PlatformTypeConverter; -import com.avaje.ebean.dbmigration.migration.AddHistoryTable; -import com.avaje.ebean.dbmigration.migration.AlterColumn; -import com.avaje.ebean.dbmigration.migration.Column; -import com.avaje.ebean.dbmigration.migration.DropHistoryTable; -import com.avaje.ebean.dbmigration.migration.IdentityType; -import com.avaje.ebean.dbmigration.model.MTable; +import io.ebean.config.DbConstraintNaming; +import io.ebean.config.ServerConfig; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbDefaultValue; +import io.ebean.config.dbplatform.DbIdentity; +import io.ebean.config.dbplatform.IdType; +import io.ebean.dbmigration.ddlgeneration.BaseDdlHandler; +import io.ebean.dbmigration.ddlgeneration.DdlBuffer; +import io.ebean.dbmigration.ddlgeneration.DdlHandler; +import io.ebean.dbmigration.ddlgeneration.DdlWrite; +import io.ebean.dbmigration.ddlgeneration.platform.util.PlatformTypeConverter; +import io.ebean.dbmigration.migration.AddHistoryTable; +import io.ebean.dbmigration.migration.AlterColumn; +import io.ebean.dbmigration.migration.Column; +import io.ebean.dbmigration.migration.DropHistoryTable; +import io.ebean.dbmigration.migration.IdentityType; +import io.ebean.dbmigration.model.MTable; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java similarity index 73% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java index a19520d58..a4f0e12ad 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java @@ -1,10 +1,10 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlWrite; -import com.avaje.ebean.dbmigration.migration.AddHistoryTable; -import com.avaje.ebean.dbmigration.migration.DropHistoryTable; -import com.avaje.ebean.dbmigration.model.MTable; +import io.ebean.config.ServerConfig; +import io.ebean.dbmigration.ddlgeneration.DdlWrite; +import io.ebean.dbmigration.migration.AddHistoryTable; +import io.ebean.dbmigration.migration.DropHistoryTable; +import io.ebean.dbmigration.model.MTable; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PostgresDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PostgresDdl.java similarity index 86% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PostgresDdl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PostgresDdl.java index 3827d786b..58415d4fc 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PostgresDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PostgresDdl.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DatabasePlatform; /** * Postgres specific DDL. diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java similarity index 96% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java index ccb026e8c..0163b2225 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlBuffer; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlWrite; -import com.avaje.ebean.dbmigration.model.MTable; +import io.ebean.dbmigration.ddlgeneration.DdlBuffer; +import io.ebean.dbmigration.ddlgeneration.DdlWrite; +import io.ebean.dbmigration.model.MTable; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/SQLiteDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SQLiteDdl.java similarity index 80% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/SQLiteDdl.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SQLiteDdl.java index 87d2b5de3..6ad64b839 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/SQLiteDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SQLiteDdl.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform; +package io.ebean.dbmigration.ddlgeneration.platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlBuffer; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.dbmigration.ddlgeneration.DdlBuffer; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexColumns.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/IndexColumns.java similarity index 95% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexColumns.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/IndexColumns.java index bc99b0701..6b4c149fa 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexColumns.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/IndexColumns.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform.util; +package io.ebean.dbmigration.ddlgeneration.platform.util; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexSet.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/IndexSet.java similarity index 96% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexSet.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/IndexSet.java index 42c098b7b..f9c9b8107 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexSet.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/IndexSet.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform.util; +package io.ebean.dbmigration.ddlgeneration.platform.util; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java similarity index 92% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java index 104167bda..3c497e2c8 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform.util; +package io.ebean.dbmigration.ddlgeneration.platform.util; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.config.dbplatform.DbPlatformTypeMapping; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbPlatformTypeMapping; /** * Converts a logical column definition into platform specific one. diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/VowelRemover.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/VowelRemover.java similarity index 92% rename from src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/VowelRemover.java rename to src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/VowelRemover.java index 6065c0845..a63d9f3dc 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/VowelRemover.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/util/VowelRemover.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.ddlgeneration.platform.util; +package io.ebean.dbmigration.ddlgeneration.platform.util; /** * Utility to remove vowels (from constraint names primarily for Oracle and DB2). diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/AddColumn.java b/src/main/java/io/ebean/dbmigration/migration/AddColumn.java similarity index 98% rename from src/main/java/com/avaje/ebean/dbmigration/migration/AddColumn.java rename to src/main/java/io/ebean/dbmigration/migration/AddColumn.java index 9392fbc29..6670f9b8c 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/AddColumn.java +++ b/src/main/java/io/ebean/dbmigration/migration/AddColumn.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/AddHistoryTable.java b/src/main/java/io/ebean/dbmigration/migration/AddHistoryTable.java similarity index 96% rename from src/main/java/com/avaje/ebean/dbmigration/migration/AddHistoryTable.java rename to src/main/java/io/ebean/dbmigration/migration/AddHistoryTable.java index d48f1ae9a..35aa160b8 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/AddHistoryTable.java +++ b/src/main/java/io/ebean/dbmigration/migration/AddHistoryTable.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/AddTableComment.java b/src/main/java/io/ebean/dbmigration/migration/AddTableComment.java similarity index 97% rename from src/main/java/com/avaje/ebean/dbmigration/migration/AddTableComment.java rename to src/main/java/io/ebean/dbmigration/migration/AddTableComment.java index a5e81e26e..9ec82d50f 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/AddTableComment.java +++ b/src/main/java/io/ebean/dbmigration/migration/AddTableComment.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/AlterColumn.java b/src/main/java/io/ebean/dbmigration/migration/AlterColumn.java similarity index 99% rename from src/main/java/com/avaje/ebean/dbmigration/migration/AlterColumn.java rename to src/main/java/io/ebean/dbmigration/migration/AlterColumn.java index a0676e33e..4a869abb1 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/AlterColumn.java +++ b/src/main/java/io/ebean/dbmigration/migration/AlterColumn.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/AlterHistoryTable.java b/src/main/java/io/ebean/dbmigration/migration/AlterHistoryTable.java similarity index 96% rename from src/main/java/com/avaje/ebean/dbmigration/migration/AlterHistoryTable.java rename to src/main/java/io/ebean/dbmigration/migration/AlterHistoryTable.java index 431188bdc..9e3dbbd16 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/AlterHistoryTable.java +++ b/src/main/java/io/ebean/dbmigration/migration/AlterHistoryTable.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Application.java b/src/main/java/io/ebean/dbmigration/migration/Application.java similarity index 97% rename from src/main/java/com/avaje/ebean/dbmigration/migration/Application.java rename to src/main/java/io/ebean/dbmigration/migration/Application.java index 2063ffaf6..2cab8b2ec 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/Application.java +++ b/src/main/java/io/ebean/dbmigration/migration/Application.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Applications.java b/src/main/java/io/ebean/dbmigration/migration/Applications.java similarity index 97% rename from src/main/java/com/avaje/ebean/dbmigration/migration/Applications.java rename to src/main/java/io/ebean/dbmigration/migration/Applications.java index 68c898b31..770561389 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/Applications.java +++ b/src/main/java/io/ebean/dbmigration/migration/Applications.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Apply.java b/src/main/java/io/ebean/dbmigration/migration/Apply.java similarity index 96% rename from src/main/java/com/avaje/ebean/dbmigration/migration/Apply.java rename to src/main/java/io/ebean/dbmigration/migration/Apply.java index b43954ace..dd05988ec 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/Apply.java +++ b/src/main/java/io/ebean/dbmigration/migration/Apply.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSet.java b/src/main/java/io/ebean/dbmigration/migration/ChangeSet.java similarity index 99% rename from src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSet.java rename to src/main/java/io/ebean/dbmigration/migration/ChangeSet.java index 6ed514c10..19f9a2635 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSet.java +++ b/src/main/java/io/ebean/dbmigration/migration/ChangeSet.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSetType.java b/src/main/java/io/ebean/dbmigration/migration/ChangeSetType.java similarity index 96% rename from src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSetType.java rename to src/main/java/io/ebean/dbmigration/migration/ChangeSetType.java index b7708a362..da61a0a76 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSetType.java +++ b/src/main/java/io/ebean/dbmigration/migration/ChangeSetType.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Column.java b/src/main/java/io/ebean/dbmigration/migration/Column.java similarity index 99% rename from src/main/java/com/avaje/ebean/dbmigration/migration/Column.java rename to src/main/java/io/ebean/dbmigration/migration/Column.java index 2e2aecfc7..4570ef822 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/Column.java +++ b/src/main/java/io/ebean/dbmigration/migration/Column.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Configuration.java b/src/main/java/io/ebean/dbmigration/migration/Configuration.java similarity index 96% rename from src/main/java/com/avaje/ebean/dbmigration/migration/Configuration.java rename to src/main/java/io/ebean/dbmigration/migration/Configuration.java index 9fe8c3f57..b1f8366be 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/Configuration.java +++ b/src/main/java/io/ebean/dbmigration/migration/Configuration.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/CreateIndex.java b/src/main/java/io/ebean/dbmigration/migration/CreateIndex.java similarity index 98% rename from src/main/java/com/avaje/ebean/dbmigration/migration/CreateIndex.java rename to src/main/java/io/ebean/dbmigration/migration/CreateIndex.java index efdebd503..fed06a0a8 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/CreateIndex.java +++ b/src/main/java/io/ebean/dbmigration/migration/CreateIndex.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/CreateTable.java b/src/main/java/io/ebean/dbmigration/migration/CreateTable.java similarity index 99% rename from src/main/java/com/avaje/ebean/dbmigration/migration/CreateTable.java rename to src/main/java/io/ebean/dbmigration/migration/CreateTable.java index 58012e99c..0c6ab9d56 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/CreateTable.java +++ b/src/main/java/io/ebean/dbmigration/migration/CreateTable.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/DefaultTablespace.java b/src/main/java/io/ebean/dbmigration/migration/DefaultTablespace.java similarity index 98% rename from src/main/java/com/avaje/ebean/dbmigration/migration/DefaultTablespace.java rename to src/main/java/io/ebean/dbmigration/migration/DefaultTablespace.java index f90124787..fc1daaece 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/DefaultTablespace.java +++ b/src/main/java/io/ebean/dbmigration/migration/DefaultTablespace.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/DropColumn.java b/src/main/java/io/ebean/dbmigration/migration/DropColumn.java similarity index 98% rename from src/main/java/com/avaje/ebean/dbmigration/migration/DropColumn.java rename to src/main/java/io/ebean/dbmigration/migration/DropColumn.java index f4c9d1ae2..77fd70e3a 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/DropColumn.java +++ b/src/main/java/io/ebean/dbmigration/migration/DropColumn.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/DropHistoryTable.java b/src/main/java/io/ebean/dbmigration/migration/DropHistoryTable.java similarity index 96% rename from src/main/java/com/avaje/ebean/dbmigration/migration/DropHistoryTable.java rename to src/main/java/io/ebean/dbmigration/migration/DropHistoryTable.java index e50ba686c..f8392a7a4 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/DropHistoryTable.java +++ b/src/main/java/io/ebean/dbmigration/migration/DropHistoryTable.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/DropIndex.java b/src/main/java/io/ebean/dbmigration/migration/DropIndex.java similarity index 97% rename from src/main/java/com/avaje/ebean/dbmigration/migration/DropIndex.java rename to src/main/java/io/ebean/dbmigration/migration/DropIndex.java index c3ffeb583..514662386 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/DropIndex.java +++ b/src/main/java/io/ebean/dbmigration/migration/DropIndex.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/DropTable.java b/src/main/java/io/ebean/dbmigration/migration/DropTable.java similarity index 96% rename from src/main/java/com/avaje/ebean/dbmigration/migration/DropTable.java rename to src/main/java/io/ebean/dbmigration/migration/DropTable.java index 47330c14b..69cdbe1d2 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/DropTable.java +++ b/src/main/java/io/ebean/dbmigration/migration/DropTable.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/ForeignKey.java b/src/main/java/io/ebean/dbmigration/migration/ForeignKey.java similarity index 98% rename from src/main/java/com/avaje/ebean/dbmigration/migration/ForeignKey.java rename to src/main/java/io/ebean/dbmigration/migration/ForeignKey.java index 63a1f1ea2..84bddcf8d 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/ForeignKey.java +++ b/src/main/java/io/ebean/dbmigration/migration/ForeignKey.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/IdentityType.java b/src/main/java/io/ebean/dbmigration/migration/IdentityType.java similarity index 96% rename from src/main/java/com/avaje/ebean/dbmigration/migration/IdentityType.java rename to src/main/java/io/ebean/dbmigration/migration/IdentityType.java index 97b2a542a..ec88f73f0 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/IdentityType.java +++ b/src/main/java/io/ebean/dbmigration/migration/IdentityType.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Migration.java b/src/main/java/io/ebean/dbmigration/migration/Migration.java similarity index 97% rename from src/main/java/com/avaje/ebean/dbmigration/migration/Migration.java rename to src/main/java/io/ebean/dbmigration/migration/Migration.java index 0277a79c0..862b66614 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/Migration.java +++ b/src/main/java/io/ebean/dbmigration/migration/Migration.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/ObjectFactory.java b/src/main/java/io/ebean/dbmigration/migration/ObjectFactory.java similarity index 95% rename from src/main/java/com/avaje/ebean/dbmigration/migration/ObjectFactory.java rename to src/main/java/io/ebean/dbmigration/migration/ObjectFactory.java index 0f064b3a6..7421a09ca 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/ObjectFactory.java +++ b/src/main/java/io/ebean/dbmigration/migration/ObjectFactory.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlRegistry; @@ -6,7 +6,7 @@ import javax.xml.bind.annotation.XmlRegistry; /** * This object contains factory methods for each * Java content interface and Java element interface - * generated in the com.avaje.ebean.dbmigration.migration package. + * generated in the io.ebean.dbmigration.migration package. *

An ObjectFactory allows you to programatically * construct new instances of the Java representation * for XML content. The Java representation of XML @@ -21,7 +21,7 @@ public class ObjectFactory { /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.avaje.ebean.dbmigration.migration + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: io.ebean.dbmigration.migration */ public ObjectFactory() { } diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/RenameColumn.java b/src/main/java/io/ebean/dbmigration/migration/RenameColumn.java similarity index 98% rename from src/main/java/com/avaje/ebean/dbmigration/migration/RenameColumn.java rename to src/main/java/io/ebean/dbmigration/migration/RenameColumn.java index 0b9711f51..ab9a095ba 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/RenameColumn.java +++ b/src/main/java/io/ebean/dbmigration/migration/RenameColumn.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/RenameTable.java b/src/main/java/io/ebean/dbmigration/migration/RenameTable.java similarity index 97% rename from src/main/java/com/avaje/ebean/dbmigration/migration/RenameTable.java rename to src/main/java/io/ebean/dbmigration/migration/RenameTable.java index 3a4c83623..a4c184b1a 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/RenameTable.java +++ b/src/main/java/io/ebean/dbmigration/migration/RenameTable.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Rollback.java b/src/main/java/io/ebean/dbmigration/migration/Rollback.java similarity index 96% rename from src/main/java/com/avaje/ebean/dbmigration/migration/Rollback.java rename to src/main/java/io/ebean/dbmigration/migration/Rollback.java index 3d9c18d32..2e6e23b75 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/Rollback.java +++ b/src/main/java/io/ebean/dbmigration/migration/Rollback.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Sql.java b/src/main/java/io/ebean/dbmigration/migration/Sql.java similarity index 97% rename from src/main/java/com/avaje/ebean/dbmigration/migration/Sql.java rename to src/main/java/io/ebean/dbmigration/migration/Sql.java index f2a951d7c..e110ae1cc 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/Sql.java +++ b/src/main/java/io/ebean/dbmigration/migration/Sql.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/UniqueConstraint.java b/src/main/java/io/ebean/dbmigration/migration/UniqueConstraint.java similarity index 97% rename from src/main/java/com/avaje/ebean/dbmigration/migration/UniqueConstraint.java rename to src/main/java/io/ebean/dbmigration/migration/UniqueConstraint.java index 0301e9a4a..0fdc50832 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/UniqueConstraint.java +++ b/src/main/java/io/ebean/dbmigration/migration/UniqueConstraint.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/package-info.java b/src/main/java/io/ebean/dbmigration/migration/package-info.java similarity index 77% rename from src/main/java/com/avaje/ebean/dbmigration/migration/package-info.java rename to src/main/java/io/ebean/dbmigration/migration/package-info.java index 3002dd9ff..d78d89ad7 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/package-info.java +++ b/src/main/java/io/ebean/dbmigration/migration/package-info.java @@ -1,2 +1,2 @@ @javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/dbmigration", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package com.avaje.ebean.dbmigration.migration; +package io.ebean.dbmigration.migration; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlReader.java b/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlReader.java similarity index 93% rename from src/main/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlReader.java rename to src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlReader.java index 055ae7918..a8b568bd7 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlReader.java +++ b/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlReader.java @@ -1,7 +1,7 @@ -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 javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; diff --git a/src/main/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlWriter.java b/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java similarity index 92% rename from src/main/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlWriter.java rename to src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java index 5fb293a37..2aa8cbf29 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlWriter.java +++ b/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java @@ -1,7 +1,7 @@ -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 javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/CurrentModel.java b/src/main/java/io/ebean/dbmigration/model/CurrentModel.java similarity index 86% rename from src/main/java/com/avaje/ebean/dbmigration/model/CurrentModel.java rename to src/main/java/io/ebean/dbmigration/model/CurrentModel.java index 1b3949a5e..80282051a 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/CurrentModel.java +++ b/src/main/java/io/ebean/dbmigration/model/CurrentModel.java @@ -1,14 +1,14 @@ -package com.avaje.ebean.dbmigration.model; +package io.ebean.dbmigration.model; -import com.avaje.ebean.config.DbConstraintNaming; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlHandler; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlWrite; -import com.avaje.ebean.dbmigration.ddlgeneration.platform.DefaultConstraintMaxLength; -import com.avaje.ebean.dbmigration.migration.ChangeSet; -import com.avaje.ebean.dbmigration.model.build.ModelBuildBeanVisitor; -import com.avaje.ebean.dbmigration.model.build.ModelBuildContext; -import com.avaje.ebean.dbmigration.model.visitor.VisitAllUsing; -import com.avaje.ebeaninternal.api.SpiEbeanServer; +import io.ebean.config.DbConstraintNaming; +import io.ebean.dbmigration.ddlgeneration.DdlHandler; +import io.ebean.dbmigration.ddlgeneration.DdlWrite; +import io.ebean.dbmigration.ddlgeneration.platform.DefaultConstraintMaxLength; +import io.ebean.dbmigration.migration.ChangeSet; +import io.ebean.dbmigration.model.build.ModelBuildBeanVisitor; +import io.ebean.dbmigration.model.build.ModelBuildContext; +import io.ebean.dbmigration.model.visitor.VisitAllUsing; +import io.ebeaninternal.api.SpiEbeanServer; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MColumn.java b/src/main/java/io/ebean/dbmigration/model/MColumn.java similarity index 98% rename from src/main/java/com/avaje/ebean/dbmigration/model/MColumn.java rename to src/main/java/io/ebean/dbmigration/model/MColumn.java index ce150d00d..836de64f3 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/MColumn.java +++ b/src/main/java/io/ebean/dbmigration/model/MColumn.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.dbmigration.model; +package io.ebean.dbmigration.model; -import com.avaje.ebean.dbmigration.migration.AlterColumn; -import com.avaje.ebean.dbmigration.migration.Column; +import io.ebean.dbmigration.migration.AlterColumn; +import io.ebean.dbmigration.migration.Column; /** * A column in the logical model. diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MCompoundForeignKey.java b/src/main/java/io/ebean/dbmigration/model/MCompoundForeignKey.java similarity index 95% rename from src/main/java/com/avaje/ebean/dbmigration/model/MCompoundForeignKey.java rename to src/main/java/io/ebean/dbmigration/model/MCompoundForeignKey.java index b528544cc..90f15012a 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/MCompoundForeignKey.java +++ b/src/main/java/io/ebean/dbmigration/model/MCompoundForeignKey.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.dbmigration.model; +package io.ebean.dbmigration.model; -import com.avaje.ebean.dbmigration.migration.ForeignKey; +import io.ebean.dbmigration.migration.ForeignKey; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MCompoundUniqueConstraint.java b/src/main/java/io/ebean/dbmigration/model/MCompoundUniqueConstraint.java similarity index 95% rename from src/main/java/com/avaje/ebean/dbmigration/model/MCompoundUniqueConstraint.java rename to src/main/java/io/ebean/dbmigration/model/MCompoundUniqueConstraint.java index 3d13e20ef..6c58455ea 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/MCompoundUniqueConstraint.java +++ b/src/main/java/io/ebean/dbmigration/model/MCompoundUniqueConstraint.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.model; +package io.ebean.dbmigration.model; /** * A unique constraint for multiple columns. diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MConfiguration.java b/src/main/java/io/ebean/dbmigration/model/MConfiguration.java similarity index 91% rename from src/main/java/com/avaje/ebean/dbmigration/model/MConfiguration.java rename to src/main/java/io/ebean/dbmigration/model/MConfiguration.java index 1c24a7650..41b52ecda 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/MConfiguration.java +++ b/src/main/java/io/ebean/dbmigration/model/MConfiguration.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.dbmigration.model; +package io.ebean.dbmigration.model; -import com.avaje.ebean.dbmigration.migration.Configuration; -import com.avaje.ebean.dbmigration.migration.DefaultTablespace; +import io.ebean.dbmigration.migration.Configuration; +import io.ebean.dbmigration.migration.DefaultTablespace; /** * Holds configuration such as the default tablespaces to use for tables, diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MIndex.java b/src/main/java/io/ebean/dbmigration/model/MIndex.java similarity index 95% rename from src/main/java/com/avaje/ebean/dbmigration/model/MIndex.java rename to src/main/java/io/ebean/dbmigration/model/MIndex.java index dc4e83af8..502790e18 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/MIndex.java +++ b/src/main/java/io/ebean/dbmigration/model/MIndex.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.dbmigration.model; +package io.ebean.dbmigration.model; -import com.avaje.ebean.dbmigration.migration.CreateIndex; -import com.avaje.ebean.dbmigration.migration.DropIndex; +import io.ebean.dbmigration.migration.CreateIndex; +import io.ebean.dbmigration.migration.DropIndex; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MTable.java b/src/main/java/io/ebean/dbmigration/model/MTable.java similarity index 96% rename from src/main/java/com/avaje/ebean/dbmigration/model/MTable.java rename to src/main/java/io/ebean/dbmigration/model/MTable.java index 8c1eeea99..dbeb5dfa8 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/MTable.java +++ b/src/main/java/io/ebean/dbmigration/model/MTable.java @@ -1,16 +1,16 @@ -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.AddTableComment; -import com.avaje.ebean.dbmigration.migration.AlterColumn; -import com.avaje.ebean.dbmigration.migration.Column; -import com.avaje.ebean.dbmigration.migration.CreateTable; -import com.avaje.ebean.dbmigration.migration.DropColumn; -import com.avaje.ebean.dbmigration.migration.DropHistoryTable; -import com.avaje.ebean.dbmigration.migration.DropTable; -import com.avaje.ebean.dbmigration.migration.IdentityType; -import com.avaje.ebean.dbmigration.migration.UniqueConstraint; +import io.ebean.dbmigration.migration.AddColumn; +import io.ebean.dbmigration.migration.AddHistoryTable; +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 io.ebean.dbmigration.migration.DropColumn; +import io.ebean.dbmigration.migration.DropHistoryTable; +import io.ebean.dbmigration.migration.DropTable; +import io.ebean.dbmigration.migration.IdentityType; +import io.ebean.dbmigration.migration.UniqueConstraint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MigrationModel.java b/src/main/java/io/ebean/dbmigration/model/MigrationModel.java similarity index 97% rename from src/main/java/com/avaje/ebean/dbmigration/model/MigrationModel.java rename to src/main/java/io/ebean/dbmigration/model/MigrationModel.java index ba4bccaa3..fd817c3e0 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/MigrationModel.java +++ b/src/main/java/io/ebean/dbmigration/model/MigrationModel.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.model; +package io.ebean.dbmigration.model; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MigrationResource.java b/src/main/java/io/ebean/dbmigration/model/MigrationResource.java similarity index 85% rename from src/main/java/com/avaje/ebean/dbmigration/model/MigrationResource.java rename to src/main/java/io/ebean/dbmigration/model/MigrationResource.java index 19b47f62d..75d9f710c 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/MigrationResource.java +++ b/src/main/java/io/ebean/dbmigration/model/MigrationResource.java @@ -1,7 +1,7 @@ -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 java.io.File; diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MigrationVersion.java b/src/main/java/io/ebean/dbmigration/model/MigrationVersion.java similarity index 99% rename from src/main/java/com/avaje/ebean/dbmigration/model/MigrationVersion.java rename to src/main/java/io/ebean/dbmigration/model/MigrationVersion.java index 11ed26603..e78d20308 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/MigrationVersion.java +++ b/src/main/java/io/ebean/dbmigration/model/MigrationVersion.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.dbmigration.model; +package io.ebean.dbmigration.model; import java.util.Arrays; diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/ModelContainer.java b/src/main/java/io/ebean/dbmigration/model/ModelContainer.java similarity index 92% rename from src/main/java/com/avaje/ebean/dbmigration/model/ModelContainer.java rename to src/main/java/io/ebean/dbmigration/model/ModelContainer.java index 1b0dbadf3..7dc783427 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/ModelContainer.java +++ b/src/main/java/io/ebean/dbmigration/model/ModelContainer.java @@ -1,17 +1,17 @@ -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.ChangeSet; -import com.avaje.ebean.dbmigration.migration.ChangeSetType; -import com.avaje.ebean.dbmigration.migration.CreateIndex; -import com.avaje.ebean.dbmigration.migration.CreateTable; -import com.avaje.ebean.dbmigration.migration.DropColumn; -import com.avaje.ebean.dbmigration.migration.DropHistoryTable; -import com.avaje.ebean.dbmigration.migration.DropIndex; -import com.avaje.ebean.dbmigration.migration.DropTable; -import com.avaje.ebean.dbmigration.migration.Migration; +import io.ebean.dbmigration.migration.AddColumn; +import io.ebean.dbmigration.migration.AddHistoryTable; +import io.ebean.dbmigration.migration.AlterColumn; +import io.ebean.dbmigration.migration.ChangeSet; +import io.ebean.dbmigration.migration.ChangeSetType; +import io.ebean.dbmigration.migration.CreateIndex; +import io.ebean.dbmigration.migration.CreateTable; +import io.ebean.dbmigration.migration.DropColumn; +import io.ebean.dbmigration.migration.DropHistoryTable; +import io.ebean.dbmigration.migration.DropIndex; +import io.ebean.dbmigration.migration.DropTable; +import io.ebean.dbmigration.migration.Migration; import java.util.LinkedHashMap; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/ModelDiff.java b/src/main/java/io/ebean/dbmigration/model/ModelDiff.java similarity index 89% rename from src/main/java/com/avaje/ebean/dbmigration/model/ModelDiff.java rename to src/main/java/io/ebean/dbmigration/model/ModelDiff.java index b0c7ae749..a3febc4bf 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/ModelDiff.java +++ b/src/main/java/io/ebean/dbmigration/model/ModelDiff.java @@ -1,16 +1,16 @@ -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.AddTableComment; -import com.avaje.ebean.dbmigration.migration.AlterColumn; -import com.avaje.ebean.dbmigration.migration.ChangeSet; -import com.avaje.ebean.dbmigration.migration.ChangeSetType; -import com.avaje.ebean.dbmigration.migration.CreateIndex; -import com.avaje.ebean.dbmigration.migration.DropColumn; -import com.avaje.ebean.dbmigration.migration.DropHistoryTable; -import com.avaje.ebean.dbmigration.migration.DropIndex; -import com.avaje.ebean.dbmigration.migration.Migration; +import io.ebean.dbmigration.migration.AddColumn; +import io.ebean.dbmigration.migration.AddHistoryTable; +import io.ebean.dbmigration.migration.AddTableComment; +import io.ebean.dbmigration.migration.AlterColumn; +import io.ebean.dbmigration.migration.ChangeSet; +import io.ebean.dbmigration.migration.ChangeSetType; +import io.ebean.dbmigration.migration.CreateIndex; +import io.ebean.dbmigration.migration.DropColumn; +import io.ebean.dbmigration.migration.DropHistoryTable; +import io.ebean.dbmigration.migration.DropIndex; +import io.ebean.dbmigration.migration.Migration; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/PendingDrops.java b/src/main/java/io/ebean/dbmigration/model/PendingDrops.java similarity index 95% rename from src/main/java/com/avaje/ebean/dbmigration/model/PendingDrops.java rename to src/main/java/io/ebean/dbmigration/model/PendingDrops.java index 456202cec..249135ed3 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/PendingDrops.java +++ b/src/main/java/io/ebean/dbmigration/model/PendingDrops.java @@ -1,10 +1,10 @@ -package com.avaje.ebean.dbmigration.model; +package io.ebean.dbmigration.model; -import com.avaje.ebean.dbmigration.migration.ChangeSet; -import com.avaje.ebean.dbmigration.migration.ChangeSetType; -import com.avaje.ebean.dbmigration.migration.DropColumn; -import com.avaje.ebean.dbmigration.migration.DropTable; -import com.avaje.ebean.dbmigration.migration.Migration; +import io.ebean.dbmigration.migration.ChangeSet; +import io.ebean.dbmigration.migration.ChangeSetType; +import io.ebean.dbmigration.migration.DropColumn; +import io.ebean.dbmigration.migration.DropTable; +import io.ebean.dbmigration.migration.Migration; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/PlatformDdlWriter.java b/src/main/java/io/ebean/dbmigration/model/PlatformDdlWriter.java similarity index 86% rename from src/main/java/com/avaje/ebean/dbmigration/model/PlatformDdlWriter.java rename to src/main/java/io/ebean/dbmigration/model/PlatformDdlWriter.java index 3c65d0920..03dd7da53 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/PlatformDdlWriter.java +++ b/src/main/java/io/ebean/dbmigration/model/PlatformDdlWriter.java @@ -1,14 +1,14 @@ -package com.avaje.ebean.dbmigration.model; +package io.ebean.dbmigration.model; -import com.avaje.ebean.config.DbMigrationConfig; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlBuffer; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlHandler; -import com.avaje.ebean.dbmigration.ddlgeneration.DdlWrite; -import com.avaje.ebean.dbmigration.migration.ChangeSet; -import com.avaje.ebean.dbmigration.migration.ChangeSetType; -import com.avaje.ebean.dbmigration.migration.Migration; +import io.ebean.config.DbMigrationConfig; +import io.ebean.config.ServerConfig; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.dbmigration.ddlgeneration.DdlBuffer; +import io.ebean.dbmigration.ddlgeneration.DdlHandler; +import io.ebean.dbmigration.ddlgeneration.DdlWrite; +import io.ebean.dbmigration.migration.ChangeSet; +import io.ebean.dbmigration.migration.ChangeSetType; +import io.ebean.dbmigration.migration.Migration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildBeanVisitor.java b/src/main/java/io/ebean/dbmigration/model/build/ModelBuildBeanVisitor.java similarity index 84% rename from src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildBeanVisitor.java rename to src/main/java/io/ebean/dbmigration/model/build/ModelBuildBeanVisitor.java index d451af807..4cd623802 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildBeanVisitor.java +++ b/src/main/java/io/ebean/dbmigration/model/build/ModelBuildBeanVisitor.java @@ -1,14 +1,14 @@ -package com.avaje.ebean.dbmigration.model.build; +package io.ebean.dbmigration.model.build; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.config.dbplatform.IdType; -import com.avaje.ebean.dbmigration.migration.IdentityType; -import com.avaje.ebean.dbmigration.model.MColumn; -import com.avaje.ebean.dbmigration.model.MTable; -import com.avaje.ebean.dbmigration.model.visitor.BeanVisitor; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.InheritInfo; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.IdType; +import io.ebean.dbmigration.migration.IdentityType; +import io.ebean.dbmigration.model.MColumn; +import io.ebean.dbmigration.model.MTable; +import io.ebean.dbmigration.model.visitor.BeanVisitor; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.InheritInfo; /** * Used to build the Model objects MTable etc. diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildContext.java b/src/main/java/io/ebean/dbmigration/model/build/ModelBuildContext.java similarity index 92% rename from src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildContext.java rename to src/main/java/io/ebean/dbmigration/model/build/ModelBuildContext.java index f891798ab..d8444171b 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildContext.java +++ b/src/main/java/io/ebean/dbmigration/model/build/ModelBuildContext.java @@ -1,13 +1,13 @@ -package com.avaje.ebean.dbmigration.model.build; +package io.ebean.dbmigration.model.build; -import com.avaje.ebean.config.DbConstraintNaming; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.config.dbplatform.DbPlatformTypeMapping; -import com.avaje.ebean.dbmigration.model.MColumn; -import com.avaje.ebean.dbmigration.model.MTable; -import com.avaje.ebean.dbmigration.model.ModelContainer; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.type.ScalarType; +import io.ebean.config.DbConstraintNaming; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbPlatformTypeMapping; +import io.ebean.dbmigration.model.MColumn; +import io.ebean.dbmigration.model.MTable; +import io.ebean.dbmigration.model.ModelContainer; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.type.ScalarType; import java.util.Collection; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java b/src/main/java/io/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java similarity index 87% rename from src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java rename to src/main/java/io/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java index 4dde64375..11a511e54 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java +++ b/src/main/java/io/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java @@ -1,13 +1,13 @@ -package com.avaje.ebean.dbmigration.model.build; +package io.ebean.dbmigration.model.build; -import com.avaje.ebean.dbmigration.model.MColumn; -import com.avaje.ebean.dbmigration.model.MCompoundForeignKey; -import com.avaje.ebean.dbmigration.model.MTable; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.TableJoin; -import com.avaje.ebeaninternal.server.deploy.TableJoinColumn; +import io.ebean.dbmigration.model.MColumn; +import io.ebean.dbmigration.model.MCompoundForeignKey; +import io.ebean.dbmigration.model.MTable; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.TableJoin; +import io.ebeaninternal.server.deploy.TableJoinColumn; /** diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java b/src/main/java/io/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java similarity index 92% rename from src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java rename to src/main/java/io/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java index d2e4fa46b..2b3bdbeac 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java +++ b/src/main/java/io/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java @@ -1,18 +1,18 @@ -package com.avaje.ebean.dbmigration.model.build; +package io.ebean.dbmigration.model.build; -import com.avaje.ebean.dbmigration.ddlgeneration.platform.util.IndexSet; -import com.avaje.ebean.dbmigration.model.MColumn; -import com.avaje.ebean.dbmigration.model.MCompoundForeignKey; -import com.avaje.ebean.dbmigration.model.MTable; -import com.avaje.ebean.dbmigration.model.visitor.BaseTablePropertyVisitor; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.deploy.IndexDefinition; -import com.avaje.ebeaninternal.server.deploy.InheritInfo; -import com.avaje.ebeaninternal.server.deploy.TableJoinColumn; -import com.avaje.ebeaninternal.server.deploy.id.ImportedId; +import io.ebean.dbmigration.ddlgeneration.platform.util.IndexSet; +import io.ebean.dbmigration.model.MColumn; +import io.ebean.dbmigration.model.MCompoundForeignKey; +import io.ebean.dbmigration.model.MTable; +import io.ebean.dbmigration.model.visitor.BaseTablePropertyVisitor; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.IndexDefinition; +import io.ebeaninternal.server.deploy.InheritInfo; +import io.ebeaninternal.server.deploy.TableJoinColumn; +import io.ebeaninternal.server.deploy.id.ImportedId; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/visitor/BaseTablePropertyVisitor.java b/src/main/java/io/ebean/dbmigration/model/visitor/BaseTablePropertyVisitor.java similarity index 79% rename from src/main/java/com/avaje/ebean/dbmigration/model/visitor/BaseTablePropertyVisitor.java rename to src/main/java/io/ebean/dbmigration/model/visitor/BaseTablePropertyVisitor.java index 29418968d..0244a8d28 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/visitor/BaseTablePropertyVisitor.java +++ b/src/main/java/io/ebean/dbmigration/model/visitor/BaseTablePropertyVisitor.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.dbmigration.model.visitor; +package io.ebean.dbmigration.model.visitor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; /** * Used to help mark PropertyVisitor methods that need to be implemented diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/visitor/BeanPropertyVisitor.java b/src/main/java/io/ebean/dbmigration/model/visitor/BeanPropertyVisitor.java similarity index 78% rename from src/main/java/com/avaje/ebean/dbmigration/model/visitor/BeanPropertyVisitor.java rename to src/main/java/io/ebean/dbmigration/model/visitor/BeanPropertyVisitor.java index 2cc74037c..ec6f6f9e3 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/visitor/BeanPropertyVisitor.java +++ b/src/main/java/io/ebean/dbmigration/model/visitor/BeanPropertyVisitor.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.dbmigration.model.visitor; +package io.ebean.dbmigration.model.visitor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; /** * Used to visit a BeanProperty given the type of bean property it is. diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/visitor/BeanVisitor.java b/src/main/java/io/ebean/dbmigration/model/visitor/BeanVisitor.java similarity index 66% rename from src/main/java/com/avaje/ebean/dbmigration/model/visitor/BeanVisitor.java rename to src/main/java/io/ebean/dbmigration/model/visitor/BeanVisitor.java index 44f0fb8c8..1e3856ca8 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/visitor/BeanVisitor.java +++ b/src/main/java/io/ebean/dbmigration/model/visitor/BeanVisitor.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.dbmigration.model.visitor; +package io.ebean.dbmigration.model.visitor; -import com.avaje.ebean.dbmigration.model.build.ModelBuildPropertyVisitor; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebean.dbmigration.model.build.ModelBuildPropertyVisitor; +import io.ebeaninternal.server.deploy.BeanDescriptor; /** * Visitor pattern for visiting a BeanDescriptor and potentially all its bean diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/visitor/VisitAllUsing.java b/src/main/java/io/ebean/dbmigration/model/visitor/VisitAllUsing.java similarity index 88% rename from src/main/java/com/avaje/ebean/dbmigration/model/visitor/VisitAllUsing.java rename to src/main/java/io/ebean/dbmigration/model/visitor/VisitAllUsing.java index 2ba2fe404..a17497810 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/visitor/VisitAllUsing.java +++ b/src/main/java/io/ebean/dbmigration/model/visitor/VisitAllUsing.java @@ -1,12 +1,12 @@ -package com.avaje.ebean.dbmigration.model.visitor; +package io.ebean.dbmigration.model.visitor; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.deploy.InheritInfo; -import com.avaje.ebeaninternal.server.deploy.InheritInfoVisitor; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.InheritInfo; +import io.ebeaninternal.server.deploy.InheritInfoVisitor; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/dbmigration/package-info.java b/src/main/java/io/ebean/dbmigration/package-info.java similarity index 87% rename from src/main/java/com/avaje/ebean/dbmigration/package-info.java rename to src/main/java/io/ebean/dbmigration/package-info.java index b4fed1868..ad0faf372 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/package-info.java +++ b/src/main/java/io/ebean/dbmigration/package-info.java @@ -5,4 +5,4 @@ * and generate DDL for the differences - adding tables, columns etc. *

*/ -package com.avaje.ebean.dbmigration; \ No newline at end of file +package io.ebean.dbmigration; diff --git a/src/main/java/com/avaje/ebean/event/AbstractBeanPersistListener.java b/src/main/java/io/ebean/event/AbstractBeanPersistListener.java similarity index 97% rename from src/main/java/com/avaje/ebean/event/AbstractBeanPersistListener.java rename to src/main/java/io/ebean/event/AbstractBeanPersistListener.java index 6f2c885c5..260558b8d 100644 --- a/src/main/java/com/avaje/ebean/event/AbstractBeanPersistListener.java +++ b/src/main/java/io/ebean/event/AbstractBeanPersistListener.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.event; +package io.ebean.event; import java.util.Set; diff --git a/src/main/java/com/avaje/ebean/event/BeanFindController.java b/src/main/java/io/ebean/event/BeanFindController.java similarity index 86% rename from src/main/java/com/avaje/ebean/event/BeanFindController.java rename to src/main/java/io/ebean/event/BeanFindController.java index 6d51b8e4f..c81a89e60 100644 --- a/src/main/java/com/avaje/ebean/event/BeanFindController.java +++ b/src/main/java/io/ebean/event/BeanFindController.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.event; +package io.ebean.event; -import com.avaje.ebean.bean.BeanCollection; +import io.ebean.bean.BeanCollection; /** * Used to override the finding implementation for a bean. @@ -11,8 +11,7 @@ import com.avaje.ebean.bean.BeanCollection; *

*

* There are a number of internal BeanFinders in Ebean to return meta data from - * Ebean at runtime such as query execution statistics etc. See the beans in - * com.avaje.ebean.meta and finders in com.avaje.ebean.server.meta. + * Ebean at runtime such as query execution statistics etc. *

*/ public interface BeanFindController { diff --git a/src/main/java/com/avaje/ebean/event/BeanPersistAdapter.java b/src/main/java/io/ebean/event/BeanPersistAdapter.java similarity index 96% rename from src/main/java/com/avaje/ebean/event/BeanPersistAdapter.java rename to src/main/java/io/ebean/event/BeanPersistAdapter.java index 5d0412a49..06056e7a8 100644 --- a/src/main/java/com/avaje/ebean/event/BeanPersistAdapter.java +++ b/src/main/java/io/ebean/event/BeanPersistAdapter.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.event; +package io.ebean.event; -import com.avaje.ebean.config.ServerConfig; +import io.ebean.config.ServerConfig; /** * A no operation implementation of BeanPersistController. Objects extending diff --git a/src/main/java/com/avaje/ebean/event/BeanPersistController.java b/src/main/java/io/ebean/event/BeanPersistController.java similarity index 99% rename from src/main/java/com/avaje/ebean/event/BeanPersistController.java rename to src/main/java/io/ebean/event/BeanPersistController.java index 69f6f6b68..6c55cf310 100644 --- a/src/main/java/com/avaje/ebean/event/BeanPersistController.java +++ b/src/main/java/io/ebean/event/BeanPersistController.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.event; +package io.ebean.event; /** * Used to enhance or override the default bean persistence mechanism. diff --git a/src/main/java/com/avaje/ebean/event/BeanPersistListener.java b/src/main/java/io/ebean/event/BeanPersistListener.java similarity index 96% rename from src/main/java/com/avaje/ebean/event/BeanPersistListener.java rename to src/main/java/io/ebean/event/BeanPersistListener.java index 94a630b63..b2216237f 100644 --- a/src/main/java/com/avaje/ebean/event/BeanPersistListener.java +++ b/src/main/java/io/ebean/event/BeanPersistListener.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.event; +package io.ebean.event; -import com.avaje.ebean.config.ServerConfig; +import io.ebean.config.ServerConfig; import java.util.Set; diff --git a/src/main/java/com/avaje/ebean/event/BeanPersistRequest.java b/src/main/java/io/ebean/event/BeanPersistRequest.java similarity index 92% rename from src/main/java/com/avaje/ebean/event/BeanPersistRequest.java rename to src/main/java/io/ebean/event/BeanPersistRequest.java index 8c6be01d6..b03dcc2c8 100644 --- a/src/main/java/com/avaje/ebean/event/BeanPersistRequest.java +++ b/src/main/java/io/ebean/event/BeanPersistRequest.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.event; +package io.ebean.event; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.ValuePair; +import io.ebean.EbeanServer; +import io.ebean.Transaction; +import io.ebean.ValuePair; import java.util.Map; import java.util.Set; diff --git a/src/main/java/com/avaje/ebean/event/BeanPostConstructListener.java b/src/main/java/io/ebean/event/BeanPostConstructListener.java similarity index 93% rename from src/main/java/com/avaje/ebean/event/BeanPostConstructListener.java rename to src/main/java/io/ebean/event/BeanPostConstructListener.java index 55b07de91..e0fb74215 100644 --- a/src/main/java/com/avaje/ebean/event/BeanPostConstructListener.java +++ b/src/main/java/io/ebean/event/BeanPostConstructListener.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.event; +package io.ebean.event; -import com.avaje.ebean.EbeanServer; +import io.ebean.EbeanServer; /** * Fired after a bean is constructed, but not yet loaded from database. diff --git a/src/main/java/com/avaje/ebean/event/BeanPostLoad.java b/src/main/java/io/ebean/event/BeanPostLoad.java similarity index 94% rename from src/main/java/com/avaje/ebean/event/BeanPostLoad.java rename to src/main/java/io/ebean/event/BeanPostLoad.java index b76f857d3..68548959e 100644 --- a/src/main/java/com/avaje/ebean/event/BeanPostLoad.java +++ b/src/main/java/io/ebean/event/BeanPostLoad.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.event; +package io.ebean.event; /** * Fired after a bean is fetched and loaded from the database. diff --git a/src/main/java/com/avaje/ebean/event/BeanQueryAdapter.java b/src/main/java/io/ebean/event/BeanQueryAdapter.java similarity index 93% rename from src/main/java/com/avaje/ebean/event/BeanQueryAdapter.java rename to src/main/java/io/ebean/event/BeanQueryAdapter.java index c2e2837df..2055f8282 100644 --- a/src/main/java/com/avaje/ebean/event/BeanQueryAdapter.java +++ b/src/main/java/io/ebean/event/BeanQueryAdapter.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.event; +package io.ebean.event; -import com.avaje.ebean.config.ServerConfig; +import io.ebean.config.ServerConfig; /** * Objects extending this modify queries prior their execution. diff --git a/src/main/java/com/avaje/ebean/event/BeanQueryRequest.java b/src/main/java/io/ebean/event/BeanQueryRequest.java similarity index 73% rename from src/main/java/com/avaje/ebean/event/BeanQueryRequest.java rename to src/main/java/io/ebean/event/BeanQueryRequest.java index e3108ecbb..4ba1e395e 100644 --- a/src/main/java/com/avaje/ebean/event/BeanQueryRequest.java +++ b/src/main/java/io/ebean/event/BeanQueryRequest.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.event; +package io.ebean.event; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Query; -import com.avaje.ebean.Transaction; +import io.ebean.EbeanServer; +import io.ebean.Query; +import io.ebean.Transaction; /** * Holds the information available for a bean query. diff --git a/src/main/java/com/avaje/ebean/event/BulkTableEvent.java b/src/main/java/io/ebean/event/BulkTableEvent.java similarity index 92% rename from src/main/java/com/avaje/ebean/event/BulkTableEvent.java rename to src/main/java/io/ebean/event/BulkTableEvent.java index 5f2bd0c73..a10168cf5 100644 --- a/src/main/java/com/avaje/ebean/event/BulkTableEvent.java +++ b/src/main/java/io/ebean/event/BulkTableEvent.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.event; +package io.ebean.event; /** * The bulk table event. diff --git a/src/main/java/com/avaje/ebean/event/BulkTableEventListener.java b/src/main/java/io/ebean/event/BulkTableEventListener.java similarity index 89% rename from src/main/java/com/avaje/ebean/event/BulkTableEventListener.java rename to src/main/java/io/ebean/event/BulkTableEventListener.java index 9161488a0..788ccd223 100644 --- a/src/main/java/com/avaje/ebean/event/BulkTableEventListener.java +++ b/src/main/java/io/ebean/event/BulkTableEventListener.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.event; +package io.ebean.event; -import com.avaje.ebean.Ebean; +import io.ebean.Ebean; import java.util.Set; diff --git a/src/main/java/com/avaje/ebean/event/ServerConfigStartup.java b/src/main/java/io/ebean/event/ServerConfigStartup.java similarity index 81% rename from src/main/java/com/avaje/ebean/event/ServerConfigStartup.java rename to src/main/java/io/ebean/event/ServerConfigStartup.java index de5b858b1..a5563869e 100644 --- a/src/main/java/com/avaje/ebean/event/ServerConfigStartup.java +++ b/src/main/java/io/ebean/event/ServerConfigStartup.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.event; +package io.ebean.event; -import com.avaje.ebean.config.ServerConfig; +import io.ebean.config.ServerConfig; /** * Used to configure the server on startup. diff --git a/src/main/java/com/avaje/ebean/event/changelog/BeanChange.java b/src/main/java/io/ebean/event/changelog/BeanChange.java similarity index 96% rename from src/main/java/com/avaje/ebean/event/changelog/BeanChange.java rename to src/main/java/io/ebean/event/changelog/BeanChange.java index 9bb359121..83df95e16 100644 --- a/src/main/java/com/avaje/ebean/event/changelog/BeanChange.java +++ b/src/main/java/io/ebean/event/changelog/BeanChange.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.event.changelog; +package io.ebean.event.changelog; -import com.avaje.ebean.ValuePair; +import io.ebean.ValuePair; import java.util.Map; diff --git a/src/main/java/com/avaje/ebean/event/changelog/ChangeLogFilter.java b/src/main/java/io/ebean/event/changelog/ChangeLogFilter.java similarity index 87% rename from src/main/java/com/avaje/ebean/event/changelog/ChangeLogFilter.java rename to src/main/java/io/ebean/event/changelog/ChangeLogFilter.java index 2451b9e4d..0bffbda25 100644 --- a/src/main/java/com/avaje/ebean/event/changelog/ChangeLogFilter.java +++ b/src/main/java/io/ebean/event/changelog/ChangeLogFilter.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.event.changelog; +package io.ebean.event.changelog; -import com.avaje.ebean.event.BeanPersistRequest; +import io.ebean.event.BeanPersistRequest; /** * Used to provide fine grained control over what persist requests are included in the change log. diff --git a/src/main/java/com/avaje/ebean/event/changelog/ChangeLogListener.java b/src/main/java/io/ebean/event/changelog/ChangeLogListener.java similarity index 94% rename from src/main/java/com/avaje/ebean/event/changelog/ChangeLogListener.java rename to src/main/java/io/ebean/event/changelog/ChangeLogListener.java index 7049088cc..617081f64 100644 --- a/src/main/java/com/avaje/ebean/event/changelog/ChangeLogListener.java +++ b/src/main/java/io/ebean/event/changelog/ChangeLogListener.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.event.changelog; +package io.ebean.event.changelog; /** * Listen for changes. diff --git a/src/main/java/com/avaje/ebean/event/changelog/ChangeLogPrepare.java b/src/main/java/io/ebean/event/changelog/ChangeLogPrepare.java similarity index 95% rename from src/main/java/com/avaje/ebean/event/changelog/ChangeLogPrepare.java rename to src/main/java/io/ebean/event/changelog/ChangeLogPrepare.java index ba9634203..d59cb39e1 100644 --- a/src/main/java/com/avaje/ebean/event/changelog/ChangeLogPrepare.java +++ b/src/main/java/io/ebean/event/changelog/ChangeLogPrepare.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.event.changelog; +package io.ebean.event.changelog; /** * Listen for changes. diff --git a/src/main/java/com/avaje/ebean/event/changelog/ChangeLogRegister.java b/src/main/java/io/ebean/event/changelog/ChangeLogRegister.java similarity index 92% rename from src/main/java/com/avaje/ebean/event/changelog/ChangeLogRegister.java rename to src/main/java/io/ebean/event/changelog/ChangeLogRegister.java index a9b7cbe62..980a60d35 100644 --- a/src/main/java/com/avaje/ebean/event/changelog/ChangeLogRegister.java +++ b/src/main/java/io/ebean/event/changelog/ChangeLogRegister.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.event.changelog; +package io.ebean.event.changelog; /** * Used to assign ChangeLogFilters to bean types. diff --git a/src/main/java/com/avaje/ebean/event/changelog/ChangeSet.java b/src/main/java/io/ebean/event/changelog/ChangeSet.java similarity index 99% rename from src/main/java/com/avaje/ebean/event/changelog/ChangeSet.java rename to src/main/java/io/ebean/event/changelog/ChangeSet.java index 4f86166fb..0891edb9d 100644 --- a/src/main/java/com/avaje/ebean/event/changelog/ChangeSet.java +++ b/src/main/java/io/ebean/event/changelog/ChangeSet.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.event.changelog; +package io.ebean.event.changelog; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/src/main/java/com/avaje/ebean/event/changelog/ChangeType.java b/src/main/java/io/ebean/event/changelog/ChangeType.java similarity index 92% rename from src/main/java/com/avaje/ebean/event/changelog/ChangeType.java rename to src/main/java/io/ebean/event/changelog/ChangeType.java index 6f8e1a3d6..4d0281758 100644 --- a/src/main/java/com/avaje/ebean/event/changelog/ChangeType.java +++ b/src/main/java/io/ebean/event/changelog/ChangeType.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.event.changelog; +package io.ebean.event.changelog; /** * The type of the change. diff --git a/src/main/java/com/avaje/ebean/event/changelog/TxnState.java b/src/main/java/io/ebean/event/changelog/TxnState.java similarity index 96% rename from src/main/java/com/avaje/ebean/event/changelog/TxnState.java rename to src/main/java/io/ebean/event/changelog/TxnState.java index 2c400124b..0b4b978d7 100644 --- a/src/main/java/com/avaje/ebean/event/changelog/TxnState.java +++ b/src/main/java/io/ebean/event/changelog/TxnState.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.event.changelog; +package io.ebean.event.changelog; /** * Transaction state when ChangeSets are sent to the ChangeSetListener. diff --git a/src/main/java/com/avaje/ebean/event/changelog/package-info.java b/src/main/java/io/ebean/event/changelog/package-info.java similarity index 93% rename from src/main/java/com/avaje/ebean/event/changelog/package-info.java rename to src/main/java/io/ebean/event/changelog/package-info.java index 60a06a908..de3227601 100644 --- a/src/main/java/com/avaje/ebean/event/changelog/package-info.java +++ b/src/main/java/io/ebean/event/changelog/package-info.java @@ -10,4 +10,4 @@ * via implementation of ChangeLogPrepare *

*/ -package com.avaje.ebean.event.changelog; \ No newline at end of file +package io.ebean.event.changelog; diff --git a/src/main/java/com/avaje/ebean/event/package.html b/src/main/java/io/ebean/event/package.html similarity index 100% rename from src/main/java/com/avaje/ebean/event/package.html rename to src/main/java/io/ebean/event/package.html diff --git a/src/main/java/com/avaje/ebean/event/readaudit/ReadAuditLogger.java b/src/main/java/io/ebean/event/readaudit/ReadAuditLogger.java similarity index 95% rename from src/main/java/com/avaje/ebean/event/readaudit/ReadAuditLogger.java rename to src/main/java/io/ebean/event/readaudit/ReadAuditLogger.java index 8e18abe4e..571b315f3 100644 --- a/src/main/java/com/avaje/ebean/event/readaudit/ReadAuditLogger.java +++ b/src/main/java/io/ebean/event/readaudit/ReadAuditLogger.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.event.readaudit; +package io.ebean.event.readaudit; /** * Log that the query was executed diff --git a/src/main/java/com/avaje/ebean/event/readaudit/ReadAuditPrepare.java b/src/main/java/io/ebean/event/readaudit/ReadAuditPrepare.java similarity index 94% rename from src/main/java/com/avaje/ebean/event/readaudit/ReadAuditPrepare.java rename to src/main/java/io/ebean/event/readaudit/ReadAuditPrepare.java index fb80d23af..7dd7015d8 100644 --- a/src/main/java/com/avaje/ebean/event/readaudit/ReadAuditPrepare.java +++ b/src/main/java/io/ebean/event/readaudit/ReadAuditPrepare.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.event.readaudit; +package io.ebean.event.readaudit; /** * Set user context information into the read event prior to it being logged. diff --git a/src/main/java/com/avaje/ebean/event/readaudit/ReadAuditQueryPlan.java b/src/main/java/io/ebean/event/readaudit/ReadAuditQueryPlan.java similarity index 97% rename from src/main/java/com/avaje/ebean/event/readaudit/ReadAuditQueryPlan.java rename to src/main/java/io/ebean/event/readaudit/ReadAuditQueryPlan.java index 604c8aa58..4bb284330 100644 --- a/src/main/java/com/avaje/ebean/event/readaudit/ReadAuditQueryPlan.java +++ b/src/main/java/io/ebean/event/readaudit/ReadAuditQueryPlan.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.event.readaudit; +package io.ebean.event.readaudit; /** * A SQL query and associated keys. diff --git a/src/main/java/com/avaje/ebean/event/readaudit/ReadEvent.java b/src/main/java/io/ebean/event/readaudit/ReadEvent.java similarity index 99% rename from src/main/java/com/avaje/ebean/event/readaudit/ReadEvent.java rename to src/main/java/io/ebean/event/readaudit/ReadEvent.java index 5a95494af..301c1f83b 100644 --- a/src/main/java/com/avaje/ebean/event/readaudit/ReadEvent.java +++ b/src/main/java/io/ebean/event/readaudit/ReadEvent.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.event.readaudit; +package io.ebean.event.readaudit; import java.util.LinkedHashMap; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/event/readaudit/package-info.java b/src/main/java/io/ebean/event/readaudit/package-info.java similarity index 84% rename from src/main/java/com/avaje/ebean/event/readaudit/package-info.java rename to src/main/java/io/ebean/event/readaudit/package-info.java index e0fc4e787..bc180f5e8 100644 --- a/src/main/java/com/avaje/ebean/event/readaudit/package-info.java +++ b/src/main/java/io/ebean/event/readaudit/package-info.java @@ -5,4 +5,4 @@ * with @ReadAudit *

*/ -package com.avaje.ebean.event.readaudit; \ No newline at end of file +package io.ebean.event.readaudit; diff --git a/src/main/java/com/avaje/ebean/meta/MetaBeanInfo.java b/src/main/java/io/ebean/meta/MetaBeanInfo.java similarity index 93% rename from src/main/java/com/avaje/ebean/meta/MetaBeanInfo.java rename to src/main/java/io/ebean/meta/MetaBeanInfo.java index d5fa97fe5..757737712 100644 --- a/src/main/java/com/avaje/ebean/meta/MetaBeanInfo.java +++ b/src/main/java/io/ebean/meta/MetaBeanInfo.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.meta; +package io.ebean.meta; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/meta/MetaInfoManager.java b/src/main/java/io/ebean/meta/MetaInfoManager.java similarity index 97% rename from src/main/java/com/avaje/ebean/meta/MetaInfoManager.java rename to src/main/java/io/ebean/meta/MetaInfoManager.java index cddda6663..c8e280483 100644 --- a/src/main/java/com/avaje/ebean/meta/MetaInfoManager.java +++ b/src/main/java/io/ebean/meta/MetaInfoManager.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.meta; +package io.ebean.meta; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/meta/MetaObjectGraphNodeStats.java b/src/main/java/io/ebean/meta/MetaObjectGraphNodeStats.java similarity index 91% rename from src/main/java/com/avaje/ebean/meta/MetaObjectGraphNodeStats.java rename to src/main/java/io/ebean/meta/MetaObjectGraphNodeStats.java index 9a70d302f..81421978b 100644 --- a/src/main/java/com/avaje/ebean/meta/MetaObjectGraphNodeStats.java +++ b/src/main/java/io/ebean/meta/MetaObjectGraphNodeStats.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.meta; +package io.ebean.meta; -import com.avaje.ebean.bean.ObjectGraphNode; +import io.ebean.bean.ObjectGraphNode; /** * Statistics for query execution based on object graph origin and paths. diff --git a/src/main/java/com/avaje/ebean/meta/MetaQueryPlanOriginCount.java b/src/main/java/io/ebean/meta/MetaQueryPlanOriginCount.java similarity index 91% rename from src/main/java/com/avaje/ebean/meta/MetaQueryPlanOriginCount.java rename to src/main/java/io/ebean/meta/MetaQueryPlanOriginCount.java index 0c8040e84..6ca5b3827 100644 --- a/src/main/java/com/avaje/ebean/meta/MetaQueryPlanOriginCount.java +++ b/src/main/java/io/ebean/meta/MetaQueryPlanOriginCount.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.meta; +package io.ebean.meta; -import com.avaje.ebean.bean.ObjectGraphNode; +import io.ebean.bean.ObjectGraphNode; /** * Holds a query 'origin' point and count for the number of queries executed for diff --git a/src/main/java/com/avaje/ebean/meta/MetaQueryPlanStatistic.java b/src/main/java/io/ebean/meta/MetaQueryPlanStatistic.java similarity index 98% rename from src/main/java/com/avaje/ebean/meta/MetaQueryPlanStatistic.java rename to src/main/java/io/ebean/meta/MetaQueryPlanStatistic.java index 54a771fd0..abe862b4e 100644 --- a/src/main/java/com/avaje/ebean/meta/MetaQueryPlanStatistic.java +++ b/src/main/java/io/ebean/meta/MetaQueryPlanStatistic.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.meta; +package io.ebean.meta; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/meta/package-info.java b/src/main/java/io/ebean/meta/package-info.java similarity index 68% rename from src/main/java/com/avaje/ebean/meta/package-info.java rename to src/main/java/io/ebean/meta/package-info.java index b637cdbc8..26f24d774 100644 --- a/src/main/java/com/avaje/ebean/meta/package-info.java +++ b/src/main/java/io/ebean/meta/package-info.java @@ -1,4 +1,4 @@ /** * Meta data that can be retrieved for the EbeanServer. */ -package com.avaje.ebean.meta; \ No newline at end of file +package io.ebean.meta; diff --git a/src/main/java/com/avaje/ebean/overview.html b/src/main/java/io/ebean/overview.html similarity index 100% rename from src/main/java/com/avaje/ebean/overview.html rename to src/main/java/io/ebean/overview.html diff --git a/src/main/java/com/avaje/ebean/package.html b/src/main/java/io/ebean/package.html similarity index 100% rename from src/main/java/com/avaje/ebean/package.html rename to src/main/java/io/ebean/package.html diff --git a/src/main/java/com/avaje/ebean/plugin/BeanDocType.java b/src/main/java/io/ebean/plugin/BeanDocType.java similarity index 92% rename from src/main/java/com/avaje/ebean/plugin/BeanDocType.java rename to src/main/java/io/ebean/plugin/BeanDocType.java index e679968f6..d82c05c84 100644 --- a/src/main/java/com/avaje/ebean/plugin/BeanDocType.java +++ b/src/main/java/io/ebean/plugin/BeanDocType.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.plugin; +package io.ebean.plugin; -import com.avaje.ebean.FetchPath; -import com.avaje.ebean.Query; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdateContext; +import io.ebean.FetchPath; +import io.ebean.Query; +import io.ebeanservice.docstore.api.DocStoreUpdateContext; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebean/plugin/BeanType.java b/src/main/java/io/ebean/plugin/BeanType.java similarity index 91% rename from src/main/java/com/avaje/ebean/plugin/BeanType.java rename to src/main/java/io/ebean/plugin/BeanType.java index 53cb26cc8..3f23853b4 100644 --- a/src/main/java/com/avaje/ebean/plugin/BeanType.java +++ b/src/main/java/io/ebean/plugin/BeanType.java @@ -1,12 +1,12 @@ -package com.avaje.ebean.plugin; +package io.ebean.plugin; -import com.avaje.ebean.config.dbplatform.IdType; -import com.avaje.ebean.event.BeanFindController; -import com.avaje.ebean.event.BeanPersistController; -import com.avaje.ebean.event.BeanPersistListener; -import com.avaje.ebean.event.BeanQueryAdapter; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeanservice.docstore.api.mapping.DocumentMapping; +import io.ebean.config.dbplatform.IdType; +import io.ebean.event.BeanFindController; +import io.ebean.event.BeanPersistController; +import io.ebean.event.BeanPersistListener; +import io.ebean.event.BeanQueryAdapter; +import io.ebeaninternal.api.SpiQuery; +import io.ebeanservice.docstore.api.mapping.DocumentMapping; import java.util.Collection; diff --git a/src/main/java/com/avaje/ebean/plugin/ExpressionPath.java b/src/main/java/io/ebean/plugin/ExpressionPath.java similarity index 93% rename from src/main/java/com/avaje/ebean/plugin/ExpressionPath.java rename to src/main/java/io/ebean/plugin/ExpressionPath.java index a136aaead..9b6e27cf0 100644 --- a/src/main/java/com/avaje/ebean/plugin/ExpressionPath.java +++ b/src/main/java/io/ebean/plugin/ExpressionPath.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.plugin; +package io.ebean.plugin; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.text.StringParser; +import io.ebean.bean.EntityBean; +import io.ebean.text.StringParser; /** * A dot notation expression path. diff --git a/src/main/java/com/avaje/ebean/plugin/ExtraTypeFactory.java b/src/main/java/io/ebean/plugin/ExtraTypeFactory.java similarity index 66% rename from src/main/java/com/avaje/ebean/plugin/ExtraTypeFactory.java rename to src/main/java/io/ebean/plugin/ExtraTypeFactory.java index 9ea259668..f50fd0fc1 100644 --- a/src/main/java/com/avaje/ebean/plugin/ExtraTypeFactory.java +++ b/src/main/java/io/ebean/plugin/ExtraTypeFactory.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.plugin; +package io.ebean.plugin; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebeaninternal.server.type.ScalarType; +import io.ebean.config.ServerConfig; +import io.ebeaninternal.server.type.ScalarType; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/plugin/Plugin.java b/src/main/java/io/ebean/plugin/Plugin.java similarity index 94% rename from src/main/java/com/avaje/ebean/plugin/Plugin.java rename to src/main/java/io/ebean/plugin/Plugin.java index 4fa8fe49d..d2107bdf9 100644 --- a/src/main/java/com/avaje/ebean/plugin/Plugin.java +++ b/src/main/java/io/ebean/plugin/Plugin.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.plugin; +package io.ebean.plugin; /** * A 'plugin' that wants to be configured on startup so it can use features of the EbeanServer itself. diff --git a/src/main/java/com/avaje/ebean/plugin/Property.java b/src/main/java/io/ebean/plugin/Property.java similarity index 91% rename from src/main/java/com/avaje/ebean/plugin/Property.java rename to src/main/java/io/ebean/plugin/Property.java index e8b45a3fb..e3e9d2c3e 100644 --- a/src/main/java/com/avaje/ebean/plugin/Property.java +++ b/src/main/java/io/ebean/plugin/Property.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.plugin; +package io.ebean.plugin; /** * Property of a entity bean that can be read. diff --git a/src/main/java/com/avaje/ebean/plugin/SpiServer.java b/src/main/java/io/ebean/plugin/SpiServer.java similarity index 85% rename from src/main/java/com/avaje/ebean/plugin/SpiServer.java rename to src/main/java/io/ebean/plugin/SpiServer.java index e93de0eb8..956275646 100644 --- a/src/main/java/com/avaje/ebean/plugin/SpiServer.java +++ b/src/main/java/io/ebean/plugin/SpiServer.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.plugin; +package io.ebean.plugin; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.EbeanServer; +import io.ebean.config.ServerConfig; +import io.ebean.config.dbplatform.DatabasePlatform; import javax.sql.DataSource; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/plugin/package-info.java b/src/main/java/io/ebean/plugin/package-info.java similarity index 85% rename from src/main/java/com/avaje/ebean/plugin/package-info.java rename to src/main/java/io/ebean/plugin/package-info.java index 385ba5c74..b541d543e 100644 --- a/src/main/java/com/avaje/ebean/plugin/package-info.java +++ b/src/main/java/io/ebean/plugin/package-info.java @@ -5,4 +5,4 @@ * functionality of the EbeanServer. *

*/ -package com.avaje.ebean.plugin; \ No newline at end of file +package io.ebean.plugin; diff --git a/src/main/java/com/avaje/ebean/search/AbstractMatch.java b/src/main/java/io/ebean/search/AbstractMatch.java similarity index 97% rename from src/main/java/com/avaje/ebean/search/AbstractMatch.java rename to src/main/java/io/ebean/search/AbstractMatch.java index ec019d502..1f922701b 100644 --- a/src/main/java/com/avaje/ebean/search/AbstractMatch.java +++ b/src/main/java/io/ebean/search/AbstractMatch.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.search; +package io.ebean.search; /** * Options for the text match and multi match expressions. diff --git a/src/main/java/com/avaje/ebean/search/Match.java b/src/main/java/io/ebean/search/Match.java similarity index 98% rename from src/main/java/com/avaje/ebean/search/Match.java rename to src/main/java/io/ebean/search/Match.java index a5a23f18d..3ca4a5da8 100644 --- a/src/main/java/com/avaje/ebean/search/Match.java +++ b/src/main/java/io/ebean/search/Match.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.search; +package io.ebean.search; /** * Options for the text match expression. diff --git a/src/main/java/com/avaje/ebean/search/MultiMatch.java b/src/main/java/io/ebean/search/MultiMatch.java similarity index 98% rename from src/main/java/com/avaje/ebean/search/MultiMatch.java rename to src/main/java/io/ebean/search/MultiMatch.java index eed065a70..0293b5947 100644 --- a/src/main/java/com/avaje/ebean/search/MultiMatch.java +++ b/src/main/java/io/ebean/search/MultiMatch.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.search; +package io.ebean.search; /** * Options for the text match expression. diff --git a/src/main/java/com/avaje/ebean/search/TextCommonTerms.java b/src/main/java/io/ebean/search/TextCommonTerms.java similarity index 98% rename from src/main/java/com/avaje/ebean/search/TextCommonTerms.java rename to src/main/java/io/ebean/search/TextCommonTerms.java index 36d50fd29..cb0320bad 100644 --- a/src/main/java/com/avaje/ebean/search/TextCommonTerms.java +++ b/src/main/java/io/ebean/search/TextCommonTerms.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.search; +package io.ebean.search; /** * Text common terms query. diff --git a/src/main/java/com/avaje/ebean/search/TextQueryString.java b/src/main/java/io/ebean/search/TextQueryString.java similarity index 99% rename from src/main/java/com/avaje/ebean/search/TextQueryString.java rename to src/main/java/io/ebean/search/TextQueryString.java index b5e3c5324..cb8b27508 100644 --- a/src/main/java/com/avaje/ebean/search/TextQueryString.java +++ b/src/main/java/io/ebean/search/TextQueryString.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.search; +package io.ebean.search; /** * Text query string options. diff --git a/src/main/java/com/avaje/ebean/search/TextSimple.java b/src/main/java/io/ebean/search/TextSimple.java similarity index 99% rename from src/main/java/com/avaje/ebean/search/TextSimple.java rename to src/main/java/io/ebean/search/TextSimple.java index 995f800f1..197acd4ed 100644 --- a/src/main/java/com/avaje/ebean/search/TextSimple.java +++ b/src/main/java/io/ebean/search/TextSimple.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.search; +package io.ebean.search; /** * Simple text query options. diff --git a/src/main/java/com/avaje/ebean/search/package-info.java b/src/main/java/io/ebean/search/package-info.java similarity index 71% rename from src/main/java/com/avaje/ebean/search/package-info.java rename to src/main/java/io/ebean/search/package-info.java index b97ec16d6..1fab5cb0a 100644 --- a/src/main/java/com/avaje/ebean/search/package-info.java +++ b/src/main/java/io/ebean/search/package-info.java @@ -1,4 +1,4 @@ /** * Provides text search expressions like Match, TextQueryString etc. */ -package com.avaje.ebean.search; \ No newline at end of file +package io.ebean.search; diff --git a/src/main/java/com/avaje/ebean/stylesheet.css b/src/main/java/io/ebean/stylesheet.css similarity index 100% rename from src/main/java/com/avaje/ebean/stylesheet.css rename to src/main/java/io/ebean/stylesheet.css diff --git a/src/main/java/com/avaje/ebean/text/PathProperties.java b/src/main/java/io/ebean/text/PathProperties.java similarity index 97% rename from src/main/java/com/avaje/ebean/text/PathProperties.java rename to src/main/java/io/ebean/text/PathProperties.java index 9944f2a8b..642704cdb 100644 --- a/src/main/java/com/avaje/ebean/text/PathProperties.java +++ b/src/main/java/io/ebean/text/PathProperties.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.text; +package io.ebean.text; -import com.avaje.ebean.FetchPath; -import com.avaje.ebean.Query; -import com.avaje.ebeaninternal.server.query.SplitName; +import io.ebean.FetchPath; +import io.ebean.Query; +import io.ebeaninternal.server.query.SplitName; import java.util.Collection; import java.util.Iterator; diff --git a/src/main/java/com/avaje/ebean/text/PathPropertiesParser.java b/src/main/java/io/ebean/text/PathPropertiesParser.java similarity index 98% rename from src/main/java/com/avaje/ebean/text/PathPropertiesParser.java rename to src/main/java/io/ebean/text/PathPropertiesParser.java index 3b0edb941..6655122d1 100644 --- a/src/main/java/com/avaje/ebean/text/PathPropertiesParser.java +++ b/src/main/java/io/ebean/text/PathPropertiesParser.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.text; +package io.ebean.text; /** * Parses Uri segments like :(id,name,shippingAddress(*),contacts(*)) so that diff --git a/src/main/java/com/avaje/ebean/text/StringFormatter.java b/src/main/java/io/ebean/text/StringFormatter.java similarity index 89% rename from src/main/java/com/avaje/ebean/text/StringFormatter.java rename to src/main/java/io/ebean/text/StringFormatter.java index 82585a3e7..a7aa2631b 100644 --- a/src/main/java/com/avaje/ebean/text/StringFormatter.java +++ b/src/main/java/io/ebean/text/StringFormatter.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.text; +package io.ebean.text; /** * Convert an Object value into a String value. diff --git a/src/main/java/com/avaje/ebean/text/StringParser.java b/src/main/java/io/ebean/text/StringParser.java similarity index 89% rename from src/main/java/com/avaje/ebean/text/StringParser.java rename to src/main/java/io/ebean/text/StringParser.java index 41784dc21..f76421944 100644 --- a/src/main/java/com/avaje/ebean/text/StringParser.java +++ b/src/main/java/io/ebean/text/StringParser.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.text; +package io.ebean.text; /** * Convert a String value into an Object value. diff --git a/src/main/java/com/avaje/ebean/text/TextException.java b/src/main/java/io/ebean/text/TextException.java similarity index 94% rename from src/main/java/com/avaje/ebean/text/TextException.java rename to src/main/java/io/ebean/text/TextException.java index 9b0953407..e5036e112 100644 --- a/src/main/java/com/avaje/ebean/text/TextException.java +++ b/src/main/java/io/ebean/text/TextException.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.text; +package io.ebean.text; /** * An exception occurred typically in processing CSV, JSON or XML. diff --git a/src/main/java/com/avaje/ebean/text/TimeStringParser.java b/src/main/java/io/ebean/text/TimeStringParser.java similarity index 97% rename from src/main/java/com/avaje/ebean/text/TimeStringParser.java rename to src/main/java/io/ebean/text/TimeStringParser.java index 087136bce..fa185eafb 100644 --- a/src/main/java/com/avaje/ebean/text/TimeStringParser.java +++ b/src/main/java/io/ebean/text/TimeStringParser.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.text; +package io.ebean.text; import java.sql.Time; diff --git a/src/main/java/com/avaje/ebean/text/csv/CsvCallback.java b/src/main/java/io/ebean/text/csv/CsvCallback.java similarity index 96% rename from src/main/java/com/avaje/ebean/text/csv/CsvCallback.java rename to src/main/java/io/ebean/text/csv/CsvCallback.java index d91d942bc..749ae51d9 100644 --- a/src/main/java/com/avaje/ebean/text/csv/CsvCallback.java +++ b/src/main/java/io/ebean/text/csv/CsvCallback.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.text.csv; +package io.ebean.text.csv; -import com.avaje.ebean.EbeanServer; +import io.ebean.EbeanServer; /** * Provides callback methods for customisation of CSV processing. diff --git a/src/main/java/com/avaje/ebean/text/csv/CsvReader.java b/src/main/java/io/ebean/text/csv/CsvReader.java similarity index 98% rename from src/main/java/com/avaje/ebean/text/csv/CsvReader.java rename to src/main/java/io/ebean/text/csv/CsvReader.java index 7b707277c..cff4a49d0 100644 --- a/src/main/java/com/avaje/ebean/text/csv/CsvReader.java +++ b/src/main/java/io/ebean/text/csv/CsvReader.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.text.csv; +package io.ebean.text.csv; -import com.avaje.ebean.text.StringParser; +import io.ebean.text.StringParser; import java.io.Reader; import java.util.Locale; diff --git a/src/main/java/com/avaje/ebean/text/csv/DefaultCsvCallback.java b/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java similarity index 97% rename from src/main/java/com/avaje/ebean/text/csv/DefaultCsvCallback.java rename to src/main/java/io/ebean/text/csv/DefaultCsvCallback.java index 20b7d7ba2..13e7f5f0e 100644 --- a/src/main/java/com/avaje/ebean/text/csv/DefaultCsvCallback.java +++ b/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.text.csv; +package io.ebean.text.csv; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Transaction; +import io.ebean.EbeanServer; +import io.ebean.Transaction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebean/text/csv/package-info.java b/src/main/java/io/ebean/text/csv/package-info.java similarity index 51% rename from src/main/java/com/avaje/ebean/text/csv/package-info.java rename to src/main/java/io/ebean/text/csv/package-info.java index 3ea1e3d80..a14c9b1df 100644 --- a/src/main/java/com/avaje/ebean/text/csv/package-info.java +++ b/src/main/java/io/ebean/text/csv/package-info.java @@ -1,4 +1,4 @@ /** * CSV processing objects. */ -package com.avaje.ebean.text.csv; \ No newline at end of file +package io.ebean.text.csv; diff --git a/src/main/java/com/avaje/ebean/text/json/EJson.java b/src/main/java/io/ebean/text/json/EJson.java similarity index 98% rename from src/main/java/com/avaje/ebean/text/json/EJson.java rename to src/main/java/io/ebean/text/json/EJson.java index f915f8244..bc81a105f 100644 --- a/src/main/java/com/avaje/ebean/text/json/EJson.java +++ b/src/main/java/io/ebean/text/json/EJson.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.text.json; +package io.ebean.text.json; -import com.avaje.ebeaninternal.server.type.ModifyAwareList; +import io.ebeaninternal.server.type.ModifyAwareList; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; diff --git a/src/main/java/com/avaje/ebean/text/json/EJsonReader.java b/src/main/java/io/ebean/text/json/EJsonReader.java similarity index 96% rename from src/main/java/com/avaje/ebean/text/json/EJsonReader.java rename to src/main/java/io/ebean/text/json/EJsonReader.java index c52230926..edf6652b6 100644 --- a/src/main/java/com/avaje/ebean/text/json/EJsonReader.java +++ b/src/main/java/io/ebean/text/json/EJsonReader.java @@ -1,9 +1,9 @@ -package com.avaje.ebean.text.json; +package io.ebean.text.json; -import com.avaje.ebeaninternal.server.type.ModifyAwareFlag; -import com.avaje.ebeaninternal.server.type.ModifyAwareList; -import com.avaje.ebeaninternal.server.type.ModifyAwareMap; -import com.avaje.ebeaninternal.server.type.ModifyAwareOwner; +import io.ebeaninternal.server.type.ModifyAwareFlag; +import io.ebeaninternal.server.type.ModifyAwareList; +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 com.fasterxml.jackson.core.JsonToken; diff --git a/src/main/java/com/avaje/ebean/text/json/EJsonWriter.java b/src/main/java/io/ebean/text/json/EJsonWriter.java similarity index 99% rename from src/main/java/com/avaje/ebean/text/json/EJsonWriter.java rename to src/main/java/io/ebean/text/json/EJsonWriter.java index 908f8c987..fb548c460 100644 --- a/src/main/java/com/avaje/ebean/text/json/EJsonWriter.java +++ b/src/main/java/io/ebean/text/json/EJsonWriter.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.text.json; +package io.ebean.text.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/src/main/java/com/avaje/ebean/text/json/JsonBeanReader.java b/src/main/java/io/ebean/text/json/JsonBeanReader.java similarity index 91% rename from src/main/java/com/avaje/ebean/text/json/JsonBeanReader.java rename to src/main/java/io/ebean/text/json/JsonBeanReader.java index 17a4eb027..6765fd081 100644 --- a/src/main/java/com/avaje/ebean/text/json/JsonBeanReader.java +++ b/src/main/java/io/ebean/text/json/JsonBeanReader.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.text.json; +package io.ebean.text.json; -import com.avaje.ebean.bean.PersistenceContext; +import io.ebean.bean.PersistenceContext; import com.fasterxml.jackson.core.JsonParser; /** diff --git a/src/main/java/com/avaje/ebean/text/json/JsonContext.java b/src/main/java/io/ebean/text/json/JsonContext.java similarity index 98% rename from src/main/java/com/avaje/ebean/text/json/JsonContext.java rename to src/main/java/io/ebean/text/json/JsonContext.java index 71d86e2b0..53a523275 100644 --- a/src/main/java/com/avaje/ebean/text/json/JsonContext.java +++ b/src/main/java/io/ebean/text/json/JsonContext.java @@ -1,7 +1,7 @@ -package com.avaje.ebean.text.json; +package io.ebean.text.json; -import com.avaje.ebean.FetchPath; -import com.avaje.ebean.plugin.BeanType; +import io.ebean.FetchPath; +import io.ebean.plugin.BeanType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebean/text/json/JsonIOException.java b/src/main/java/io/ebean/text/json/JsonIOException.java similarity index 93% rename from src/main/java/com/avaje/ebean/text/json/JsonIOException.java rename to src/main/java/io/ebean/text/json/JsonIOException.java index 58f0a46eb..430cad2fb 100644 --- a/src/main/java/com/avaje/ebean/text/json/JsonIOException.java +++ b/src/main/java/io/ebean/text/json/JsonIOException.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.text.json; +package io.ebean.text.json; /** * Unchecked exception thrown when an IOException occurs in json processing. diff --git a/src/main/java/com/avaje/ebean/text/json/JsonReadBeanVisitor.java b/src/main/java/io/ebean/text/json/JsonReadBeanVisitor.java similarity index 95% rename from src/main/java/com/avaje/ebean/text/json/JsonReadBeanVisitor.java rename to src/main/java/io/ebean/text/json/JsonReadBeanVisitor.java index 5d5b63dc3..75552bcb5 100644 --- a/src/main/java/com/avaje/ebean/text/json/JsonReadBeanVisitor.java +++ b/src/main/java/io/ebean/text/json/JsonReadBeanVisitor.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.text.json; +package io.ebean.text.json; import java.util.Map; @@ -27,4 +27,4 @@ public interface JsonReadBeanVisitor { */ void visit(T bean, Map unmapped); -} \ No newline at end of file +} diff --git a/src/main/java/com/avaje/ebean/text/json/JsonReadOptions.java b/src/main/java/io/ebean/text/json/JsonReadOptions.java similarity index 97% rename from src/main/java/com/avaje/ebean/text/json/JsonReadOptions.java rename to src/main/java/io/ebean/text/json/JsonReadOptions.java index 6864302c6..08a071217 100644 --- a/src/main/java/com/avaje/ebean/text/json/JsonReadOptions.java +++ b/src/main/java/io/ebean/text/json/JsonReadOptions.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.text.json; +package io.ebean.text.json; -import com.avaje.ebean.bean.PersistenceContext; +import io.ebean.bean.PersistenceContext; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/com/avaje/ebean/text/json/JsonWriteBeanVisitor.java b/src/main/java/io/ebean/text/json/JsonWriteBeanVisitor.java similarity index 95% rename from src/main/java/com/avaje/ebean/text/json/JsonWriteBeanVisitor.java rename to src/main/java/io/ebean/text/json/JsonWriteBeanVisitor.java index c84b62829..05a3102d6 100644 --- a/src/main/java/com/avaje/ebean/text/json/JsonWriteBeanVisitor.java +++ b/src/main/java/io/ebean/text/json/JsonWriteBeanVisitor.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.text.json; +package io.ebean.text.json; /** * Allows for customising the JSON write processing. diff --git a/src/main/java/com/avaje/ebean/text/json/JsonWriteOptions.java b/src/main/java/io/ebean/text/json/JsonWriteOptions.java similarity index 92% rename from src/main/java/com/avaje/ebean/text/json/JsonWriteOptions.java rename to src/main/java/io/ebean/text/json/JsonWriteOptions.java index 5c80e0c43..0ae713c93 100644 --- a/src/main/java/com/avaje/ebean/text/json/JsonWriteOptions.java +++ b/src/main/java/io/ebean/text/json/JsonWriteOptions.java @@ -1,8 +1,8 @@ -package com.avaje.ebean.text.json; +package io.ebean.text.json; -import com.avaje.ebean.FetchPath; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebean.text.PathProperties; +import io.ebean.FetchPath; +import io.ebean.config.JsonConfig; +import io.ebean.text.PathProperties; import java.util.HashMap; import java.util.Map; @@ -29,7 +29,7 @@ public class JsonWriteOptions { * (a,b,c(d,e),f(g)) where "c" is a path containing "d" and "e" and "f" is a * path containing "g" and the root path contains "a","b","c" and "f". * - * @see com.avaje.ebean.text.PathProperties#parse(String) + * @see io.ebean.text.PathProperties#parse(String) */ public static JsonWriteOptions parsePath(String pathProperties) { diff --git a/src/main/java/com/avaje/ebean/text/json/JsonWriter.java b/src/main/java/io/ebean/text/json/JsonWriter.java similarity index 99% rename from src/main/java/com/avaje/ebean/text/json/JsonWriter.java rename to src/main/java/io/ebean/text/json/JsonWriter.java index 9c0e3df46..baed9a9cb 100644 --- a/src/main/java/com/avaje/ebean/text/json/JsonWriter.java +++ b/src/main/java/io/ebean/text/json/JsonWriter.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.text.json; +package io.ebean.text.json; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/src/main/java/com/avaje/ebean/text/json/package-info.java b/src/main/java/io/ebean/text/json/package-info.java similarity index 95% rename from src/main/java/com/avaje/ebean/text/json/package-info.java rename to src/main/java/io/ebean/text/json/package-info.java index 0c1ea677d..a5033072f 100644 --- a/src/main/java/com/avaje/ebean/text/json/package-info.java +++ b/src/main/java/io/ebean/text/json/package-info.java @@ -25,4 +25,4 @@ * * } */ -package com.avaje.ebean.text.json; +package io.ebean.text.json; diff --git a/src/main/java/com/avaje/ebean/text/package-info.java b/src/main/java/io/ebean/text/package-info.java similarity index 67% rename from src/main/java/com/avaje/ebean/text/package-info.java rename to src/main/java/io/ebean/text/package-info.java index 8573f43f9..9719966d8 100644 --- a/src/main/java/com/avaje/ebean/text/package-info.java +++ b/src/main/java/io/ebean/text/package-info.java @@ -1,4 +1,4 @@ /** * Utility objects for CSV, JSON and XML processing. */ -package com.avaje.ebean.text; \ No newline at end of file +package io.ebean.text; diff --git a/src/main/java/com/avaje/ebean/util/CamelCaseHelper.java b/src/main/java/io/ebean/util/CamelCaseHelper.java similarity index 95% rename from src/main/java/com/avaje/ebean/util/CamelCaseHelper.java rename to src/main/java/io/ebean/util/CamelCaseHelper.java index 4a73ffbb0..42ed0d0de 100644 --- a/src/main/java/com/avaje/ebean/util/CamelCaseHelper.java +++ b/src/main/java/io/ebean/util/CamelCaseHelper.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.util; +package io.ebean.util; public class CamelCaseHelper { diff --git a/src/main/java/com/avaje/ebean/util/ClassUtil.java b/src/main/java/io/ebean/util/ClassUtil.java similarity index 98% rename from src/main/java/com/avaje/ebean/util/ClassUtil.java rename to src/main/java/io/ebean/util/ClassUtil.java index 300145bb6..7886c11a7 100644 --- a/src/main/java/com/avaje/ebean/util/ClassUtil.java +++ b/src/main/java/io/ebean/util/ClassUtil.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.util; +package io.ebean.util; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/src/main/java/com/avaje/ebean/util/StringHelper.java b/src/main/java/io/ebean/util/StringHelper.java similarity index 99% rename from src/main/java/com/avaje/ebean/util/StringHelper.java rename to src/main/java/io/ebean/util/StringHelper.java index 384defbc4..530c9350c 100644 --- a/src/main/java/com/avaje/ebean/util/StringHelper.java +++ b/src/main/java/io/ebean/util/StringHelper.java @@ -1,4 +1,4 @@ -package com.avaje.ebean.util; +package io.ebean.util; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/avaje/ebeaninternal/api/BeanIdList.java b/src/main/java/io/ebeaninternal/api/BeanIdList.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/api/BeanIdList.java rename to src/main/java/io/ebeaninternal/api/BeanIdList.java index 95d82e27e..1b635b8b8 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/BeanIdList.java +++ b/src/main/java/io/ebeaninternal/api/BeanIdList.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/api/BindParams.java b/src/main/java/io/ebeaninternal/api/BindParams.java similarity index 99% rename from src/main/java/com/avaje/ebeaninternal/api/BindParams.java rename to src/main/java/io/ebeaninternal/api/BindParams.java index a3c8023b7..9b848bc3c 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/BindParams.java +++ b/src/main/java/io/ebeaninternal/api/BindParams.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebeaninternal.server.querydefn.NaturalKeyBindParam; +import io.ebeaninternal.server.querydefn.NaturalKeyBindParam; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeaninternal/api/CQueryPlanKey.java b/src/main/java/io/ebeaninternal/api/CQueryPlanKey.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/api/CQueryPlanKey.java rename to src/main/java/io/ebeaninternal/api/CQueryPlanKey.java index b169dca82..54de71025 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/CQueryPlanKey.java +++ b/src/main/java/io/ebeaninternal/api/CQueryPlanKey.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; /** * Key used for caching query plans for ORM and RawSql queries. diff --git a/src/main/java/com/avaje/ebeaninternal/api/ClassUtil.java b/src/main/java/io/ebeaninternal/api/ClassUtil.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/api/ClassUtil.java rename to src/main/java/io/ebeaninternal/api/ClassUtil.java index aac90be4c..cafd39c16 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/ClassUtil.java +++ b/src/main/java/io/ebeaninternal/api/ClassUtil.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; /** diff --git a/src/main/java/com/avaje/ebeaninternal/api/ConcurrencyMode.java b/src/main/java/io/ebeaninternal/api/ConcurrencyMode.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/api/ConcurrencyMode.java rename to src/main/java/io/ebeaninternal/api/ConcurrencyMode.java index 5de101008..043a2ade2 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/ConcurrencyMode.java +++ b/src/main/java/io/ebeaninternal/api/ConcurrencyMode.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; /** * Optimistic concurrency mode used for updates and deletes. diff --git a/src/main/java/com/avaje/ebeaninternal/api/HashQuery.java b/src/main/java/io/ebeaninternal/api/HashQuery.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/api/HashQuery.java rename to src/main/java/io/ebeaninternal/api/HashQuery.java index 92ef0700c..e58ff8226 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/HashQuery.java +++ b/src/main/java/io/ebeaninternal/api/HashQuery.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; /** * A hash key for a query including both the query plan and bind values. diff --git a/src/main/java/com/avaje/ebeaninternal/api/HashQueryPlan.java b/src/main/java/io/ebeaninternal/api/HashQueryPlan.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/api/HashQueryPlan.java rename to src/main/java/io/ebeaninternal/api/HashQueryPlan.java index efa7bdc37..879592088 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/HashQueryPlan.java +++ b/src/main/java/io/ebeaninternal/api/HashQueryPlan.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; /** * A hash for a query plan. diff --git a/src/main/java/com/avaje/ebeaninternal/api/HashQueryPlanBuilder.java b/src/main/java/io/ebeaninternal/api/HashQueryPlanBuilder.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/api/HashQueryPlanBuilder.java rename to src/main/java/io/ebeaninternal/api/HashQueryPlanBuilder.java index e55962625..be337d202 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/HashQueryPlanBuilder.java +++ b/src/main/java/io/ebeaninternal/api/HashQueryPlanBuilder.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; import java.util.Set; diff --git a/src/main/java/com/avaje/ebeaninternal/api/HelpScopeTrans.java b/src/main/java/io/ebeaninternal/api/HelpScopeTrans.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/api/HelpScopeTrans.java rename to src/main/java/io/ebeaninternal/api/HelpScopeTrans.java index 2c7978171..882a622c5 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/HelpScopeTrans.java +++ b/src/main/java/io/ebeaninternal/api/HelpScopeTrans.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.TxScope; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.TxScope; /** * Helper object to make AOP generated code simpler. diff --git a/src/main/java/com/avaje/ebeaninternal/api/LoadBeanBuffer.java b/src/main/java/io/ebeaninternal/api/LoadBeanBuffer.java similarity index 66% rename from src/main/java/com/avaje/ebeaninternal/api/LoadBeanBuffer.java rename to src/main/java/io/ebeaninternal/api/LoadBeanBuffer.java index 4a90fefa9..346da41fd 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/LoadBeanBuffer.java +++ b/src/main/java/io/ebeaninternal/api/LoadBeanBuffer.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/api/LoadBeanContext.java b/src/main/java/io/ebeaninternal/api/LoadBeanContext.java similarity index 79% rename from src/main/java/com/avaje/ebeaninternal/api/LoadBeanContext.java rename to src/main/java/io/ebeaninternal/api/LoadBeanContext.java index 65c9b0ffc..b24055765 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/LoadBeanContext.java +++ b/src/main/java/io/ebeaninternal/api/LoadBeanContext.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; /** diff --git a/src/main/java/com/avaje/ebeaninternal/api/LoadBeanRequest.java b/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/api/LoadBeanRequest.java rename to src/main/java/io/ebeaninternal/api/LoadBeanRequest.java index 09e796aac..eaa2acb49 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/LoadBeanRequest.java +++ b/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/api/LoadContext.java b/src/main/java/io/ebeaninternal/api/LoadContext.java similarity index 82% rename from src/main/java/com/avaje/ebeaninternal/api/LoadContext.java rename to src/main/java/io/ebeaninternal/api/LoadContext.java index beac37864..1703581ea 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/LoadContext.java +++ b/src/main/java/io/ebeaninternal/api/LoadContext.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebean.bean.ObjectGraphNode; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.bean.ObjectGraphNode; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.server.core.OrmQueryRequest; /** * Controls the loading of reference objects for a query instance. diff --git a/src/main/java/com/avaje/ebeaninternal/api/LoadManyBuffer.java b/src/main/java/io/ebeaninternal/api/LoadManyBuffer.java similarity index 61% rename from src/main/java/com/avaje/ebeaninternal/api/LoadManyBuffer.java rename to src/main/java/io/ebeaninternal/api/LoadManyBuffer.java index f8d1a1ce3..5fa30220e 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/LoadManyBuffer.java +++ b/src/main/java/io/ebeaninternal/api/LoadManyBuffer.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.ObjectGraphNode; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.ObjectGraphNode; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/api/LoadManyContext.java b/src/main/java/io/ebeaninternal/api/LoadManyContext.java similarity index 79% rename from src/main/java/com/avaje/ebeaninternal/api/LoadManyContext.java rename to src/main/java/io/ebeaninternal/api/LoadManyContext.java index dd64d2bd9..d496e1567 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/LoadManyContext.java +++ b/src/main/java/io/ebeaninternal/api/LoadManyContext.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; /** diff --git a/src/main/java/com/avaje/ebeaninternal/api/LoadManyRequest.java b/src/main/java/io/ebeaninternal/api/LoadManyRequest.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/api/LoadManyRequest.java rename to src/main/java/io/ebeaninternal/api/LoadManyRequest.java index 281939151..4ce9f174c 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/LoadManyRequest.java +++ b/src/main/java/io/ebeaninternal/api/LoadManyRequest.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.lib.util.StringHelper; +import io.ebean.EbeanServer; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.lib.util.StringHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/api/LoadRequest.java b/src/main/java/io/ebeaninternal/api/LoadRequest.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/api/LoadRequest.java rename to src/main/java/io/ebeaninternal/api/LoadRequest.java index 4220a28f3..528b6407a 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/LoadRequest.java +++ b/src/main/java/io/ebeaninternal/api/LoadRequest.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.Transaction; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; +import io.ebean.Transaction; +import io.ebeaninternal.server.core.OrmQueryRequest; /** * Request for loading Associated One Beans. diff --git a/src/main/java/com/avaje/ebeaninternal/api/LoadSecondaryQuery.java b/src/main/java/io/ebeaninternal/api/LoadSecondaryQuery.java similarity index 79% rename from src/main/java/com/avaje/ebeaninternal/api/LoadSecondaryQuery.java rename to src/main/java/io/ebeaninternal/api/LoadSecondaryQuery.java index 317409f45..0417d0463 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/LoadSecondaryQuery.java +++ b/src/main/java/io/ebeaninternal/api/LoadSecondaryQuery.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.core.OrmQueryRequest; /** * Defines the method for executing secondary queries. diff --git a/src/main/java/com/avaje/ebeaninternal/api/ManyWhereJoins.java b/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/api/ManyWhereJoins.java rename to src/main/java/io/ebeaninternal/api/ManyWhereJoins.java index 41b9f9540..e174876be 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/ManyWhereJoins.java +++ b/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.el.ElPropertyDeploy; -import com.avaje.ebeaninternal.server.query.SplitName; -import com.avaje.ebeaninternal.server.query.SqlJoinType; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.el.ElPropertyDeploy; +import io.ebeaninternal.server.query.SplitName; +import io.ebeaninternal.server.query.SqlJoinType; import java.io.Serializable; import java.util.Collection; diff --git a/src/main/java/com/avaje/ebeaninternal/api/Monitor.java b/src/main/java/io/ebeaninternal/api/Monitor.java similarity index 85% rename from src/main/java/com/avaje/ebeaninternal/api/Monitor.java rename to src/main/java/io/ebeaninternal/api/Monitor.java index 86aac0370..e1b930769 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/Monitor.java +++ b/src/main/java/io/ebeaninternal/api/Monitor.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; import java.io.Serializable; diff --git a/src/main/java/com/avaje/ebeaninternal/api/PropertyJoin.java b/src/main/java/io/ebeaninternal/api/PropertyJoin.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/api/PropertyJoin.java rename to src/main/java/io/ebeaninternal/api/PropertyJoin.java index 0b9338ed9..2b11732b0 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/PropertyJoin.java +++ b/src/main/java/io/ebeaninternal/api/PropertyJoin.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebeaninternal.server.query.SqlJoinType; +import io.ebeaninternal.server.query.SqlJoinType; /** * Represents a join required for a given property and whether than needs to be an outer join. diff --git a/src/main/java/com/avaje/ebeaninternal/api/ScopeTrans.java b/src/main/java/io/ebeaninternal/api/ScopeTrans.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/api/ScopeTrans.java rename to src/main/java/io/ebeaninternal/api/ScopeTrans.java index 734099800..0f4f1f390 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/ScopeTrans.java +++ b/src/main/java/io/ebeaninternal/api/ScopeTrans.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.TxScope; -import com.avaje.ebean.config.PersistBatch; +import io.ebean.TxScope; +import io.ebean.PersistBatch; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java rename to src/main/java/io/ebeaninternal/api/ScopedTransaction.java index 8351f8efc..e25ccd76f 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java +++ b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java @@ -1,16 +1,16 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.TransactionCallback; -import com.avaje.ebean.annotation.DocStoreMode; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebean.config.PersistBatch; -import com.avaje.ebean.event.changelog.BeanChange; -import com.avaje.ebean.event.changelog.ChangeSet; -import com.avaje.ebeaninternal.server.core.PersistDeferredRelationship; -import com.avaje.ebeaninternal.server.core.PersistRequest; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.persist.BatchControl; -import com.avaje.ebeanservice.docstore.api.DocStoreTransaction; +import io.ebean.TransactionCallback; +import io.ebean.annotation.DocStoreMode; +import io.ebean.bean.PersistenceContext; +import io.ebean.PersistBatch; +import io.ebean.event.changelog.BeanChange; +import io.ebean.event.changelog.ChangeSet; +import io.ebeaninternal.server.core.PersistDeferredRelationship; +import io.ebeaninternal.server.core.PersistRequest; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.persist.BatchControl; +import io.ebeanservice.docstore.api.DocStoreTransaction; import javax.persistence.PersistenceException; import javax.persistence.RollbackException; diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiBackgroundExecutor.java b/src/main/java/io/ebeaninternal/api/SpiBackgroundExecutor.java similarity index 72% rename from src/main/java/com/avaje/ebeaninternal/api/SpiBackgroundExecutor.java rename to src/main/java/io/ebeaninternal/api/SpiBackgroundExecutor.java index 3619b9349..8bd813af6 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiBackgroundExecutor.java +++ b/src/main/java/io/ebeaninternal/api/SpiBackgroundExecutor.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.BackgroundExecutor; +import io.ebean.BackgroundExecutor; /** * Internal Extension to BackgroundExecutor with shutdown. diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiCallableSql.java b/src/main/java/io/ebeaninternal/api/SpiCallableSql.java similarity index 66% rename from src/main/java/com/avaje/ebeaninternal/api/SpiCallableSql.java rename to src/main/java/io/ebeaninternal/api/SpiCallableSql.java index 2afa43159..3ddab2b51 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiCallableSql.java +++ b/src/main/java/io/ebeaninternal/api/SpiCallableSql.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.CallableSql; +import io.ebean.CallableSql; public interface SpiCallableSql extends CallableSql { diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/api/SpiEbeanServer.java rename to src/main/java/io/ebeaninternal/api/SpiEbeanServer.java index 97d2ff8e9..5d11135c0 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiEbeanServer.java +++ b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java @@ -1,22 +1,22 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.PersistenceContextScope; -import com.avaje.ebean.Query; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.TxScope; -import com.avaje.ebean.bean.BeanCollectionLoader; -import com.avaje.ebean.bean.BeanLoader; -import com.avaje.ebean.bean.CallStack; -import com.avaje.ebean.bean.ObjectGraphNode; -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.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.EbeanServer; +import io.ebean.PersistenceContextScope; +import io.ebean.Query; +import io.ebean.Transaction; +import io.ebean.TxScope; +import io.ebean.bean.BeanCollectionLoader; +import io.ebean.bean.BeanLoader; +import io.ebean.bean.CallStack; +import io.ebean.bean.ObjectGraphNode; +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.ebeaninternal.server.core.timezone.DataTimeZone; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.query.CQuery; +import io.ebeaninternal.server.transaction.RemoteTransactionEvent; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiExpression.java b/src/main/java/io/ebeaninternal/api/SpiExpression.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/api/SpiExpression.java rename to src/main/java/io/ebeaninternal/api/SpiExpression.java index 7195d79e7..be25997e1 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiExpression.java +++ b/src/main/java/io/ebeaninternal/api/SpiExpression.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.Expression; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.expression.DocQueryContext; +import io.ebean.Expression; +import io.ebean.event.BeanQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.expression.DocQueryContext; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiExpressionFactory.java b/src/main/java/io/ebeaninternal/api/SpiExpressionFactory.java similarity index 70% rename from src/main/java/com/avaje/ebeaninternal/api/SpiExpressionFactory.java rename to src/main/java/io/ebeaninternal/api/SpiExpressionFactory.java index d56cb0225..1dfcd147a 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiExpressionFactory.java +++ b/src/main/java/io/ebeaninternal/api/SpiExpressionFactory.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.ExpressionFactory; +import io.ebean.ExpressionFactory; public interface SpiExpressionFactory extends ExpressionFactory { diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiExpressionList.java b/src/main/java/io/ebeaninternal/api/SpiExpressionList.java similarity index 82% rename from src/main/java/com/avaje/ebeaninternal/api/SpiExpressionList.java rename to src/main/java/io/ebeaninternal/api/SpiExpressionList.java index 895b81203..cc07d2787 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiExpressionList.java +++ b/src/main/java/io/ebeaninternal/api/SpiExpressionList.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.ExpressionList; -import com.avaje.ebean.Junction; -import com.avaje.ebeaninternal.server.expression.DocQueryContext; +import io.ebean.ExpressionList; +import io.ebean.Junction; +import io.ebeaninternal.server.expression.DocQueryContext; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiExpressionRequest.java b/src/main/java/io/ebeaninternal/api/SpiExpressionRequest.java similarity index 85% rename from src/main/java/com/avaje/ebeaninternal/api/SpiExpressionRequest.java rename to src/main/java/io/ebeaninternal/api/SpiExpressionRequest.java index 3e3d182df..e99c164af 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiExpressionRequest.java +++ b/src/main/java/io/ebeaninternal/api/SpiExpressionRequest.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebeaninternal.server.core.DbExpressionHandler; -import com.avaje.ebeaninternal.server.core.SpiOrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.core.DbExpressionHandler; +import io.ebeaninternal.server.core.SpiOrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiExpressionValidation.java b/src/main/java/io/ebeaninternal/api/SpiExpressionValidation.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/api/SpiExpressionValidation.java rename to src/main/java/io/ebeaninternal/api/SpiExpressionValidation.java index 1b0cdb24e..e02397a75 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiExpressionValidation.java +++ b/src/main/java/io/ebeaninternal/api/SpiExpressionValidation.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.plugin.BeanType; +import io.ebean.plugin.BeanType; import java.util.LinkedHashSet; import java.util.Set; diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiJunction.java b/src/main/java/io/ebeaninternal/api/SpiJunction.java similarity index 66% rename from src/main/java/com/avaje/ebeaninternal/api/SpiJunction.java rename to src/main/java/io/ebeaninternal/api/SpiJunction.java index e14da700e..59bc0cc06 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiJunction.java +++ b/src/main/java/io/ebeaninternal/api/SpiJunction.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.Junction; -import com.avaje.ebeaninternal.server.expression.DocQueryContext; +import io.ebean.Junction; +import io.ebeaninternal.server.expression.DocQueryContext; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiNamedParam.java b/src/main/java/io/ebeaninternal/api/SpiNamedParam.java similarity index 61% rename from src/main/java/com/avaje/ebeaninternal/api/SpiNamedParam.java rename to src/main/java/io/ebeaninternal/api/SpiNamedParam.java index 2206c5301..adde816f9 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiNamedParam.java +++ b/src/main/java/io/ebeaninternal/api/SpiNamedParam.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; public interface SpiNamedParam { diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java rename to src/main/java/io/ebeaninternal/api/SpiQuery.java index 0b0a57311..6dbff5650 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java +++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java @@ -1,24 +1,24 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.ExpressionList; -import com.avaje.ebean.OrderBy; -import com.avaje.ebean.PersistenceContextScope; -import com.avaje.ebean.Query; -import com.avaje.ebean.bean.CallStack; -import com.avaje.ebean.bean.ObjectGraphNode; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.ebean.event.readaudit.ReadEvent; -import com.avaje.ebean.plugin.BeanType; -import com.avaje.ebeaninternal.server.autotune.ProfilingListener; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.TableJoin; -import com.avaje.ebeaninternal.server.query.CancelableQuery; -import com.avaje.ebeaninternal.server.querydefn.NaturalKeyBindParam; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; -import com.avaje.ebeaninternal.server.querydefn.OrmUpdateProperties; +import io.ebean.EbeanServer; +import io.ebean.ExpressionList; +import io.ebean.OrderBy; +import io.ebean.PersistenceContextScope; +import io.ebean.Query; +import io.ebean.bean.CallStack; +import io.ebean.bean.ObjectGraphNode; +import io.ebean.bean.PersistenceContext; +import io.ebean.event.BeanQueryRequest; +import io.ebean.event.readaudit.ReadEvent; +import io.ebean.plugin.BeanType; +import io.ebeaninternal.server.autotune.ProfilingListener; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.TableJoin; +import io.ebeaninternal.server.query.CancelableQuery; +import io.ebeaninternal.server.querydefn.NaturalKeyBindParam; +import io.ebeaninternal.server.querydefn.OrmQueryDetail; +import io.ebeaninternal.server.querydefn.OrmUpdateProperties; import java.sql.Timestamp; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiQuerySecondary.java b/src/main/java/io/ebeaninternal/api/SpiQuerySecondary.java similarity index 78% rename from src/main/java/com/avaje/ebeaninternal/api/SpiQuerySecondary.java rename to src/main/java/io/ebeaninternal/api/SpiQuerySecondary.java index 172ea4270..f4156c8ff 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiQuerySecondary.java +++ b/src/main/java/io/ebeaninternal/api/SpiQuerySecondary.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryProperties; +import io.ebeaninternal.server.querydefn.OrmQueryProperties; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiSqlQuery.java b/src/main/java/io/ebeaninternal/api/SpiSqlQuery.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/api/SpiSqlQuery.java rename to src/main/java/io/ebeaninternal/api/SpiSqlQuery.java index 99c81f2ec..b296badcd 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiSqlQuery.java +++ b/src/main/java/io/ebeaninternal/api/SpiSqlQuery.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.SqlQuery; +import io.ebean.SqlQuery; /** * SQL query - Internal extension to SqlQuery. diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiSqlUpdate.java b/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java similarity index 63% rename from src/main/java/com/avaje/ebeaninternal/api/SpiSqlUpdate.java rename to src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java index b19ce0b9d..d9da393c8 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiSqlUpdate.java +++ b/src/main/java/io/ebeaninternal/api/SpiSqlUpdate.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.SqlUpdate; +import io.ebean.SqlUpdate; public interface SpiSqlUpdate extends SqlUpdate { diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiTransaction.java b/src/main/java/io/ebeaninternal/api/SpiTransaction.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/api/SpiTransaction.java rename to src/main/java/io/ebeaninternal/api/SpiTransaction.java index a06f4bf02..ff51ec278 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiTransaction.java +++ b/src/main/java/io/ebeaninternal/api/SpiTransaction.java @@ -1,15 +1,15 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.annotation.DocStoreMode; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebean.event.changelog.BeanChange; -import com.avaje.ebean.event.changelog.ChangeSet; -import com.avaje.ebeaninternal.server.core.PersistDeferredRelationship; -import com.avaje.ebeaninternal.server.core.PersistRequest; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.persist.BatchControl; -import com.avaje.ebeanservice.docstore.api.DocStoreTransaction; +import io.ebean.Transaction; +import io.ebean.annotation.DocStoreMode; +import io.ebean.bean.PersistenceContext; +import io.ebean.event.changelog.BeanChange; +import io.ebean.event.changelog.ChangeSet; +import io.ebeaninternal.server.core.PersistDeferredRelationship; +import io.ebeaninternal.server.core.PersistRequest; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.persist.BatchControl; +import io.ebeanservice.docstore.api.DocStoreTransaction; import java.sql.Connection; diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiTransactionScopeManager.java b/src/main/java/io/ebeaninternal/api/SpiTransactionScopeManager.java similarity index 69% rename from src/main/java/com/avaje/ebeaninternal/api/SpiTransactionScopeManager.java rename to src/main/java/io/ebeaninternal/api/SpiTransactionScopeManager.java index 32a316338..e2b4a826f 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiTransactionScopeManager.java +++ b/src/main/java/io/ebeaninternal/api/SpiTransactionScopeManager.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; public interface SpiTransactionScopeManager { diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiUpdate.java b/src/main/java/io/ebeaninternal/api/SpiUpdate.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/api/SpiUpdate.java rename to src/main/java/io/ebeaninternal/api/SpiUpdate.java index 17324e507..613e1f592 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiUpdate.java +++ b/src/main/java/io/ebeaninternal/api/SpiUpdate.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.Update; +import io.ebean.Update; /** * Internal extension to the Update interface. diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiUpdatePlan.java b/src/main/java/io/ebeaninternal/api/SpiUpdatePlan.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/api/SpiUpdatePlan.java rename to src/main/java/io/ebeaninternal/api/SpiUpdatePlan.java index 0d5b8a78a..ab094616d 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiUpdatePlan.java +++ b/src/main/java/io/ebeaninternal/api/SpiUpdatePlan.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.persist.dml.DmlHandler; -import com.avaje.ebeaninternal.server.persist.dmlbind.Bindable; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.persist.dml.DmlHandler; +import io.ebeaninternal.server.persist.dmlbind.Bindable; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/api/TransactionEvent.java b/src/main/java/io/ebeaninternal/api/TransactionEvent.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/api/TransactionEvent.java rename to src/main/java/io/ebeaninternal/api/TransactionEvent.java index 2f1d0a2f9..44ba7cf4d 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/TransactionEvent.java +++ b/src/main/java/io/ebeaninternal/api/TransactionEvent.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebeaninternal.server.cache.CacheChangeSet; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.transaction.DeleteByIdMap; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; +import io.ebeaninternal.server.cache.CacheChangeSet; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.transaction.DeleteByIdMap; +import io.ebeanservice.docstore.api.DocStoreUpdates; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/api/TransactionEventBeans.java b/src/main/java/io/ebeaninternal/api/TransactionEventBeans.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/api/TransactionEventBeans.java rename to src/main/java/io/ebeaninternal/api/TransactionEventBeans.java index 608091511..8e0cd0621 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/TransactionEventBeans.java +++ b/src/main/java/io/ebeaninternal/api/TransactionEventBeans.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebeaninternal.server.cache.CacheChangeSet; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.cache.CacheChangeSet; +import io.ebeaninternal.server.core.PersistRequestBean; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/api/TransactionEventTable.java b/src/main/java/io/ebeaninternal/api/TransactionEventTable.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/api/TransactionEventTable.java rename to src/main/java/io/ebeaninternal/api/TransactionEventTable.java index c96580f4a..17a884b89 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/TransactionEventTable.java +++ b/src/main/java/io/ebeaninternal/api/TransactionEventTable.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.api; +package io.ebeaninternal.api; -import com.avaje.ebean.event.BulkTableEvent; -import com.avaje.ebeaninternal.server.cluster.BinaryMessage; -import com.avaje.ebeaninternal.server.cluster.BinaryMessageList; +import io.ebean.event.BulkTableEvent; +import io.ebeaninternal.server.cluster.BinaryMessage; +import io.ebeaninternal.server.cluster.BinaryMessageList; import java.io.DataInput; import java.io.DataOutputStream; diff --git a/src/main/java/io/ebeaninternal/api/package-info.java b/src/main/java/io/ebeaninternal/api/package-info.java new file mode 100644 index 000000000..26f2c671a --- /dev/null +++ b/src/main/java/io/ebeaninternal/api/package-info.java @@ -0,0 +1 @@ +package io.ebeaninternal.api; diff --git a/src/main/java/com/avaje/ebeaninternal/extraddl/model/DdlScript.java b/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/extraddl/model/DdlScript.java rename to src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java index fd104ac5a..c5bd66989 100644 --- a/src/main/java/com/avaje/ebeaninternal/extraddl/model/DdlScript.java +++ b/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.extraddl.model; +package io.ebeaninternal.extraddl.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebeaninternal/extraddl/model/ExtraDdl.java b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/extraddl/model/ExtraDdl.java rename to src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java index 3c7867262..2255ee88d 100644 --- a/src/main/java/com/avaje/ebeaninternal/extraddl/model/ExtraDdl.java +++ b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.extraddl.model; +package io.ebeaninternal.extraddl.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java rename to src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java index 1a5e1fbf0..51ef82590 100644 --- a/src/main/java/com/avaje/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java +++ b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.extraddl.model; +package io.ebeaninternal.extraddl.model; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/extraddl/model/ObjectFactory.java b/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java similarity index 82% rename from src/main/java/com/avaje/ebeaninternal/extraddl/model/ObjectFactory.java rename to src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java index c73abca6f..20cf3cd46 100644 --- a/src/main/java/com/avaje/ebeaninternal/extraddl/model/ObjectFactory.java +++ b/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.extraddl.model; +package io.ebeaninternal.extraddl.model; import javax.xml.bind.annotation.XmlRegistry; @@ -6,7 +6,7 @@ import javax.xml.bind.annotation.XmlRegistry; /** * This object contains factory methods for each * Java content interface and Java element interface - * generated in the com.avaje.ebeaninternal.extraddl.model package. + * generated in the io.ebeaninternal.extraddl.model package. *

An ObjectFactory allows you to programatically * construct new instances of the Java representation * for XML content. The Java representation of XML @@ -21,7 +21,7 @@ public class ObjectFactory { /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.avaje.ebeaninternal.extraddl.model + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: io.ebeaninternal.extraddl.model */ public ObjectFactory() { } diff --git a/src/main/java/com/avaje/ebeaninternal/extraddl/model/package-info.java b/src/main/java/io/ebeaninternal/extraddl/model/package-info.java similarity index 77% rename from src/main/java/com/avaje/ebeaninternal/extraddl/model/package-info.java rename to src/main/java/io/ebeaninternal/extraddl/model/package-info.java index aa0783686..c8e18d1dc 100644 --- a/src/main/java/com/avaje/ebeaninternal/extraddl/model/package-info.java +++ b/src/main/java/io/ebeaninternal/extraddl/model/package-info.java @@ -1,2 +1,2 @@ @javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/extraddl", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package com.avaje.ebeaninternal.extraddl.model; +package io.ebeaninternal.extraddl.model; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneCollection.java b/src/main/java/io/ebeaninternal/server/autotune/AutoTuneCollection.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneCollection.java rename to src/main/java/io/ebeaninternal/server/autotune/AutoTuneCollection.java index 61658145f..bcff9b636 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneCollection.java +++ b/src/main/java/io/ebeaninternal/server/autotune/AutoTuneCollection.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.autotune; +package io.ebeaninternal.server.autotune; -import com.avaje.ebean.bean.ObjectGraphOrigin; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; +import io.ebean.bean.ObjectGraphOrigin; +import io.ebeaninternal.server.querydefn.OrmQueryDetail; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneService.java b/src/main/java/io/ebeaninternal/server/autotune/AutoTuneService.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneService.java rename to src/main/java/io/ebeaninternal/server/autotune/AutoTuneService.java index 19295518b..05fd5d128 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneService.java +++ b/src/main/java/io/ebeaninternal/server/autotune/AutoTuneService.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.autotune; +package io.ebeaninternal.server.autotune; -import com.avaje.ebean.AutoTune; -import com.avaje.ebeaninternal.api.SpiQuery; +import io.ebean.AutoTune; +import io.ebeaninternal.api.SpiQuery; /** * Collects and manages the the profile information. diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/ProfilingListener.java b/src/main/java/io/ebeaninternal/server/autotune/ProfilingListener.java similarity index 79% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/ProfilingListener.java rename to src/main/java/io/ebeaninternal/server/autotune/ProfilingListener.java index b01e73148..232efb52a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/ProfilingListener.java +++ b/src/main/java/io/ebeaninternal/server/autotune/ProfilingListener.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.autotune; +package io.ebeaninternal.server.autotune; -import com.avaje.ebean.bean.NodeUsageListener; -import com.avaje.ebean.bean.ObjectGraphNode; -import com.avaje.ebeaninternal.api.SpiQuery; +import io.ebean.bean.NodeUsageListener; +import io.ebean.bean.ObjectGraphNode; +import io.ebeaninternal.api.SpiQuery; /** * Profiling listener gets call backs for node usage and the associated query executions. diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Autotune.java b/src/main/java/io/ebeaninternal/server/autotune/model/Autotune.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/model/Autotune.java rename to src/main/java/io/ebeaninternal/server/autotune/model/Autotune.java index c9c67c248..f5b4954bb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Autotune.java +++ b/src/main/java/io/ebeaninternal/server/autotune/model/Autotune.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.autotune.model; +package io.ebeaninternal.server.autotune.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ObjectFactory.java b/src/main/java/io/ebeaninternal/server/autotune/model/ObjectFactory.java similarity index 85% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/model/ObjectFactory.java rename to src/main/java/io/ebeaninternal/server/autotune/model/ObjectFactory.java index 26e70bd70..2e5d7eba3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ObjectFactory.java +++ b/src/main/java/io/ebeaninternal/server/autotune/model/ObjectFactory.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.autotune.model; +package io.ebeaninternal.server.autotune.model; import javax.xml.bind.annotation.XmlRegistry; @@ -6,7 +6,7 @@ import javax.xml.bind.annotation.XmlRegistry; /** * This object contains factory methods for each * Java content interface and Java element interface - * generated in the com.avaje.ebeaninternal.server.autotune.model package. + * generated in the io.ebeaninternal.server.autotune.model package. *

An ObjectFactory allows you to programatically * construct new instances of the Java representation * for XML content. The Java representation of XML @@ -21,7 +21,7 @@ public class ObjectFactory { /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.avaje.ebeaninternal.server.autotune.model + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: io.ebeaninternal.server.autotune.model */ public ObjectFactory() { } diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Origin.java b/src/main/java/io/ebeaninternal/server/autotune/model/Origin.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/model/Origin.java rename to src/main/java/io/ebeaninternal/server/autotune/model/Origin.java index 150197c3b..6471d3877 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Origin.java +++ b/src/main/java/io/ebeaninternal/server/autotune/model/Origin.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.autotune.model; +package io.ebeaninternal.server.autotune.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileDiff.java b/src/main/java/io/ebeaninternal/server/autotune/model/ProfileDiff.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileDiff.java rename to src/main/java/io/ebeaninternal/server/autotune/model/ProfileDiff.java index 5fc587ef0..1738fead9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileDiff.java +++ b/src/main/java/io/ebeaninternal/server/autotune/model/ProfileDiff.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.autotune.model; +package io.ebeaninternal.server.autotune.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileEmpty.java b/src/main/java/io/ebeaninternal/server/autotune/model/ProfileEmpty.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileEmpty.java rename to src/main/java/io/ebeaninternal/server/autotune/model/ProfileEmpty.java index 1a962316c..d22140aa8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileEmpty.java +++ b/src/main/java/io/ebeaninternal/server/autotune/model/ProfileEmpty.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.autotune.model; +package io.ebeaninternal.server.autotune.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileNew.java b/src/main/java/io/ebeaninternal/server/autotune/model/ProfileNew.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileNew.java rename to src/main/java/io/ebeaninternal/server/autotune/model/ProfileNew.java index 03f208d6b..7910acb84 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileNew.java +++ b/src/main/java/io/ebeaninternal/server/autotune/model/ProfileNew.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.autotune.model; +package io.ebeaninternal.server.autotune.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/package-info.java b/src/main/java/io/ebeaninternal/server/autotune/model/package-info.java similarity index 74% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/model/package-info.java rename to src/main/java/io/ebeaninternal/server/autotune/model/package-info.java index d43f79f2b..78deec068 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/package-info.java +++ b/src/main/java/io/ebeaninternal/server/autotune/model/package-info.java @@ -1,2 +1,2 @@ @javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/autotune", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package com.avaje.ebeaninternal.server.autotune.model; +package io.ebeaninternal.server.autotune.model; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneAllCollection.java b/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneAllCollection.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneAllCollection.java rename to src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneAllCollection.java index 5f2068842..463b35b25 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneAllCollection.java +++ b/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneAllCollection.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 java.util.Collection; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java b/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java rename to src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java index 636e5f731..4f8213388 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java +++ b/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.autotune.service; +package io.ebeaninternal.server.autotune.service; -import com.avaje.ebean.bean.ObjectGraphOrigin; -import com.avaje.ebeaninternal.server.autotune.AutoTuneCollection; -import com.avaje.ebeaninternal.server.autotune.model.Autotune; -import com.avaje.ebeaninternal.server.autotune.model.Origin; -import com.avaje.ebeaninternal.server.autotune.model.ProfileDiff; -import com.avaje.ebeaninternal.server.autotune.model.ProfileNew; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; +import io.ebean.bean.ObjectGraphOrigin; +import io.ebeaninternal.server.autotune.AutoTuneCollection; +import io.ebeaninternal.server.autotune.model.Autotune; +import io.ebeaninternal.server.autotune.model.Origin; +import io.ebeaninternal.server.autotune.model.ProfileDiff; +import io.ebeaninternal.server.autotune.model.ProfileNew; +import io.ebeaninternal.server.querydefn.OrmQueryDetail; /** * Event where profiling information is collected and processed for differences diff --git a/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneServiceFactory.java b/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneServiceFactory.java new file mode 100644 index 000000000..c27adf1c9 --- /dev/null +++ b/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneServiceFactory.java @@ -0,0 +1,14 @@ +package io.ebeaninternal.server.autotune.service; + +import io.ebean.config.ServerConfig; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.autotune.AutoTuneService; + +public class AutoTuneServiceFactory { + + public static AutoTuneService create(SpiEbeanServer server, ServerConfig serverConfig) { + + return new DefaultAutoTuneService(server, serverConfig); + } + +} diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java b/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java rename to src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java index d757117aa..39f87f560 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java +++ b/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java @@ -1,7 +1,7 @@ -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 javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java b/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java rename to src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java index 552eb9123..3a9fd859e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java +++ b/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java @@ -1,7 +1,7 @@ -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 javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/BaseQueryTuner.java b/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/service/BaseQueryTuner.java rename to src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java index 6d2dcf043..45053b9e6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/BaseQueryTuner.java +++ b/src/main/java/io/ebeaninternal/server/autotune/service/BaseQueryTuner.java @@ -1,14 +1,14 @@ -package com.avaje.ebeaninternal.server.autotune.service; +package io.ebeaninternal.server.autotune.service; -import com.avaje.ebean.bean.CallStack; -import com.avaje.ebean.bean.ObjectGraphNode; -import com.avaje.ebean.config.AutoTuneConfig; -import com.avaje.ebean.config.AutoTuneMode; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.autotune.ProfilingListener; -import com.avaje.ebeaninternal.server.autotune.model.Origin; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; +import io.ebean.bean.CallStack; +import io.ebean.bean.ObjectGraphNode; +import io.ebean.config.AutoTuneConfig; +import io.ebean.config.AutoTuneMode; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.autotune.ProfilingListener; +import io.ebeaninternal.server.autotune.model.Origin; +import io.ebeaninternal.server.querydefn.OrmQueryDetail; import javax.persistence.PersistenceException; import java.util.Collection; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java b/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java rename to src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java index c3ae7f756..9e71ec617 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java +++ b/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.autotune.service; +package io.ebeaninternal.server.autotune.service; -import com.avaje.ebean.config.AutoTuneConfig; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.autotune.AutoTuneCollection; -import com.avaje.ebeaninternal.server.autotune.AutoTuneService; -import com.avaje.ebeaninternal.server.autotune.model.Autotune; -import com.avaje.ebeaninternal.server.autotune.model.Origin; +import io.ebean.config.AutoTuneConfig; +import io.ebean.config.ServerConfig; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.autotune.AutoTuneCollection; +import io.ebeaninternal.server.autotune.AutoTuneService; +import io.ebeaninternal.server.autotune.model.Autotune; +import io.ebeaninternal.server.autotune.model.Origin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileManager.java b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileManager.java rename to src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java index fdf3d702f..ee93cc1ce 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileManager.java +++ b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java @@ -1,14 +1,14 @@ -package com.avaje.ebeaninternal.server.autotune.service; +package io.ebeaninternal.server.autotune.service; -import com.avaje.ebean.bean.NodeUsageCollector; -import com.avaje.ebean.bean.ObjectGraphNode; -import com.avaje.ebean.bean.ObjectGraphOrigin; -import com.avaje.ebean.config.AutoTuneConfig; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.autotune.AutoTuneCollection; -import com.avaje.ebeaninternal.server.autotune.ProfilingListener; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebean.bean.NodeUsageCollector; +import io.ebean.bean.ObjectGraphNode; +import io.ebean.bean.ObjectGraphOrigin; +import io.ebean.config.AutoTuneConfig; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.autotune.AutoTuneCollection; +import io.ebeaninternal.server.autotune.ProfilingListener; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOrigin.java b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOrigin.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOrigin.java rename to src/main/java/io/ebeaninternal/server/autotune/service/ProfileOrigin.java index 7f9391abe..0e3e9c1a7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOrigin.java +++ b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOrigin.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.autotune.service; +package io.ebeaninternal.server.autotune.service; -import com.avaje.ebean.bean.NodeUsageCollector; -import com.avaje.ebean.bean.ObjectGraphNode; -import com.avaje.ebean.bean.ObjectGraphOrigin; -import com.avaje.ebean.text.PathProperties; -import com.avaje.ebean.text.PathProperties.Props; -import com.avaje.ebeaninternal.server.autotune.AutoTuneCollection; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; +import io.ebean.bean.NodeUsageCollector; +import io.ebean.bean.ObjectGraphNode; +import io.ebean.bean.ObjectGraphOrigin; +import io.ebean.text.PathProperties; +import io.ebean.text.PathProperties.Props; +import io.ebeaninternal.server.autotune.AutoTuneCollection; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.querydefn.OrmQueryDetail; import java.util.Collection; import java.util.Map; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java rename to src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java index 561e1ce46..e19e8703f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java +++ b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.autotune.service; +package io.ebeaninternal.server.autotune.service; -import com.avaje.ebean.bean.NodeUsageCollector; -import com.avaje.ebean.text.PathProperties; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssoc; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; -import com.avaje.ebeaninternal.server.query.SplitName; +import io.ebean.bean.NodeUsageCollector; +import io.ebean.text.PathProperties; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssoc; +import io.ebeaninternal.server.el.ElPropertyValue; +import io.ebeaninternal.server.query.SplitName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -110,4 +110,4 @@ public class ProfileOriginNodeUsage { public String toString() { return "path[" + path + "] profileCount[" + profileCount + "] used[" + profileUsedCount + "] props" + aggregateUsed; } -} \ No newline at end of file +} diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginQuery.java b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginQuery.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginQuery.java rename to src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginQuery.java index d7f298152..a5f385b52 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginQuery.java +++ b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginQuery.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.autotune.service; +package io.ebeaninternal.server.autotune.service; -import com.avaje.ebeaninternal.server.autotune.AutoTuneCollection; +import io.ebeaninternal.server.autotune.AutoTuneCollection; import java.io.Serializable; import java.util.concurrent.atomic.LongAdder; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/SortAutoTuneDocument.java b/src/main/java/io/ebeaninternal/server/autotune/service/SortAutoTuneDocument.java similarity index 81% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/service/SortAutoTuneDocument.java rename to src/main/java/io/ebeaninternal/server/autotune/service/SortAutoTuneDocument.java index fd3d51523..0f9669fa7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/SortAutoTuneDocument.java +++ b/src/main/java/io/ebeaninternal/server/autotune/service/SortAutoTuneDocument.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.autotune.service; +package io.ebeaninternal.server.autotune.service; -import com.avaje.ebeaninternal.server.autotune.model.Autotune; -import com.avaje.ebeaninternal.server.autotune.model.Origin; -import com.avaje.ebeaninternal.server.autotune.model.ProfileDiff; -import com.avaje.ebeaninternal.server.autotune.model.ProfileEmpty; -import com.avaje.ebeaninternal.server.autotune.model.ProfileNew; +import io.ebeaninternal.server.autotune.model.Autotune; +import io.ebeaninternal.server.autotune.model.Origin; +import io.ebeaninternal.server.autotune.model.ProfileDiff; +import io.ebeaninternal.server.autotune.model.ProfileEmpty; +import io.ebeaninternal.server.autotune.model.ProfileNew; import java.util.Collections; import java.util.Comparator; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/TunedQueryInfo.java b/src/main/java/io/ebeaninternal/server/autotune/service/TunedQueryInfo.java similarity index 82% rename from src/main/java/com/avaje/ebeaninternal/server/autotune/service/TunedQueryInfo.java rename to src/main/java/io/ebeaninternal/server/autotune/service/TunedQueryInfo.java index 55ab0956c..f8faa0952 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/TunedQueryInfo.java +++ b/src/main/java/io/ebeaninternal/server/autotune/service/TunedQueryInfo.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.autotune.service; +package io.ebeaninternal.server.autotune.service; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.autotune.model.Origin; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetailParser; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.autotune.model.Origin; +import io.ebeaninternal.server.querydefn.OrmQueryDetail; +import io.ebeaninternal.server.querydefn.OrmQueryDetailParser; import java.io.Serializable; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChange.java b/src/main/java/io/ebeaninternal/server/cache/CacheChange.java similarity index 72% rename from src/main/java/com/avaje/ebeaninternal/server/cache/CacheChange.java rename to src/main/java/io/ebeaninternal/server/cache/CacheChange.java index 9c29534dc..c0ecb042c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChange.java +++ b/src/main/java/io/ebeaninternal/server/cache/CacheChange.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; /** * A change to the cache. diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeBeanRemove.java b/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanRemove.java similarity index 78% rename from src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeBeanRemove.java rename to src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanRemove.java index df8ce0569..82e45fdd7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeBeanRemove.java +++ b/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanRemove.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanDescriptor; /** * Change to remove bean from L2 cache. diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeBeanUpdate.java b/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanUpdate.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeBeanUpdate.java rename to src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanUpdate.java index 38442c9a9..cce2a4f9b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeBeanUpdate.java +++ b/src/main/java/io/ebeaninternal/server/cache/CacheChangeBeanUpdate.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.util.Map; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeNaturalKeyPut.java b/src/main/java/io/ebeaninternal/server/cache/CacheChangeNaturalKeyPut.java similarity index 81% rename from src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeNaturalKeyPut.java rename to src/main/java/io/ebeaninternal/server/cache/CacheChangeNaturalKeyPut.java index 3cad5c356..208e097bb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeNaturalKeyPut.java +++ b/src/main/java/io/ebeaninternal/server/cache/CacheChangeNaturalKeyPut.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanDescriptor; /** * Change the natural key mapping for a bean. diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeSet.java b/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeSet.java rename to src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java index 43f485e38..8f9c3df4a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeSet.java +++ b/src/main/java/io/ebeaninternal/server/cache/CacheChangeSet.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanData.java b/src/main/java/io/ebeaninternal/server/cache/CachedBeanData.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanData.java rename to src/main/java/io/ebeaninternal/server/cache/CachedBeanData.java index 526d56f24..eb1b3389a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanData.java +++ b/src/main/java/io/ebeaninternal/server/cache/CachedBeanData.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; import java.io.Externalizable; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBean.java b/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBean.java rename to src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java index 3f2dc99bb..1de76f18a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBean.java +++ b/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataToBean.java b/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java similarity index 76% rename from src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataToBean.java rename to src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java index 35e9bf52b..beee32400 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataToBean.java +++ b/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataToBean.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; public class CachedBeanDataToBean { diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedManyIds.java b/src/main/java/io/ebeaninternal/server/cache/CachedManyIds.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/cache/CachedManyIds.java rename to src/main/java/io/ebeaninternal/server/cache/CachedManyIds.java index dcc5b2f96..15fcf0d8f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedManyIds.java +++ b/src/main/java/io/ebeaninternal/server/cache/CachedManyIds.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; import java.io.Externalizable; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultCacheAdapter.java b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/cache/DefaultCacheAdapter.java rename to src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java index 929a3fd43..9d22db12b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultCacheAdapter.java +++ b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebean.cache.ServerCacheManager; +import io.ebean.cache.ServerCache; +import io.ebean.cache.ServerCacheManager; /** * Adapts SpiCacheManager to ServerCacheManager. diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder.java b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder.java rename to src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java index eeb19a929..3b5f91e31 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder.java +++ b/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebean.annotation.CacheBeanTuning; -import com.avaje.ebean.annotation.CacheQueryTuning; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebean.cache.ServerCacheFactory; -import com.avaje.ebean.cache.ServerCacheOptions; -import com.avaje.ebean.cache.ServerCacheType; -import com.avaje.ebean.config.CurrentTenantProvider; +import io.ebean.annotation.CacheBeanTuning; +import io.ebean.annotation.CacheQueryTuning; +import io.ebean.cache.ServerCache; +import io.ebean.cache.ServerCacheFactory; +import io.ebean.cache.ServerCacheOptions; +import io.ebean.cache.ServerCacheType; +import io.ebean.config.CurrentTenantProvider; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache.java rename to src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java index 0204c677e..abc97956c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache.java +++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebean.cache.ServerCacheOptions; -import com.avaje.ebean.cache.ServerCacheStatistics; +import io.ebean.BackgroundExecutor; +import io.ebean.cache.ServerCache; +import io.ebean.cache.ServerCacheOptions; +import io.ebean.cache.ServerCacheStatistics; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCacheFactory.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java similarity index 72% rename from src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCacheFactory.java rename to src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java index a17eb0b88..23ce910b6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCacheFactory.java +++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebean.cache.ServerCacheFactory; -import com.avaje.ebean.cache.ServerCacheOptions; -import com.avaje.ebean.cache.ServerCacheType; +import io.ebean.BackgroundExecutor; +import io.ebean.cache.ServerCache; +import io.ebean.cache.ServerCacheFactory; +import io.ebean.cache.ServerCacheOptions; +import io.ebean.cache.ServerCacheType; /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCacheManager.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCacheManager.java rename to src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java index 27348eb03..ea399165c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCacheManager.java +++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebean.cache.ServerCacheFactory; -import com.avaje.ebean.cache.ServerCacheOptions; -import com.avaje.ebean.cache.ServerCacheType; -import com.avaje.ebean.config.CurrentTenantProvider; +import io.ebean.cache.ServerCache; +import io.ebean.cache.ServerCacheFactory; +import io.ebean.cache.ServerCacheOptions; +import io.ebean.cache.ServerCacheType; +import io.ebean.config.CurrentTenantProvider; import java.util.function.Supplier; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCachePlugin.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCachePlugin.java similarity index 59% rename from src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCachePlugin.java rename to src/main/java/io/ebeaninternal/server/cache/DefaultServerCachePlugin.java index 9432056ac..09cbc0910 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCachePlugin.java +++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCachePlugin.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.cache.ServerCacheFactory; -import com.avaje.ebean.cache.ServerCachePlugin; -import com.avaje.ebean.config.ServerConfig; +import io.ebean.BackgroundExecutor; +import io.ebean.cache.ServerCacheFactory; +import io.ebean.cache.ServerCachePlugin; +import io.ebean.config.ServerConfig; /** * Default implementation of ServerCachePlugin. diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/SpiCacheManager.java b/src/main/java/io/ebeaninternal/server/cache/SpiCacheManager.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/cache/SpiCacheManager.java rename to src/main/java/io/ebeaninternal/server/cache/SpiCacheManager.java index 3889a1eb8..6396f4ae3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/SpiCacheManager.java +++ b/src/main/java/io/ebeaninternal/server/cache/SpiCacheManager.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebean.cache.ServerCache; +import io.ebean.cache.ServerCache; import java.util.function.Supplier; diff --git a/src/main/java/io/ebeaninternal/server/cache/package-info.java b/src/main/java/io/ebeaninternal/server/cache/package-info.java new file mode 100644 index 000000000..636fc54ea --- /dev/null +++ b/src/main/java/io/ebeaninternal/server/cache/package-info.java @@ -0,0 +1 @@ +package io.ebeaninternal.server.cache; diff --git a/src/main/java/com/avaje/ebeaninternal/server/changelog/ChangeJsonBuilder.java b/src/main/java/io/ebeaninternal/server/changelog/ChangeJsonBuilder.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/changelog/ChangeJsonBuilder.java rename to src/main/java/io/ebeaninternal/server/changelog/ChangeJsonBuilder.java index 507d3ad4f..ddfa3d980 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/changelog/ChangeJsonBuilder.java +++ b/src/main/java/io/ebeaninternal/server/changelog/ChangeJsonBuilder.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.changelog; +package io.ebeaninternal.server.changelog; -import com.avaje.ebean.ValuePair; -import com.avaje.ebean.event.changelog.BeanChange; -import com.avaje.ebean.event.changelog.ChangeSet; -import com.avaje.ebean.event.changelog.ChangeType; -import com.avaje.ebean.text.json.JsonContext; +import io.ebean.ValuePair; +import io.ebean.event.changelog.BeanChange; +import io.ebean.event.changelog.ChangeSet; +import io.ebean.event.changelog.ChangeType; +import io.ebean.text.json.JsonContext; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/src/main/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogListener.java b/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogListener.java rename to src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java index 3d6c0bb31..d347430cc 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogListener.java +++ b/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.changelog; +package io.ebeaninternal.server.changelog; -import com.avaje.ebean.event.changelog.BeanChange; -import com.avaje.ebean.event.changelog.ChangeLogListener; -import com.avaje.ebean.event.changelog.ChangeSet; -import com.avaje.ebean.event.changelog.ChangeType; -import com.avaje.ebean.plugin.Plugin; -import com.avaje.ebean.plugin.SpiServer; +import io.ebean.event.changelog.BeanChange; +import io.ebean.event.changelog.ChangeLogListener; +import io.ebean.event.changelog.ChangeSet; +import io.ebean.event.changelog.ChangeType; +import io.ebean.plugin.Plugin; +import io.ebean.plugin.SpiServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogPrepare.java b/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogPrepare.java similarity index 75% rename from src/main/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogPrepare.java rename to src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogPrepare.java index 6edcf6ca3..16af27424 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogPrepare.java +++ b/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogPrepare.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.changelog; +package io.ebeaninternal.server.changelog; -import com.avaje.ebean.event.changelog.ChangeLogPrepare; -import com.avaje.ebean.event.changelog.ChangeSet; +import io.ebean.event.changelog.ChangeLogPrepare; +import io.ebean.event.changelog.ChangeSet; /** * Placeholder/default implementation that does not do anything. diff --git a/src/main/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogRegister.java b/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegister.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogRegister.java rename to src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegister.java index d0c0b68ea..80e6620f8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogRegister.java +++ b/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegister.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.changelog; +package io.ebeaninternal.server.changelog; -import com.avaje.ebean.annotation.ChangeLog; -import com.avaje.ebean.annotation.ChangeLogInsertMode; -import com.avaje.ebean.event.BeanPersistRequest; -import com.avaje.ebean.event.changelog.ChangeLogFilter; -import com.avaje.ebean.event.changelog.ChangeLogRegister; -import com.avaje.ebeaninternal.server.deploy.parse.AnnotationBase; +import io.ebean.annotation.ChangeLog; +import io.ebean.annotation.ChangeLogInsertMode; +import io.ebean.event.BeanPersistRequest; +import io.ebean.event.changelog.ChangeLogFilter; +import io.ebean.event.changelog.ChangeLogRegister; +import io.ebeaninternal.server.deploy.parse.AnnotationBase; import java.util.Collections; import java.util.HashSet; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/BinaryMessage.java b/src/main/java/io/ebeaninternal/server/cluster/BinaryMessage.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/cluster/BinaryMessage.java rename to src/main/java/io/ebeaninternal/server/cluster/BinaryMessage.java index c556c3263..c470c1793 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cluster/BinaryMessage.java +++ b/src/main/java/io/ebeaninternal/server/cluster/BinaryMessage.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.cluster; +package io.ebeaninternal.server.cluster; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/BinaryMessageList.java b/src/main/java/io/ebeaninternal/server/cluster/BinaryMessageList.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/cluster/BinaryMessageList.java rename to src/main/java/io/ebeaninternal/server/cluster/BinaryMessageList.java index d46111512..3b3513063 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cluster/BinaryMessageList.java +++ b/src/main/java/io/ebeaninternal/server/cluster/BinaryMessageList.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.cluster; +package io.ebeaninternal.server.cluster; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/ClusterBroadcast.java b/src/main/java/io/ebeaninternal/server/cluster/ClusterBroadcast.java similarity index 80% rename from src/main/java/com/avaje/ebeaninternal/server/cluster/ClusterBroadcast.java rename to src/main/java/io/ebeaninternal/server/cluster/ClusterBroadcast.java index 8bf919048..bef3d3aef 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cluster/ClusterBroadcast.java +++ b/src/main/java/io/ebeaninternal/server/cluster/ClusterBroadcast.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.cluster; +package io.ebeaninternal.server.cluster; -import com.avaje.ebeaninternal.server.transaction.RemoteTransactionEvent; +import io.ebeaninternal.server.transaction.RemoteTransactionEvent; /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/ClusterBroadcastFactory.java b/src/main/java/io/ebeaninternal/server/cluster/ClusterBroadcastFactory.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/cluster/ClusterBroadcastFactory.java rename to src/main/java/io/ebeaninternal/server/cluster/ClusterBroadcastFactory.java index af303d919..b350e036f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cluster/ClusterBroadcastFactory.java +++ b/src/main/java/io/ebeaninternal/server/cluster/ClusterBroadcastFactory.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.cluster; +package io.ebeaninternal.server.cluster; import java.util.Properties; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/ClusterManager.java b/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/cluster/ClusterManager.java rename to src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java index 90f848946..003f09942 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cluster/ClusterManager.java +++ b/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.cluster; +package io.ebeaninternal.server.cluster; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.config.ContainerConfig; -import com.avaje.ebeaninternal.server.transaction.RemoteTransactionEvent; +import io.ebean.EbeanServer; +import io.ebean.config.ContainerConfig; +import io.ebeaninternal.server.transaction.RemoteTransactionEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/package.html b/src/main/java/io/ebeaninternal/server/cluster/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/cluster/package.html rename to src/main/java/io/ebeaninternal/server/cluster/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/BasicTypeConverter.java b/src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java similarity index 99% rename from src/main/java/com/avaje/ebeaninternal/server/core/BasicTypeConverter.java rename to src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java index fa83a4764..34beed7df 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/BasicTypeConverter.java +++ b/src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebeaninternal.server.type.ScalarTypeUUIDBinary; +import io.ebeaninternal.server.type.ScalarTypeUUIDBinary; import java.io.Serializable; import java.math.BigDecimal; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/BeanRequest.java b/src/main/java/io/ebeaninternal/server/core/BeanRequest.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/core/BeanRequest.java rename to src/main/java/io/ebeaninternal/server/core/BeanRequest.java index 9ba4070e7..87200d964 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/BeanRequest.java +++ b/src/main/java/io/ebeaninternal/server/core/BeanRequest.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.core.timezone.DataTimeZone; +import io.ebean.EbeanServer; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.core.timezone.DataTimeZone; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/CObjectGraphNodeStatistics.java b/src/main/java/io/ebeaninternal/server/core/CObjectGraphNodeStatistics.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/core/CObjectGraphNodeStatistics.java rename to src/main/java/io/ebeaninternal/server/core/CObjectGraphNodeStatistics.java index 41349515d..2fbfaa9be 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/CObjectGraphNodeStatistics.java +++ b/src/main/java/io/ebeaninternal/server/core/CObjectGraphNodeStatistics.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.bean.ObjectGraphNode; -import com.avaje.ebean.meta.MetaObjectGraphNodeStats; +import io.ebean.bean.ObjectGraphNode; +import io.ebean.meta.MetaObjectGraphNodeStats; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.LongAdder; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/CacheOptions.java b/src/main/java/io/ebeaninternal/server/core/CacheOptions.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/core/CacheOptions.java rename to src/main/java/io/ebeaninternal/server/core/CacheOptions.java index ed8166f29..751c7fded 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/CacheOptions.java +++ b/src/main/java/io/ebeaninternal/server/core/CacheOptions.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.annotation.Cache; +import io.ebean.annotation.Cache; /** * Options for controlling cache behaviour for a given type. diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/CallStackFactory.java b/src/main/java/io/ebeaninternal/server/core/CallStackFactory.java similarity index 73% rename from src/main/java/com/avaje/ebeaninternal/server/core/CallStackFactory.java rename to src/main/java/io/ebeaninternal/server/core/CallStackFactory.java index f5b4b4f1a..e514e083a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/CallStackFactory.java +++ b/src/main/java/io/ebeaninternal/server/core/CallStackFactory.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.bean.CallStack; +import io.ebean.bean.CallStack; /** * Creates CallStack based on the stack trace. diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/ClassPathScanners.java b/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/core/ClassPathScanners.java rename to src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java index e08b28eef..38222784a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/ClassPathScanners.java +++ b/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.config.ServerConfig; +import io.ebean.config.ServerConfig; import org.avaje.classpath.scanner.ClassPathScanner; import org.avaje.classpath.scanner.ClassPathScannerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DatabasePlatformFactory.java b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java similarity index 83% rename from src/main/java/com/avaje/ebeaninternal/server/core/DatabasePlatformFactory.java rename to src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java index 02ef1a7b7..e463261bd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DatabasePlatformFactory.java +++ b/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java @@ -1,18 +1,18 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.dbplatform.db2.DB2Platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.h2.H2Platform; -import com.avaje.ebean.config.dbplatform.hsqldb.HsqldbPlatform; -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.Postgres8Platform; -import com.avaje.ebean.config.dbplatform.postgres.PostgresPlatform; -import com.avaje.ebean.config.dbplatform.sqlite.SQLitePlatform; -import com.avaje.ebean.config.dbplatform.sqlanywhere.SqlAnywherePlatform; -import com.avaje.ebean.dbmigration.DbOffline; +import io.ebean.config.ServerConfig; +import io.ebean.config.dbplatform.db2.DB2Platform; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.h2.H2Platform; +import io.ebean.config.dbplatform.hsqldb.HsqldbPlatform; +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.Postgres8Platform; +import io.ebean.config.dbplatform.postgres.PostgresPlatform; +import io.ebean.config.dbplatform.sqlite.SQLitePlatform; +import io.ebean.config.dbplatform.sqlanywhere.SqlAnywherePlatform; +import io.ebean.dbmigration.DbOffline; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DbExpressionHandler.java b/src/main/java/io/ebeaninternal/server/core/DbExpressionHandler.java similarity index 78% rename from src/main/java/com/avaje/ebeaninternal/server/core/DbExpressionHandler.java rename to src/main/java/io/ebeaninternal/server/core/DbExpressionHandler.java index 0c1d4bb2b..14083802d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DbExpressionHandler.java +++ b/src/main/java/io/ebeaninternal/server/core/DbExpressionHandler.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.expression.Op; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.expression.Op; /** * Adds the db platform specific json expression. diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBackgroundExecutor.java b/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java similarity index 81% rename from src/main/java/com/avaje/ebeaninternal/server/core/DefaultBackgroundExecutor.java rename to src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java index f32a3d512..7cd0b1500 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBackgroundExecutor.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebeaninternal.api.SpiBackgroundExecutor; -import com.avaje.ebeaninternal.server.lib.DaemonExecutorService; -import com.avaje.ebeaninternal.server.lib.DaemonScheduleThreadPool; +import io.ebeaninternal.api.SpiBackgroundExecutor; +import io.ebeaninternal.server.lib.DaemonExecutorService; +import io.ebeaninternal.server.lib.DaemonScheduleThreadPool; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java b/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java rename to src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java index 6f899b9f4..3b430f1f2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java @@ -1,21 +1,21 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.ExpressionList; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebeaninternal.api.LoadBeanRequest; -import com.avaje.ebeaninternal.api.LoadManyRequest; -import com.avaje.ebeaninternal.api.LoadRequest; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.api.SpiQuery.Mode; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor.EntityType; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.transaction.DefaultPersistenceContext; +import io.ebean.ExpressionList; +import io.ebean.Transaction; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.api.LoadBeanRequest; +import io.ebeaninternal.api.LoadManyRequest; +import io.ebeaninternal.api.LoadRequest; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.api.SpiQuery.Mode; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanDescriptor.EntityType; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.transaction.DefaultPersistenceContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanState.java b/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanState.java rename to src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java index 1a20d6b04..b211c9159 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanState.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.BeanState; -import com.avaje.ebean.ValuePair; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; +import io.ebean.BeanState; +import io.ebean.ValuePair; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; import java.beans.PropertyChangeListener; import java.util.Map; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultCallStackFactory.java b/src/main/java/io/ebeaninternal/server/core/DefaultCallStackFactory.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/core/DefaultCallStackFactory.java rename to src/main/java/io/ebeaninternal/server/core/DefaultCallStackFactory.java index 7a14ceae0..23ada5e8b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultCallStackFactory.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultCallStackFactory.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.bean.CallStack; +import io.ebean.bean.CallStack; /** * Default CallStackFactory where the Hash function for StackTraceElement includes the line number. diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultCallableSql.java b/src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/core/DefaultCallableSql.java rename to src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java index f74b340b6..60bd0e16a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultCallableSql.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.CallableSql; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebeaninternal.api.BindParams; -import com.avaje.ebeaninternal.api.BindParams.Param; -import com.avaje.ebeaninternal.api.SpiCallableSql; -import com.avaje.ebeaninternal.api.TransactionEventTable; +import io.ebean.CallableSql; +import io.ebean.EbeanServer; +import io.ebeaninternal.api.BindParams; +import io.ebeaninternal.api.BindParams.Param; +import io.ebeaninternal.api.SpiCallableSql; +import io.ebeaninternal.api.TransactionEventTable; import java.io.Serializable; import java.sql.CallableStatement; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java rename to src/main/java/io/ebeaninternal/server/core/DefaultContainer.java index c1263f2df..1bfb3d77b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java @@ -1,27 +1,27 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.cache.ServerCacheFactory; -import com.avaje.ebean.cache.ServerCacheOptions; -import com.avaje.ebean.cache.ServerCachePlugin; -import com.avaje.ebean.common.SpiContainer; -import com.avaje.ebean.config.ContainerConfig; -import com.avaje.ebean.config.PropertyMap; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.TenantMode; -import com.avaje.ebean.config.UnderscoreNamingConvention; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.h2.H2Platform; -import com.avaje.ebean.dbmigration.DbOffline; -import com.avaje.ebeaninternal.api.SpiBackgroundExecutor; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.cache.DefaultServerCacheManager; -import com.avaje.ebeaninternal.server.cache.DefaultServerCachePlugin; -import com.avaje.ebeaninternal.server.cache.SpiCacheManager; -import com.avaje.ebeaninternal.server.cluster.ClusterManager; -import com.avaje.ebeaninternal.server.core.bootup.BootupClassPathSearch; -import com.avaje.ebeaninternal.server.core.bootup.BootupClasses; -import com.avaje.ebeaninternal.server.lib.ShutdownManager; +import io.ebean.BackgroundExecutor; +import io.ebean.cache.ServerCacheFactory; +import io.ebean.cache.ServerCacheOptions; +import io.ebean.cache.ServerCachePlugin; +import io.ebean.common.SpiContainer; +import io.ebean.config.ContainerConfig; +import io.ebean.config.PropertyMap; +import io.ebean.config.ServerConfig; +import io.ebean.config.TenantMode; +import io.ebean.config.UnderscoreNamingConvention; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.h2.H2Platform; +import io.ebean.dbmigration.DbOffline; +import io.ebeaninternal.api.SpiBackgroundExecutor; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.cache.DefaultServerCacheManager; +import io.ebeaninternal.server.cache.DefaultServerCachePlugin; +import io.ebeaninternal.server.cache.SpiCacheManager; +import io.ebeaninternal.server.cluster.ClusterManager; +import io.ebeaninternal.server.core.bootup.BootupClassPathSearch; +import io.ebeaninternal.server.core.bootup.BootupClasses; +import io.ebeaninternal.server.lib.ShutdownManager; import org.avaje.datasource.DataSourceAlertFactory; import org.avaje.datasource.DataSourceConfig; import org.avaje.datasource.DataSourceFactory; @@ -43,7 +43,7 @@ import java.util.ServiceLoader; */ public class DefaultContainer implements SpiContainer { - private static final Logger logger = LoggerFactory.getLogger("com.avaje.ebean.internal.DefaultContainer"); + private static final Logger logger = LoggerFactory.getLogger("io.ebean.internal.DefaultContainer"); private final ClusterManager clusterManager; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultMetaInfoManager.java b/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/core/DefaultMetaInfoManager.java rename to src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java index b0f7e9bf0..cf454f3cd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultMetaInfoManager.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.meta.MetaBeanInfo; -import com.avaje.ebean.meta.MetaInfoManager; -import com.avaje.ebean.meta.MetaObjectGraphNodeStats; -import com.avaje.ebean.meta.MetaQueryPlanStatistic; +import io.ebean.meta.MetaBeanInfo; +import io.ebean.meta.MetaInfoManager; +import io.ebean.meta.MetaObjectGraphNodeStats; +import io.ebean.meta.MetaQueryPlanStatistic; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java rename to src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 7c229d5d7..35ad47d17 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -1,70 +1,97 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.*; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.CallStack; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebean.bean.ObjectGraphNode; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebean.bean.PersistenceContext.WithOption; -import com.avaje.ebean.cache.ServerCacheManager; -import com.avaje.ebean.config.CurrentTenantProvider; -import com.avaje.ebean.config.DbMigrationConfig; -import com.avaje.ebean.config.EncryptKeyManager; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.TenantMode; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.dbmigration.DdlGenerator; -import com.avaje.ebean.event.BeanPersistController; -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.BeanType; -import com.avaje.ebean.plugin.Plugin; -import com.avaje.ebean.plugin.SpiServer; -import com.avaje.ebean.text.csv.CsvReader; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.ebeaninternal.api.LoadBeanRequest; -import com.avaje.ebeaninternal.api.LoadManyRequest; -import com.avaje.ebeaninternal.api.ScopeTrans; -import com.avaje.ebeaninternal.api.ScopedTransaction; -import com.avaje.ebeaninternal.api.SpiBackgroundExecutor; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.api.SpiQuery.Type; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.api.TransactionEventTable; -import com.avaje.ebeaninternal.server.autotune.AutoTuneService; -import com.avaje.ebeaninternal.server.core.timezone.DataTimeZone; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptorManager; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.InheritInfo; -import com.avaje.ebeaninternal.server.el.ElFilter; -import com.avaje.ebeaninternal.server.grammer.EqlParser; -import com.avaje.ebeaninternal.server.lib.ShutdownManager; -import com.avaje.ebeaninternal.server.query.CQuery; -import com.avaje.ebeaninternal.server.query.CQueryEngine; -import com.avaje.ebeaninternal.server.query.CallableQueryIds; -import com.avaje.ebeaninternal.server.query.CallableQueryList; -import com.avaje.ebeaninternal.server.query.CallableQueryRowCount; -import com.avaje.ebeaninternal.server.query.LimitOffsetPagedList; -import com.avaje.ebeaninternal.server.query.QueryFutureIds; -import com.avaje.ebeaninternal.server.query.QueryFutureList; -import com.avaje.ebeaninternal.server.query.QueryFutureRowCount; -import com.avaje.ebeaninternal.server.querydefn.DefaultOrmQuery; -import com.avaje.ebeaninternal.server.querydefn.DefaultOrmUpdate; -import com.avaje.ebeaninternal.server.querydefn.DefaultRelationalQuery; -import com.avaje.ebeaninternal.server.querydefn.DefaultUpdateQuery; -import com.avaje.ebeaninternal.server.text.csv.TCsvReader; -import com.avaje.ebeaninternal.server.transaction.DefaultPersistenceContext; -import com.avaje.ebeaninternal.server.transaction.RemoteTransactionEvent; -import com.avaje.ebeaninternal.server.transaction.TransactionManager; -import com.avaje.ebeaninternal.server.transaction.TransactionScopeManager; -import com.avaje.ebeaninternal.util.ParamTypeHelper; -import com.avaje.ebeaninternal.util.ParamTypeHelper.TypeInfo; -import com.avaje.ebeanservice.docstore.api.DocStoreIntegration; +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.RawSql; +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.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.bean.ObjectGraphNode; +import io.ebean.bean.PersistenceContext; +import io.ebean.bean.PersistenceContext.WithOption; +import io.ebean.cache.ServerCacheManager; +import io.ebean.config.CurrentTenantProvider; +import io.ebean.config.EncryptKeyManager; +import io.ebean.config.ServerConfig; +import io.ebean.config.TenantMode; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.dbmigration.DdlGenerator; +import io.ebean.event.BeanPersistController; +import io.ebean.event.readaudit.ReadAuditLogger; +import io.ebean.event.readaudit.ReadAuditPrepare; +import io.ebean.meta.MetaInfoManager; +import io.ebean.plugin.BeanType; +import io.ebean.plugin.Plugin; +import io.ebean.plugin.SpiServer; +import io.ebean.text.csv.CsvReader; +import io.ebean.text.json.JsonContext; +import io.ebeaninternal.api.LoadBeanRequest; +import io.ebeaninternal.api.LoadManyRequest; +import io.ebeaninternal.api.ScopeTrans; +import io.ebeaninternal.api.ScopedTransaction; +import io.ebeaninternal.api.SpiBackgroundExecutor; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.api.SpiQuery.Type; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.TransactionEventTable; +import io.ebeaninternal.server.autotune.AutoTuneService; +import io.ebeaninternal.server.core.timezone.DataTimeZone; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanDescriptorManager; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.InheritInfo; +import io.ebeaninternal.server.el.ElFilter; +import io.ebeaninternal.server.grammer.EqlParser; +import io.ebeaninternal.server.lib.ShutdownManager; +import io.ebeaninternal.server.query.CQuery; +import io.ebeaninternal.server.query.CQueryEngine; +import io.ebeaninternal.server.query.CallableQueryIds; +import io.ebeaninternal.server.query.CallableQueryList; +import io.ebeaninternal.server.query.CallableQueryRowCount; +import io.ebeaninternal.server.query.LimitOffsetPagedList; +import io.ebeaninternal.server.query.QueryFutureIds; +import io.ebeaninternal.server.query.QueryFutureList; +import io.ebeaninternal.server.query.QueryFutureRowCount; +import io.ebeaninternal.server.querydefn.DefaultOrmQuery; +import io.ebeaninternal.server.querydefn.DefaultOrmUpdate; +import io.ebeaninternal.server.querydefn.DefaultRelationalQuery; +import io.ebeaninternal.server.querydefn.DefaultUpdateQuery; +import io.ebeaninternal.server.text.csv.TCsvReader; +import io.ebeaninternal.server.transaction.DefaultPersistenceContext; +import io.ebeaninternal.server.transaction.RemoteTransactionEvent; +import io.ebeaninternal.server.transaction.TransactionManager; +import io.ebeaninternal.server.transaction.TransactionScopeManager; +import io.ebeaninternal.util.ParamTypeHelper; +import io.ebeaninternal.util.ParamTypeHelper.TypeInfo; +import io.ebeanservice.docstore.api.DocStoreIntegration; +import io.ebean.TxIsolation; +import io.ebean.TxType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -91,9 +118,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { private static final int IGNORE_LEADING_ELEMENTS = 5; - private static final String COM_AVAJE_EBEAN = "com.avaje.ebean"; - - private static final String ORG_AVAJE_EBEAN = "org.avaje.ebean"; + private static final String IO_EBEAN = "io.ebean"; private final ServerConfig serverConfig; @@ -2018,12 +2043,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { // find the first non-avaje stackElement for (; startIndex < stackTrace.length; startIndex++) { - if (!stackTrace[startIndex].getClassName().startsWith(COM_AVAJE_EBEAN)) { - break; - } - } - for (; startIndex < stackTrace.length; startIndex++) { - if (!stackTrace[startIndex].getClassName().startsWith(ORG_AVAJE_EBEAN)) { + if (!stackTrace[startIndex].getClassName().startsWith(IO_EBEAN)) { break; } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultSqlUpdate.java b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/core/DefaultSqlUpdate.java rename to src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java index 66c025526..8b5ea418d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultSqlUpdate.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.SqlUpdate; -import com.avaje.ebean.Update; -import com.avaje.ebeaninternal.api.BindParams; -import com.avaje.ebeaninternal.api.SpiSqlUpdate; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.SqlUpdate; +import io.ebean.Update; +import io.ebeaninternal.api.BindParams; +import io.ebeaninternal.api.SpiSqlUpdate; import java.io.Serializable; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DiffHelp.java b/src/main/java/io/ebeaninternal/server/core/DiffHelp.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/core/DiffHelp.java rename to src/main/java/io/ebeaninternal/server/core/DiffHelp.java index 0a0535dd5..1634fe84a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DiffHelp.java +++ b/src/main/java/io/ebeaninternal/server/core/DiffHelp.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.ValuePair; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebean.ValuePair; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; import java.util.Iterator; import java.util.LinkedHashMap; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/InternString.java b/src/main/java/io/ebeaninternal/server/core/InternString.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/core/InternString.java rename to src/main/java/io/ebeaninternal/server/core/InternString.java index 5bdcb71f0..d5ed47264 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/InternString.java +++ b/src/main/java/io/ebeaninternal/server/core/InternString.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; import java.util.HashMap; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java similarity index 75% rename from src/main/java/com/avaje/ebeaninternal/server/core/InternalConfiguration.java rename to src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java index 9936f9609..ddad6db12 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/InternalConfiguration.java +++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java @@ -1,65 +1,65 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.ExpressionFactory; -import com.avaje.ebean.cache.ServerCacheManager; -import com.avaje.ebean.config.ExternalTransactionManager; -import com.avaje.ebean.config.Platform; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.DbHistorySupport; -import com.avaje.ebean.event.changelog.ChangeLogListener; -import com.avaje.ebean.event.changelog.ChangeLogPrepare; -import com.avaje.ebean.event.changelog.ChangeLogRegister; -import com.avaje.ebean.event.readaudit.ReadAuditLogger; -import com.avaje.ebean.event.readaudit.ReadAuditPrepare; -import com.avaje.ebean.plugin.Plugin; -import com.avaje.ebean.plugin.SpiServer; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.ebeaninternal.api.SpiBackgroundExecutor; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.autotune.AutoTuneService; -import com.avaje.ebeaninternal.server.autotune.service.AutoTuneServiceFactory; -import com.avaje.ebeaninternal.server.cache.DefaultCacheAdapter; -import com.avaje.ebeaninternal.server.cache.SpiCacheManager; -import com.avaje.ebeaninternal.server.changelog.DefaultChangeLogListener; -import com.avaje.ebeaninternal.server.changelog.DefaultChangeLogPrepare; -import com.avaje.ebeaninternal.server.changelog.DefaultChangeLogRegister; -import com.avaje.ebeaninternal.server.cluster.ClusterManager; -import com.avaje.ebeaninternal.server.core.bootup.BootupClasses; -import com.avaje.ebeaninternal.server.core.timezone.CloneDataTimeZone; -import com.avaje.ebeaninternal.server.core.timezone.DataTimeZone; -import com.avaje.ebeaninternal.server.core.timezone.NoDataTimeZone; -import com.avaje.ebeaninternal.server.core.timezone.SimpleDataTimeZone; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptorManager; -import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory; -import com.avaje.ebeaninternal.server.deploy.parse.DeployCreateProperties; -import com.avaje.ebeaninternal.server.deploy.parse.DeployInherit; -import com.avaje.ebeaninternal.server.deploy.parse.DeployUtil; -import com.avaje.ebeaninternal.server.expression.DefaultExpressionFactory; -import com.avaje.ebeaninternal.server.persist.Binder; -import com.avaje.ebeaninternal.server.persist.DefaultPersister; -import com.avaje.ebeaninternal.server.query.CQueryEngine; -import com.avaje.ebeaninternal.server.query.DefaultOrmQueryEngine; -import com.avaje.ebeaninternal.server.query.DefaultRelationalQueryEngine; -import com.avaje.ebeaninternal.server.readaudit.DefaultReadAuditLogger; -import com.avaje.ebeaninternal.server.readaudit.DefaultReadAuditPrepare; -import com.avaje.ebeaninternal.server.text.json.DJsonContext; -import com.avaje.ebeaninternal.server.transaction.AutoCommitTransactionManager; -import com.avaje.ebeaninternal.server.transaction.DataSourceSupplier; -import com.avaje.ebeaninternal.server.transaction.DefaultTransactionScopeManager; -import com.avaje.ebeaninternal.server.transaction.DocStoreTransactionManager; -import com.avaje.ebeaninternal.server.transaction.ExplicitTransactionManager; -import com.avaje.ebeaninternal.server.transaction.ExternalTransactionScopeManager; -import com.avaje.ebeaninternal.server.transaction.JtaTransactionManager; -import com.avaje.ebeaninternal.server.transaction.TransactionManager; -import com.avaje.ebeaninternal.server.transaction.TransactionManagerOptions; -import com.avaje.ebeaninternal.server.transaction.TransactionScopeManager; -import com.avaje.ebeaninternal.server.type.DefaultTypeManager; -import com.avaje.ebeaninternal.server.type.TypeManager; -import com.avaje.ebeanservice.docstore.api.DocStoreFactory; -import com.avaje.ebeanservice.docstore.api.DocStoreIntegration; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdateProcessor; -import com.avaje.ebeanservice.docstore.none.NoneDocStoreFactory; +import io.ebean.ExpressionFactory; +import io.ebean.cache.ServerCacheManager; +import io.ebean.config.ExternalTransactionManager; +import io.ebean.Platform; +import io.ebean.config.ServerConfig; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbHistorySupport; +import io.ebean.event.changelog.ChangeLogListener; +import io.ebean.event.changelog.ChangeLogPrepare; +import io.ebean.event.changelog.ChangeLogRegister; +import io.ebean.event.readaudit.ReadAuditLogger; +import io.ebean.event.readaudit.ReadAuditPrepare; +import io.ebean.plugin.Plugin; +import io.ebean.plugin.SpiServer; +import io.ebean.text.json.JsonContext; +import io.ebeaninternal.api.SpiBackgroundExecutor; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.autotune.AutoTuneService; +import io.ebeaninternal.server.autotune.service.AutoTuneServiceFactory; +import io.ebeaninternal.server.cache.DefaultCacheAdapter; +import io.ebeaninternal.server.cache.SpiCacheManager; +import io.ebeaninternal.server.changelog.DefaultChangeLogListener; +import io.ebeaninternal.server.changelog.DefaultChangeLogPrepare; +import io.ebeaninternal.server.changelog.DefaultChangeLogRegister; +import io.ebeaninternal.server.cluster.ClusterManager; +import io.ebeaninternal.server.core.bootup.BootupClasses; +import io.ebeaninternal.server.core.timezone.CloneDataTimeZone; +import io.ebeaninternal.server.core.timezone.DataTimeZone; +import io.ebeaninternal.server.core.timezone.NoDataTimeZone; +import io.ebeaninternal.server.core.timezone.SimpleDataTimeZone; +import io.ebeaninternal.server.deploy.BeanDescriptorManager; +import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory; +import io.ebeaninternal.server.deploy.parse.DeployCreateProperties; +import io.ebeaninternal.server.deploy.parse.DeployInherit; +import io.ebeaninternal.server.deploy.parse.DeployUtil; +import io.ebeaninternal.server.expression.DefaultExpressionFactory; +import io.ebeaninternal.server.persist.Binder; +import io.ebeaninternal.server.persist.DefaultPersister; +import io.ebeaninternal.server.query.CQueryEngine; +import io.ebeaninternal.server.query.DefaultOrmQueryEngine; +import io.ebeaninternal.server.query.DefaultRelationalQueryEngine; +import io.ebeaninternal.server.readaudit.DefaultReadAuditLogger; +import io.ebeaninternal.server.readaudit.DefaultReadAuditPrepare; +import io.ebeaninternal.server.text.json.DJsonContext; +import io.ebeaninternal.server.transaction.AutoCommitTransactionManager; +import io.ebeaninternal.server.transaction.DataSourceSupplier; +import io.ebeaninternal.server.transaction.DefaultTransactionScopeManager; +import io.ebeaninternal.server.transaction.DocStoreTransactionManager; +import io.ebeaninternal.server.transaction.ExplicitTransactionManager; +import io.ebeaninternal.server.transaction.ExternalTransactionScopeManager; +import io.ebeaninternal.server.transaction.JtaTransactionManager; +import io.ebeaninternal.server.transaction.TransactionManager; +import io.ebeaninternal.server.transaction.TransactionManagerOptions; +import io.ebeaninternal.server.transaction.TransactionScopeManager; +import io.ebeaninternal.server.type.DefaultTypeManager; +import io.ebeaninternal.server.type.TypeManager; +import io.ebeanservice.docstore.api.DocStoreFactory; +import io.ebeanservice.docstore.api.DocStoreIntegration; +import io.ebeanservice.docstore.api.DocStoreUpdateProcessor; +import io.ebeanservice.docstore.none.NoneDocStoreFactory; import com.fasterxml.jackson.core.JsonFactory; import org.avaje.datasource.DataSourcePool; import org.slf4j.Logger; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/JndiDataSourceLookup.java b/src/main/java/io/ebeaninternal/server/core/JndiDataSourceLookup.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/core/JndiDataSourceLookup.java rename to src/main/java/io/ebeaninternal/server/core/JndiDataSourceLookup.java index 120cce758..0e541fadd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/JndiDataSourceLookup.java +++ b/src/main/java/io/ebeaninternal/server/core/JndiDataSourceLookup.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; import javax.naming.Context; import javax.naming.InitialContext; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/Message.java b/src/main/java/io/ebeaninternal/server/core/Message.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/core/Message.java rename to src/main/java/io/ebeaninternal/server/core/Message.java index d0f1edd84..2676be013 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/Message.java +++ b/src/main/java/io/ebeaninternal/server/core/Message.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; import java.text.MessageFormat; import java.util.MissingResourceException; @@ -9,7 +9,7 @@ import java.util.ResourceBundle; */ public class Message { - private static final String bundle = "com.avaje.ebeaninternal.api.message"; + private static final String bundle = "io.ebeaninternal.api.message"; /** * Return a message that has a single argument. diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java b/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java rename to src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java index 940d58ad4..d24652403 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java +++ b/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.config.CurrentTenantProvider; -import com.avaje.ebean.config.TenantSchemaProvider; -import com.avaje.ebeaninternal.server.transaction.DataSourceSupplier; +import io.ebean.config.CurrentTenantProvider; +import io.ebean.config.TenantSchemaProvider; +import io.ebeaninternal.server.transaction.DataSourceSupplier; import org.avaje.datasource.DataSourcePool; import javax.sql.DataSource; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/MultiTenantDbSupplier.java b/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSupplier.java similarity index 80% rename from src/main/java/com/avaje/ebeaninternal/server/core/MultiTenantDbSupplier.java rename to src/main/java/io/ebeaninternal/server/core/MultiTenantDbSupplier.java index 17733ffd5..53472881d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/MultiTenantDbSupplier.java +++ b/src/main/java/io/ebeaninternal/server/core/MultiTenantDbSupplier.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.config.CurrentTenantProvider; -import com.avaje.ebean.config.TenantDataSourceProvider; -import com.avaje.ebeaninternal.server.transaction.DataSourceSupplier; +import io.ebean.config.CurrentTenantProvider; +import io.ebean.config.TenantDataSourceProvider; +import io.ebeaninternal.server.transaction.DataSourceSupplier; import javax.sql.DataSource; import java.sql.Connection; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/NotSupportedDbExpression.java b/src/main/java/io/ebeaninternal/server/core/NotSupportedDbExpression.java similarity index 82% rename from src/main/java/com/avaje/ebeaninternal/server/core/NotSupportedDbExpression.java rename to src/main/java/io/ebeaninternal/server/core/NotSupportedDbExpression.java index 17db357a5..ef5a9fc29 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/NotSupportedDbExpression.java +++ b/src/main/java/io/ebeaninternal/server/core/NotSupportedDbExpression.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.expression.Op; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.expression.Op; /** * Not supported JSON or ARRAY expression handler. diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/OracleDbExpression.java b/src/main/java/io/ebeaninternal/server/core/OracleDbExpression.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/core/OracleDbExpression.java rename to src/main/java/io/ebeaninternal/server/core/OracleDbExpression.java index d3f73cc1e..5eff8280f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/OracleDbExpression.java +++ b/src/main/java/io/ebeaninternal/server/core/OracleDbExpression.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.expression.Op; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.expression.Op; /** * Oracle JSON expression handler, ARRAY expressions not supported. diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryEngine.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryEngine.java rename to src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java index 83acce984..79285478e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryEngine.java +++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.QueryIterator; -import com.avaje.ebean.Version; -import com.avaje.ebean.bean.BeanCollection; +import io.ebean.QueryIterator; +import io.ebean.Version; +import io.ebean.bean.BeanCollection; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryRequest.java rename to src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index a17d0e5c3..95b59842c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryRequest.java +++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -1,33 +1,32 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.PersistenceContextScope; -import com.avaje.ebean.QueryIterator; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.Version; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebean.event.BeanFindController; -import com.avaje.ebean.event.BeanQueryAdapter; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.ebean.text.json.JsonReadOptions; -import com.avaje.ebeaninternal.api.CQueryPlanKey; -import com.avaje.ebeaninternal.api.HashQuery; -import com.avaje.ebeaninternal.api.LoadContext; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.api.SpiQuery.Type; -import com.avaje.ebeaninternal.api.SpiQuerySecondary; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.DeployParser; -import com.avaje.ebeaninternal.server.deploy.DeployPropertyParserMap; -import com.avaje.ebeaninternal.server.loadcontext.DLoadContext; -import com.avaje.ebeaninternal.server.query.CQueryPlan; -import com.avaje.ebeaninternal.server.query.CancelableQuery; -import com.avaje.ebeaninternal.server.transaction.DefaultPersistenceContext; +import io.ebean.PersistenceContextScope; +import io.ebean.QueryIterator; +import io.ebean.Version; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.EntityBean; +import io.ebean.bean.PersistenceContext; +import io.ebean.event.BeanFindController; +import io.ebean.event.BeanQueryAdapter; +import io.ebean.event.BeanQueryRequest; +import io.ebean.text.json.JsonReadOptions; +import io.ebeaninternal.api.CQueryPlanKey; +import io.ebeaninternal.api.HashQuery; +import io.ebeaninternal.api.LoadContext; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.api.SpiQuery.Type; +import io.ebeaninternal.api.SpiQuerySecondary; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.DeployParser; +import io.ebeaninternal.server.deploy.DeployPropertyParserMap; +import io.ebeaninternal.server.loadcontext.DLoadContext; +import io.ebeaninternal.server.query.CQueryPlan; +import io.ebeaninternal.server.query.CancelableQuery; +import io.ebeaninternal.server.transaction.DefaultPersistenceContext; import javax.persistence.PersistenceException; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PersistDeferredRelationship.java b/src/main/java/io/ebeaninternal/server/core/PersistDeferredRelationship.java similarity index 81% rename from src/main/java/com/avaje/ebeaninternal/server/core/PersistDeferredRelationship.java rename to src/main/java/io/ebeaninternal/server/core/PersistDeferredRelationship.java index 863aa95fd..a9eb5ba03 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/PersistDeferredRelationship.java +++ b/src/main/java/io/ebeaninternal/server/core/PersistDeferredRelationship.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.SqlUpdate; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.id.ImportedId; +import io.ebean.SqlUpdate; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.id.ImportedId; /** * Deferred update of a relationship where an Id value is not initially available diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequest.java b/src/main/java/io/ebeaninternal/server/core/PersistRequest.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/core/PersistRequest.java rename to src/main/java/io/ebeaninternal/server/core/PersistRequest.java index 17d9618b4..918032895 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequest.java +++ b/src/main/java/io/ebeaninternal/server/core/PersistRequest.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.persist.BatchControl; -import com.avaje.ebeaninternal.server.persist.BatchPostExecute; -import com.avaje.ebeaninternal.server.persist.PersistExecute; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.persist.BatchControl; +import io.ebeaninternal.server.persist.BatchPostExecute; +import io.ebeaninternal.server.persist.PersistExecute; /** * Wraps all the objects used to persist a bean. diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java rename to src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java index 50f4f9cdd..5e98dbcac 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java +++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java @@ -1,30 +1,30 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.ValuePair; -import com.avaje.ebean.annotation.DocStoreMode; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebean.bean.PreGetterCallback; -import com.avaje.ebean.event.BeanPersistController; -import com.avaje.ebean.event.BeanPersistListener; -import com.avaje.ebean.event.BeanPersistRequest; -import com.avaje.ebean.event.changelog.BeanChange; -import com.avaje.ebeaninternal.api.ConcurrencyMode; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.api.TransactionEvent; -import com.avaje.ebeaninternal.server.cache.CacheChangeSet; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanManager; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.id.ImportedId; -import com.avaje.ebeaninternal.server.persist.BatchControl; -import com.avaje.ebeaninternal.server.persist.PersistExecute; -import com.avaje.ebeaninternal.server.transaction.BeanPersistIdMap; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdate; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdateContext; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; +import io.ebean.ValuePair; +import io.ebean.annotation.DocStoreMode; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.bean.PreGetterCallback; +import io.ebean.event.BeanPersistController; +import io.ebean.event.BeanPersistListener; +import io.ebean.event.BeanPersistRequest; +import io.ebean.event.changelog.BeanChange; +import io.ebeaninternal.api.ConcurrencyMode; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.TransactionEvent; +import io.ebeaninternal.server.cache.CacheChangeSet; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanManager; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.id.ImportedId; +import io.ebeaninternal.server.persist.BatchControl; +import io.ebeaninternal.server.persist.PersistExecute; +import io.ebeaninternal.server.transaction.BeanPersistIdMap; +import io.ebeanservice.docstore.api.DocStoreUpdate; +import io.ebeanservice.docstore.api.DocStoreUpdateContext; +import io.ebeanservice.docstore.api.DocStoreUpdates; import javax.persistence.OptimisticLockException; import javax.persistence.PersistenceException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestCallableSql.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestCallableSql.java rename to src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java index b2db58e0b..6ca034b82 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestCallableSql.java +++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.CallableSql; -import com.avaje.ebeaninternal.api.BindParams; -import com.avaje.ebeaninternal.api.BindParams.Param; -import com.avaje.ebeaninternal.api.SpiCallableSql; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.api.TransactionEventTable; -import com.avaje.ebeaninternal.server.persist.PersistExecute; +import io.ebean.CallableSql; +import io.ebeaninternal.api.BindParams; +import io.ebeaninternal.api.BindParams.Param; +import io.ebeaninternal.api.SpiCallableSql; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.TransactionEventTable; +import io.ebeaninternal.server.persist.PersistExecute; import java.sql.CallableStatement; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestOrmUpdate.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java similarity index 83% rename from src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestOrmUpdate.java rename to src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java index 70f7d099e..f4bc66eda 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestOrmUpdate.java +++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.api.SpiUpdate; -import com.avaje.ebeaninternal.api.SpiUpdate.OrmUpdateType; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanManager; -import com.avaje.ebeaninternal.server.persist.PersistExecute; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.SpiUpdate; +import io.ebeaninternal.api.SpiUpdate.OrmUpdateType; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanManager; +import io.ebeaninternal.server.persist.PersistExecute; /** * Persist request specifically for CallableSql. diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestUpdateSql.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestUpdateSql.java rename to src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java index 531416f51..fee7e76df 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestUpdateSql.java +++ b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.SqlUpdate; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiSqlUpdate; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.persist.PersistExecute; +import io.ebean.SqlUpdate; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiSqlUpdate; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.persist.PersistExecute; /** * Persist request specifically for CallableSql. diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/Persister.java b/src/main/java/io/ebeaninternal/server/core/Persister.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/core/Persister.java rename to src/main/java/io/ebeaninternal/server/core/Persister.java index 89797b8fe..ea6155cb5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/Persister.java +++ b/src/main/java/io/ebeaninternal/server/core/Persister.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.CallableSql; -import com.avaje.ebean.Query; -import com.avaje.ebean.SqlUpdate; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.Update; -import com.avaje.ebean.bean.EntityBean; +import io.ebean.CallableSql; +import io.ebean.Query; +import io.ebean.SqlUpdate; +import io.ebean.Transaction; +import io.ebean.Update; +import io.ebean.bean.EntityBean; import java.util.Collection; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PostgresCast.java b/src/main/java/io/ebeaninternal/server/core/PostgresCast.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/core/PostgresCast.java rename to src/main/java/io/ebeaninternal/server/core/PostgresCast.java index 7088d3964..47dbb3f74 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/PostgresCast.java +++ b/src/main/java/io/ebeaninternal/server/core/PostgresCast.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; /** * Helper for determining type casting for JSON and ARRAY expressions. diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PostgresJsonExpression.java b/src/main/java/io/ebeaninternal/server/core/PostgresJsonExpression.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/core/PostgresJsonExpression.java rename to src/main/java/io/ebeaninternal/server/core/PostgresJsonExpression.java index 3e102b132..2803e0172 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/PostgresJsonExpression.java +++ b/src/main/java/io/ebeaninternal/server/core/PostgresJsonExpression.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.expression.Op; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.expression.Op; /** * Postgres JSON and ARRAY expression handler diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/RefreshHelp.java b/src/main/java/io/ebeaninternal/server/core/RefreshHelp.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/core/RefreshHelp.java rename to src/main/java/io/ebeaninternal/server/core/RefreshHelp.java index bd5622718..24ff1d117 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/RefreshHelp.java +++ b/src/main/java/io/ebeaninternal/server/core/RefreshHelp.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; /** @@ -14,9 +14,9 @@ public class RefreshHelp { // * Helper for debug of lazy loading. // */ // private final DebugLazyLoad debugLazyLoad; -// +// // private final MAdminLoggingMBean logControl; -// +// // public RefreshHelp(MAdminLoggingMBean logControl, boolean debugLazyLoad){ // this.logControl = logControl; // this.debugLazyLoad = new DebugLazyLoad(debugLazyLoad); @@ -33,15 +33,15 @@ public class RefreshHelp { // // set of properties to exclude from the refresh because it is // // not a refresh but rather a lazyLoading event. // Set excludes = null; -// +// // // turn off intercepting so lazy loading is // // not invoked when populating the bean // // with PropertyChangeSupport // ebi.setIntercepting(false); -// +// // boolean readOnly = ebi.isReadOnly(); // boolean sharedInstance = ebi.isSharedInstance(); -// +// // if (isLazyLoad){ // excludes = ebi.getLoadedProps(); // if (excludes != null){ @@ -49,26 +49,26 @@ public class RefreshHelp { // // contains some properties and perhaps some oldValues // // and these will need to be maintained... // originalOldValues = ebi.getOldValues(); -// setOriginalOldValues = originalOldValues != null; +// setOriginalOldValues = originalOldValues != null; // } -// +// // if (logControl.isDebugLazyLoad()){ // debug(desc, ebi, id, excludes); -// } +// } // } -// -// +// +// // BeanProperty[] props = desc.propertiesBaseScalar(); // for (int i = 0; i < props.length; i++) { // BeanProperty prop = props[i]; // if (excludes != null && excludes.contains(prop.getName())){ // // ignore this property (partial bean lazy loading) -// +// // } else { // Object dbVal = prop.getValue(dbBean); // if (isLazyLoad) { // prop.setValue(o, dbVal); -// } else { +// } else { // prop.setValueIntercept(o, dbVal); // } // if (setOriginalOldValues){ @@ -83,11 +83,11 @@ public class RefreshHelp { // BeanProperty prop = ones[i]; // if (excludes != null && excludes.contains(prop.getName())){ // // ignore this property (partial bean lazy loading) -// +// // } else { // Object dbVal = prop.getValue(dbBean); // if (isLazyLoad){ -// prop.setValue(o, dbVal); +// prop.setValue(o, dbVal); // } else { // prop.setValueIntercept(o, dbVal); // } @@ -101,10 +101,10 @@ public class RefreshHelp { // ((EntityBean)dbVal)._ebean_getIntercept().setSharedInstance(); // } else if (readOnly) { // // propagate readOnly status to associated beans -// ((EntityBean)dbVal)._ebean_getIntercept().setReadOnly(true); +// ((EntityBean)dbVal)._ebean_getIntercept().setReadOnly(true); // } // } -// +// // } // } // @@ -116,20 +116,20 @@ public class RefreshHelp { // BeanPropertyAssocMany prop = manys[i]; // if (excludes != null && excludes.contains(prop.getName())){ // // the many already existed on the bean -// +// // } else { // // set a lazy loading proxy -// prop.createReference(o, null, readOnly, sharedInstance); +// prop.createReference(o, null, readOnly, sharedInstance); // } // } -// +// // // the refreshed/lazy loaded bean is always fully // // populated so set loadedProps to null // ebi.setLoadedProps(null); -// -// +// +// // // reset the loaded status -// ebi.setLoaded(); +// ebi.setLoaded(); // } // // /** @@ -145,10 +145,10 @@ public class RefreshHelp { // } else { // // the original embedded bean // Object oEmb = prop.getValue(o); -// +// // // the new one from the database // Object dbEmb = prop.getValue(dbBean); -// +// // if (oEmb == null){ // // original embedded bean was null // // so just replace the entire embedded bean @@ -157,7 +157,7 @@ public class RefreshHelp { // // propagate readOnly status to embedded beans // ((EntityBean)dbEmb)._ebean_getIntercept().setReadOnly(true); // } -// +// // } else { // // refresh each property of the original // // embedded bean @@ -166,38 +166,38 @@ public class RefreshHelp { // // but allow PropertyChangeSupport // ((EntityBean) oEmb)._ebean_getIntercept().setIntercepting(false); // } -// +// // BeanProperty[] props = prop.getProperties(); // for (int j = 0; j < props.length; j++) { // Object v = props[j].getValue(dbEmb); // props[j].setValueIntercept(oEmb, v); // } -// +// // // No longer calling setLoaded() on embedded bean // // as the EntityBean itself // // .. calls setEmbeddedLoaded() on each of -// // .. its embedded beans itself. +// // .. its embedded beans itself. // } // } // } // } -// +// // // /** // * Output some debug to describe the lazy loading event. // */ // private void debug(BeanDescriptor desc, EntityBeanIntercept ebi, Object id, Set excludes) { -// -// +// +// // Class beanType = desc.getBeanType(); -// +// // StackTraceElement cause = debugLazyLoad.getStackTraceElement(beanType); -// +// // String lazyLoadProperty = ebi.getLazyLoadProperty(); // String msg = "debug.lazyLoad ["+desc+"] id["+id+"] lazyLoadProperty["+lazyLoadProperty+"]"; // if (excludes != null){ // msg += " partialProps"+excludes; -// } +// } // if (cause != null){ // String causeLine = cause.toString(); // if (causeLine.indexOf(".groovy:") > -1){ @@ -206,10 +206,10 @@ public class RefreshHelp { // } // msg += " at: "+causeLine; // } -// System.err.println(msg); +// System.err.println(msg); // } -// // -// +// +// } diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/RelationalQueryEngine.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/core/RelationalQueryEngine.java rename to src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java index f8ab496a7..b0f01d8cb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/RelationalQueryEngine.java +++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryEngine.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.SqlRow; +import io.ebean.SqlRow; import java.util.List; import java.util.function.Consumer; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/RelationalQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/core/RelationalQueryRequest.java rename to src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java index 3ae82d85c..9131514e5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/RelationalQueryRequest.java +++ b/src/main/java/io/ebeaninternal/server/core/RelationalQueryRequest.java @@ -1,18 +1,18 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.SqlQuery; -import com.avaje.ebean.SqlRow; -import com.avaje.ebean.Transaction; -import com.avaje.ebeaninternal.api.BindParams; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiSqlQuery; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.lib.util.Str; -import com.avaje.ebeaninternal.server.persist.Binder; -import com.avaje.ebeaninternal.server.query.DefaultSqlRow; -import com.avaje.ebeaninternal.server.transaction.TransactionManager; -import com.avaje.ebeaninternal.server.util.BindParamsParser; +import io.ebean.EbeanServer; +import io.ebean.SqlQuery; +import io.ebean.SqlRow; +import io.ebean.Transaction; +import io.ebeaninternal.api.BindParams; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiSqlQuery; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.lib.util.Str; +import io.ebeaninternal.server.persist.Binder; +import io.ebeaninternal.server.query.DefaultSqlRow; +import io.ebeaninternal.server.transaction.TransactionManager; +import io.ebeaninternal.server.util.BindParamsParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/ServletContextListener.java b/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java similarity index 85% rename from src/main/java/com/avaje/ebeaninternal/server/core/ServletContextListener.java rename to src/main/java/io/ebeaninternal/server/core/ServletContextListener.java index f9486be50..743aca4e1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/ServletContextListener.java +++ b/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebeaninternal.server.lib.ShutdownManager; +import io.ebeaninternal.server.lib.ShutdownManager; import javax.servlet.ServletContextEvent; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/SimpleDataSourceProvider.java b/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/core/SimpleDataSourceProvider.java rename to src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java index 2e3dfa0a6..7fda482c4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/SimpleDataSourceProvider.java +++ b/src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebeaninternal.server.transaction.DataSourceSupplier; +import io.ebeaninternal.server.transaction.DataSourceSupplier; import org.avaje.datasource.DataSourcePool; import javax.sql.DataSource; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/SpiOrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/core/SpiOrmQueryRequest.java rename to src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java index bde00ff50..752665a8e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/SpiOrmQueryRequest.java +++ b/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.QueryIterator; -import com.avaje.ebean.Version; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeanservice.docstore.api.DocQueryRequest; +import io.ebean.QueryIterator; +import io.ebean.Version; +import io.ebean.bean.BeanCollection; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeanservice.docstore.api.DocQueryRequest; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/TransWrapper.java b/src/main/java/io/ebeaninternal/server/core/TransWrapper.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/core/TransWrapper.java rename to src/main/java/io/ebeaninternal/server/core/TransWrapper.java index e1cdf36ac..a8f9d11e9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/TransWrapper.java +++ b/src/main/java/io/ebeaninternal/server/core/TransWrapper.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.SpiTransaction; /** * Used to temporarily wrap a thread local based transaction. diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/bootup/BootupClassPathSearch.java b/src/main/java/io/ebeaninternal/server/core/bootup/BootupClassPathSearch.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/core/bootup/BootupClassPathSearch.java rename to src/main/java/io/ebeaninternal/server/core/bootup/BootupClassPathSearch.java index f5641eed1..b27e5cf81 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/bootup/BootupClassPathSearch.java +++ b/src/main/java/io/ebeaninternal/server/core/bootup/BootupClassPathSearch.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.core.bootup; +package io.ebeaninternal.server.core.bootup; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebeaninternal.server.core.ClassPathScanners; +import io.ebean.config.ServerConfig; +import io.ebeaninternal.server.core.ClassPathScanners; import org.avaje.classpath.scanner.ClassPathScanner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/bootup/BootupClasses.java b/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/core/bootup/BootupClasses.java rename to src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java index 96515df28..ad82e833b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/bootup/BootupClasses.java +++ b/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java @@ -1,22 +1,22 @@ -package com.avaje.ebeaninternal.server.core.bootup; +package io.ebeaninternal.server.core.bootup; -import com.avaje.ebean.annotation.DocStore; -import com.avaje.ebean.config.IdGenerator; -import com.avaje.ebean.config.ScalarTypeConverter; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.event.BeanFindController; -import com.avaje.ebean.event.BeanPersistController; -import com.avaje.ebean.event.BeanPersistListener; -import com.avaje.ebean.event.BeanPostConstructListener; -import com.avaje.ebean.event.BeanPostLoad; -import com.avaje.ebean.event.BeanQueryAdapter; -import com.avaje.ebean.event.ServerConfigStartup; -import com.avaje.ebean.event.changelog.ChangeLogListener; -import com.avaje.ebean.event.changelog.ChangeLogPrepare; -import com.avaje.ebean.event.changelog.ChangeLogRegister; -import com.avaje.ebean.event.readaudit.ReadAuditLogger; -import com.avaje.ebean.event.readaudit.ReadAuditPrepare; -import com.avaje.ebeaninternal.server.type.ScalarType; +import io.ebean.annotation.DocStore; +import io.ebean.config.IdGenerator; +import io.ebean.config.ScalarTypeConverter; +import io.ebean.config.ServerConfig; +import io.ebean.event.BeanFindController; +import io.ebean.event.BeanPersistController; +import io.ebean.event.BeanPersistListener; +import io.ebean.event.BeanPostConstructListener; +import io.ebean.event.BeanPostLoad; +import io.ebean.event.BeanQueryAdapter; +import io.ebean.event.ServerConfigStartup; +import io.ebean.event.changelog.ChangeLogListener; +import io.ebean.event.changelog.ChangeLogPrepare; +import io.ebean.event.changelog.ChangeLogRegister; +import io.ebean.event.readaudit.ReadAuditLogger; +import io.ebean.event.readaudit.ReadAuditPrepare; +import io.ebeaninternal.server.type.ScalarType; import org.avaje.classpath.scanner.ClassFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/bootup/DistillPackages.java b/src/main/java/io/ebeaninternal/server/core/bootup/DistillPackages.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/core/bootup/DistillPackages.java rename to src/main/java/io/ebeaninternal/server/core/bootup/DistillPackages.java index 6dbfb865a..1b5ebe8e9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/bootup/DistillPackages.java +++ b/src/main/java/io/ebeaninternal/server/core/bootup/DistillPackages.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.core.bootup; +package io.ebeaninternal.server.core.bootup; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/bootup/ManifestReader.java b/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/core/bootup/ManifestReader.java rename to src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java index 3acfb8996..72edb61cb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/bootup/ManifestReader.java +++ b/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.core.bootup; +package io.ebeaninternal.server.core.bootup; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/package.html b/src/main/java/io/ebeaninternal/server/core/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/core/package.html rename to src/main/java/io/ebeaninternal/server/core/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/timezone/CloneDataTimeZone.java b/src/main/java/io/ebeaninternal/server/core/timezone/CloneDataTimeZone.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/core/timezone/CloneDataTimeZone.java rename to src/main/java/io/ebeaninternal/server/core/timezone/CloneDataTimeZone.java index 4f18d653d..7dd18da11 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/timezone/CloneDataTimeZone.java +++ b/src/main/java/io/ebeaninternal/server/core/timezone/CloneDataTimeZone.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.core.timezone; +package io.ebeaninternal.server.core.timezone; import java.util.Calendar; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/timezone/DataTimeZone.java b/src/main/java/io/ebeaninternal/server/core/timezone/DataTimeZone.java similarity index 82% rename from src/main/java/com/avaje/ebeaninternal/server/core/timezone/DataTimeZone.java rename to src/main/java/io/ebeaninternal/server/core/timezone/DataTimeZone.java index 2509fd4a2..c86bc19d5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/timezone/DataTimeZone.java +++ b/src/main/java/io/ebeaninternal/server/core/timezone/DataTimeZone.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.core.timezone; +package io.ebeaninternal.server.core.timezone; import java.util.Calendar; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/timezone/NoDataTimeZone.java b/src/main/java/io/ebeaninternal/server/core/timezone/NoDataTimeZone.java similarity index 83% rename from src/main/java/com/avaje/ebeaninternal/server/core/timezone/NoDataTimeZone.java rename to src/main/java/io/ebeaninternal/server/core/timezone/NoDataTimeZone.java index 735af0202..f951fcd2b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/timezone/NoDataTimeZone.java +++ b/src/main/java/io/ebeaninternal/server/core/timezone/NoDataTimeZone.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.core.timezone; +package io.ebeaninternal.server.core.timezone; import java.util.Calendar; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/timezone/SimpleDataTimeZone.java b/src/main/java/io/ebeaninternal/server/core/timezone/SimpleDataTimeZone.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/core/timezone/SimpleDataTimeZone.java rename to src/main/java/io/ebeaninternal/server/core/timezone/SimpleDataTimeZone.java index 29c1904c1..f7debf4cf 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/timezone/SimpleDataTimeZone.java +++ b/src/main/java/io/ebeaninternal/server/core/timezone/SimpleDataTimeZone.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.core.timezone; +package io.ebeaninternal.server.core.timezone; import java.util.Calendar; import java.util.TimeZone; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelp.java b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelp.java rename to src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java index 307698334..adfb689a2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebeaninternal.server.query.SqlJoinType; +import io.ebean.bean.EntityBean; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.server.query.SqlJoinType; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java rename to src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java index b1e3bd45b..7cf4cc5d2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java +++ b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.bean.EntityBean; +import io.ebean.bean.EntityBean; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefExported.java b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefExported.java rename to src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java index 318a158a3..81de5a036 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefExported.java +++ b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebeaninternal.server.query.SqlJoinType; +import io.ebeaninternal.server.query.SqlJoinType; /** * Helper for BeanPropertyAssocOne for OneToOne exported reference - not so common. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java rename to src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java index 6ec408677..0bc418563 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java +++ b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebeaninternal.server.query.SqlJoinType; +import io.ebean.bean.EntityBean; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.server.query.SqlJoinType; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java rename to src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java index f84e861cf..9e10e9ec8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java +++ b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefSimple.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; /** * Helper for BeanPropertyAssocOne imported reference - this is the common case. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCascadeInfo.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCascadeInfo.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java index 3ac26d4b7..54801eae9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCascadeInfo.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import javax.persistence.CascadeType; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCollectionHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java similarity index 78% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCollectionHelp.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java index f870b7803..4d05dd0c9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCollectionHelp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Query; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.BeanCollectionAdd; -import com.avaje.ebean.bean.BeanCollectionLoader; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.text.json.WriteJson; +import io.ebean.EbeanServer; +import io.ebean.Query; +import io.ebean.Transaction; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.BeanCollectionAdd; +import io.ebean.bean.BeanCollectionLoader; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.text.json.WriteJson; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java index fcf14366a..856e25c91 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.core.OrmQueryRequest; /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCollectionUtil.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCollectionUtil.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java index 220633a62..e8e2b1c0c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCollectionUtil.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.util.Collection; import java.util.Map; import javax.persistence.PersistenceException; -import com.avaje.ebean.bean.BeanCollection; +import io.ebean.bean.BeanCollection; /** * Utility methods for BeanCollections. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index de27672fe..3ce46aac2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -1,83 +1,83 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.OrderBy; -import com.avaje.ebean.PersistenceContextScope; -import com.avaje.ebean.Query; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.SqlUpdate; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.ValuePair; -import com.avaje.ebean.annotation.DocStoreMode; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebean.bean.PersistenceContextUtil; -import com.avaje.ebean.config.EncryptKey; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.dbplatform.IdType; -import com.avaje.ebean.config.dbplatform.PlatformIdGenerator; -import com.avaje.ebean.event.BeanFindController; -import com.avaje.ebean.event.BeanPersistController; -import com.avaje.ebean.event.BeanPersistListener; -import com.avaje.ebean.event.BeanPostConstructListener; -import com.avaje.ebean.event.BeanPostLoad; -import com.avaje.ebean.event.BeanQueryAdapter; -import com.avaje.ebean.event.changelog.BeanChange; -import com.avaje.ebean.event.changelog.ChangeLogFilter; -import com.avaje.ebean.event.changelog.ChangeType; -import com.avaje.ebean.event.readaudit.ReadAuditLogger; -import com.avaje.ebean.event.readaudit.ReadAuditPrepare; -import com.avaje.ebean.event.readaudit.ReadEvent; -import com.avaje.ebean.meta.MetaBeanInfo; -import com.avaje.ebean.meta.MetaQueryPlanStatistic; -import com.avaje.ebean.plugin.BeanDocType; -import com.avaje.ebean.plugin.BeanType; -import com.avaje.ebean.plugin.ExpressionPath; -import com.avaje.ebean.plugin.Property; -import com.avaje.ebeaninternal.api.CQueryPlanKey; -import com.avaje.ebeaninternal.api.ConcurrencyMode; -import com.avaje.ebeaninternal.api.LoadContext; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.api.SpiUpdatePlan; -import com.avaje.ebeaninternal.api.TransactionEventTable.TableIUD; -import com.avaje.ebeaninternal.server.cache.CacheChangeSet; -import com.avaje.ebeaninternal.server.cache.CachedBeanData; -import com.avaje.ebeaninternal.server.cache.CachedManyIds; -import com.avaje.ebeaninternal.server.core.CacheOptions; -import com.avaje.ebeaninternal.server.core.DefaultSqlUpdate; -import com.avaje.ebeaninternal.server.core.DiffHelp; -import com.avaje.ebeaninternal.server.core.InternString; -import com.avaje.ebeaninternal.server.core.PersistRequest; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.id.IdBinder; -import com.avaje.ebeaninternal.server.deploy.id.ImportedId; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyLists; -import com.avaje.ebeaninternal.server.el.ElComparator; -import com.avaje.ebeaninternal.server.el.ElComparatorCompound; -import com.avaje.ebeaninternal.server.el.ElComparatorProperty; -import com.avaje.ebeaninternal.server.el.ElPropertyChainBuilder; -import com.avaje.ebeaninternal.server.el.ElPropertyDeploy; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; -import com.avaje.ebeaninternal.server.persist.DmlUtil; -import com.avaje.ebeaninternal.server.query.CQueryPlan; -import com.avaje.ebeaninternal.server.query.CQueryPlanStats.Snapshot; -import com.avaje.ebeaninternal.server.query.SplitName; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; -import com.avaje.ebeaninternal.server.text.json.ReadJson; -import com.avaje.ebeaninternal.server.text.json.WriteJson; -import com.avaje.ebeaninternal.server.type.DataBind; -import com.avaje.ebeaninternal.util.SortByClause; -import com.avaje.ebeaninternal.util.SortByClauseParser; -import com.avaje.ebeanservice.docstore.api.DocStoreBeanAdapter; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdateContext; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; -import com.avaje.ebeanservice.docstore.api.mapping.DocMappingBuilder; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyMapping; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; -import com.avaje.ebeanservice.docstore.api.mapping.DocumentMapping; +import io.ebean.OrderBy; +import io.ebean.PersistenceContextScope; +import io.ebean.Query; +import io.ebean.RawSql; +import io.ebean.SqlUpdate; +import io.ebean.Transaction; +import io.ebean.ValuePair; +import io.ebean.annotation.DocStoreMode; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.bean.PersistenceContext; +import io.ebean.bean.PersistenceContextUtil; +import io.ebean.config.EncryptKey; +import io.ebean.config.ServerConfig; +import io.ebean.config.dbplatform.IdType; +import io.ebean.config.dbplatform.PlatformIdGenerator; +import io.ebean.event.BeanFindController; +import io.ebean.event.BeanPersistController; +import io.ebean.event.BeanPersistListener; +import io.ebean.event.BeanPostConstructListener; +import io.ebean.event.BeanPostLoad; +import io.ebean.event.BeanQueryAdapter; +import io.ebean.event.changelog.BeanChange; +import io.ebean.event.changelog.ChangeLogFilter; +import io.ebean.event.changelog.ChangeType; +import io.ebean.event.readaudit.ReadAuditLogger; +import io.ebean.event.readaudit.ReadAuditPrepare; +import io.ebean.event.readaudit.ReadEvent; +import io.ebean.meta.MetaBeanInfo; +import io.ebean.meta.MetaQueryPlanStatistic; +import io.ebean.plugin.BeanDocType; +import io.ebean.plugin.BeanType; +import io.ebean.plugin.ExpressionPath; +import io.ebean.plugin.Property; +import io.ebeaninternal.api.CQueryPlanKey; +import io.ebeaninternal.api.ConcurrencyMode; +import io.ebeaninternal.api.LoadContext; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.api.SpiUpdatePlan; +import io.ebeaninternal.api.TransactionEventTable.TableIUD; +import io.ebeaninternal.server.cache.CacheChangeSet; +import io.ebeaninternal.server.cache.CachedBeanData; +import io.ebeaninternal.server.cache.CachedManyIds; +import io.ebeaninternal.server.core.CacheOptions; +import io.ebeaninternal.server.core.DefaultSqlUpdate; +import io.ebeaninternal.server.core.DiffHelp; +import io.ebeaninternal.server.core.InternString; +import io.ebeaninternal.server.core.PersistRequest; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.id.IdBinder; +import io.ebeaninternal.server.deploy.id.ImportedId; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyLists; +import io.ebeaninternal.server.el.ElComparator; +import io.ebeaninternal.server.el.ElComparatorCompound; +import io.ebeaninternal.server.el.ElComparatorProperty; +import io.ebeaninternal.server.el.ElPropertyChainBuilder; +import io.ebeaninternal.server.el.ElPropertyDeploy; +import io.ebeaninternal.server.el.ElPropertyValue; +import io.ebeaninternal.server.persist.DmlUtil; +import io.ebeaninternal.server.query.CQueryPlan; +import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot; +import io.ebeaninternal.server.query.SplitName; +import io.ebeaninternal.server.querydefn.OrmQueryDetail; +import io.ebeaninternal.server.text.json.ReadJson; +import io.ebeaninternal.server.text.json.WriteJson; +import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.util.SortByClause; +import io.ebeaninternal.util.SortByClauseParser; +import io.ebeanservice.docstore.api.DocStoreBeanAdapter; +import io.ebeanservice.docstore.api.DocStoreUpdateContext; +import io.ebeanservice.docstore.api.DocStoreUpdates; +import io.ebeanservice.docstore.api.mapping.DocMappingBuilder; +import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeanservice.docstore.api.mapping.DocumentMapping; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java index fc0025e33..b2a6d0b4c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java @@ -1,23 +1,23 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.api.TransactionEventTable.TableIUD; -import com.avaje.ebeaninternal.server.cache.CacheChangeSet; -import com.avaje.ebeaninternal.server.cache.CachedBeanData; -import com.avaje.ebeaninternal.server.cache.CachedBeanDataFromBean; -import com.avaje.ebeaninternal.server.cache.CachedBeanDataToBean; -import com.avaje.ebeaninternal.server.cache.CachedManyIds; -import com.avaje.ebeaninternal.server.cache.SpiCacheManager; -import com.avaje.ebeaninternal.server.core.CacheOptions; -import com.avaje.ebeaninternal.server.core.PersistRequest; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.querydefn.NaturalKeyBindParam; -import com.avaje.ebeaninternal.server.transaction.DefaultPersistenceContext; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.bean.PersistenceContext; +import io.ebean.cache.ServerCache; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.api.TransactionEventTable.TableIUD; +import io.ebeaninternal.server.cache.CacheChangeSet; +import io.ebeaninternal.server.cache.CachedBeanData; +import io.ebeaninternal.server.cache.CachedBeanDataFromBean; +import io.ebeaninternal.server.cache.CachedBeanDataToBean; +import io.ebeaninternal.server.cache.CachedManyIds; +import io.ebeaninternal.server.cache.SpiCacheManager; +import io.ebeaninternal.server.core.CacheOptions; +import io.ebeaninternal.server.core.PersistRequest; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.querydefn.NaturalKeyBindParam; +import io.ebeaninternal.server.transaction.DefaultPersistenceContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java index 70f35ec56..89525901f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.Query; -import com.avaje.ebean.bean.EntityBean; +import io.ebean.Query; +import io.ebean.bean.EntityBean; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java index bdc79731d..6de001332 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.text.json.EJson; -import com.avaje.ebeaninternal.server.text.json.ReadJson; -import com.avaje.ebeaninternal.server.text.json.WriteJson; -import com.avaje.ebeaninternal.server.text.json.WriteJson.WriteBean; +import io.ebean.bean.EntityBean; +import io.ebean.text.json.EJson; +import io.ebeaninternal.server.text.json.ReadJson; +import io.ebeaninternal.server.text.json.WriteJson; +import io.ebeaninternal.server.text.json.WriteJson.WriteBean; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index 9c5c35643..82503612f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -1,61 +1,61 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.Model; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.config.EncryptKey; -import com.avaje.ebean.config.EncryptKeyManager; -import com.avaje.ebean.config.NamingConvention; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.DbHistorySupport; -import com.avaje.ebean.config.dbplatform.DbIdentity; -import com.avaje.ebean.config.dbplatform.IdType; -import com.avaje.ebean.config.dbplatform.PlatformIdGenerator; -import com.avaje.ebean.event.changelog.ChangeLogFilter; -import com.avaje.ebean.event.changelog.ChangeLogListener; -import com.avaje.ebean.event.changelog.ChangeLogPrepare; -import com.avaje.ebean.event.changelog.ChangeLogRegister; -import com.avaje.ebean.plugin.BeanType; -import com.avaje.ebeaninternal.api.ConcurrencyMode; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.TransactionEventTable; -import com.avaje.ebeaninternal.server.cache.SpiCacheManager; -import com.avaje.ebeaninternal.server.core.InternString; -import com.avaje.ebeaninternal.server.core.InternalConfiguration; -import com.avaje.ebeaninternal.server.core.Message; -import com.avaje.ebeaninternal.server.core.bootup.BootupClasses; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor.EntityType; -import com.avaje.ebeaninternal.server.deploy.id.IdBinder; -import com.avaje.ebeaninternal.server.deploy.id.IdBinderEmbedded; -import com.avaje.ebeaninternal.server.deploy.id.IdBinderFactory; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanTable; -import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoin; -import com.avaje.ebeaninternal.server.deploy.parse.DeployBeanInfo; -import com.avaje.ebeaninternal.server.deploy.parse.DeployCreateProperties; -import com.avaje.ebeaninternal.server.deploy.parse.DeployInherit; -import com.avaje.ebeaninternal.server.deploy.parse.DeployUtil; -import com.avaje.ebeaninternal.server.deploy.parse.ReadAnnotations; -import com.avaje.ebeaninternal.server.deploy.parse.TransientProperties; -import com.avaje.ebeaninternal.server.properties.BeanPropertiesReader; -import com.avaje.ebeaninternal.server.properties.BeanPropertyAccess; -import com.avaje.ebeaninternal.server.properties.EnhanceBeanPropertyAccess; -import com.avaje.ebeaninternal.xmlmapping.XmlMappingReader; -import com.avaje.ebeaninternal.xmlmapping.model.XmAliasMapping; -import com.avaje.ebeaninternal.xmlmapping.model.XmColumnMapping; -import com.avaje.ebeaninternal.xmlmapping.model.XmEbean; -import com.avaje.ebeaninternal.xmlmapping.model.XmEntity; -import com.avaje.ebeaninternal.xmlmapping.model.XmNamedQuery; -import com.avaje.ebeaninternal.xmlmapping.model.XmRawSql; -import com.avaje.ebeanservice.docstore.api.DocStoreBeanAdapter; -import com.avaje.ebeanservice.docstore.api.DocStoreFactory; +import io.ebean.BackgroundExecutor; +import io.ebean.Model; +import io.ebean.RawSqlBuilder; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.EntityBean; +import io.ebean.config.EncryptKey; +import io.ebean.config.EncryptKeyManager; +import io.ebean.config.NamingConvention; +import io.ebean.config.ServerConfig; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbHistorySupport; +import io.ebean.config.dbplatform.DbIdentity; +import io.ebean.config.dbplatform.IdType; +import io.ebean.config.dbplatform.PlatformIdGenerator; +import io.ebean.event.changelog.ChangeLogFilter; +import io.ebean.event.changelog.ChangeLogListener; +import io.ebean.event.changelog.ChangeLogPrepare; +import io.ebean.event.changelog.ChangeLogRegister; +import io.ebean.plugin.BeanType; +import io.ebeaninternal.api.ConcurrencyMode; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.TransactionEventTable; +import io.ebeaninternal.server.cache.SpiCacheManager; +import io.ebeaninternal.server.core.InternString; +import io.ebeaninternal.server.core.InternalConfiguration; +import io.ebeaninternal.server.core.Message; +import io.ebeaninternal.server.core.bootup.BootupClasses; +import io.ebeaninternal.server.deploy.BeanDescriptor.EntityType; +import io.ebeaninternal.server.deploy.id.IdBinder; +import io.ebeaninternal.server.deploy.id.IdBinderEmbedded; +import io.ebeaninternal.server.deploy.id.IdBinderFactory; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.meta.DeployBeanTable; +import io.ebeaninternal.server.deploy.meta.DeployTableJoin; +import io.ebeaninternal.server.deploy.parse.DeployBeanInfo; +import io.ebeaninternal.server.deploy.parse.DeployCreateProperties; +import io.ebeaninternal.server.deploy.parse.DeployInherit; +import io.ebeaninternal.server.deploy.parse.DeployUtil; +import io.ebeaninternal.server.deploy.parse.ReadAnnotations; +import io.ebeaninternal.server.deploy.parse.TransientProperties; +import io.ebeaninternal.server.properties.BeanPropertiesReader; +import io.ebeaninternal.server.properties.BeanPropertyAccess; +import io.ebeaninternal.server.properties.EnhanceBeanPropertyAccess; +import io.ebeaninternal.xmlmapping.XmlMappingReader; +import io.ebeaninternal.xmlmapping.model.XmAliasMapping; +import io.ebeaninternal.xmlmapping.model.XmColumnMapping; +import io.ebeaninternal.xmlmapping.model.XmEbean; +import io.ebeaninternal.xmlmapping.model.XmEntity; +import io.ebeaninternal.xmlmapping.model.XmNamedQuery; +import io.ebeaninternal.xmlmapping.model.XmRawSql; +import io.ebeanservice.docstore.api.DocStoreBeanAdapter; +import io.ebeanservice.docstore.api.DocStoreFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1418,9 +1418,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap { // the bean already implements EntityBean checkInheritedClasses(beanClass); - if (!beanClass.getName().startsWith("com.avaje.ebean.meta")) { - entityBeanCount++; - } + entityBeanCount++; } /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorMap.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java similarity index 71% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorMap.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java index 3a4d5ddcd..d01664bc2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorMap.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.config.EncryptKey; -import com.avaje.ebean.config.NamingConvention; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebeaninternal.server.cache.SpiCacheManager; -import com.avaje.ebeaninternal.server.deploy.id.IdBinder; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; -import com.avaje.ebeanservice.docstore.api.DocStoreBeanAdapter; +import io.ebean.config.EncryptKey; +import io.ebean.config.NamingConvention; +import io.ebean.config.ServerConfig; +import io.ebeaninternal.server.cache.SpiCacheManager; +import io.ebeaninternal.server.deploy.id.IdBinder; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebeanservice.docstore.api.DocStoreBeanAdapter; /** * Provides a method to find a BeanDescriptor. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanEmbeddedMeta.java b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMeta.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanEmbeddedMeta.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMeta.java index 11557fac8..676db4497 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanEmbeddedMeta.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMeta.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; public class BeanEmbeddedMeta { diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java index e86e7714f..0a8e274f1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.util.Map; import javax.persistence.PersistenceException; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; /** * Creates BeanProperties for Embedded beans that have deployment information diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanFinderManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java similarity index 79% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanFinderManager.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java index c3b65060f..5e81ba3aa 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanFinderManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.event.BeanFindController; -import com.avaje.ebeaninternal.server.core.bootup.BootupClasses; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebean.event.BeanFindController; +import io.ebeaninternal.server.core.bootup.BootupClasses; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanFkeyProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanFkeyProperty.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java index b9e438b69..ab56c714a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanFkeyProperty.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.text.StringParser; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; +import io.ebean.bean.EntityBean; +import io.ebean.text.StringParser; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.el.ElPropertyValue; /** * Used to evaluate imported foreign keys so as to avoid unnecessary joins. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java index dbb02c205..fabe7587a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -15,13 +15,13 @@ import javax.persistence.PrePersist; import javax.persistence.PreRemove; import javax.persistence.PreUpdate; -import com.avaje.ebean.annotation.PostSoftDelete; -import com.avaje.ebean.annotation.PreSoftDelete; -import com.avaje.ebean.event.BeanPersistAdapter; -import com.avaje.ebean.event.BeanPersistRequest; -import com.avaje.ebean.event.BeanPostConstructListener; -import com.avaje.ebean.event.BeanPostLoad; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebean.annotation.PostSoftDelete; +import io.ebean.annotation.PreSoftDelete; +import io.ebean.event.BeanPersistAdapter; +import io.ebean.event.BeanPersistRequest; +import io.ebean.event.BeanPostConstructListener; +import io.ebean.event.BeanPostLoad; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; /** * Helper that looks for methods annotated with lifecycle events and registers an adapter for them. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanListHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanListHelp.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java index 8745568f2..eef71b386 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanListHelp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java @@ -1,18 +1,18 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Query; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.BeanCollectionAdd; -import com.avaje.ebean.bean.BeanCollectionLoader; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.common.BeanList; -import com.avaje.ebeaninternal.server.text.json.WriteJson; +import io.ebean.EbeanServer; +import io.ebean.Query; +import io.ebean.Transaction; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.BeanCollectionAdd; +import io.ebean.bean.BeanCollectionLoader; +import io.ebean.bean.EntityBean; +import io.ebean.common.BeanList; +import io.ebeaninternal.server.text.json.WriteJson; /** * Helper object for dealing with Lists. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanManager.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanManager.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanManager.java index d77704f65..630c60b4e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanManager.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebeaninternal.server.persist.BeanPersister; +import io.ebeaninternal.server.persist.BeanPersister; /** * Holds the BeanDescriptor and its associated BeanPersister. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanManagerFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanManagerFactory.java similarity index 61% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanManagerFactory.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanManagerFactory.java index 70723d72d..dfca06bc2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanManagerFactory.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanManagerFactory.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebeaninternal.server.persist.BeanPersisterFactory; -import com.avaje.ebeaninternal.server.persist.dml.DmlBeanPersisterFactory; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebeaninternal.server.persist.BeanPersisterFactory; +import io.ebeaninternal.server.persist.dml.DmlBeanPersisterFactory; /** * Creates BeanManagers. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanMapHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanMapHelp.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java index 8e7971647..81fa4971d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanMapHelp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java @@ -1,14 +1,14 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Query; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.BeanCollectionAdd; -import com.avaje.ebean.bean.BeanCollectionLoader; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.common.BeanMap; -import com.avaje.ebeaninternal.server.text.json.WriteJson; +import io.ebean.EbeanServer; +import io.ebean.Query; +import io.ebean.Transaction; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.BeanCollectionAdd; +import io.ebean.bean.BeanCollectionLoader; +import io.ebean.bean.EntityBean; +import io.ebean.common.BeanMap; +import io.ebeaninternal.server.text.json.WriteJson; import java.io.IOException; import java.util.LinkedHashMap; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index a8eeb6889..827a7b4e0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -1,40 +1,40 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.ValuePair; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebean.config.EncryptKey; -import com.avaje.ebean.config.dbplatform.DbEncryptFunction; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.plugin.Property; -import com.avaje.ebean.text.StringParser; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.core.InternString; -import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; -import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedWhenCreated; -import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedWhenModified; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import com.avaje.ebeaninternal.server.el.ElPropertyChainBuilder; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; -import com.avaje.ebeaninternal.server.lib.util.StringHelper; -import com.avaje.ebeaninternal.server.properties.BeanPropertyGetter; -import com.avaje.ebeaninternal.server.properties.BeanPropertySetter; -import com.avaje.ebeaninternal.server.query.SplitName; -import com.avaje.ebeaninternal.server.query.SqlBeanLoad; -import com.avaje.ebeaninternal.server.query.SqlJoinType; -import com.avaje.ebeaninternal.server.text.json.ReadJson; -import com.avaje.ebeaninternal.server.text.json.WriteJson; -import com.avaje.ebeaninternal.server.type.DataBind; -import com.avaje.ebeaninternal.server.type.ScalarType; -import com.avaje.ebeaninternal.server.type.ScalarTypeBoolean; -import com.avaje.ebeaninternal.server.type.ScalarTypeEnum; -import com.avaje.ebeaninternal.server.type.ScalarTypeLogicalType; -import com.avaje.ebeaninternal.util.ValueUtil; -import com.avaje.ebeanservice.docstore.api.mapping.DocMappingBuilder; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyMapping; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyOptions; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; -import com.avaje.ebeanservice.docstore.api.support.DocStructure; +import io.ebean.ValuePair; +import io.ebean.bean.EntityBean; +import io.ebean.bean.PersistenceContext; +import io.ebean.config.EncryptKey; +import io.ebean.config.dbplatform.DbEncryptFunction; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.plugin.Property; +import io.ebean.text.StringParser; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.core.InternString; +import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; +import io.ebeaninternal.server.deploy.generatedproperty.GeneratedWhenCreated; +import io.ebeaninternal.server.deploy.generatedproperty.GeneratedWhenModified; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebeaninternal.server.el.ElPropertyChainBuilder; +import io.ebeaninternal.server.el.ElPropertyValue; +import io.ebeaninternal.server.lib.util.StringHelper; +import io.ebeaninternal.server.properties.BeanPropertyGetter; +import io.ebeaninternal.server.properties.BeanPropertySetter; +import io.ebeaninternal.server.query.SplitName; +import io.ebeaninternal.server.query.SqlBeanLoad; +import io.ebeaninternal.server.query.SqlJoinType; +import io.ebeaninternal.server.text.json.ReadJson; +import io.ebeaninternal.server.text.json.WriteJson; +import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.type.ScalarType; +import io.ebeaninternal.server.type.ScalarTypeBoolean; +import io.ebeaninternal.server.type.ScalarTypeEnum; +import io.ebeaninternal.server.type.ScalarTypeLogicalType; +import io.ebeaninternal.util.ValueUtil; +import io.ebeanservice.docstore.api.mapping.DocMappingBuilder; +import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; +import io.ebeanservice.docstore.api.mapping.DocPropertyOptions; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeanservice.docstore.api.support.DocStructure; import com.fasterxml.jackson.core.JsonToken; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssoc.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java index f41e5839d..a8fc81ec6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssoc.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java @@ -1,21 +1,21 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.text.PathProperties; -import com.avaje.ebeaninternal.server.core.InternString; -import com.avaje.ebeaninternal.server.deploy.id.IdBinder; -import com.avaje.ebeaninternal.server.deploy.id.ImportedId; -import com.avaje.ebeaninternal.server.deploy.id.ImportedIdEmbedded; -import com.avaje.ebeaninternal.server.deploy.id.ImportedIdSimple; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc; -import com.avaje.ebeaninternal.server.el.ElPropertyChainBuilder; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; -import com.avaje.ebeaninternal.server.query.SplitName; -import com.avaje.ebeaninternal.server.query.SqlJoinType; -import com.avaje.ebeanservice.docstore.api.mapping.DocMappingBuilder; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyMapping; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; -import com.avaje.ebeanservice.docstore.api.support.DocStructure; +import io.ebean.bean.EntityBean; +import io.ebean.text.PathProperties; +import io.ebeaninternal.server.core.InternString; +import io.ebeaninternal.server.deploy.id.IdBinder; +import io.ebeaninternal.server.deploy.id.ImportedId; +import io.ebeaninternal.server.deploy.id.ImportedIdEmbedded; +import io.ebeaninternal.server.deploy.id.ImportedIdSimple; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc; +import io.ebeaninternal.server.el.ElPropertyChainBuilder; +import io.ebeaninternal.server.el.ElPropertyValue; +import io.ebeaninternal.server.query.SplitName; +import io.ebeaninternal.server.query.SqlJoinType; +import io.ebeanservice.docstore.api.mapping.DocMappingBuilder; +import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeanservice.docstore.api.support.DocStructure; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index 1ef618e42..555881d03 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -1,26 +1,26 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Expression; -import com.avaje.ebean.Query; -import com.avaje.ebean.SqlUpdate; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.BeanCollection.ModifyListenMode; -import com.avaje.ebean.bean.BeanCollectionAdd; -import com.avaje.ebean.bean.BeanCollectionLoader; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.text.PathProperties; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.core.DefaultSqlUpdate; -import com.avaje.ebeaninternal.server.deploy.id.ImportedId; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.el.ElPropertyChainBuilder; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; -import com.avaje.ebeaninternal.server.query.SqlBeanLoad; -import com.avaje.ebeaninternal.server.text.json.ReadJson; -import com.avaje.ebeaninternal.server.text.json.WriteJson; +import io.ebean.EbeanServer; +import io.ebean.Expression; +import io.ebean.Query; +import io.ebean.SqlUpdate; +import io.ebean.Transaction; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.BeanCollection.ModifyListenMode; +import io.ebean.bean.BeanCollectionAdd; +import io.ebean.bean.BeanCollectionLoader; +import io.ebean.bean.EntityBean; +import io.ebean.text.PathProperties; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.core.DefaultSqlUpdate; +import io.ebeaninternal.server.deploy.id.ImportedId; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany; +import io.ebeaninternal.server.el.ElPropertyChainBuilder; +import io.ebeaninternal.server.el.ElPropertyValue; +import io.ebeaninternal.server.query.SqlBeanLoad; +import io.ebeaninternal.server.text.json.ReadJson; +import io.ebeaninternal.server.text.json.WriteJson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java index 466eba53a..5e5f45f71 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.BeanCollectionAdd; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.text.json.ReadJson; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.BeanCollectionAdd; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.text.json.ReadJson; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -38,7 +38,7 @@ public class BeanPropertyAssocManyJsonHelp { * Read the JSON for this property. */ public void jsonRead(ReadJson readJson, EntityBean parentBean) throws IOException { - + if (!this.many.jsonDeserialize) { return; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java index 7c7a8df3f..50de7e849 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.text.json.ReadJson; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.text.json.ReadJson; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.CollectionType; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocOne.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index fce69143b..029c0e414 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -1,24 +1,24 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Query; -import com.avaje.ebean.SqlUpdate; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.ValuePair; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebeaninternal.server.cache.CacheChangeSet; -import com.avaje.ebeaninternal.server.cache.CachedBeanData; -import com.avaje.ebeaninternal.server.core.DefaultSqlUpdate; -import com.avaje.ebeaninternal.server.deploy.id.ImportedId; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.el.ElPropertyChainBuilder; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; -import com.avaje.ebeaninternal.server.query.SplitName; -import com.avaje.ebeaninternal.server.query.SqlBeanLoad; -import com.avaje.ebeaninternal.server.query.SqlJoinType; -import com.avaje.ebeaninternal.server.text.json.ReadJson; -import com.avaje.ebeaninternal.server.text.json.WriteJson; +import io.ebean.EbeanServer; +import io.ebean.Query; +import io.ebean.SqlUpdate; +import io.ebean.Transaction; +import io.ebean.ValuePair; +import io.ebean.bean.EntityBean; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.server.cache.CacheChangeSet; +import io.ebeaninternal.server.cache.CachedBeanData; +import io.ebeaninternal.server.core.DefaultSqlUpdate; +import io.ebeaninternal.server.deploy.id.ImportedId; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; +import io.ebeaninternal.server.el.ElPropertyChainBuilder; +import io.ebeaninternal.server.el.ElPropertyValue; +import io.ebeaninternal.server.query.SplitName; +import io.ebeaninternal.server.query.SqlBeanLoad; +import io.ebeaninternal.server.query.SqlJoinType; +import io.ebeaninternal.server.text.json.ReadJson; +import io.ebeaninternal.server.text.json.WriteJson; import javax.persistence.PersistenceException; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyOverride.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOverride.java similarity index 74% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyOverride.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOverride.java index 5841c16f2..a1905eb05 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyOverride.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOverride.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebeaninternal.server.core.InternString; -import com.avaje.ebeaninternal.server.lib.util.StringHelper; +import io.ebeaninternal.server.core.InternString; +import io.ebeaninternal.server.lib.util.StringHelper; /** * Used hold meta data when a bean property is overridden. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java similarity index 64% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java index 7e8de93ad..c3d7fc6a2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertySimpleCollection; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertySimpleCollection; public class BeanPropertySimpleCollection extends BeanPropertyAssocMany { diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanQueryAdapterManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java similarity index 79% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanQueryAdapterManager.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java index 4b54c62c9..25de267cc 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanQueryAdapterManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.event.BeanQueryAdapter; -import com.avaje.ebeaninternal.server.core.bootup.BootupClasses; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebean.event.BeanQueryAdapter; +import io.ebeaninternal.server.core.bootup.BootupClasses; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanSetHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanSetHelp.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java index 487d89f7e..4d2221cf3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanSetHelp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java @@ -1,18 +1,18 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.io.IOException; import java.util.LinkedHashSet; import java.util.Set; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Query; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.BeanCollectionAdd; -import com.avaje.ebean.bean.BeanCollectionLoader; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.common.BeanSet; -import com.avaje.ebeaninternal.server.text.json.WriteJson; +import io.ebean.EbeanServer; +import io.ebean.Query; +import io.ebean.Transaction; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.BeanCollectionAdd; +import io.ebean.bean.BeanCollectionLoader; +import io.ebean.bean.EntityBean; +import io.ebean.common.BeanSet; +import io.ebeaninternal.server.text.json.WriteJson; /** * Helper specifically for dealing with Sets. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanTable.java b/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/BeanTable.java rename to src/main/java/io/ebeaninternal/server/deploy/BeanTable.java index 654bac64e..972ecfd45 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanTable.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebeaninternal.server.core.InternString; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanTable; -import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoin; -import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; +import io.ebeaninternal.server.core.InternString; +import io.ebeaninternal.server.deploy.meta.DeployBeanTable; +import io.ebeaninternal.server.deploy.meta.DeployTableJoin; +import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPersistController.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPersistController.java rename to src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java index 941f59023..d5e0efdab 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPersistController.java +++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.event.BeanPersistController; -import com.avaje.ebean.event.BeanPersistRequest; +import io.ebean.event.BeanPersistController; +import io.ebean.event.BeanPersistRequest; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPersistListener.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPersistListener.java rename to src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java index 6e5a4fffa..2dd0b5ee9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPersistListener.java +++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.util.ArrayList; import java.util.List; import java.util.Set; -import com.avaje.ebean.event.BeanPersistListener; +import io.ebean.event.BeanPersistListener; /** * Handles multiple BeanPersistListener's for a given entity type. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java rename to src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java index b02d4d945..a19fdb05f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java +++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.event.BeanPostConstructListener; +import io.ebean.event.BeanPostConstructListener; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPostLoad.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPostLoad.java rename to src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java index 316b054a4..2ac9c92de 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPostLoad.java +++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPostLoad.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.event.BeanPostLoad; +import io.ebean.event.BeanPostLoad; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java rename to src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java index 4d609c0bf..b0d12312a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java +++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import java.util.List; -import com.avaje.ebean.event.BeanQueryAdapter; -import com.avaje.ebean.event.BeanQueryRequest; +import io.ebean.event.BeanQueryAdapter; +import io.ebean.event.BeanQueryRequest; /** * Handles multiple BeanQueryAdapter for a given entity type. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DbReadContext.java b/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/DbReadContext.java rename to src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java index 93634032b..083809019 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DbReadContext.java +++ b/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.util.Map; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.type.DataReader; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.type.DataReader; /** * Context provided when a BeanProperty reads from a ResultSet. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DbSqlContext.java b/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/DbSqlContext.java rename to src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java index 392c63b13..fa1563866 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DbSqlContext.java +++ b/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebeaninternal.server.query.SqlJoinType; +import io.ebeaninternal.server.query.SqlJoinType; /** * Used to provide context during sql construction. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployDocPropertyOptions.java b/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java similarity index 85% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/DeployDocPropertyOptions.java rename to src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java index ba27d14c1..51eec152d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployDocPropertyOptions.java +++ b/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.annotation.DocCode; -import com.avaje.ebean.annotation.DocProperty; -import com.avaje.ebean.annotation.DocSortable; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyOptions; +import io.ebean.annotation.DocCode; +import io.ebean.annotation.DocProperty; +import io.ebean.annotation.DocSortable; +import io.ebeanservice.docstore.api.mapping.DocPropertyOptions; /** * The options for document property collected when reading deployment mapping. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployParser.java b/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/DeployParser.java rename to src/main/java/io/ebeaninternal/server/deploy/DeployParser.java index cd3197628..864eeb217 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployParser.java +++ b/src/main/java/io/ebeaninternal/server/deploy/DeployParser.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.util.Set; @@ -26,9 +26,9 @@ public abstract class DeployParser { * Used to determine when a column name terminates. */ protected static final char PERIOD = '.'; - + protected boolean encrypted; - + protected String source; protected StringBuilder sb; @@ -40,12 +40,12 @@ public abstract class DeployParser { protected String word; protected char wordTerminator; - + protected abstract String convertWord(); public abstract String getDeployWord(String expression); - + /** * Return the join includes. */ @@ -60,7 +60,7 @@ public abstract class DeployParser { if (source == null) { return null; } - + pos = -1; this.source = source; this.sourceLength = source.length(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParser.java b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParser.java rename to src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java index 276ca89cb..d1fc24cad 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParser.java +++ b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.util.HashSet; import java.util.Set; -import com.avaje.ebeaninternal.server.el.ElPropertyDeploy; +import io.ebeaninternal.server.el.ElPropertyDeploy; /** * Converts logical property names to database columns with table alias. @@ -14,9 +14,9 @@ import com.avaje.ebeaninternal.server.el.ElPropertyDeploy; */ public final class DeployPropertyParser extends DeployParser { - + private final BeanDescriptor beanDescriptor; - + private final Set includes = new HashSet<>(); public DeployPropertyParser(BeanDescriptor beanDescriptor) { @@ -26,7 +26,7 @@ public final class DeployPropertyParser extends DeployParser { public Set getIncludes() { return includes; } - + @Override public String getDeployWord(String expression) { ElPropertyDeploy elProp = beanDescriptor.getElPropertyDeploy(expression); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMap.java b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParserMap.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMap.java rename to src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParserMap.java index 19b1078fa..0ade33ff9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMap.java +++ b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParserMap.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.util.Collections; import java.util.Map; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployUpdateParser.java b/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/DeployUpdateParser.java rename to src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java index cf6261b3d..8f26809f5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployUpdateParser.java +++ b/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.util.Set; -import com.avaje.ebeaninternal.server.el.ElPropertyDeploy; +import io.ebeaninternal.server.el.ElPropertyDeploy; /** * For updates converts logical property names to database columns and bean type to base table. @@ -10,11 +10,11 @@ import com.avaje.ebeaninternal.server.el.ElPropertyDeploy; public final class DeployUpdateParser extends DeployParser { private final BeanDescriptor beanDescriptor; - + public DeployUpdateParser(BeanDescriptor beanDescriptor) { this.beanDescriptor = beanDescriptor; } - + /** * Return null as not used for updates. */ @@ -29,13 +29,13 @@ public final class DeployUpdateParser extends DeployParser { if (dbWord != null) { return dbWord; - } + } // maybe tableAlias.propertyName - return convertSubword(0, word, null); + return convertSubword(0, word, null); } private String convertSubword(int start, String currentWord, StringBuilder localBuffer) { - + int dotPos = currentWord.indexOf('.', start); if (start == 0 && dotPos == -1){ return currentWord; @@ -44,23 +44,23 @@ public final class DeployUpdateParser extends DeployParser { localBuffer = new StringBuilder(); } if (dotPos == -1){ - // no match... + // no match... localBuffer.append(currentWord.substring(start)); return localBuffer.toString(); } - + // append up to the dot localBuffer.append(currentWord.substring(start, dotPos+1)); - + if (dotPos == currentWord.length()-1){ // ends with a "." ??? return localBuffer.toString(); } - + // get the remainder after the dot start = dotPos+1; String remainder = currentWord.substring(start, currentWord.length()); - + //String dbWord = deployMap.get(remainder.toLowerCase()); String dbWord = getDeployWord(remainder); if (dbWord != null){ @@ -72,9 +72,9 @@ public final class DeployUpdateParser extends DeployParser { return convertSubword(start, currentWord, localBuffer); } } - + public String getDeployWord(String expression) { - + if (expression.equalsIgnoreCase(beanDescriptor.getName())){ return beanDescriptor.getBaseTable(); } @@ -86,5 +86,5 @@ public final class DeployUpdateParser extends DeployParser { return null; } } - + } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DetermineAggPath.java b/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/DetermineAggPath.java rename to src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java index 1b24a7217..3d4e3683e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DetermineAggPath.java +++ b/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; class DetermineAggPath { diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DetermineManyType.java b/src/main/java/io/ebeaninternal/server/deploy/DetermineManyType.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/DetermineManyType.java rename to src/main/java/io/ebeaninternal/server/deploy/DetermineManyType.java index 53cfd3b64..cfa560310 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DetermineManyType.java +++ b/src/main/java/io/ebeaninternal/server/deploy/DetermineManyType.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/ExportedProperty.java b/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/ExportedProperty.java rename to src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java index 438eb99d2..164b2e3ac 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/ExportedProperty.java +++ b/src/main/java/io/ebeaninternal/server/deploy/ExportedProperty.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.core.InternString; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.InternString; /** * The Exported foreign key and property. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/IndexDefinition.java b/src/main/java/io/ebeaninternal/server/deploy/IndexDefinition.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/IndexDefinition.java rename to src/main/java/io/ebeaninternal/server/deploy/IndexDefinition.java index 8e1f86c7b..dc3db84cc 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/IndexDefinition.java +++ b/src/main/java/io/ebeaninternal/server/deploy/IndexDefinition.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; /** * Holds multiple column unique constraints defined for an entity. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfo.java b/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfo.java rename to src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java index 4a419b29c..6859eeafc 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfo.java +++ b/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.sql.SQLException; import java.util.ArrayList; @@ -7,11 +7,11 @@ import java.util.Set; import javax.persistence.PersistenceException; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.core.InternString; -import com.avaje.ebeaninternal.server.deploy.id.IdBinder; -import com.avaje.ebeaninternal.server.deploy.parse.DeployInheritInfo; -import com.avaje.ebeaninternal.server.query.SqlTreeProperties; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.InternString; +import io.ebeaninternal.server.deploy.id.IdBinder; +import io.ebeaninternal.server.deploy.parse.DeployInheritInfo; +import io.ebeaninternal.server.query.SqlTreeProperties; /** * Represents a node in the Inheritance tree. Holds information regarding Super Subclass support. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfoVisitor.java b/src/main/java/io/ebeaninternal/server/deploy/InheritInfoVisitor.java similarity index 81% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfoVisitor.java rename to src/main/java/io/ebeaninternal/server/deploy/InheritInfoVisitor.java index 33770c1d1..a2b91ee7a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfoVisitor.java +++ b/src/main/java/io/ebeaninternal/server/deploy/InheritInfoVisitor.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; /** * Used to visit all the InheritInfo in a single inheritance hierarchy. @@ -9,5 +9,5 @@ public interface InheritInfoVisitor { * visit the InheritInfo for this node. */ void visit(InheritInfo inheritInfo); - + } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/IntersectionRow.java b/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/IntersectionRow.java rename to src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java index 49225a35d..756ff0106 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/IntersectionRow.java +++ b/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java @@ -1,16 +1,16 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.SqlUpdate; -import com.avaje.ebeaninternal.api.BindParams; -import com.avaje.ebeaninternal.server.core.DefaultSqlUpdate; -import com.avaje.ebeaninternal.server.expression.IdInExpression; -import com.avaje.ebeaninternal.server.expression.DefaultExpressionRequest; +import io.ebean.EbeanServer; +import io.ebean.SqlUpdate; +import io.ebeaninternal.api.BindParams; +import io.ebeaninternal.server.core.DefaultSqlUpdate; +import io.ebeaninternal.server.expression.IdInExpression; +import io.ebeaninternal.server.expression.DefaultExpressionRequest; public class IntersectionRow { diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/ManyType.java b/src/main/java/io/ebeaninternal/server/deploy/ManyType.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/ManyType.java rename to src/main/java/io/ebeaninternal/server/deploy/ManyType.java index ec0ab7d1d..7f8b0bfb8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/ManyType.java +++ b/src/main/java/io/ebeaninternal/server/deploy/ManyType.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.util.Collection; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/ParamTypeUtil.java b/src/main/java/io/ebeaninternal/server/deploy/ParamTypeUtil.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/ParamTypeUtil.java rename to src/main/java/io/ebeaninternal/server/deploy/ParamTypeUtil.java index efdd8518a..55c5549a5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/ParamTypeUtil.java +++ b/src/main/java/io/ebeaninternal/server/deploy/ParamTypeUtil.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/PersistControllerManager.java b/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java similarity index 80% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/PersistControllerManager.java rename to src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java index c57eec213..9b2210e2b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/PersistControllerManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import java.util.List; -import com.avaje.ebean.event.BeanPersistController; -import com.avaje.ebeaninternal.server.core.bootup.BootupClasses; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebean.event.BeanPersistController; +import io.ebeaninternal.server.core.bootup.BootupClasses; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/PersistListenerManager.java b/src/main/java/io/ebeaninternal/server/deploy/PersistListenerManager.java similarity index 81% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/PersistListenerManager.java rename to src/main/java/io/ebeaninternal/server/deploy/PersistListenerManager.java index 4cc9771e7..484da5cd8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/PersistListenerManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/PersistListenerManager.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.event.BeanPersistListener; -import com.avaje.ebeaninternal.server.core.bootup.BootupClasses; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebean.event.BeanPersistListener; +import io.ebeaninternal.server.core.bootup.BootupClasses; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/PostConstructManager.java b/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java similarity index 79% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/PostConstructManager.java rename to src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java index 50c879656..d39b81df9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/PostConstructManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.event.BeanPostConstructListener; -import com.avaje.ebeaninternal.server.core.bootup.BootupClasses; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebean.event.BeanPostConstructListener; +import io.ebeaninternal.server.core.bootup.BootupClasses; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/PostLoadManager.java b/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java similarity index 79% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/PostLoadManager.java rename to src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java index b4288411c..a8fac0009 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/PostLoadManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.event.BeanPostLoad; -import com.avaje.ebeaninternal.server.core.bootup.BootupClasses; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebean.event.BeanPostLoad; +import io.ebeaninternal.server.core.bootup.BootupClasses; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/TableJoin.java b/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/TableJoin.java rename to src/main/java/io/ebeaninternal/server/deploy/TableJoin.java index 6241519c6..a22f6acf0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/TableJoin.java +++ b/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebeaninternal.server.core.InternString; -import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoin; -import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; -import com.avaje.ebeaninternal.server.query.SplitName; -import com.avaje.ebeaninternal.server.query.SqlJoinType; +import io.ebeaninternal.server.core.InternString; +import io.ebeaninternal.server.deploy.meta.DeployTableJoin; +import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; +import io.ebeaninternal.server.query.SplitName; +import io.ebeaninternal.server.query.SqlJoinType; /** * Represents a join to another table. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/TableJoinColumn.java b/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/TableJoinColumn.java rename to src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java index 4c5314a72..fad822aeb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/TableJoinColumn.java +++ b/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebeaninternal.server.core.InternString; -import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; +import io.ebeaninternal.server.core.InternString; +import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; /** * A join pair of local and foreign properties. @@ -14,18 +14,18 @@ public class TableJoinColumn { private final String localDbColumn; private final String localSqlFormula; - + /** * The foreign database column name. */ private final String foreignDbColumn; - + private final String foreignSqlFormula; private final boolean insertable; private final boolean updateable; - + /** * Hash for including in a query plan @@ -75,7 +75,7 @@ public class TableJoinColumn { } public String toString() { - return (localSqlFormula == null ? localDbColumn : localSqlFormula) + " = " + return (localSqlFormula == null ? localDbColumn : localSqlFormula) + " = " + (foreignSqlFormula == null ? foreignDbColumn : foreignSqlFormula); } @@ -117,9 +117,9 @@ public class TableJoinColumn { public String getLocalSqlFormula() { return localSqlFormula; } - + public String getForeignSqlFormula() { return foreignSqlFormula; } - + } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java index 736de329c..3eb037971 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import javax.persistence.PersistenceException; import java.math.BigDecimal; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java similarity index 83% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java index dc6c57009..fe0fa1a12 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeaninternal.server.deploy.BeanProperty; /** * A general number counter for various number types. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java index 6b6a305c1..72ad7cb7c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanProperty; /** * Used to create a counter version column for Integer. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java index 60dff0e33..e1a0661e0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanProperty; /** * Used to create a counter version column for Long. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java index 0e9d05717..0a2ada4dc 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanProperty; import java.util.Date; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTime.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTime.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTime.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTime.java index 4ae5d1734..3b95b4e0d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTime.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTime.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanProperty; /** * Support java.time types as GeneratedProperty. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java index e9ac67a60..f346be035 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJodaTime.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanProperty; import org.joda.time.DateTime; import org.joda.time.LocalDateTime; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java similarity index 83% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java index 17d955738..db3a589da 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanProperty; /** * Used to generate a (Long) timestamp when a bean is inserted. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java index ef733a789..11cd627df 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanProperty; import java.sql.Timestamp; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedProperty.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedProperty.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedProperty.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedProperty.java index af0665cb9..d6f64a9f3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedProperty.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedProperty.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanProperty; /** * Used to generate values for a property rather than have then set by the user. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java index a9e0bd32d..0d2ab4be5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.config.ClassLoadConfig; -import com.avaje.ebean.config.CurrentUserProvider; -import com.avaje.ebean.config.IdGenerator; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.dbplatform.PlatformIdGenerator; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebean.Transaction; +import io.ebean.config.ClassLoadConfig; +import io.ebean.config.CurrentUserProvider; +import io.ebean.config.IdGenerator; +import io.ebean.config.ServerConfig; +import io.ebean.config.dbplatform.PlatformIdGenerator; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import java.math.BigDecimal; import java.util.HashMap; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java index 36f68ec6f..5b0339cd2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanProperty; import java.util.Date; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJavaTime.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJavaTime.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJavaTime.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJavaTime.java index d3d06e9c3..8592425df 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJavaTime.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJavaTime.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanProperty; /** * Support java.time DateTime types as GeneratedProperty. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJodaTime.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJodaTime.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJodaTime.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJodaTime.java index 40fbcce10..de4cc1878 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJodaTime.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateJodaTime.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanProperty; import org.joda.time.DateTime; import org.joda.time.LocalDateTime; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java similarity index 83% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java index 800bee6f9..b18934f18 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanProperty; /** * Generate a (Long) Timestamp whenever the bean is inserted or updated. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java index 37956231a..26dff129e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanProperty; import java.sql.Timestamp; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedWhenCreated.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhenCreated.java similarity index 68% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedWhenCreated.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhenCreated.java index a669b31f2..d015dcae0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedWhenCreated.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhenCreated.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; /** * Marker interface for all implementations mapping to @WhenCreated or @CreatedTimestamp. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedWhenModified.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhenModified.java similarity index 68% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedWhenModified.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhenModified.java index 73f8d20e4..0a6708e34 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedWhenModified.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhenModified.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; /** * Marker interface for all implementations mapping to @WhenModified or @UpdatedTimestamp. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java similarity index 79% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java index 9f53cdd5b..0387d1bf3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoCreated.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.config.CurrentUserProvider; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebean.bean.EntityBean; +import io.ebean.config.CurrentUserProvider; +import io.ebeaninternal.server.deploy.BeanProperty; /** * Used to populate @WhoCreated bean properties. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java similarity index 80% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java index ec413e90e..aac3ddbe2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedWhoModified.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.config.CurrentUserProvider; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebean.bean.EntityBean; +import io.ebean.config.CurrentUserProvider; +import io.ebeaninternal.server.deploy.BeanProperty; /** * Used to populate @WhoModified bean properties. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java index b1a510507..0f69e5982 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.config.ClassLoadConfig; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebean.config.ClassLoadConfig; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import javax.persistence.PersistenceException; import java.sql.Timestamp; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java index dda1097f6..986724938 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/JavaTimeUtils.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; import java.sql.Timestamp; import java.time.Instant; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java index 1e9f005e6..cb4c953f3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java +++ b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.config.ClassLoadConfig; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebean.config.ClassLoadConfig; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import javax.persistence.PersistenceException; import java.sql.Timestamp; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/package.html b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/package.html rename to src/main/java/io/ebeaninternal/server/deploy/generatedproperty/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinder.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinder.java rename to src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java index 707dfca5e..95212c98a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinder.java +++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.deploy.id; +package io.ebeaninternal.server.deploy.id; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.core.DefaultSqlUpdate; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.DbReadContext; -import com.avaje.ebeaninternal.server.deploy.DbSqlContext; -import com.avaje.ebeaninternal.server.type.DataBind; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.core.DefaultSqlUpdate; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.DbReadContext; +import io.ebeaninternal.server.deploy.DbSqlContext; +import io.ebeaninternal.server.type.DataBind; import java.io.DataInput; import java.io.DataOutput; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmbedded.java rename to src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java index 6576e3c7b..ae748a093 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmbedded.java +++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java @@ -1,15 +1,15 @@ -package com.avaje.ebeaninternal.server.deploy.id; +package io.ebeaninternal.server.deploy.id; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.core.DefaultSqlUpdate; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.deploy.DbReadContext; -import com.avaje.ebeaninternal.server.deploy.DbSqlContext; -import com.avaje.ebeaninternal.server.query.SplitName; -import com.avaje.ebeaninternal.server.type.DataBind; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.core.DefaultSqlUpdate; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.DbReadContext; +import io.ebeaninternal.server.deploy.DbSqlContext; +import io.ebeaninternal.server.query.SplitName; +import io.ebeaninternal.server.type.DataBind; import java.io.DataInput; import java.io.DataOutput; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmpty.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java similarity index 85% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmpty.java rename to src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java index 0d60ac68d..8cd0ec903 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmpty.java +++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.deploy.id; +package io.ebeaninternal.server.deploy.id; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.core.DefaultSqlUpdate; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.DbReadContext; -import com.avaje.ebeaninternal.server.deploy.DbSqlContext; -import com.avaje.ebeaninternal.server.type.DataBind; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.core.DefaultSqlUpdate; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.DbReadContext; +import io.ebeaninternal.server.deploy.DbSqlContext; +import io.ebeaninternal.server.type.DataBind; import java.io.DataInput; import java.io.DataOutput; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderFactory.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderFactory.java similarity index 80% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderFactory.java rename to src/main/java/io/ebeaninternal/server/deploy/id/IdBinderFactory.java index 9c47d5e14..00793db0d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderFactory.java +++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderFactory.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.id; +package io.ebeaninternal.server.deploy.id; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; /** * Creates the appropriate IdConvertSet depending on the type of Id property(s). diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderSimple.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderSimple.java rename to src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java index aa677d98b..bd7a7963d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderSimple.java +++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java @@ -1,14 +1,14 @@ -package com.avaje.ebeaninternal.server.deploy.id; +package io.ebeaninternal.server.deploy.id; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.core.DefaultSqlUpdate; -import com.avaje.ebeaninternal.server.core.InternString; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.DbReadContext; -import com.avaje.ebeaninternal.server.deploy.DbSqlContext; -import com.avaje.ebeaninternal.server.type.DataBind; -import com.avaje.ebeaninternal.server.type.ScalarType; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.core.DefaultSqlUpdate; +import io.ebeaninternal.server.core.InternString; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.DbReadContext; +import io.ebeaninternal.server.deploy.DbSqlContext; +import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.type.ScalarType; import java.io.DataInput; import java.io.DataOutput; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedId.java b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedId.java similarity index 73% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedId.java rename to src/main/java/io/ebeaninternal/server/deploy/id/ImportedId.java index 98749e3f5..ed79717a3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedId.java +++ b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedId.java @@ -1,14 +1,14 @@ -package com.avaje.ebeaninternal.server.deploy.id; +package io.ebeaninternal.server.deploy.id; import java.sql.SQLException; -import com.avaje.ebean.SqlUpdate; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.DbSqlContext; -import com.avaje.ebeaninternal.server.deploy.IntersectionRow; -import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; -import com.avaje.ebeaninternal.server.persist.dmlbind.BindableRequest; +import io.ebean.SqlUpdate; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.DbSqlContext; +import io.ebeaninternal.server.deploy.IntersectionRow; +import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import io.ebeaninternal.server.persist.dmlbind.BindableRequest; /** * Represents a imported property. @@ -66,4 +66,4 @@ public interface ImportedId { * Return the set importedId clause. */ String importedIdClause(); -} \ No newline at end of file +} diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java similarity index 85% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java rename to src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java index dc29e59b3..4a58960d1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java +++ b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java @@ -1,19 +1,19 @@ -package com.avaje.ebeaninternal.server.deploy.id; +package io.ebeaninternal.server.deploy.id; import java.sql.SQLException; import javax.persistence.PersistenceException; -import com.avaje.ebean.SqlUpdate; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanFkeyProperty; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssoc; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.deploy.DbSqlContext; -import com.avaje.ebeaninternal.server.deploy.IntersectionRow; -import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; -import com.avaje.ebeaninternal.server.persist.dmlbind.BindableRequest; +import io.ebean.SqlUpdate; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanFkeyProperty; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssoc; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.DbSqlContext; +import io.ebeaninternal.server.deploy.IntersectionRow; +import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import io.ebeaninternal.server.persist.dmlbind.BindableRequest; /** * Imported Embedded id. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java similarity index 85% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java rename to src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java index 06ac324b9..98b7fca4f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java +++ b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy.id; +package io.ebeaninternal.server.deploy.id; import java.sql.SQLException; import java.util.Arrays; @@ -7,16 +7,16 @@ import java.util.List; import javax.persistence.PersistenceException; -import com.avaje.ebean.SqlUpdate; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.core.InternString; -import com.avaje.ebeaninternal.server.deploy.BeanFkeyProperty; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssoc; -import com.avaje.ebeaninternal.server.deploy.DbSqlContext; -import com.avaje.ebeaninternal.server.deploy.IntersectionRow; -import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; -import com.avaje.ebeaninternal.server.persist.dmlbind.BindableRequest; +import io.ebean.SqlUpdate; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.InternString; +import io.ebeaninternal.server.deploy.BeanFkeyProperty; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssoc; +import io.ebeaninternal.server.deploy.DbSqlContext; +import io.ebeaninternal.server.deploy.IntersectionRow; +import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import io.ebeaninternal.server.persist.dmlbind.BindableRequest; /** * Single scalar imported id. @@ -37,7 +37,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable owner; protected final String localDbColumn; - + protected final String localSqlFormula; protected final String logicalName; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/package.html b/src/main/java/io/ebeaninternal/server/deploy/id/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/id/package.html rename to src/main/java/io/ebeaninternal/server/deploy/id/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java rename to src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java index 5376dc79a..3028a8ca7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java +++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java @@ -1,35 +1,35 @@ -package com.avaje.ebeaninternal.server.deploy.meta; +package io.ebeaninternal.server.deploy.meta; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.annotation.Cache; -import com.avaje.ebean.annotation.DocStore; -import com.avaje.ebean.annotation.DocStoreMode; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.TableName; -import com.avaje.ebean.config.dbplatform.IdType; -import com.avaje.ebean.config.dbplatform.PlatformIdGenerator; -import com.avaje.ebean.event.BeanFindController; -import com.avaje.ebean.event.BeanPersistController; -import com.avaje.ebean.event.BeanPersistListener; -import com.avaje.ebean.event.BeanPostConstructListener; -import com.avaje.ebean.event.BeanPostLoad; -import com.avaje.ebean.event.BeanQueryAdapter; -import com.avaje.ebean.event.changelog.ChangeLogFilter; -import com.avaje.ebean.text.PathProperties; -import com.avaje.ebean.util.CamelCaseHelper; -import com.avaje.ebeaninternal.api.ConcurrencyMode; -import com.avaje.ebeaninternal.server.core.CacheOptions; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor.EntityType; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptorManager; -import com.avaje.ebeaninternal.server.deploy.ChainedBeanPersistController; -import com.avaje.ebeaninternal.server.deploy.ChainedBeanPersistListener; -import com.avaje.ebeaninternal.server.deploy.ChainedBeanPostConstructListener; -import com.avaje.ebeaninternal.server.deploy.ChainedBeanPostLoad; -import com.avaje.ebeaninternal.server.deploy.ChainedBeanQueryAdapter; -import com.avaje.ebeaninternal.server.deploy.IndexDefinition; -import com.avaje.ebeaninternal.server.deploy.InheritInfo; -import com.avaje.ebeaninternal.server.deploy.parse.DeployBeanInfo; -import com.avaje.ebeaninternal.server.idgen.UuidIdGenerator; +import io.ebean.RawSql; +import io.ebean.annotation.Cache; +import io.ebean.annotation.DocStore; +import io.ebean.annotation.DocStoreMode; +import io.ebean.config.ServerConfig; +import io.ebean.config.TableName; +import io.ebean.config.dbplatform.IdType; +import io.ebean.config.dbplatform.PlatformIdGenerator; +import io.ebean.event.BeanFindController; +import io.ebean.event.BeanPersistController; +import io.ebean.event.BeanPersistListener; +import io.ebean.event.BeanPostConstructListener; +import io.ebean.event.BeanPostLoad; +import io.ebean.event.BeanQueryAdapter; +import io.ebean.event.changelog.ChangeLogFilter; +import io.ebean.text.PathProperties; +import io.ebean.util.CamelCaseHelper; +import io.ebeaninternal.api.ConcurrencyMode; +import io.ebeaninternal.server.core.CacheOptions; +import io.ebeaninternal.server.deploy.BeanDescriptor.EntityType; +import io.ebeaninternal.server.deploy.BeanDescriptorManager; +import io.ebeaninternal.server.deploy.ChainedBeanPersistController; +import io.ebeaninternal.server.deploy.ChainedBeanPersistListener; +import io.ebeaninternal.server.deploy.ChainedBeanPostConstructListener; +import io.ebeaninternal.server.deploy.ChainedBeanPostLoad; +import io.ebeaninternal.server.deploy.ChainedBeanQueryAdapter; +import io.ebeaninternal.server.deploy.IndexDefinition; +import io.ebeaninternal.server.deploy.InheritInfo; +import io.ebeaninternal.server.deploy.parse.DeployBeanInfo; +import io.ebeaninternal.server.idgen.UuidIdGenerator; import javax.persistence.Entity; import javax.persistence.MappedSuperclass; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java rename to src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java index 48f1db521..3d2f6b25f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java +++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy.meta; +package io.ebeaninternal.server.deploy.meta; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java rename to src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java index cc429768b..110c10a70 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java +++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java @@ -1,30 +1,30 @@ -package com.avaje.ebeaninternal.server.deploy.meta; +package io.ebeaninternal.server.deploy.meta; -import com.avaje.ebean.annotation.CreatedTimestamp; -import com.avaje.ebean.annotation.DocCode; -import com.avaje.ebean.annotation.DocProperty; -import com.avaje.ebean.annotation.DocSortable; -import com.avaje.ebean.annotation.SoftDelete; -import com.avaje.ebean.annotation.UpdatedTimestamp; -import com.avaje.ebean.annotation.WhenCreated; -import com.avaje.ebean.annotation.WhenModified; -import com.avaje.ebean.annotation.WhoCreated; -import com.avaje.ebean.annotation.WhoModified; -import com.avaje.ebean.config.ScalarTypeConverter; -import com.avaje.ebean.config.dbplatform.DbDefaultValue; -import com.avaje.ebean.config.dbplatform.DbEncrypt; -import com.avaje.ebean.config.dbplatform.DbEncryptFunction; -import com.avaje.ebeaninternal.server.core.InternString; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.DeployDocPropertyOptions; -import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; -import com.avaje.ebeaninternal.server.deploy.parse.AnnotationBase; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; -import com.avaje.ebeaninternal.server.properties.BeanPropertyGetter; -import com.avaje.ebeaninternal.server.properties.BeanPropertySetter; -import com.avaje.ebeaninternal.server.type.ScalarType; -import com.avaje.ebeaninternal.server.type.ScalarTypeWrapper; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyOptions; +import io.ebean.annotation.CreatedTimestamp; +import io.ebean.annotation.DocCode; +import io.ebean.annotation.DocProperty; +import io.ebean.annotation.DocSortable; +import io.ebean.annotation.SoftDelete; +import io.ebean.annotation.UpdatedTimestamp; +import io.ebean.annotation.WhenCreated; +import io.ebean.annotation.WhenModified; +import io.ebean.annotation.WhoCreated; +import io.ebean.annotation.WhoModified; +import io.ebean.config.ScalarTypeConverter; +import io.ebean.config.dbplatform.DbDefaultValue; +import io.ebean.config.dbplatform.DbEncrypt; +import io.ebean.config.dbplatform.DbEncryptFunction; +import io.ebeaninternal.server.core.InternString; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.DeployDocPropertyOptions; +import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; +import io.ebeaninternal.server.deploy.parse.AnnotationBase; +import io.ebeaninternal.server.el.ElPropertyValue; +import io.ebeaninternal.server.properties.BeanPropertyGetter; +import io.ebeaninternal.server.properties.BeanPropertySetter; +import io.ebeaninternal.server.type.ScalarType; +import io.ebeaninternal.server.type.ScalarTypeWrapper; +import io.ebeanservice.docstore.api.mapping.DocPropertyOptions; import javax.persistence.EmbeddedId; import javax.persistence.FetchType; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java rename to src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java index fc4ab947c..38055e1cb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java +++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.meta; +package io.ebeaninternal.server.deploy.meta; -import com.avaje.ebeaninternal.server.deploy.BeanCascadeInfo; -import com.avaje.ebeaninternal.server.deploy.BeanTable; +import io.ebeaninternal.server.deploy.BeanCascadeInfo; +import io.ebeaninternal.server.deploy.BeanTable; /** * Abstract base for properties mapped to an associated bean, list, set or map. @@ -81,7 +81,7 @@ public abstract class DeployBeanPropertyAssoc extends DeployBeanProperty { public void setExtraWhere(String extraWhere) { this.extraWhere = extraWhere; } - + /** * return the join to use for the bean. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java rename to src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java index 2f21b235c..6bab6698d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java +++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.deploy.meta; +package io.ebeaninternal.server.deploy.meta; -import com.avaje.ebean.bean.BeanCollection.ModifyListenMode; -import com.avaje.ebeaninternal.server.deploy.ManyType; -import com.avaje.ebeaninternal.server.deploy.TableJoin; +import io.ebean.bean.BeanCollection.ModifyListenMode; +import io.ebeaninternal.server.deploy.ManyType; +import io.ebeaninternal.server.deploy.TableJoin; /** * Property mapped to a List Set or Map. @@ -15,7 +15,7 @@ public class DeployBeanPropertyAssocMany extends DeployBeanPropertyAssoc { final ManyType manyType; ModifyListenMode modifyListenMode = ModifyListenMode.NONE; - + /** * Flag to indicate manyToMany relationship. */ @@ -61,8 +61,8 @@ public class DeployBeanPropertyAssocMany extends DeployBeanPropertyAssoc { public void setTargetType(Class cls){ this.targetType = (Class)cls; } - - + + /** * Return the many type. */ @@ -122,7 +122,7 @@ public class DeployBeanPropertyAssocMany extends DeployBeanPropertyAssoc { return null; } } - + /** * Create the immutable version of the inverse join. */ @@ -133,7 +133,7 @@ public class DeployBeanPropertyAssocMany extends DeployBeanPropertyAssoc { return null; } } - + /** * ManyToMany only, join from local table to intersection table. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java rename to src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java index 8dd09cb59..fff547d9c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java +++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy.meta; +package io.ebeaninternal.server.deploy.meta; /** * Property mapped to a joined bean. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java rename to src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java index 13eaee055..2a2936757 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java +++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java @@ -1,15 +1,15 @@ -package com.avaje.ebeaninternal.server.deploy.meta; +package io.ebeaninternal.server.deploy.meta; -import com.avaje.ebean.bean.BeanCollection.ModifyListenMode; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptorMap; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.deploy.BeanPropertySimpleCollection; -import com.avaje.ebeaninternal.server.deploy.InheritInfo; -import com.avaje.ebeaninternal.server.deploy.TableJoin; -import com.avaje.ebeaninternal.server.type.ScalarTypeString; +import io.ebean.bean.BeanCollection.ModifyListenMode; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanDescriptorMap; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.BeanPropertySimpleCollection; +import io.ebeaninternal.server.deploy.InheritInfo; +import io.ebeaninternal.server.deploy.TableJoin; +import io.ebeaninternal.server.type.ScalarTypeString; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertySimpleCollection.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertySimpleCollection.java similarity index 76% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertySimpleCollection.java rename to src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertySimpleCollection.java index 24df80a6d..6777dcc4c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertySimpleCollection.java +++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertySimpleCollection.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.meta; +package io.ebeaninternal.server.deploy.meta; -import com.avaje.ebean.bean.BeanCollection.ModifyListenMode; -import com.avaje.ebeaninternal.server.deploy.ManyType; +import io.ebean.bean.BeanCollection.ModifyListenMode; +import io.ebeaninternal.server.deploy.ManyType; public class DeployBeanPropertySimpleCollection extends DeployBeanPropertyAssocMany { diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanTable.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanTable.java rename to src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java index 8510f46b4..c2eb4ad9c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanTable.java +++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.deploy.meta; +package io.ebeaninternal.server.deploy.meta; import java.util.List; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptorMap; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.BeanDescriptorMap; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; /** @@ -26,14 +26,14 @@ public class DeployBeanTable { private String baseTable; private List idProperties; - + /** * Create the BeanTable. */ public DeployBeanTable(Class beanType) { this.beanType = beanType; } - + /** * Return the base table for this BeanTable. * This is used to determine the join information @@ -49,7 +49,7 @@ public class DeployBeanTable { public void setBaseTable(String baseTable) { this.baseTable = baseTable; } - + /** * Return the id properties. */ @@ -60,17 +60,17 @@ public class DeployBeanTable { } return props; } - + @SuppressWarnings({ "unchecked", "rawtypes" }) private BeanProperty createProperty(BeanDescriptorMap owner, DeployBeanProperty prop){ - + if (prop instanceof DeployBeanPropertyAssocOne){ return new BeanPropertyAssocOne(owner, (DeployBeanPropertyAssocOne)prop); - + } else { return new BeanProperty(prop); } - + } /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java rename to src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java index 436f4e3a2..0fc738b82 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java +++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.deploy.meta; +package io.ebeaninternal.server.deploy.meta; -import com.avaje.ebeaninternal.server.deploy.BeanTable; -import com.avaje.ebeaninternal.server.deploy.InheritInfo; -import com.avaje.ebeaninternal.server.query.SqlJoinType; +import io.ebeaninternal.server.deploy.BeanTable; +import io.ebeaninternal.server.deploy.InheritInfo; +import io.ebeaninternal.server.query.SqlJoinType; import javax.persistence.JoinColumn; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java rename to src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java index 293857cdc..f80f77280 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java +++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.deploy.meta; +package io.ebeaninternal.server.deploy.meta; import javax.persistence.JoinColumn; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanTable; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanTable; /** * A join pair of local and foreign properties. @@ -24,7 +24,7 @@ public class DeployTableJoinColumn { * The foreign database column name. */ String foreignDbColumn; - + /** * SQL formula used for foreign column */ @@ -33,9 +33,9 @@ public class DeployTableJoinColumn { boolean insertable; boolean updateable; - - + + /** * Construct when automatically determining the join. *

@@ -45,7 +45,7 @@ public class DeployTableJoinColumn { public DeployTableJoinColumn(String localDbColumn, String foreignDbColumn) { this(localDbColumn, foreignDbColumn, true, true); } - + /** * Construct with explicit insertable and updateable flags. */ @@ -55,7 +55,7 @@ public class DeployTableJoinColumn { this.insertable = insertable; this.updateable = updateable; } - + public void setLocalSqlFormula(String localSqlFormula) { if (localSqlFormula != null) { this.localSqlFormula = localSqlFormula; @@ -64,11 +64,11 @@ public class DeployTableJoinColumn { this.updateable = false; } } - + public String getLocalSqlFormula() { return localSqlFormula; } - + public void setForeignSqlFormula(String foreignSqlFormula) { if (foreignSqlFormula != null) { this.foreignSqlFormula = foreignSqlFormula; @@ -77,12 +77,12 @@ public class DeployTableJoinColumn { this.updateable = false; } } - + public String getForeignSqlFormula() { return foreignSqlFormula; } - - + + public DeployTableJoinColumn(boolean order, JoinColumn jc, BeanTable beanTable) { this(jc.referencedColumnName(), jc.name(), jc.insertable(), jc.updatable()); setReferencedColumn(beanTable); @@ -99,7 +99,7 @@ public class DeployTableJoinColumn { } } } - + /** * Reverse the direction of the join. */ @@ -107,7 +107,7 @@ public class DeployTableJoinColumn { String temp = localDbColumn; localDbColumn = foreignDbColumn; foreignDbColumn = temp; - + temp = localSqlFormula; localSqlFormula = foreignSqlFormula; foreignSqlFormula = temp; @@ -123,10 +123,10 @@ public class DeployTableJoinColumn { } return s; } - - + + public DeployTableJoinColumn copy(boolean reverse) { - // Note that the insertable and updateable are just copied + // Note that the insertable and updateable are just copied // which may not always be the correct thing to do // but will leave it like this for now DeployTableJoinColumn ret; @@ -134,9 +134,9 @@ public class DeployTableJoinColumn { ret = new DeployTableJoinColumn(foreignDbColumn, localDbColumn, insertable, updateable); ret.setLocalSqlFormula(foreignSqlFormula); ret.setForeignSqlFormula(localSqlFormula); - + } else { - ret = new DeployTableJoinColumn(localDbColumn, foreignDbColumn, insertable, updateable); + ret = new DeployTableJoinColumn(localDbColumn, foreignDbColumn, insertable, updateable); ret.setLocalSqlFormula(localSqlFormula); ret.setForeignSqlFormula(foreignSqlFormula); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/package.html b/src/main/java/io/ebeaninternal/server/deploy/meta/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/meta/package.html rename to src/main/java/io/ebeaninternal/server/deploy/meta/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/package.html b/src/main/java/io/ebeaninternal/server/deploy/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/package.html rename to src/main/java/io/ebeaninternal/server/deploy/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java rename to src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java index 94cdfbd0f..a1b4c0457 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java @@ -1,20 +1,20 @@ -package com.avaje.ebeaninternal.server.deploy.parse; +package io.ebeaninternal.server.deploy.parse; -import com.avaje.ebean.annotation.HistoryExclude; -import com.avaje.ebean.annotation.PrivateOwned; -import com.avaje.ebean.annotation.Where; -import com.avaje.ebean.bean.BeanCollection.ModifyListenMode; -import com.avaje.ebean.config.NamingConvention; -import com.avaje.ebean.config.TableName; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptorManager; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanTable; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoin; -import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; -import com.avaje.ebeaninternal.server.lib.util.StringHelper; -import com.avaje.ebeaninternal.server.query.SqlJoinType; +import io.ebean.annotation.HistoryExclude; +import io.ebean.annotation.PrivateOwned; +import io.ebean.annotation.Where; +import io.ebean.bean.BeanCollection.ModifyListenMode; +import io.ebean.config.NamingConvention; +import io.ebean.config.TableName; +import io.ebeaninternal.server.deploy.BeanDescriptorManager; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanTable; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.meta.DeployTableJoin; +import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; +import io.ebeaninternal.server.lib.util.StringHelper; +import io.ebeaninternal.server.query.SqlJoinType; import javax.persistence.JoinColumn; import javax.persistence.JoinTable; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java rename to src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java index 73f61a135..901cd22a8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.deploy.parse; +package io.ebeaninternal.server.deploy.parse; -import com.avaje.ebean.annotation.Where; -import com.avaje.ebean.config.NamingConvention; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptorManager; -import com.avaje.ebeaninternal.server.deploy.BeanTable; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.query.SqlJoinType; +import io.ebean.annotation.Where; +import io.ebean.config.NamingConvention; +import io.ebeaninternal.server.deploy.BeanDescriptorManager; +import io.ebeaninternal.server.deploy.BeanTable; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; +import io.ebeaninternal.server.query.SqlJoinType; import javax.persistence.Column; import javax.persistence.Embedded; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationBase.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationBase.java rename to src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java index ebb6a43c4..83e2047ac 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationBase.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.deploy.parse; +package io.ebeaninternal.server.deploy.parse; -import com.avaje.ebean.annotation.Formula; -import com.avaje.ebean.annotation.Where; -import com.avaje.ebean.config.NamingConvention; -import com.avaje.ebean.config.Platform; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebean.annotation.Formula; +import io.ebean.annotation.Where; +import io.ebean.config.NamingConvention; +import io.ebean.Platform; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import javax.persistence.JoinColumn; import javax.persistence.JoinColumns; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationClass.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationClass.java rename to src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java index 7c735f703..1f9be565f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationClass.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java @@ -1,20 +1,20 @@ -package com.avaje.ebeaninternal.server.deploy.parse; +package io.ebeaninternal.server.deploy.parse; -import com.avaje.ebean.annotation.Cache; -import com.avaje.ebean.annotation.DbComment; -import com.avaje.ebean.annotation.DocStore; -import com.avaje.ebean.annotation.Draftable; -import com.avaje.ebean.annotation.DraftableElement; -import com.avaje.ebean.annotation.History; -import com.avaje.ebean.annotation.Index; -import com.avaje.ebean.annotation.ReadAudit; -import com.avaje.ebean.annotation.UpdateMode; -import com.avaje.ebean.annotation.View; -import com.avaje.ebean.config.TableName; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor.EntityType; -import com.avaje.ebeaninternal.server.deploy.IndexDefinition; -import com.avaje.ebeaninternal.server.deploy.InheritInfo; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebean.annotation.Cache; +import io.ebean.annotation.DbComment; +import io.ebean.annotation.DocStore; +import io.ebean.annotation.Draftable; +import io.ebean.annotation.DraftableElement; +import io.ebean.annotation.History; +import io.ebean.annotation.Index; +import io.ebean.annotation.ReadAudit; +import io.ebean.annotation.UpdateMode; +import io.ebean.annotation.View; +import io.ebean.config.TableName; +import io.ebeaninternal.server.deploy.BeanDescriptor.EntityType; +import io.ebeaninternal.server.deploy.IndexDefinition; +import io.ebeaninternal.server.deploy.InheritInfo; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationFields.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationFields.java rename to src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java index 89b8d2066..47c5ec721 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationFields.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java @@ -1,23 +1,50 @@ -package com.avaje.ebeaninternal.server.deploy.parse; +package io.ebeaninternal.server.deploy.parse; -import com.avaje.ebean.annotation.*; -import com.avaje.ebean.annotation.Index; -import com.avaje.ebean.config.EncryptDeploy; -import com.avaje.ebean.config.EncryptDeploy.Mode; -import com.avaje.ebean.config.dbplatform.DbEncrypt; -import com.avaje.ebean.config.dbplatform.DbEncryptFunction; -import com.avaje.ebean.config.dbplatform.IdType; -import com.avaje.ebean.config.dbplatform.PlatformIdGenerator; -import com.avaje.ebeaninternal.server.deploy.IndexDefinition; -import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.type.DataEncryptSupport; -import com.avaje.ebeaninternal.server.type.ScalarType; -import com.avaje.ebeaninternal.server.type.ScalarTypeBytesBase; -import com.avaje.ebeaninternal.server.type.ScalarTypeBytesEncrypted; -import com.avaje.ebeaninternal.server.type.ScalarTypeEncryptedWrapper; +import io.ebean.annotation.Aggregation; +import io.ebean.annotation.CreatedTimestamp; +import io.ebean.annotation.DbArray; +import io.ebean.annotation.DbComment; +import io.ebean.annotation.DbHstore; +import io.ebean.annotation.DbJson; +import io.ebean.annotation.DbJsonB; +import io.ebean.annotation.DocCode; +import io.ebean.annotation.DocEmbedded; +import io.ebean.annotation.DocProperty; +import io.ebean.annotation.DocSortable; +import io.ebean.annotation.Draft; +import io.ebean.annotation.DraftDirty; +import io.ebean.annotation.DraftOnly; +import io.ebean.annotation.DraftReset; +import io.ebean.annotation.Encrypted; +import io.ebean.annotation.Expose; +import io.ebean.annotation.Formula; +import io.ebean.annotation.HistoryExclude; +import io.ebean.annotation.Index; +import io.ebean.config.EncryptDeploy; +import io.ebean.config.EncryptDeploy.Mode; +import io.ebean.config.dbplatform.DbEncrypt; +import io.ebean.config.dbplatform.DbEncryptFunction; +import io.ebean.config.dbplatform.IdType; +import io.ebean.config.dbplatform.PlatformIdGenerator; +import io.ebeaninternal.server.deploy.IndexDefinition; +import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; +import io.ebeaninternal.server.type.DataEncryptSupport; +import io.ebeaninternal.server.type.ScalarType; +import io.ebeaninternal.server.type.ScalarTypeBytesBase; +import io.ebeaninternal.server.type.ScalarTypeBytesEncrypted; +import io.ebeaninternal.server.type.ScalarTypeEncryptedWrapper; +import io.ebean.annotation.JsonIgnore; +import io.ebean.annotation.SoftDelete; +import io.ebean.annotation.TenantId; +import io.ebean.annotation.UnmappedJson; +import io.ebean.annotation.UpdatedTimestamp; +import io.ebean.annotation.WhenCreated; +import io.ebean.annotation.WhenModified; +import io.ebean.annotation.WhoCreated; +import io.ebean.annotation.WhoModified; import javax.persistence.*; import javax.validation.constraints.NotNull; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationParser.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationParser.java rename to src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java index 31d269a3e..0d8bad219 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationParser.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy.parse; +package io.ebeaninternal.server.deploy.parse; import java.util.HashMap; import java.util.Set; @@ -8,11 +8,11 @@ import javax.persistence.CascadeType; import javax.persistence.Column; import javax.validation.groups.Default; -import com.avaje.ebean.annotation.EbeanDDL; -import com.avaje.ebeaninternal.server.deploy.BeanCascadeInfo; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; +import io.ebean.annotation.EbeanDDL; +import io.ebeaninternal.server.deploy.BeanCascadeInfo; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; /** * Base class for reading deployment annotations. @@ -92,13 +92,13 @@ public abstract class AnnotationParser extends AnnotationBase { prop.setSecondaryTable(tableName); } } - + /** - * Return true if the validation groups are {@link Default} (respectively empty) or contains {@link EbeanDDL} + * Return true if the validation groups are {@link Default} (respectively empty) or contains {@link EbeanDDL} * can be applied to DDL generation. */ protected boolean isEbeanValidationGroups(Class[] groups) { - if (groups.length == 0 + if (groups.length == 0 || groups.length == 1 && javax.validation.groups.Default.class.isAssignableFrom(groups[0])) { return true; } else { diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationSql.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationSql.java similarity index 75% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationSql.java rename to src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationSql.java index d84fca20c..fad15f283 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationSql.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationSql.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.parse; +package io.ebeaninternal.server.deploy.parse; -import com.avaje.ebean.annotation.Sql; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebean.annotation.Sql; +import io.ebeaninternal.server.deploy.BeanDescriptor; /** * Read the class level deployment annotations. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployBeanInfo.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployBeanInfo.java rename to src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java index ac7543d1b..0cb9bca67 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployBeanInfo.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.deploy.parse; +package io.ebeaninternal.server.deploy.parse; -import com.avaje.ebean.RawSql; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoin; -import com.avaje.ebeaninternal.server.query.SqlJoinType; +import io.ebean.RawSql; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.meta.DeployTableJoin; +import io.ebeaninternal.server.query.SqlJoinType; import java.util.HashMap; @@ -47,7 +47,7 @@ public class DeployBeanInfo { public DeployUtil getUtil() { return util; } - + /** * Appropriate TableJoin for a property mapped to a secondary table. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployCreateProperties.java rename to src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java index 96d5d41da..401d302d5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployCreateProperties.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java @@ -1,19 +1,19 @@ -package com.avaje.ebeaninternal.server.deploy.parse; +package io.ebeaninternal.server.deploy.parse; -import com.avaje.ebean.annotation.DbArray; -import com.avaje.ebean.annotation.DbHstore; -import com.avaje.ebean.annotation.DbJson; -import com.avaje.ebean.annotation.DbJsonB; -import com.avaje.ebean.annotation.UnmappedJson; -import com.avaje.ebeaninternal.server.deploy.DetermineManyType; -import com.avaje.ebeaninternal.server.deploy.ManyType; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertySimpleCollection; -import com.avaje.ebeaninternal.server.type.ScalarType; -import com.avaje.ebeaninternal.server.type.TypeManager; +import io.ebean.annotation.DbArray; +import io.ebean.annotation.DbHstore; +import io.ebean.annotation.DbJson; +import io.ebean.annotation.DbJsonB; +import io.ebean.annotation.UnmappedJson; +import io.ebeaninternal.server.deploy.DetermineManyType; +import io.ebeaninternal.server.deploy.ManyType; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertySimpleCollection; +import io.ebeaninternal.server.type.ScalarType; +import io.ebeaninternal.server.type.TypeManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInherit.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInherit.java rename to src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java index a1eec01bd..06c21d7f8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInherit.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.deploy.parse; +package io.ebeaninternal.server.deploy.parse; -import com.avaje.ebeaninternal.server.core.bootup.BootupClasses; -import com.avaje.ebeaninternal.server.deploy.InheritInfo; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebeaninternal.server.core.bootup.BootupClasses; +import io.ebeaninternal.server.deploy.InheritInfo; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import javax.persistence.DiscriminatorColumn; import javax.persistence.DiscriminatorType; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInheritInfo.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInheritInfo.java rename to src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java index 3964c5d23..c5c9fd442 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInheritInfo.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.deploy.parse; +package io.ebeaninternal.server.deploy.parse; -import com.avaje.ebeaninternal.server.deploy.InheritInfo; +import io.ebeaninternal.server.deploy.InheritInfo; import java.sql.Types; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployUtil.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployUtil.java rename to src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java index 9b89aa9e6..8f3ac03df 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployUtil.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java @@ -1,31 +1,31 @@ -package com.avaje.ebeaninternal.server.deploy.parse; +package io.ebeaninternal.server.deploy.parse; import java.sql.Types; import javax.persistence.EnumType; import javax.persistence.Enumerated; import javax.persistence.PersistenceException; -import com.avaje.ebean.annotation.DbArray; -import com.avaje.ebean.annotation.DbHstore; -import com.avaje.ebean.annotation.DbJson; -import com.avaje.ebean.annotation.DbJsonB; -import com.avaje.ebean.annotation.DbJsonType; -import com.avaje.ebean.config.EncryptDeploy; -import com.avaje.ebean.config.EncryptDeployManager; -import com.avaje.ebean.config.EncryptKeyManager; -import com.avaje.ebean.config.Encryptor; -import com.avaje.ebean.config.NamingConvention; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.TableName; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import com.avaje.ebeaninternal.server.type.DataEncryptSupport; -import com.avaje.ebeaninternal.server.type.ScalarType; -import com.avaje.ebeaninternal.server.type.ScalarTypeArrayList; -import com.avaje.ebeaninternal.server.type.ScalarTypeEnumStandard; -import com.avaje.ebeaninternal.server.type.SimpleAesEncryptor; -import com.avaje.ebeaninternal.server.type.TypeManager; +import io.ebean.annotation.DbArray; +import io.ebean.annotation.DbHstore; +import io.ebean.annotation.DbJson; +import io.ebean.annotation.DbJsonB; +import io.ebean.annotation.DbJsonType; +import io.ebean.config.EncryptDeploy; +import io.ebean.config.EncryptDeployManager; +import io.ebean.config.EncryptKeyManager; +import io.ebean.config.Encryptor; +import io.ebean.config.NamingConvention; +import io.ebean.config.ServerConfig; +import io.ebean.config.TableName; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebeaninternal.server.type.DataEncryptSupport; +import io.ebeaninternal.server.type.ScalarType; +import io.ebeaninternal.server.type.ScalarTypeArrayList; +import io.ebeaninternal.server.type.ScalarTypeEnumStandard; +import io.ebeaninternal.server.type.SimpleAesEncryptor; +import io.ebeaninternal.server.type.TypeManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/ReadAnnotations.java b/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/parse/ReadAnnotations.java rename to src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java index 22d031495..41f065a9a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/ReadAnnotations.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.parse; +package io.ebeaninternal.server.deploy.parse; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptorManager; -import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory; +import io.ebeaninternal.server.deploy.BeanDescriptorManager; +import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory; /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/SqlReservedWords.java b/src/main/java/io/ebeaninternal/server/deploy/parse/SqlReservedWords.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/parse/SqlReservedWords.java rename to src/main/java/io/ebeaninternal/server/deploy/parse/SqlReservedWords.java index 24afe1ed3..b48e2162f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/SqlReservedWords.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/SqlReservedWords.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy.parse; +package io.ebeaninternal.server.deploy.parse; import java.util.HashSet; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/TransientProperties.java b/src/main/java/io/ebeaninternal/server/deploy/parse/TransientProperties.java similarity index 74% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/parse/TransientProperties.java rename to src/main/java/io/ebeaninternal/server/deploy/parse/TransientProperties.java index 2f8b52d9f..83ed97321 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/TransientProperties.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/TransientProperties.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.deploy.parse; +package io.ebeaninternal.server.deploy.parse; import java.util.List; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; /** * Mark transient properties. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/ebeandeploy.dtd b/src/main/java/io/ebeaninternal/server/deploy/parse/ebeandeploy.dtd similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/parse/ebeandeploy.dtd rename to src/main/java/io/ebeaninternal/server/deploy/parse/ebeandeploy.dtd diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/package.html b/src/main/java/io/ebeaninternal/server/deploy/parse/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/deploy/parse/package.html rename to src/main/java/io/ebeaninternal/server/deploy/parse/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/CharMatch.java b/src/main/java/io/ebeaninternal/server/el/CharMatch.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/el/CharMatch.java rename to src/main/java/io/ebeaninternal/server/el/CharMatch.java index d90a70206..13af0c02a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/CharMatch.java +++ b/src/main/java/io/ebeaninternal/server/el/CharMatch.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.el; +package io.ebeaninternal.server.el; /** * Case insensitive string matching. diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElComparator.java b/src/main/java/io/ebeaninternal/server/el/ElComparator.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/el/ElComparator.java rename to src/main/java/io/ebeaninternal/server/el/ElComparator.java index 1bc28365e..c5f7c3396 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElComparator.java +++ b/src/main/java/io/ebeaninternal/server/el/ElComparator.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.el; +package io.ebeaninternal.server.el; import java.util.Comparator; @@ -17,4 +17,4 @@ public interface ElComparator extends Comparator { */ int compareValue(Object value, T o2); -} \ No newline at end of file +} diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElComparatorCompound.java b/src/main/java/io/ebeaninternal/server/el/ElComparatorCompound.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/el/ElComparatorCompound.java rename to src/main/java/io/ebeaninternal/server/el/ElComparatorCompound.java index 9f77d986f..3ce52a6e2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElComparatorCompound.java +++ b/src/main/java/io/ebeaninternal/server/el/ElComparatorCompound.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.el; +package io.ebeaninternal.server.el; import java.util.Comparator; diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElComparatorProperty.java b/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/el/ElComparatorProperty.java rename to src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java index 54aeb0b1b..818e6fdcb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElComparatorProperty.java +++ b/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.el; +package io.ebeaninternal.server.el; import java.util.Comparator; diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElFilter.java b/src/main/java/io/ebeaninternal/server/el/ElFilter.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/el/ElFilter.java rename to src/main/java/io/ebeaninternal/server/el/ElFilter.java index a6f80a0f3..55fb3ef6b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElFilter.java +++ b/src/main/java/io/ebeaninternal/server/el/ElFilter.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.el; +package io.ebeaninternal.server.el; -import com.avaje.ebean.Filter; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebean.Filter; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElMatchBuilder.java b/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java similarity index 99% rename from src/main/java/com/avaje/ebeaninternal/server/el/ElMatchBuilder.java rename to src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java index b8554445b..730798e14 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElMatchBuilder.java +++ b/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.el; +package io.ebeaninternal.server.el; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElMatcher.java b/src/main/java/io/ebeaninternal/server/el/ElMatcher.java similarity index 81% rename from src/main/java/com/avaje/ebeaninternal/server/el/ElMatcher.java rename to src/main/java/io/ebeaninternal/server/el/ElMatcher.java index 5a37fc031..2697abbde 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElMatcher.java +++ b/src/main/java/io/ebeaninternal/server/el/ElMatcher.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.el; +package io.ebeaninternal.server.el; /** * Interface for defining matches for filter expressions. diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChain.java b/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChain.java rename to src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java index 4d298ca4f..6f6e86608 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChain.java +++ b/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.el; +package io.ebeaninternal.server.el; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.text.StringParser; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.lib.util.StringHelper; -import com.avaje.ebeaninternal.server.query.SplitName; -import com.avaje.ebeaninternal.server.type.ScalarType; +import io.ebean.bean.EntityBean; +import io.ebean.text.StringParser; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.lib.util.StringHelper; +import io.ebeaninternal.server.query.SplitName; +import io.ebeaninternal.server.type.ScalarType; import java.util.Arrays; diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChainBuilder.java b/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChainBuilder.java rename to src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java index d8b681858..cb4e7d55e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChainBuilder.java +++ b/src/main/java/io/ebeaninternal/server/el/ElPropertyChainBuilder.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.el; +package io.ebeaninternal.server.el; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyDeploy.java b/src/main/java/io/ebeaninternal/server/el/ElPropertyDeploy.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyDeploy.java rename to src/main/java/io/ebeaninternal/server/el/ElPropertyDeploy.java index 2b3b08009..066612e09 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyDeploy.java +++ b/src/main/java/io/ebeaninternal/server/el/ElPropertyDeploy.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.el; +package io.ebeaninternal.server.el; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanProperty; /** * Used to parse expressions in queries (where, orderBy etc). diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyValue.java b/src/main/java/io/ebeaninternal/server/el/ElPropertyValue.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyValue.java rename to src/main/java/io/ebeaninternal/server/el/ElPropertyValue.java index ac0bd8334..d22585ce9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyValue.java +++ b/src/main/java/io/ebeaninternal/server/el/ElPropertyValue.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.el; +package io.ebeaninternal.server.el; -import com.avaje.ebean.plugin.ExpressionPath; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; +import io.ebean.plugin.ExpressionPath; +import io.ebeaninternal.api.SpiExpressionRequest; /** * The expression language object that can get values. diff --git a/src/main/java/io/ebeaninternal/server/el/package-info.java b/src/main/java/io/ebeaninternal/server/el/package-info.java new file mode 100644 index 000000000..3c5da1e10 --- /dev/null +++ b/src/main/java/io/ebeaninternal/server/el/package-info.java @@ -0,0 +1 @@ +package io.ebeaninternal.server.el; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/AbstractExpression.java b/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java similarity index 80% rename from src/main/java/com/avaje/ebeaninternal/server/expression/AbstractExpression.java rename to src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java index 6200d5746..d0f2827e8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/AbstractExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java @@ -1,14 +1,14 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.api.SpiExpressionValidation; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.el.ElPropertyDeploy; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; -import com.avaje.ebeaninternal.server.query.SplitName; +import io.ebean.event.BeanQueryRequest; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.SpiExpressionValidation; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.el.ElPropertyDeploy; +import io.ebeaninternal.server.el.ElPropertyValue; +import io.ebeaninternal.server.query.SplitName; /** * Base class for simple expressions. diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/AbstractTextExpression.java b/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/expression/AbstractTextExpression.java rename to src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java index 87fe3bdbf..1434cd018 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/AbstractTextExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/AbstractTextExpression.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; /** * Base class for TextExpressions that are only executable by doc store. diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/AbstractValueExpression.java b/src/main/java/io/ebeaninternal/server/expression/AbstractValueExpression.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/expression/AbstractValueExpression.java rename to src/main/java/io/ebeaninternal/server/expression/AbstractValueExpression.java index fb6756d7e..7adb2729b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/AbstractValueExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/AbstractValueExpression.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; /** * Abstract expression that helps with named parameter use. diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpression.java b/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpression.java rename to src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java index 0325a322d..49cf8237a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/AllEqualsExpression.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.api.SpiExpressionValidation; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.el.ElPropertyDeploy; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.SpiExpressionValidation; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.el.ElPropertyDeploy; import java.io.IOException; import java.util.Iterator; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/ArrayContainsExpression.java b/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/expression/ArrayContainsExpression.java rename to src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java index b65eed668..aa5e29ac1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/ArrayContainsExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/ArrayContainsExpression.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/ArrayIsEmptyExpression.java b/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java similarity index 85% rename from src/main/java/com/avaje/ebeaninternal/server/expression/ArrayIsEmptyExpression.java rename to src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java index 2b7338c9e..6dbe91d79 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/ArrayIsEmptyExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/ArrayIsEmptyExpression.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenExpression.java b/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/expression/BetweenExpression.java rename to src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java index 9888e89fd..7387ecd93 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/BetweenExpression.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpression.java b/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java similarity index 85% rename from src/main/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpression.java rename to src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java index d8cc71871..a9bb15e90 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/BetweenPropertyExpression.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.api.SpiExpressionValidation; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.el.ElPropertyDeploy; -import com.avaje.ebeaninternal.server.query.SplitName; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.SpiExpressionValidation; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.el.ElPropertyDeploy; +import io.ebeaninternal.server.query.SplitName; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java b/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java rename to src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java index cad89dd58..089dee7b7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.el.ElPropertyValue; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java rename to src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java index 9bb9041e9..5d4411c79 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java @@ -1,18 +1,18 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.ExampleExpression; -import com.avaje.ebean.LikeType; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.api.SpiExpressionValidation; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.query.SplitName; +import io.ebean.ExampleExpression; +import io.ebean.LikeType; +import io.ebean.bean.EntityBean; +import io.ebean.event.BeanQueryRequest; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.SpiExpressionValidation; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.query.SplitName; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactory.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactory.java rename to src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java index 3bcc1392c..153b278ce 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactory.java +++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java @@ -1,20 +1,20 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.ExampleExpression; -import com.avaje.ebean.Expression; -import com.avaje.ebean.ExpressionFactory; -import com.avaje.ebean.ExpressionList; -import com.avaje.ebean.Junction; -import com.avaje.ebean.LikeType; -import com.avaje.ebean.Query; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.search.Match; -import com.avaje.ebean.search.MultiMatch; -import com.avaje.ebean.search.TextCommonTerms; -import com.avaje.ebean.search.TextQueryString; -import com.avaje.ebean.search.TextSimple; -import com.avaje.ebeaninternal.api.SpiExpressionFactory; -import com.avaje.ebeaninternal.api.SpiQuery; +import io.ebean.ExampleExpression; +import io.ebean.Expression; +import io.ebean.ExpressionFactory; +import io.ebean.ExpressionList; +import io.ebean.Junction; +import io.ebean.LikeType; +import io.ebean.Query; +import io.ebean.bean.EntityBean; +import io.ebean.search.Match; +import io.ebean.search.MultiMatch; +import io.ebean.search.TextCommonTerms; +import io.ebean.search.TextQueryString; +import io.ebean.search.TextSimple; +import io.ebeaninternal.api.SpiExpressionFactory; +import io.ebeaninternal.api.SpiQuery; import java.util.Arrays; import java.util.Collection; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java rename to src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java index ddc8f073a..6b27483ac 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java +++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java @@ -1,32 +1,32 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.Expression; -import com.avaje.ebean.ExpressionFactory; -import com.avaje.ebean.ExpressionList; -import com.avaje.ebean.FetchPath; -import com.avaje.ebean.FutureIds; -import com.avaje.ebean.FutureList; -import com.avaje.ebean.FutureRowCount; -import com.avaje.ebean.Junction; -import com.avaje.ebean.OrderBy; -import com.avaje.ebean.PagedList; -import com.avaje.ebean.Query; -import com.avaje.ebean.QueryIterator; -import com.avaje.ebean.Version; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.ebean.search.Match; -import com.avaje.ebean.search.MultiMatch; -import com.avaje.ebean.search.TextCommonTerms; -import com.avaje.ebean.search.TextQueryString; -import com.avaje.ebean.search.TextSimple; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionList; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.api.SpiExpressionValidation; -import com.avaje.ebeaninternal.api.SpiJunction; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebean.Expression; +import io.ebean.ExpressionFactory; +import io.ebean.ExpressionList; +import io.ebean.FetchPath; +import io.ebean.FutureIds; +import io.ebean.FutureList; +import io.ebean.FutureRowCount; +import io.ebean.Junction; +import io.ebean.OrderBy; +import io.ebean.PagedList; +import io.ebean.Query; +import io.ebean.QueryIterator; +import io.ebean.Version; +import io.ebean.event.BeanQueryRequest; +import io.ebean.search.Match; +import io.ebean.search.MultiMatch; +import io.ebean.search.TextCommonTerms; +import io.ebean.search.TextQueryString; +import io.ebean.search.TextSimple; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionList; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.SpiExpressionValidation; +import io.ebeaninternal.api.SpiJunction; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.io.IOException; import java.sql.Timestamp; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionRequest.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionRequest.java rename to src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java index 35b75c931..d0ad74eb5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionRequest.java +++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.SpiExpressionList; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.core.DbExpressionHandler; -import com.avaje.ebeaninternal.server.core.SpiOrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.DeployParser; -import com.avaje.ebeaninternal.server.persist.Binder; -import com.avaje.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.api.SpiExpressionList; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.core.DbExpressionHandler; +import io.ebeaninternal.server.core.SpiOrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.DeployParser; +import io.ebeaninternal.server.persist.Binder; +import io.ebeaninternal.server.type.DataBind; import java.sql.SQLException; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DocQueryContext.java b/src/main/java/io/ebeaninternal/server/expression/DocQueryContext.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/expression/DocQueryContext.java rename to src/main/java/io/ebeaninternal/server/expression/DocQueryContext.java index e3d3b2605..abdf2e6a8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/DocQueryContext.java +++ b/src/main/java/io/ebeaninternal/server/expression/DocQueryContext.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.Junction; -import com.avaje.ebean.LikeType; -import com.avaje.ebean.plugin.ExpressionPath; -import com.avaje.ebean.search.Match; -import com.avaje.ebean.search.MultiMatch; -import com.avaje.ebean.search.TextCommonTerms; -import com.avaje.ebean.search.TextQueryString; -import com.avaje.ebean.search.TextSimple; +import io.ebean.Junction; +import io.ebean.LikeType; +import io.ebean.plugin.ExpressionPath; +import io.ebean.search.Match; +import io.ebean.search.MultiMatch; +import io.ebean.search.TextCommonTerms; +import io.ebean.search.TextQueryString; +import io.ebean.search.TextSimple; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/ExistsQueryExpression.java b/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/expression/ExistsQueryExpression.java rename to src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java index 8de510482..dc1f955a6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/ExistsQueryExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java @@ -1,15 +1,15 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.api.SpiExpressionValidation; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.query.CQuery; +import io.ebean.event.BeanQueryRequest; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.SpiExpressionValidation; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.query.CQuery; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/FilterExprPath.java b/src/main/java/io/ebeaninternal/server/expression/FilterExprPath.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/expression/FilterExprPath.java rename to src/main/java/io/ebeaninternal/server/expression/FilterExprPath.java index e13f027bc..d7b04de44 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/FilterExprPath.java +++ b/src/main/java/io/ebeaninternal/server/expression/FilterExprPath.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; import java.io.Serializable; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/FilterExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/expression/FilterExpressionList.java rename to src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java index e9cf35d22..801b58e9f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/FilterExpressionList.java +++ b/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.ExpressionFactory; -import com.avaje.ebean.ExpressionList; -import com.avaje.ebean.FutureIds; -import com.avaje.ebean.FutureList; -import com.avaje.ebean.FutureRowCount; -import com.avaje.ebean.OrderBy; -import com.avaje.ebean.Query; -import com.avaje.ebeaninternal.api.SpiExpressionList; +import io.ebean.ExpressionFactory; +import io.ebean.ExpressionList; +import io.ebean.FutureIds; +import io.ebean.FutureList; +import io.ebean.FutureRowCount; +import io.ebean.OrderBy; +import io.ebean.Query; +import io.ebeaninternal.api.SpiExpressionList; import javax.persistence.PersistenceException; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/IdExpression.java b/src/main/java/io/ebeaninternal/server/expression/IdExpression.java similarity index 83% rename from src/main/java/com/avaje/ebeaninternal/server/expression/IdExpression.java rename to src/main/java/io/ebeaninternal/server/expression/IdExpression.java index d39931aea..6f59eff32 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/IdExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/IdExpression.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.api.SpiExpressionValidation; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.SpiExpressionValidation; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/IdInExpression.java b/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/expression/IdInExpression.java rename to src/main/java/io/ebeaninternal/server/expression/IdInExpression.java index 2b329000a..712fea1dd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/IdInExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/IdInExpression.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.api.SpiExpressionValidation; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.id.IdBinder; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.SpiExpressionValidation; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.id.IdBinder; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/InExpression.java b/src/main/java/io/ebeaninternal/server/expression/InExpression.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/expression/InExpression.java rename to src/main/java/io/ebeaninternal/server/expression/InExpression.java index 4abffd0e1..d41b772c6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/InExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/InExpression.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; +import io.ebean.bean.EntityBean; +import io.ebean.event.BeanQueryRequest; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.el.ElPropertyValue; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/InQueryExpression.java b/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/expression/InQueryExpression.java rename to src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java index 2a7026dea..43da81e3c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/InQueryExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.query.CQuery; +import io.ebean.event.BeanQueryRequest; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.query.CQuery; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/IsEmptyExpression.java b/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/expression/IsEmptyExpression.java rename to src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java index 744bd4a0f..edfb43d62 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/IsEmptyExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/IsEmptyExpression.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; -import com.avaje.ebeaninternal.server.query.SplitName; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.el.ElPropertyValue; +import io.ebeaninternal.server.query.SplitName; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/JsonPathExpression.java b/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/expression/JsonPathExpression.java rename to src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java index 63032bd38..db0a5efe4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/JsonPathExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/JsonPathExpression.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java rename to src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java index 8de793dab..256bb62ec 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java @@ -1,30 +1,30 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.Expression; -import com.avaje.ebean.ExpressionList; -import com.avaje.ebean.FetchPath; -import com.avaje.ebean.FutureIds; -import com.avaje.ebean.FutureList; -import com.avaje.ebean.FutureRowCount; -import com.avaje.ebean.Junction; -import com.avaje.ebean.OrderBy; -import com.avaje.ebean.PagedList; -import com.avaje.ebean.Query; -import com.avaje.ebean.QueryIterator; -import com.avaje.ebean.Version; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.ebean.search.Match; -import com.avaje.ebean.search.MultiMatch; -import com.avaje.ebean.search.TextCommonTerms; -import com.avaje.ebean.search.TextQueryString; -import com.avaje.ebean.search.TextSimple; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.api.SpiExpressionValidation; -import com.avaje.ebeaninternal.api.SpiJunction; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebean.Expression; +import io.ebean.ExpressionList; +import io.ebean.FetchPath; +import io.ebean.FutureIds; +import io.ebean.FutureList; +import io.ebean.FutureRowCount; +import io.ebean.Junction; +import io.ebean.OrderBy; +import io.ebean.PagedList; +import io.ebean.Query; +import io.ebean.QueryIterator; +import io.ebean.Version; +import io.ebean.event.BeanQueryRequest; +import io.ebean.search.Match; +import io.ebean.search.MultiMatch; +import io.ebean.search.TextCommonTerms; +import io.ebean.search.TextQueryString; +import io.ebean.search.TextSimple; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.SpiExpressionValidation; +import io.ebeaninternal.api.SpiJunction; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.io.IOException; import java.sql.Timestamp; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/LikeExpression.java b/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/expression/LikeExpression.java rename to src/main/java/io/ebeaninternal/server/expression/LikeExpression.java index f34de403a..4f864f0dd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/LikeExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/LikeExpression.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.LikeType; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; +import io.ebean.LikeType; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.el.ElPropertyValue; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/LogicExpression.java b/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/expression/LogicExpression.java rename to src/main/java/io/ebeaninternal/server/expression/LogicExpression.java index 67d4ac8fe..22902d9fa 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/LogicExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java @@ -1,14 +1,14 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.Expression; -import com.avaje.ebean.Junction; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.api.SpiExpressionValidation; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebean.Expression; +import io.ebean.Junction; +import io.ebean.event.BeanQueryRequest; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.SpiExpressionValidation; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/NamedParamHelp.java b/src/main/java/io/ebeaninternal/server/expression/NamedParamHelp.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/expression/NamedParamHelp.java rename to src/main/java/io/ebeaninternal/server/expression/NamedParamHelp.java index cda7e69d9..5487cffbf 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/NamedParamHelp.java +++ b/src/main/java/io/ebeaninternal/server/expression/NamedParamHelp.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.SpiNamedParam; +import io.ebeaninternal.api.SpiNamedParam; import java.util.Collection; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/NativeILikeExpression.java b/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java similarity index 85% rename from src/main/java/com/avaje/ebeaninternal/server/expression/NativeILikeExpression.java rename to src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java index 5526fd145..1cca474b7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/NativeILikeExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/NativeILikeExpression.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.LikeType; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; +import io.ebean.LikeType; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.el.ElPropertyValue; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/NestedPathWrapperExpression.java b/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java similarity index 83% rename from src/main/java/com/avaje/ebeaninternal/server/expression/NestedPathWrapperExpression.java rename to src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java index da2bba9a3..726533041 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/NestedPathWrapperExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.api.SpiExpressionValidation; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebean.event.BeanQueryRequest; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.SpiExpressionValidation; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/NonPrepareExpression.java b/src/main/java/io/ebeaninternal/server/expression/NonPrepareExpression.java similarity index 77% rename from src/main/java/com/avaje/ebeaninternal/server/expression/NonPrepareExpression.java rename to src/main/java/io/ebeaninternal/server/expression/NonPrepareExpression.java index 39432b690..21507b4d3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/NonPrepareExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/NonPrepareExpression.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.ebeaninternal.api.SpiExpression; +import io.ebean.event.BeanQueryRequest; +import io.ebeaninternal.api.SpiExpression; /** * Base abstract expression that does nothing for prepareExpression(). diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/NoopExpression.java b/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java similarity index 78% rename from src/main/java/com/avaje/ebeaninternal/server/expression/NoopExpression.java rename to src/main/java/io/ebeaninternal/server/expression/NoopExpression.java index 3cbfbc381..e3843c4a9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/NoopExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.api.SpiExpressionValidation; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebean.event.BeanQueryRequest; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.SpiExpressionValidation; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/NotExpression.java b/src/main/java/io/ebeaninternal/server/expression/NotExpression.java similarity index 82% rename from src/main/java/com/avaje/ebeaninternal/server/expression/NotExpression.java rename to src/main/java/io/ebeaninternal/server/expression/NotExpression.java index b0e8a00ef..518f547f1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/NotExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/NotExpression.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.Expression; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.api.SpiExpressionValidation; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebean.Expression; +import io.ebean.event.BeanQueryRequest; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.SpiExpressionValidation; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/NullExpression.java b/src/main/java/io/ebeaninternal/server/expression/NullExpression.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/expression/NullExpression.java rename to src/main/java/io/ebeaninternal/server/expression/NullExpression.java index 7fed6fa76..49290802f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/NullExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/NullExpression.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; -import com.avaje.ebeaninternal.server.query.SplitName; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.el.ElPropertyValue; +import io.ebeaninternal.server.query.SplitName; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/Op.java b/src/main/java/io/ebeaninternal/server/expression/Op.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/expression/Op.java rename to src/main/java/io/ebeaninternal/server/expression/Op.java index c8add0bd4..90321dc0e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/Op.java +++ b/src/main/java/io/ebeaninternal/server/expression/Op.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; /** * Simple operators - equals, greater than, less than etc. diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/PrepareDocNested.java b/src/main/java/io/ebeaninternal/server/expression/PrepareDocNested.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/expression/PrepareDocNested.java rename to src/main/java/io/ebeaninternal/server/expression/PrepareDocNested.java index 2b8b142a4..492a53257 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/PrepareDocNested.java +++ b/src/main/java/io/ebeaninternal/server/expression/PrepareDocNested.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.Junction; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebean.Junction; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/RawExpression.java b/src/main/java/io/ebeaninternal/server/expression/RawExpression.java similarity index 82% rename from src/main/java/com/avaje/ebeaninternal/server/expression/RawExpression.java rename to src/main/java/io/ebeaninternal/server/expression/RawExpression.java index d0f065596..32c7856fd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/RawExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/RawExpression.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.api.SpiExpressionValidation; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.api.SpiExpressionValidation; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/Same.java b/src/main/java/io/ebeaninternal/server/expression/Same.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/expression/Same.java rename to src/main/java/io/ebeaninternal/server/expression/Same.java index 05e483d94..8e4e343a4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/Same.java +++ b/src/main/java/io/ebeaninternal/server/expression/Same.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; import java.util.Collection; import java.util.Iterator; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/SimpleExpression.java b/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/expression/SimpleExpression.java rename to src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java index ec457e5fc..7182646d4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/SimpleExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.plugin.ExpressionPath; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; +import io.ebean.bean.EntityBean; +import io.ebean.plugin.ExpressionPath; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.el.ElPropertyValue; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/TextCommonTermsExpression.java b/src/main/java/io/ebeaninternal/server/expression/TextCommonTermsExpression.java similarity index 83% rename from src/main/java/com/avaje/ebeaninternal/server/expression/TextCommonTermsExpression.java rename to src/main/java/io/ebeaninternal/server/expression/TextCommonTermsExpression.java index f75dd9f3e..8cc5fb5bb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/TextCommonTermsExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/TextCommonTermsExpression.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.search.TextCommonTerms; +import io.ebean.search.TextCommonTerms; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/TextMatchExpression.java b/src/main/java/io/ebeaninternal/server/expression/TextMatchExpression.java similarity index 85% rename from src/main/java/com/avaje/ebeaninternal/server/expression/TextMatchExpression.java rename to src/main/java/io/ebeaninternal/server/expression/TextMatchExpression.java index a0630ade7..d36f491b7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/TextMatchExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/TextMatchExpression.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.search.Match; +import io.ebean.search.Match; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/TextMultiMatchExpression.java b/src/main/java/io/ebeaninternal/server/expression/TextMultiMatchExpression.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/expression/TextMultiMatchExpression.java rename to src/main/java/io/ebeaninternal/server/expression/TextMultiMatchExpression.java index 786da9f18..e51538e9f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/TextMultiMatchExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/TextMultiMatchExpression.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.search.MultiMatch; +import io.ebean.search.MultiMatch; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/TextQueryStringExpression.java b/src/main/java/io/ebeaninternal/server/expression/TextQueryStringExpression.java similarity index 83% rename from src/main/java/com/avaje/ebeaninternal/server/expression/TextQueryStringExpression.java rename to src/main/java/io/ebeaninternal/server/expression/TextQueryStringExpression.java index 128f67954..2a44e39d5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/TextQueryStringExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/TextQueryStringExpression.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.search.TextQueryString; +import io.ebean.search.TextQueryString; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/TextSimpleExpression.java b/src/main/java/io/ebeaninternal/server/expression/TextSimpleExpression.java similarity index 83% rename from src/main/java/com/avaje/ebeaninternal/server/expression/TextSimpleExpression.java rename to src/main/java/io/ebeaninternal/server/expression/TextSimpleExpression.java index 34fd1ec82..9faa7d1a7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/TextSimpleExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/TextSimpleExpression.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.search.TextSimple; +import io.ebean.search.TextSimple; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/UnsupportedDocStoreExpression.java b/src/main/java/io/ebeaninternal/server/expression/UnsupportedDocStoreExpression.java similarity index 70% rename from src/main/java/com/avaje/ebeaninternal/server/expression/UnsupportedDocStoreExpression.java rename to src/main/java/io/ebeaninternal/server/expression/UnsupportedDocStoreExpression.java index 3849e06c7..286f95b59 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/UnsupportedDocStoreExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/UnsupportedDocStoreExpression.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; /** * Marked interface for expressions unsupported in doc store. diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/package.html b/src/main/java/io/ebeaninternal/server/expression/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/expression/package.html rename to src/main/java/io/ebeaninternal/server/expression/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapter.java b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapter.java rename to src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java index b1cd04c17..b3ecad1c3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapter.java +++ b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java @@ -1,15 +1,15 @@ -package com.avaje.ebeaninternal.server.grammer; +package io.ebeaninternal.server.grammer; -import com.avaje.ebean.Expression; -import com.avaje.ebean.ExpressionList; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.LikeType; -import com.avaje.ebean.OrderBy; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.grammer.antlr.EQLBaseListener; -import com.avaje.ebeaninternal.server.grammer.antlr.EQLLexer; -import com.avaje.ebeaninternal.server.grammer.antlr.EQLParser; -import com.avaje.ebeaninternal.server.util.ArrayStack; +import io.ebean.Expression; +import io.ebean.ExpressionList; +import io.ebean.FetchConfig; +import io.ebean.LikeType; +import io.ebean.OrderBy; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.grammer.antlr.EQLBaseListener; +import io.ebeaninternal.server.grammer.antlr.EQLLexer; +import io.ebeaninternal.server.grammer.antlr.EQLParser; +import io.ebeaninternal.server.util.ArrayStack; import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.TerminalNode; diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapterHelper.java b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapterHelper.java rename to src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java index 41df9bbaa..ebcf8521e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapterHelper.java +++ b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.grammer; +package io.ebeaninternal.server.grammer; -import com.avaje.ebean.ExpressionList; -import com.avaje.ebean.LikeType; +import io.ebean.ExpressionList; +import io.ebean.LikeType; import java.math.BigDecimal; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlOperator.java b/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java similarity index 78% rename from src/main/java/com/avaje/ebeaninternal/server/grammer/EqlOperator.java rename to src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java index 70f2b1410..73cab1063 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlOperator.java +++ b/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.grammer; +package io.ebeaninternal.server.grammer; enum EqlOperator { diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlParser.java b/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/grammer/EqlParser.java rename to src/main/java/io/ebeaninternal/server/grammer/EqlParser.java index 44e06bff3..f4e8a184d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlParser.java +++ b/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.grammer; +package io.ebeaninternal.server.grammer; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.grammer.antlr.EQLLexer; -import com.avaje.ebeaninternal.server.grammer.antlr.EQLParser; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.grammer.antlr.EQLLexer; +import io.ebeaninternal.server.grammer.antlr.EQLParser; import org.antlr.v4.runtime.ANTLRInputStream; import org.antlr.v4.runtime.BaseErrorListener; import org.antlr.v4.runtime.CommonTokenStream; diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/NamedParameter.java b/src/main/java/io/ebeaninternal/server/grammer/NamedParameter.java similarity index 82% rename from src/main/java/com/avaje/ebeaninternal/server/grammer/NamedParameter.java rename to src/main/java/io/ebeaninternal/server/grammer/NamedParameter.java index 23f508f33..c40efe6ef 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/grammer/NamedParameter.java +++ b/src/main/java/io/ebeaninternal/server/grammer/NamedParameter.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.grammer; +package io.ebeaninternal.server.grammer; public class NamedParameter { diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/OperatorMapping.java b/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/grammer/OperatorMapping.java rename to src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java index 8ad872cb0..d7a588856 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/grammer/OperatorMapping.java +++ b/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.grammer; +package io.ebeaninternal.server.grammer; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/ParseFetchConfig.java b/src/main/java/io/ebeaninternal/server/grammer/ParseFetchConfig.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/grammer/ParseFetchConfig.java rename to src/main/java/io/ebeaninternal/server/grammer/ParseFetchConfig.java index 0432345d2..67b2b9c24 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/grammer/ParseFetchConfig.java +++ b/src/main/java/io/ebeaninternal/server/grammer/ParseFetchConfig.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.grammer; +package io.ebeaninternal.server.grammer; -import com.avaje.ebean.FetchConfig; +import io.ebean.FetchConfig; /** * Parse the path that potentially is a FetchConfig definition. diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQL.tokens b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQL.tokens rename to src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLBaseListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java similarity index 99% rename from src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLBaseListener.java rename to src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java index e6ab2e11b..f6338f9e2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLBaseListener.java +++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java @@ -1,5 +1,5 @@ // Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.5.3 -package com.avaje.ebeaninternal.server.grammer.antlr; +package io.ebeaninternal.server.grammer.antlr; import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.tree.ErrorNode; diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLLexer.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java similarity index 99% rename from src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLLexer.java rename to src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java index 6ecbf17d7..2b2efc63f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLLexer.java +++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java @@ -1,5 +1,5 @@ // Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.5.3 -package com.avaje.ebeaninternal.server.grammer.antlr; +package io.ebeaninternal.server.grammer.antlr; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.Lexer; diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLLexer.tokens b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLLexer.tokens rename to src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java similarity index 99% rename from src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLListener.java rename to src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java index 3a6e3d4ec..783b52e94 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLListener.java +++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java @@ -1,5 +1,5 @@ // Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.5.3 -package com.avaje.ebeaninternal.server.grammer.antlr; +package io.ebeaninternal.server.grammer.antlr; import org.antlr.v4.runtime.tree.ParseTreeListener; diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLParser.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java similarity index 99% rename from src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLParser.java rename to src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java index 3bf7eb517..f7136d6be 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/grammer/antlr/EQLParser.java +++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java @@ -1,5 +1,5 @@ // Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.5.3 -package com.avaje.ebeaninternal.server.grammer.antlr; +package io.ebeaninternal.server.grammer.antlr; import org.antlr.v4.runtime.NoViableAltException; import org.antlr.v4.runtime.Parser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/idgen/UuidIdGenerator.java b/src/main/java/io/ebeaninternal/server/idgen/UuidIdGenerator.java similarity index 82% rename from src/main/java/com/avaje/ebeaninternal/server/idgen/UuidIdGenerator.java rename to src/main/java/io/ebeaninternal/server/idgen/UuidIdGenerator.java index 26978ff68..12a1d3b28 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/idgen/UuidIdGenerator.java +++ b/src/main/java/io/ebeaninternal/server/idgen/UuidIdGenerator.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.idgen; +package io.ebeaninternal.server.idgen; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.config.dbplatform.PlatformIdGenerator; +import io.ebean.Transaction; +import io.ebean.config.dbplatform.PlatformIdGenerator; import java.util.UUID; diff --git a/src/main/java/com/avaje/ebeaninternal/server/idgen/package.html b/src/main/java/io/ebeaninternal/server/idgen/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/idgen/package.html rename to src/main/java/io/ebeaninternal/server/idgen/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonExecutorService.java b/src/main/java/io/ebeaninternal/server/lib/DaemonExecutorService.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/lib/DaemonExecutorService.java rename to src/main/java/io/ebeaninternal/server/lib/DaemonExecutorService.java index bb92f84c3..c2c0a4370 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonExecutorService.java +++ b/src/main/java/io/ebeaninternal/server/lib/DaemonExecutorService.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.lib; +package io.ebeaninternal.server.lib; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonScheduleThreadPool.java b/src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/lib/DaemonScheduleThreadPool.java rename to src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java index 0e45a8caf..942be926f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonScheduleThreadPool.java +++ b/src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.lib; +package io.ebeaninternal.server.lib; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonThreadFactory.java b/src/main/java/io/ebeaninternal/server/lib/DaemonThreadFactory.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/lib/DaemonThreadFactory.java rename to src/main/java/io/ebeaninternal/server/lib/DaemonThreadFactory.java index 63dc82944..69c8b2067 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/lib/DaemonThreadFactory.java +++ b/src/main/java/io/ebeaninternal/server/lib/DaemonThreadFactory.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.lib; +package io.ebeaninternal.server.lib; import java.util.concurrent.ThreadFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/ShutdownHook.java b/src/main/java/io/ebeaninternal/server/lib/ShutdownHook.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/lib/ShutdownHook.java rename to src/main/java/io/ebeaninternal/server/lib/ShutdownHook.java index cb8b4472c..882796480 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/lib/ShutdownHook.java +++ b/src/main/java/io/ebeaninternal/server/lib/ShutdownHook.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.lib; +package io.ebeaninternal.server.lib; /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/ShutdownManager.java b/src/main/java/io/ebeaninternal/server/lib/ShutdownManager.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/lib/ShutdownManager.java rename to src/main/java/io/ebeaninternal/server/lib/ShutdownManager.java index 892a36e9c..67b4d01f1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/lib/ShutdownManager.java +++ b/src/main/java/io/ebeaninternal/server/lib/ShutdownManager.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.lib; +package io.ebeaninternal.server.lib; -import com.avaje.ebean.common.SpiContainer; -import com.avaje.ebeaninternal.api.ClassUtil; -import com.avaje.ebeaninternal.api.SpiEbeanServer; +import io.ebean.common.SpiContainer; +import io.ebeaninternal.api.ClassUtil; +import io.ebeaninternal.api.SpiEbeanServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/package.html b/src/main/java/io/ebeaninternal/server/lib/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/lib/package.html rename to src/main/java/io/ebeaninternal/server/lib/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/Str.java b/src/main/java/io/ebeaninternal/server/lib/util/Str.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/lib/util/Str.java rename to src/main/java/io/ebeaninternal/server/lib/util/Str.java index 6e7cfce48..b181a30e3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/Str.java +++ b/src/main/java/io/ebeaninternal/server/lib/util/Str.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.lib.util; +package io.ebeaninternal.server.lib.util; /** * String utility for adding strings together. diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringHelper.java b/src/main/java/io/ebeaninternal/server/lib/util/StringHelper.java similarity index 99% rename from src/main/java/com/avaje/ebeaninternal/server/lib/util/StringHelper.java rename to src/main/java/io/ebeaninternal/server/lib/util/StringHelper.java index ca008eb7c..e8aa44a37 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringHelper.java +++ b/src/main/java/io/ebeaninternal/server/lib/util/StringHelper.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.lib.util; +package io.ebeaninternal.server.lib.util; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/package.html b/src/main/java/io/ebeaninternal/server/lib/util/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/lib/util/package.html rename to src/main/java/io/ebeaninternal/server/lib/util/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBaseContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBaseContext.java rename to src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java index 72bc67626..0922af599 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBaseContext.java +++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.loadcontext; +package io.ebeaninternal.server.loadcontext; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.bean.ObjectGraphNode; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryProperties; +import io.ebean.FetchConfig; +import io.ebean.bean.ObjectGraphNode; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.querydefn.OrmQueryProperties; /** * Base class for Bean and BeanCollection loading (lazy loading and query join loading). diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java rename to src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java index c1f374bb1..75c62ff78 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java +++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java @@ -1,15 +1,15 @@ -package com.avaje.ebeaninternal.server.loadcontext; +package io.ebeaninternal.server.loadcontext; -import com.avaje.ebean.bean.BeanLoader; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebeaninternal.api.LoadBeanBuffer; -import com.avaje.ebeaninternal.api.LoadBeanContext; -import com.avaje.ebeaninternal.api.LoadBeanRequest; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryProperties; +import io.ebean.bean.BeanLoader; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.api.LoadBeanBuffer; +import io.ebeaninternal.api.LoadBeanContext; +import io.ebeaninternal.api.LoadBeanRequest; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.querydefn.OrmQueryProperties; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContext.java rename to src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java index 7d39c2647..bb65f8a64 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContext.java +++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java @@ -1,23 +1,23 @@ -package com.avaje.ebeaninternal.server.loadcontext; +package io.ebeaninternal.server.loadcontext; -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.bean.ObjectGraphOrigin; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebeaninternal.api.LoadContext; -import com.avaje.ebeaninternal.api.LoadSecondaryQuery; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.api.SpiQuerySecondary; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssoc; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryProperties; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.CallStack; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.bean.ObjectGraphNode; +import io.ebean.bean.ObjectGraphOrigin; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.api.LoadContext; +import io.ebeaninternal.api.LoadSecondaryQuery; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.api.SpiQuerySecondary; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssoc; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.el.ElPropertyValue; +import io.ebeaninternal.server.querydefn.OrmQueryProperties; import java.sql.Timestamp; import java.util.HashMap; diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadManyContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadManyContext.java rename to src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java index b55b1efe4..2684ca13c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadManyContext.java +++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java @@ -1,18 +1,18 @@ -package com.avaje.ebeaninternal.server.loadcontext; +package io.ebeaninternal.server.loadcontext; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.BeanCollectionLoader; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.ObjectGraphNode; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebeaninternal.api.LoadManyBuffer; -import com.avaje.ebeaninternal.api.LoadManyContext; -import com.avaje.ebeaninternal.api.LoadManyRequest; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryProperties; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.BeanCollectionLoader; +import io.ebean.bean.EntityBean; +import io.ebean.bean.ObjectGraphNode; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.api.LoadManyBuffer; +import io.ebeaninternal.api.LoadManyContext; +import io.ebeaninternal.api.LoadManyRequest; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.querydefn.OrmQueryProperties; import java.util.ArrayList; import java.util.List; @@ -129,8 +129,8 @@ public class DLoadManyContext extends DLoadBaseContext implements LoadManyContex public LoadBuffer(DLoadManyContext context, int batchSize) { this.context = context; - // set the persistence context as at this moment in - // case it changes as part of a findIterate etc + // set the persistence context as at this moment in + // case it changes as part of a findIterate etc this.persistenceContext = context.getPersistenceContext(); this.batchSize = batchSize; this.list = new ArrayList<>(batchSize); diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/package-info.java b/src/main/java/io/ebeaninternal/server/loadcontext/package-info.java new file mode 100644 index 000000000..9d17dcd8e --- /dev/null +++ b/src/main/java/io/ebeaninternal/server/loadcontext/package-info.java @@ -0,0 +1 @@ +package io.ebeaninternal.server.loadcontext; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchControl.java b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/persist/BatchControl.java rename to src/main/java/io/ebeaninternal/server/persist/BatchControl.java index 3242809af..688753e10 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchControl.java +++ b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.core.PersistRequest; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.core.PersistRequest; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; import javax.persistence.PersistenceException; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchDepthComparator.java b/src/main/java/io/ebeaninternal/server/persist/BatchDepthComparator.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/persist/BatchDepthComparator.java rename to src/main/java/io/ebeaninternal/server/persist/BatchDepthComparator.java index ad6dba553..5bec5c320 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchDepthComparator.java +++ b/src/main/java/io/ebeaninternal/server/persist/BatchDepthComparator.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; import java.io.Serializable; import java.util.Comparator; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchPostExecute.java b/src/main/java/io/ebeaninternal/server/persist/BatchPostExecute.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/persist/BatchPostExecute.java rename to src/main/java/io/ebeaninternal/server/persist/BatchPostExecute.java index b91b56fc7..b35a445f0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchPostExecute.java +++ b/src/main/java/io/ebeaninternal/server/persist/BatchPostExecute.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; /** * Handles the processing required after batch execution. diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolder.java b/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolder.java rename to src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java index e842c52eb..0dd343eed 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolder.java +++ b/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; -import com.avaje.ebeaninternal.server.core.PersistRequest; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.core.PersistRequest; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.util.ArrayList; import java.util.IdentityHashMap; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmt.java b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmt.java rename to src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java index 999bf4ef8..94f0aef3e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmt.java +++ b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java rename to src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java index 1cc374303..fa68fd486 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java +++ b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersister.java b/src/main/java/io/ebeaninternal/server/persist/BeanPersister.java similarity index 82% rename from src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersister.java rename to src/main/java/io/ebeaninternal/server/persist/BeanPersister.java index c4e192288..d4cab2a17 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersister.java +++ b/src/main/java/io/ebeaninternal/server/persist/BeanPersister.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.core.PersistRequestBean; import javax.persistence.PersistenceException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersisterFactory.java b/src/main/java/io/ebeaninternal/server/persist/BeanPersisterFactory.java similarity index 67% rename from src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersisterFactory.java rename to src/main/java/io/ebeaninternal/server/persist/BeanPersisterFactory.java index bc0c59089..0c8104d4d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersisterFactory.java +++ b/src/main/java/io/ebeaninternal/server/persist/BeanPersisterFactory.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanDescriptor; /** * Factory for creating BeanPersister implementations. diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BindValues.java b/src/main/java/io/ebeaninternal/server/persist/BindValues.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/persist/BindValues.java rename to src/main/java/io/ebeaninternal/server/persist/BindValues.java index 8bf946244..ebb72db9d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BindValues.java +++ b/src/main/java/io/ebeaninternal/server/persist/BindValues.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java b/src/main/java/io/ebeaninternal/server/persist/Binder.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java rename to src/main/java/io/ebeaninternal/server/persist/Binder.java index 4049b26a0..3397ea6c7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java +++ b/src/main/java/io/ebeaninternal/server/persist/Binder.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebeaninternal.api.BindParams; -import com.avaje.ebeaninternal.server.core.DbExpressionHandler; -import com.avaje.ebeaninternal.server.core.Message; -import com.avaje.ebeaninternal.server.core.timezone.DataTimeZone; -import com.avaje.ebeaninternal.server.type.DataBind; -import com.avaje.ebeaninternal.server.type.ScalarType; -import com.avaje.ebeaninternal.server.type.TypeManager; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebeaninternal.api.BindParams; +import io.ebeaninternal.server.core.DbExpressionHandler; +import io.ebeaninternal.server.core.Message; +import io.ebeaninternal.server.core.timezone.DataTimeZone; +import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.type.ScalarType; +import io.ebeaninternal.server.type.TypeManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersistExecute.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java similarity index 82% rename from src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersistExecute.java rename to src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java index 467cbb193..8d2cf2ed0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersistExecute.java +++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.core.PersistRequestCallableSql; -import com.avaje.ebeaninternal.server.core.PersistRequestOrmUpdate; -import com.avaje.ebeaninternal.server.core.PersistRequestUpdateSql; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.core.PersistRequestCallableSql; +import io.ebeaninternal.server.core.PersistRequestOrmUpdate; +import io.ebeaninternal.server.core.PersistRequestUpdateSql; /** * Default PersistExecute implementation using DML statements. diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java rename to src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index f676bc153..ce7d06f4a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java +++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -1,35 +1,35 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; -import com.avaje.ebean.CallableSql; -import com.avaje.ebean.Query; -import com.avaje.ebean.SqlUpdate; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.Update; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.BeanCollection.ModifyListenMode; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.api.SpiUpdate; -import com.avaje.ebeaninternal.server.core.Message; -import com.avaje.ebeaninternal.server.core.PersistRequest; -import com.avaje.ebeaninternal.server.core.PersistRequest.Type; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.core.PersistRequestCallableSql; -import com.avaje.ebeaninternal.server.core.PersistRequestOrmUpdate; -import com.avaje.ebeaninternal.server.core.PersistRequestUpdateSql; -import com.avaje.ebeaninternal.server.core.Persister; -import com.avaje.ebeaninternal.server.deploy.BeanCollectionUtil; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptorManager; -import com.avaje.ebeaninternal.server.deploy.BeanManager; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.deploy.IntersectionRow; -import com.avaje.ebeaninternal.server.deploy.ManyType; +import io.ebean.CallableSql; +import io.ebean.Query; +import io.ebean.SqlUpdate; +import io.ebean.Transaction; +import io.ebean.Update; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.BeanCollection.ModifyListenMode; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.SpiUpdate; +import io.ebeaninternal.server.core.Message; +import io.ebeaninternal.server.core.PersistRequest; +import io.ebeaninternal.server.core.PersistRequest.Type; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.core.PersistRequestCallableSql; +import io.ebeaninternal.server.core.PersistRequestOrmUpdate; +import io.ebeaninternal.server.core.PersistRequestUpdateSql; +import io.ebeaninternal.server.core.Persister; +import io.ebeaninternal.server.deploy.BeanCollectionUtil; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanDescriptorManager; +import io.ebeaninternal.server.deploy.BeanManager; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.IntersectionRow; +import io.ebeaninternal.server.deploy.ManyType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,7 +55,7 @@ import java.util.Set; *

  • Handles the batching and queueing
    • *

    * - * @see com.avaje.ebeaninternal.server.persist.DefaultPersistExecute + * @see io.ebeaninternal.server.persist.DefaultPersistExecute */ public final class DefaultPersister implements Persister { diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java b/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java similarity index 82% rename from src/main/java/com/avaje/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java rename to src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java index 4d2b97b50..f570c27b6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java +++ b/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java @@ -1,14 +1,14 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; -import com.avaje.ebean.PersistenceContextScope; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.transaction.DefaultPersistenceContext; +import io.ebean.PersistenceContextScope; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.transaction.DefaultPersistenceContext; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/DmlUtil.java b/src/main/java/io/ebeaninternal/server/persist/DmlUtil.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/persist/DmlUtil.java rename to src/main/java/io/ebeaninternal/server/persist/DmlUtil.java index df174cfbd..46ce61d33 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/DmlUtil.java +++ b/src/main/java/io/ebeaninternal/server/persist/DmlUtil.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/ExeCallableSql.java b/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/persist/ExeCallableSql.java rename to src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java index ec565bc9f..842541160 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/ExeCallableSql.java +++ b/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; -import com.avaje.ebeaninternal.api.BindParams; -import com.avaje.ebeaninternal.api.SpiCallableSql; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.core.PersistRequestCallableSql; -import com.avaje.ebeaninternal.server.util.BindParamsParser; +import io.ebeaninternal.api.BindParams; +import io.ebeaninternal.api.SpiCallableSql; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.core.PersistRequestCallableSql; +import io.ebeaninternal.server.util.BindParamsParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/ExeOrmUpdate.java b/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/persist/ExeOrmUpdate.java rename to src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java index a53564a20..756111a72 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/ExeOrmUpdate.java +++ b/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; -import com.avaje.ebeaninternal.api.BindParams; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.api.SpiUpdate; -import com.avaje.ebeaninternal.server.core.PersistRequestOrmUpdate; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.util.BindParamsParser; +import io.ebeaninternal.api.BindParams; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.SpiUpdate; +import io.ebeaninternal.server.core.PersistRequestOrmUpdate; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.util.BindParamsParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/ExeUpdateSql.java b/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/persist/ExeUpdateSql.java rename to src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java index 30e0ac473..6fc3549ec 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/ExeUpdateSql.java +++ b/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; -import com.avaje.ebeaninternal.api.BindParams; -import com.avaje.ebeaninternal.api.SpiSqlUpdate; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.core.PersistRequestUpdateSql; -import com.avaje.ebeaninternal.server.core.PersistRequestUpdateSql.SqlType; -import com.avaje.ebeaninternal.server.util.BindParamsParser; +import io.ebeaninternal.api.BindParams; +import io.ebeaninternal.api.SpiSqlUpdate; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.core.PersistRequestUpdateSql; +import io.ebeaninternal.server.core.PersistRequestUpdateSql.SqlType; +import io.ebeaninternal.server.util.BindParamsParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/PersistExecute.java b/src/main/java/io/ebeaninternal/server/persist/PersistExecute.java similarity index 67% rename from src/main/java/com/avaje/ebeaninternal/server/persist/PersistExecute.java rename to src/main/java/io/ebeaninternal/server/persist/PersistExecute.java index ddfd2d41e..04ce2db7c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/PersistExecute.java +++ b/src/main/java/io/ebeaninternal/server/persist/PersistExecute.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.core.PersistRequestCallableSql; -import com.avaje.ebeaninternal.server.core.PersistRequestOrmUpdate; -import com.avaje.ebeaninternal.server.core.PersistRequestUpdateSql; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.core.PersistRequestCallableSql; +import io.ebeaninternal.server.core.PersistRequestOrmUpdate; +import io.ebeaninternal.server.core.PersistRequestUpdateSql; /** * The actual execution of persist requests. diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/PstmtFactory.java b/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/persist/PstmtFactory.java rename to src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java index 0cfae26b1..47f12e39a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/PstmtFactory.java +++ b/src/main/java/io/ebeaninternal/server/persist/PstmtFactory.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; -import com.avaje.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.SpiTransaction; import java.sql.CallableStatement; import java.sql.Connection; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteHandler.java rename to src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java index 677f80112..b092186b3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteHandler.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.persist.dml; +package io.ebeaninternal.server.persist.dml; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.core.PersistRequestBean; import javax.persistence.OptimisticLockException; import java.sql.PreparedStatement; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteMeta.java rename to src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java index f09b41531..20b0bc14c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteMeta.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.persist.dml; +package io.ebeaninternal.server.persist.dml; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.api.ConcurrencyMode; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.persist.dmlbind.Bindable; -import com.avaje.ebeaninternal.server.persist.dmlbind.BindableId; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.ConcurrencyMode; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.persist.dmlbind.Bindable; +import io.ebeaninternal.server.persist.dmlbind.BindableId; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersister.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersister.java rename to src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java index c37a60098..8f9851a10 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersister.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.persist.dml; +package io.ebeaninternal.server.persist.dml; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.lib.util.StringHelper; -import com.avaje.ebeaninternal.server.persist.BeanPersister; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.lib.util.StringHelper; +import io.ebeaninternal.server.persist.BeanPersister; import javax.persistence.PersistenceException; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java similarity index 72% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java rename to src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java index cc2f1f03d..0236d6574 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.persist.dml; +package io.ebeaninternal.server.persist.dml; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.persist.BeanPersister; -import com.avaje.ebeaninternal.server.persist.BeanPersisterFactory; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.persist.BeanPersister; +import io.ebeaninternal.server.persist.BeanPersisterFactory; /** * Factory for creating a DmlBeanPersister for a bean type. diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java rename to src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java index 98721b20d..75a743c9c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java @@ -1,14 +1,14 @@ -package com.avaje.ebeaninternal.server.persist.dml; +package io.ebeaninternal.server.persist.dml; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.lib.util.Str; -import com.avaje.ebeaninternal.server.persist.BatchedPstmt; -import com.avaje.ebeaninternal.server.persist.BatchedPstmtHolder; -import com.avaje.ebeaninternal.server.persist.dmlbind.BindableRequest; -import com.avaje.ebeaninternal.server.transaction.TransactionManager; -import com.avaje.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.lib.util.Str; +import io.ebeaninternal.server.persist.BatchedPstmt; +import io.ebeaninternal.server.persist.BatchedPstmtHolder; +import io.ebeaninternal.server.persist.dmlbind.BindableRequest; +import io.ebeaninternal.server.transaction.TransactionManager; +import io.ebeaninternal.server.type.DataBind; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlMode.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlMode.java similarity index 77% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlMode.java rename to src/main/java/io/ebeaninternal/server/persist/dml/DmlMode.java index c29af82e9..37e8f00df 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlMode.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/DmlMode.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.persist.dml; +package io.ebeaninternal.server.persist.dml; /** * Used to indicate the part of DML being processed. diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java b/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java rename to src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java index 0f5e7b4ad..9bbe7bfcd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.persist.dml; +package io.ebeaninternal.server.persist.dml; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.persist.BeanPersister; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.persist.BeanPersister; import javax.persistence.PersistenceException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/GenerateDmlRequest.java b/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/GenerateDmlRequest.java rename to src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java index c1356ea65..2a0ad38dc 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/GenerateDmlRequest.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.persist.dml; +package io.ebeaninternal.server.persist.dml; /** * Helper to support the generation of DML statements. diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/GeneratedProperties.java b/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedProperties.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/GeneratedProperties.java rename to src/main/java/io/ebeaninternal/server/persist/dml/GeneratedProperties.java index ee4c496e2..3a36c0b0e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/GeneratedProperties.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedProperties.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.persist.dml; +package io.ebeaninternal.server.persist.dml; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java b/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java similarity index 77% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java rename to src/main/java/io/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java index 51abc3382..08f1d054d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/GeneratedPropertyCollector.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.persist.dml; +package io.ebeaninternal.server.persist.dml; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/InsertHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/InsertHandler.java rename to src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java index 022af7799..df8b82d5c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/InsertHandler.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.persist.dml; +package io.ebeaninternal.server.persist.dml; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.core.Message; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.persist.DmlUtil; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.core.Message; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.persist.DmlUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/InsertMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/InsertMeta.java rename to src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java index 20ad4f8dc..ff11081aa 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/InsertMeta.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java @@ -1,14 +1,14 @@ -package com.avaje.ebeaninternal.server.persist.dml; +package io.ebeaninternal.server.persist.dml; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.InheritInfo; -import com.avaje.ebeaninternal.server.persist.dmlbind.Bindable; -import com.avaje.ebeaninternal.server.persist.dmlbind.BindableDiscriminator; -import com.avaje.ebeaninternal.server.persist.dmlbind.BindableId; -import com.avaje.ebeaninternal.server.persist.dmlbind.BindableList; +import io.ebean.bean.EntityBean; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.InheritInfo; +import io.ebeaninternal.server.persist.dmlbind.Bindable; +import io.ebeaninternal.server.persist.dmlbind.BindableDiscriminator; +import io.ebeaninternal.server.persist.dmlbind.BindableId; +import io.ebeaninternal.server.persist.dmlbind.BindableList; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/MetaFactory.java b/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java similarity index 75% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/MetaFactory.java rename to src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java index 374500421..287dc9350 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/MetaFactory.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java @@ -1,18 +1,18 @@ -package com.avaje.ebeaninternal.server.persist.dml; +package io.ebeaninternal.server.persist.dml; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.DbEncrypt; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.persist.dmlbind.Bindable; -import com.avaje.ebeaninternal.server.persist.dmlbind.BindableId; -import com.avaje.ebeaninternal.server.persist.dmlbind.BindableList; -import com.avaje.ebeaninternal.server.persist.dmlbind.BindableUnidirectional; -import com.avaje.ebeaninternal.server.persist.dmlbind.FactoryAssocOnes; -import com.avaje.ebeaninternal.server.persist.dmlbind.FactoryBaseProperties; -import com.avaje.ebeaninternal.server.persist.dmlbind.FactoryEmbedded; -import com.avaje.ebeaninternal.server.persist.dmlbind.FactoryId; -import com.avaje.ebeaninternal.server.persist.dmlbind.FactoryVersion; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbEncrypt; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.persist.dmlbind.Bindable; +import io.ebeaninternal.server.persist.dmlbind.BindableId; +import io.ebeaninternal.server.persist.dmlbind.BindableList; +import io.ebeaninternal.server.persist.dmlbind.BindableUnidirectional; +import io.ebeaninternal.server.persist.dmlbind.FactoryAssocOnes; +import io.ebeaninternal.server.persist.dmlbind.FactoryBaseProperties; +import io.ebeaninternal.server.persist.dmlbind.FactoryEmbedded; +import io.ebeaninternal.server.persist.dmlbind.FactoryId; +import io.ebeaninternal.server.persist.dmlbind.FactoryVersion; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/PersistHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/PersistHandler.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/PersistHandler.java rename to src/main/java/io/ebeaninternal/server/persist/dml/PersistHandler.java index 1bd238791..ec33ba500 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/PersistHandler.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/PersistHandler.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.persist.dml; +package io.ebeaninternal.server.persist.dml; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateHandler.java rename to src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java index f25b5e3b4..5e4860111 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateHandler.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.persist.dml; +package io.ebeaninternal.server.persist.dml; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.api.SpiUpdatePlan; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.SpiUpdatePlan; +import io.ebeaninternal.server.core.PersistRequestBean; import javax.persistence.OptimisticLockException; import java.sql.PreparedStatement; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateMeta.java b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateMeta.java rename to src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java index 1e29dacda..29afa8a69 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateMeta.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.persist.dml; +package io.ebeaninternal.server.persist.dml; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.api.ConcurrencyMode; -import com.avaje.ebeaninternal.api.SpiUpdatePlan; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.persist.dmlbind.Bindable; -import com.avaje.ebeaninternal.server.persist.dmlbind.BindableId; -import com.avaje.ebeaninternal.server.persist.dmlbind.BindableList; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.ConcurrencyMode; +import io.ebeaninternal.api.SpiUpdatePlan; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.persist.dmlbind.Bindable; +import io.ebeaninternal.server.persist.dmlbind.BindableId; +import io.ebeaninternal.server.persist.dmlbind.BindableList; import java.sql.SQLException; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdatePlan.java b/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdatePlan.java rename to src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java index 404dfaa1b..f5290e20f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdatePlan.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.persist.dml; +package io.ebeaninternal.server.persist.dml; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.api.ConcurrencyMode; -import com.avaje.ebeaninternal.api.SpiUpdatePlan; -import com.avaje.ebeaninternal.server.persist.dmlbind.Bindable; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.ConcurrencyMode; +import io.ebeaninternal.api.SpiUpdatePlan; +import io.ebeaninternal.server.persist.dmlbind.Bindable; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/package.html b/src/main/java/io/ebeaninternal/server/persist/dml/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dml/package.html rename to src/main/java/io/ebeaninternal/server/persist/dml/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/Bindable.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/Bindable.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/Bindable.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/Bindable.java index a3d877203..be8dbb73b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/Bindable.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/Bindable.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import java.sql.SQLException; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java similarity index 79% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java index 3265a6557..96a6a9285 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.deploy.id.ImportedId; -import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.id.ImportedId; +import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import java.sql.SQLException; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java similarity index 79% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java index 881875ff6..7006431e5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.InheritInfo; -import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.InheritInfo; +import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import javax.persistence.PersistenceException; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java index 9461ab30c..fb077a66a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import java.sql.SQLException; import java.util.Arrays; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java index 03ffe0392..b57010d1d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import java.sql.SQLException; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableId.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableId.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableId.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableId.java index 80f86154f..031ffd887 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableId.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableId.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.core.PersistRequestBean; /** * Adds support for id creation for concatenated ids on intersection tables. diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java index e0bd48f6c..3a13f3ab7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import javax.persistence.PersistenceException; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java similarity index 75% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java index 357b5bbb9..62b7fd730 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import java.sql.SQLException; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java similarity index 83% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java index 1db027f63..ec30ff289 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import javax.persistence.PersistenceException; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableList.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableList.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java index 2843c8684..00b659a67 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableList.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import java.sql.SQLException; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableProperty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java similarity index 81% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableProperty.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java index d5286035d..5f026b117 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableProperty.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import java.sql.SQLException; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java similarity index 76% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java index f036e3031..9d8775eab 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; -import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; +import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java similarity index 79% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java index 68331e690..d94237df2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; -import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; +import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import java.sql.SQLException; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableRequest.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableRequest.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableRequest.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableRequest.java index ecec65482..a3f497b4e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableRequest.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableRequest.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanProperty; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java similarity index 81% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java index cd87ec737..1cb036507 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.deploy.id.ImportedId; -import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.id.ImportedId; +import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import javax.persistence.PersistenceException; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java similarity index 77% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java index 58c8a57ba..78b0c558d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.persist.dml.DmlMode; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.persist.dml.DmlMode; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java similarity index 76% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java index 24f771009..48ac8ad1f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.persist.dml.DmlMode; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.persist.dml.DmlMode; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java similarity index 77% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java index 709c5524c..b568d72d5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.persist.dml.DmlMode; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.persist.dml.DmlMode; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryId.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java similarity index 68% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryId.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java index 6a57341db..bc67aa4c8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryId.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryId.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; /** * Create a Bindable for the ids of a bean type. diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryProperty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryProperty.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java index 5c03e3b87..d223ec7ba 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryProperty.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; -import com.avaje.ebeaninternal.server.persist.dml.DmlMode; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; +import io.ebeaninternal.server.persist.dml.DmlMode; /** * Creates the appropriate Bindable for a BeanProperty. diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryVersion.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java similarity index 72% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryVersion.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java index 628c98cd7..12dcf45d9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryVersion.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryVersion.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; /** * Creates a Bindable to support version concurrency where clauses. diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java index a95505f2c..d6b128d6d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.persist.dmlbind; +package io.ebeaninternal.server.persist.dmlbind; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; /** * Matches local embedded id properties to 'matching' properties from a diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/package.html b/src/main/java/io/ebeaninternal/server/persist/dmlbind/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/package.html rename to src/main/java/io/ebeaninternal/server/persist/dmlbind/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/package.html b/src/main/java/io/ebeaninternal/server/persist/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/persist/package.html rename to src/main/java/io/ebeaninternal/server/persist/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertiesReader.java b/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertiesReader.java rename to src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java index 62c23aa7c..86fb51b8c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertiesReader.java +++ b/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.properties; +package io.ebeaninternal.server.properties; import java.lang.reflect.Field; import java.util.Arrays; diff --git a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyAccess.java b/src/main/java/io/ebeaninternal/server/properties/BeanPropertyAccess.java similarity index 85% rename from src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyAccess.java rename to src/main/java/io/ebeaninternal/server/properties/BeanPropertyAccess.java index 943130236..122948e92 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyAccess.java +++ b/src/main/java/io/ebeaninternal/server/properties/BeanPropertyAccess.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.properties; +package io.ebeaninternal.server.properties; /** * Provides getter setter methods for beans. diff --git a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyGetter.java b/src/main/java/io/ebeaninternal/server/properties/BeanPropertyGetter.java similarity index 72% rename from src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyGetter.java rename to src/main/java/io/ebeaninternal/server/properties/BeanPropertyGetter.java index 65687da8b..ba054072c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyGetter.java +++ b/src/main/java/io/ebeaninternal/server/properties/BeanPropertyGetter.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.properties; +package io.ebeaninternal.server.properties; -import com.avaje.ebean.bean.EntityBean; +import io.ebean.bean.EntityBean; /** * The getter implementation for a given bean property. diff --git a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertySetter.java b/src/main/java/io/ebeaninternal/server/properties/BeanPropertySetter.java similarity index 81% rename from src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertySetter.java rename to src/main/java/io/ebeaninternal/server/properties/BeanPropertySetter.java index a3e31b331..b6a47de4a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertySetter.java +++ b/src/main/java/io/ebeaninternal/server/properties/BeanPropertySetter.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.properties; +package io.ebeaninternal.server.properties; -import com.avaje.ebean.bean.EntityBean; +import io.ebean.bean.EntityBean; /** * The setter for a given bean property. diff --git a/src/main/java/com/avaje/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java b/src/main/java/io/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java rename to src/main/java/io/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java index bc2f6714a..f7a517974 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java +++ b/src/main/java/io/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.properties; +package io.ebeaninternal.server.properties; -import com.avaje.ebean.bean.EntityBean; +import io.ebean.bean.EntityBean; /** * Returns Getter and Setter methods based on EntityBean enhancement and field position. diff --git a/src/main/java/com/avaje/ebeaninternal/server/properties/package.html b/src/main/java/io/ebeaninternal/server/properties/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/properties/package.html rename to src/main/java/io/ebeaninternal/server/properties/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/BaseFuture.java b/src/main/java/io/ebeaninternal/server/query/BaseFuture.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/query/BaseFuture.java rename to src/main/java/io/ebeaninternal/server/query/BaseFuture.java index e00a98f78..9e22a459f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/BaseFuture.java +++ b/src/main/java/io/ebeaninternal/server/query/BaseFuture.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQuery.java b/src/main/java/io/ebeaninternal/server/query/CQuery.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/query/CQuery.java rename to src/main/java/io/ebeaninternal/server/query/CQuery.java index 8a6663b36..b81b603a7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQuery.java +++ b/src/main/java/io/ebeaninternal/server/query/CQuery.java @@ -1,30 +1,30 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.QueryIterator; -import com.avaje.ebean.Version; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebean.bean.NodeUsageCollector; -import com.avaje.ebean.bean.NodeUsageListener; -import com.avaje.ebean.bean.ObjectGraphNode; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebean.event.readaudit.ReadEvent; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.api.SpiQuery.Mode; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.autotune.ProfilingListener; -import com.avaje.ebeaninternal.server.core.Message; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.core.SpiOrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanCollectionHelp; -import com.avaje.ebeaninternal.server.deploy.BeanCollectionHelpFactory; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.DbReadContext; -import com.avaje.ebeaninternal.server.lib.util.StringHelper; -import com.avaje.ebeaninternal.server.type.DataBind; -import com.avaje.ebeaninternal.server.type.DataReader; +import io.ebean.QueryIterator; +import io.ebean.Version; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.bean.NodeUsageCollector; +import io.ebean.bean.NodeUsageListener; +import io.ebean.bean.ObjectGraphNode; +import io.ebean.bean.PersistenceContext; +import io.ebean.event.readaudit.ReadEvent; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.api.SpiQuery.Mode; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.autotune.ProfilingListener; +import io.ebeaninternal.server.core.Message; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.core.SpiOrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanCollectionHelp; +import io.ebeaninternal.server.deploy.BeanCollectionHelpFactory; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.DbReadContext; +import io.ebeaninternal.server.lib.util.StringHelper; +import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.type.DataReader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java rename to src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java index 22ecc40f8..45fff963c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java @@ -1,27 +1,27 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSql.ColumnMapping; -import com.avaje.ebean.RawSql.ColumnMapping.Column; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.SqlLimitRequest; -import com.avaje.ebean.config.dbplatform.SqlLimitResponse; -import com.avaje.ebean.config.dbplatform.SqlLimiter; -import com.avaje.ebean.event.readaudit.ReadAuditQueryPlan; -import com.avaje.ebean.text.PathProperties; -import com.avaje.ebean.util.StringHelper; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; -import com.avaje.ebeaninternal.server.persist.Binder; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryLimitRequest; +import io.ebean.RawSql; +import io.ebean.RawSql.ColumnMapping; +import io.ebean.RawSql.ColumnMapping.Column; +import io.ebean.RawSqlBuilder; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.SqlLimitRequest; +import io.ebean.config.dbplatform.SqlLimitResponse; +import io.ebean.config.dbplatform.SqlLimiter; +import io.ebean.event.readaudit.ReadAuditQueryPlan; +import io.ebean.text.PathProperties; +import io.ebean.util.StringHelper; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.el.ElPropertyValue; +import io.ebeaninternal.server.persist.Binder; +import io.ebeaninternal.server.querydefn.OrmQueryDetail; +import io.ebeaninternal.server.querydefn.OrmQueryLimitRequest; import javax.persistence.PersistenceException; import java.sql.Connection; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilderRawSql.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilderRawSql.java rename to src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java index c342731c3..10b69eba1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilderRawSql.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java @@ -1,15 +1,15 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.SqlLimitResponse; -import com.avaje.ebean.config.dbplatform.SqlLimiter; -import com.avaje.ebeaninternal.api.BindParams; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryLimitRequest; -import com.avaje.ebeaninternal.server.util.BindParamsParser; +import io.ebean.RawSql; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.SqlLimitResponse; +import io.ebean.config.dbplatform.SqlLimiter; +import io.ebeaninternal.api.BindParams; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.querydefn.OrmQueryLimitRequest; +import io.ebeaninternal.server.util.BindParamsParser; class CQueryBuilderRawSql { diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryDraftSupport.java b/src/main/java/io/ebeaninternal/server/query/CQueryDraftSupport.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/query/CQueryDraftSupport.java rename to src/main/java/io/ebeaninternal/server/query/CQueryDraftSupport.java index ef84db1db..da1e01cac 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryDraftSupport.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryDraftSupport.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; import java.util.Map; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/query/CQueryEngine.java rename to src/main/java/io/ebeaninternal/server/query/CQueryEngine.java index 3c95a3850..0990119c5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryEngine.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java @@ -1,20 +1,20 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.QueryIterator; -import com.avaje.ebean.ValuePair; -import com.avaje.ebean.Version; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.ObjectGraphNode; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.core.DiffHelp; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.lib.util.Str; -import com.avaje.ebeaninternal.server.persist.Binder; -import com.avaje.ebeaninternal.server.transaction.TransactionManager; +import io.ebean.QueryIterator; +import io.ebean.ValuePair; +import io.ebean.Version; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.EntityBean; +import io.ebean.bean.ObjectGraphNode; +import io.ebean.config.ServerConfig; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.core.DiffHelp; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.lib.util.Str; +import io.ebeaninternal.server.persist.Binder; +import io.ebeaninternal.server.transaction.TransactionManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/query/CQueryFetchSingleAttribute.java rename to src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java index 997b5c12b..85f0b45a3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryFetchSingleAttribute.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.type.RsetDataReader; -import com.avaje.ebeaninternal.server.type.ScalarType; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.type.RsetDataReader; +import io.ebeaninternal.server.type.ScalarType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryHistorySupport.java b/src/main/java/io/ebeaninternal/server/query/CQueryHistorySupport.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/query/CQueryHistorySupport.java rename to src/main/java/io/ebeaninternal/server/query/CQueryHistorySupport.java index a62ad346f..5f810c6da 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryHistorySupport.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryHistorySupport.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.config.dbplatform.DbHistorySupport; +import io.ebean.config.dbplatform.DbHistorySupport; import java.util.Map; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryIteratorSimple.java b/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/query/CQueryIteratorSimple.java rename to src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java index fac87a5a6..93710f4b7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryIteratorSimple.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.QueryIterator; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; +import io.ebean.QueryIterator; +import io.ebeaninternal.server.core.OrmQueryRequest; import javax.persistence.PersistenceException; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryIteratorWithBuffer.java b/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/query/CQueryIteratorWithBuffer.java rename to src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java index 1ffdeac1c..e45aa24b3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryIteratorWithBuffer.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.QueryIterator; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; +import io.ebean.QueryIterator; +import io.ebeaninternal.server.core.OrmQueryRequest; import javax.persistence.PersistenceException; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryOrderBy.java b/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java similarity index 77% rename from src/main/java/com/avaje/ebeaninternal/server/query/CQueryOrderBy.java rename to src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java index 0d8be611b..9898169d4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryOrderBy.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.OrderBy; -import com.avaje.ebean.OrderBy.Property; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssoc; -import com.avaje.ebeaninternal.server.deploy.id.IdBinder; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; +import io.ebean.OrderBy; +import io.ebean.OrderBy.Property; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssoc; +import io.ebeaninternal.server.deploy.id.IdBinder; +import io.ebeaninternal.server.el.ElPropertyValue; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlan.java rename to src/main/java/io/ebeaninternal/server/query/CQueryPlan.java index e20e9c491..701bdd0a8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlan.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java @@ -1,17 +1,17 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.bean.ObjectGraphNode; -import com.avaje.ebean.config.dbplatform.SqlLimitResponse; -import com.avaje.ebeaninternal.api.CQueryPlanKey; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.core.timezone.DataTimeZone; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.query.CQueryPlanStats.Snapshot; -import com.avaje.ebeaninternal.server.type.DataBind; -import com.avaje.ebeaninternal.server.type.DataReader; -import com.avaje.ebeaninternal.server.type.RsetDataReader; -import com.avaje.ebeaninternal.server.util.Md5; +import io.ebean.bean.ObjectGraphNode; +import io.ebean.config.dbplatform.SqlLimitResponse; +import io.ebeaninternal.api.CQueryPlanKey; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.core.timezone.DataTimeZone; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot; +import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.type.DataReader; +import io.ebeaninternal.server.type.RsetDataReader; +import io.ebeaninternal.server.util.Md5; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlanRawSql.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlanRawSql.java rename to src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java index 2f0ec4a51..43b7ff92b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlanRawSql.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.RawSql.ColumnMapping; -import com.avaje.ebean.config.dbplatform.SqlLimitResponse; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.type.DataReader; -import com.avaje.ebeaninternal.server.type.RsetDataReaderIndexed; +import io.ebean.RawSql.ColumnMapping; +import io.ebean.config.dbplatform.SqlLimitResponse; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.type.DataReader; +import io.ebeaninternal.server.type.RsetDataReaderIndexed; import java.sql.ResultSet; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlanStats.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlanStats.java rename to src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java index 36a55fcc9..6813e0a5c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPlanStats.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.bean.ObjectGraphNode; -import com.avaje.ebean.meta.MetaQueryPlanOriginCount; -import com.avaje.ebean.meta.MetaQueryPlanStatistic; +import io.ebean.bean.ObjectGraphNode; +import io.ebean.meta.MetaQueryPlanOriginCount; +import io.ebean.meta.MetaQueryPlanStatistic; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPredicates.java b/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/query/CQueryPredicates.java rename to src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java index f56363322..4ca81ddcd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryPredicates.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java @@ -1,19 +1,19 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.RawSql; -import com.avaje.ebeaninternal.api.BindParams; -import com.avaje.ebeaninternal.api.SpiExpressionList; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.DeployParser; -import com.avaje.ebeaninternal.server.expression.DefaultExpressionRequest; -import com.avaje.ebeaninternal.server.persist.Binder; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryProperties; -import com.avaje.ebeaninternal.server.querydefn.OrmUpdateProperties; -import com.avaje.ebeaninternal.server.type.DataBind; -import com.avaje.ebeaninternal.server.util.BindParamsParser; +import io.ebean.RawSql; +import io.ebeaninternal.api.BindParams; +import io.ebeaninternal.api.SpiExpressionList; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.DeployParser; +import io.ebeaninternal.server.expression.DefaultExpressionRequest; +import io.ebeaninternal.server.persist.Binder; +import io.ebeaninternal.server.querydefn.OrmQueryProperties; +import io.ebeaninternal.server.querydefn.OrmUpdateProperties; +import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.util.BindParamsParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryRowCount.java b/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/query/CQueryRowCount.java rename to src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java index e3011c17c..20b73586b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryRowCount.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; import javax.persistence.PersistenceException; import java.sql.Connection; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryUpdate.java b/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/query/CQueryUpdate.java rename to src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java index fb1abb580..e4c1a6d89 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQueryUpdate.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CallableQuery.java b/src/main/java/io/ebeaninternal/server/query/CallableQuery.java similarity index 76% rename from src/main/java/com/avaje/ebeaninternal/server/query/CallableQuery.java rename to src/main/java/io/ebeaninternal/server/query/CallableQuery.java index 31683d361..4d29b0fe8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CallableQuery.java +++ b/src/main/java/io/ebeaninternal/server/query/CallableQuery.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.Transaction; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiQuery; +import io.ebean.Transaction; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiQuery; /** * Base object for making query execution into Callable's. diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryIds.java b/src/main/java/io/ebeaninternal/server/query/CallableQueryIds.java similarity index 81% rename from src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryIds.java rename to src/main/java/io/ebeaninternal/server/query/CallableQueryIds.java index d8a6aec89..1d9eaab17 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryIds.java +++ b/src/main/java/io/ebeaninternal/server/query/CallableQueryIds.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.Transaction; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiQuery; +import io.ebean.Transaction; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiQuery; import java.util.List; import java.util.concurrent.Callable; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryList.java b/src/main/java/io/ebeaninternal/server/query/CallableQueryList.java similarity index 78% rename from src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryList.java rename to src/main/java/io/ebeaninternal/server/query/CallableQueryList.java index 352c63e8e..083ba1d9d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryList.java +++ b/src/main/java/io/ebeaninternal/server/query/CallableQueryList.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.Transaction; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiQuery; +import io.ebean.Transaction; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiQuery; import java.util.List; import java.util.concurrent.Callable; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryRowCount.java b/src/main/java/io/ebeaninternal/server/query/CallableQueryRowCount.java similarity index 81% rename from src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryRowCount.java rename to src/main/java/io/ebeaninternal/server/query/CallableQueryRowCount.java index d583675da..3e9196804 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CallableQueryRowCount.java +++ b/src/main/java/io/ebeaninternal/server/query/CallableQueryRowCount.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.Transaction; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiQuery; +import io.ebean.Transaction; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiQuery; import java.util.concurrent.Callable; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CancelableQuery.java b/src/main/java/io/ebeaninternal/server/query/CancelableQuery.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/query/CancelableQuery.java rename to src/main/java/io/ebeaninternal/server/query/CancelableQuery.java index 7e745b7df..890fbb47f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CancelableQuery.java +++ b/src/main/java/io/ebeaninternal/server/query/CancelableQuery.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; /** * Defines a cancelable query. diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultDbSqlContext.java b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/query/DefaultDbSqlContext.java rename to src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java index e1af25150..4a271255d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultDbSqlContext.java +++ b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.DbSqlContext; -import com.avaje.ebeaninternal.server.deploy.TableJoinColumn; -import com.avaje.ebeaninternal.server.lib.util.StringHelper; -import com.avaje.ebeaninternal.server.util.ArrayStack; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.DbSqlContext; +import io.ebeaninternal.server.deploy.TableJoinColumn; +import io.ebeaninternal.server.lib.util.StringHelper; +import io.ebeaninternal.server.util.ArrayStack; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultOrmQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/query/DefaultOrmQueryEngine.java rename to src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java index 493d7030b..d0434c651 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultOrmQueryEngine.java +++ b/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java @@ -1,15 +1,15 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.QueryIterator; -import com.avaje.ebean.Version; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.event.BeanFindController; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.core.OrmQueryEngine; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebean.QueryIterator; +import io.ebean.Version; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.EntityBean; +import io.ebean.event.BeanFindController; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.core.OrmQueryEngine; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.util.Collection; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/query/DefaultRelationalQueryEngine.java rename to src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java index 3249246c0..5712ae100 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultRelationalQueryEngine.java +++ b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.SqlRow; -import com.avaje.ebeaninternal.server.core.Message; -import com.avaje.ebeaninternal.server.core.RelationalQueryEngine; -import com.avaje.ebeaninternal.server.core.RelationalQueryRequest; -import com.avaje.ebeaninternal.server.persist.Binder; +import io.ebean.SqlRow; +import io.ebeaninternal.server.core.Message; +import io.ebeaninternal.server.core.RelationalQueryEngine; +import io.ebeaninternal.server.core.RelationalQueryRequest; +import io.ebeaninternal.server.persist.Binder; import javax.persistence.PersistenceException; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultSqlRow.java b/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/query/DefaultSqlRow.java rename to src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java index 0cb102c09..eb5a03648 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultSqlRow.java +++ b/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.SqlQuery; -import com.avaje.ebean.SqlRow; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebean.SqlQuery; +import io.ebean.SqlRow; +import io.ebeaninternal.server.core.BasicTypeConverter; import java.math.BigDecimal; import java.sql.Date; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedList.java b/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedList.java rename to src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java index 6dc4e9232..923dc1256 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedList.java +++ b/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.PagedList; -import com.avaje.ebeaninternal.api.Monitor; -import com.avaje.ebeaninternal.api.SpiQuery; +import io.ebean.EbeanServer; +import io.ebean.PagedList; +import io.ebeaninternal.api.Monitor; +import io.ebeaninternal.api.SpiQuery; import javax.persistence.PersistenceException; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/NativeSqlQueryPlanKey.java b/src/main/java/io/ebeaninternal/server/query/NativeSqlQueryPlanKey.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/query/NativeSqlQueryPlanKey.java rename to src/main/java/io/ebeaninternal/server/query/NativeSqlQueryPlanKey.java index b43fae81d..d513f8b83 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/NativeSqlQueryPlanKey.java +++ b/src/main/java/io/ebeaninternal/server/query/NativeSqlQueryPlanKey.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebeaninternal.api.CQueryPlanKey; +import io.ebeaninternal.api.CQueryPlanKey; /** * QueryPlanKey for native sql queries. diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/OrderVersionDesc.java b/src/main/java/io/ebeaninternal/server/query/OrderVersionDesc.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/query/OrderVersionDesc.java rename to src/main/java/io/ebeaninternal/server/query/OrderVersionDesc.java index b37e26760..2ea46ac3a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/OrderVersionDesc.java +++ b/src/main/java/io/ebeaninternal/server/query/OrderVersionDesc.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.Version; +import io.ebean.Version; import java.sql.Timestamp; import java.util.Comparator; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/QueryFutureIds.java b/src/main/java/io/ebeaninternal/server/query/QueryFutureIds.java similarity index 82% rename from src/main/java/com/avaje/ebeaninternal/server/query/QueryFutureIds.java rename to src/main/java/io/ebeaninternal/server/query/QueryFutureIds.java index a96a524c9..c9b2cd0fe 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/QueryFutureIds.java +++ b/src/main/java/io/ebeaninternal/server/query/QueryFutureIds.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.FutureIds; -import com.avaje.ebean.Query; -import com.avaje.ebean.Transaction; +import io.ebean.FutureIds; +import io.ebean.Query; +import io.ebean.Transaction; import java.util.List; import java.util.concurrent.FutureTask; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/QueryFutureList.java b/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/query/QueryFutureList.java rename to src/main/java/io/ebeaninternal/server/query/QueryFutureList.java index 7f68a84c6..2d3999b61 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/QueryFutureList.java +++ b/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.FutureList; -import com.avaje.ebean.Query; -import com.avaje.ebean.Transaction; +import io.ebean.FutureList; +import io.ebean.Query; +import io.ebean.Transaction; import javax.persistence.PersistenceException; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/QueryFutureRowCount.java b/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java similarity index 82% rename from src/main/java/com/avaje/ebeaninternal/server/query/QueryFutureRowCount.java rename to src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java index f5202883d..381dd81df 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/QueryFutureRowCount.java +++ b/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.FutureRowCount; -import com.avaje.ebean.Query; -import com.avaje.ebean.Transaction; +import io.ebean.FutureRowCount; +import io.ebean.Query; +import io.ebean.Transaction; import java.util.concurrent.FutureTask; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/RawSqlQueryPlanKey.java b/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/query/RawSqlQueryPlanKey.java rename to src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java index c04b49430..d196ab56d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/RawSqlQueryPlanKey.java +++ b/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebeaninternal.api.CQueryPlanKey; +import io.ebeaninternal.api.CQueryPlanKey; /** * QueryPlanKey for RawSql queries. diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SplitName.java b/src/main/java/io/ebeaninternal/server/query/SplitName.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/query/SplitName.java rename to src/main/java/io/ebeaninternal/server/query/SplitName.java index 77f82d039..2da7519a1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SplitName.java +++ b/src/main/java/io/ebeaninternal/server/query/SplitName.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; /** * Helper for dot notation property paths. diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlBeanLoad.java b/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/query/SqlBeanLoad.java rename to src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java index 546dbf4c8..be7767a34 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlBeanLoad.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlBeanLoad.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebeaninternal.api.SpiQuery.Mode; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.DbReadContext; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebeaninternal.api.SpiQuery.Mode; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.DbReadContext; import javax.persistence.PersistenceException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlJoinType.java b/src/main/java/io/ebeaninternal/server/query/SqlJoinType.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/query/SqlJoinType.java rename to src/main/java/io/ebeaninternal/server/query/SqlJoinType.java index 711d2130b..0f1035ba3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlJoinType.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlJoinType.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; /** * Inner join, Outer join or automatic determination based on cardinality and optionality. diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTree.java b/src/main/java/io/ebeaninternal/server/query/SqlTree.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/query/SqlTree.java rename to src/main/java/io/ebeaninternal/server/query/SqlTree.java index ac9c4f867..a6a81459f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTree.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTree.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeAlias.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeAlias.java rename to src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java index 5f06cb226..31fc7fab3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeAlias.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.el.ElPropertyDeploy; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.el.ElPropertyDeploy; import javax.persistence.PersistenceException; import java.util.HashMap; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java rename to src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java index 29cfccd5c..864e8819b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java @@ -1,20 +1,20 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.PropertyJoin; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.api.SpiQuery.Type; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssoc; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.deploy.InheritInfo; -import com.avaje.ebeaninternal.server.deploy.TableJoin; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryProperties; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.PropertyJoin; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.api.SpiQuery.Type; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssoc; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.InheritInfo; +import io.ebeaninternal.server.deploy.TableJoin; +import io.ebeaninternal.server.el.ElPropertyValue; +import io.ebeaninternal.server.querydefn.OrmQueryDetail; +import io.ebeaninternal.server.querydefn.OrmQueryProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNode.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java similarity index 83% rename from src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNode.java rename to src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java index 35b2b37bb..8787caba6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNode.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.Version; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.DbReadContext; -import com.avaje.ebeaninternal.server.deploy.DbSqlContext; +import io.ebean.Version; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.DbReadContext; +import io.ebeaninternal.server.deploy.DbSqlContext; import java.sql.SQLException; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java rename to src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java index 38f34394b..c2ed06810 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java @@ -1,22 +1,22 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.Version; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.api.SpiQuery.Mode; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssoc; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.DbReadContext; -import com.avaje.ebeaninternal.server.deploy.DbSqlContext; -import com.avaje.ebeaninternal.server.deploy.InheritInfo; -import com.avaje.ebeaninternal.server.deploy.TableJoin; -import com.avaje.ebeaninternal.server.deploy.id.IdBinder; -import com.avaje.ebeaninternal.server.lib.util.StringHelper; +import io.ebean.Version; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.api.SpiQuery.Mode; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssoc; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.DbReadContext; +import io.ebeaninternal.server.deploy.DbSqlContext; +import io.ebeaninternal.server.deploy.InheritInfo; +import io.ebeaninternal.server.deploy.TableJoin; +import io.ebeaninternal.server.deploy.id.IdBinder; +import io.ebeaninternal.server.lib.util.StringHelper; import java.sql.SQLException; import java.sql.Timestamp; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java rename to src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java index b605d51f2..1caaea1aa 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java @@ -1,14 +1,14 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.Version; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssoc; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.DbReadContext; -import com.avaje.ebeaninternal.server.deploy.DbSqlContext; -import com.avaje.ebeaninternal.server.deploy.TableJoin; +import io.ebean.Version; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssoc; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.DbReadContext; +import io.ebeaninternal.server.deploy.DbSqlContext; +import io.ebeaninternal.server.deploy.TableJoin; import java.sql.SQLException; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeManyRoot.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java similarity index 80% rename from src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeManyRoot.java rename to src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java index 002f077bf..5a38ab192 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeManyRoot.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.DbReadContext; -import com.avaje.ebeaninternal.server.deploy.DbSqlContext; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.DbReadContext; +import io.ebeaninternal.server.deploy.DbSqlContext; import java.sql.SQLException; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java similarity index 83% rename from src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java rename to src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java index 30d0d2301..165aef3e9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java @@ -1,15 +1,15 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.Version; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssoc; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.deploy.DbReadContext; -import com.avaje.ebeaninternal.server.deploy.DbSqlContext; -import com.avaje.ebeaninternal.server.deploy.TableJoin; +import io.ebean.Version; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssoc; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.deploy.DbReadContext; +import io.ebeaninternal.server.deploy.DbSqlContext; +import io.ebeaninternal.server.deploy.TableJoin; import java.sql.SQLException; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeRoot.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java similarity index 81% rename from src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeRoot.java rename to src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java index d75fbb140..e8e23ec8b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeRoot.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.DbSqlContext; -import com.avaje.ebeaninternal.server.deploy.TableJoin; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.DbSqlContext; +import io.ebeaninternal.server.deploy.TableJoin; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java rename to src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java index e674f3146..c41d12012 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeProperties.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.server.deploy.BeanProperty; import java.util.ArrayList; import java.util.LinkedHashSet; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/UtilJdbc.java b/src/main/java/io/ebeaninternal/server/query/UtilJdbc.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/query/UtilJdbc.java rename to src/main/java/io/ebeaninternal/server/query/UtilJdbc.java index 824e0f0d5..56cec9d40 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/UtilJdbc.java +++ b/src/main/java/io/ebeaninternal/server/query/UtilJdbc.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/ebeaninternal/server/query/package-info.java b/src/main/java/io/ebeaninternal/server/query/package-info.java new file mode 100644 index 000000000..159a8f147 --- /dev/null +++ b/src/main/java/io/ebeaninternal/server/query/package-info.java @@ -0,0 +1 @@ +package io.ebeaninternal.server.query; diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java rename to src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index c8b0b4dad..81fc58b97 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -1,32 +1,47 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; -import com.avaje.ebean.*; -import com.avaje.ebean.OrderBy.Property; -import com.avaje.ebean.bean.CallStack; -import com.avaje.ebean.bean.ObjectGraphNode; -import com.avaje.ebean.bean.ObjectGraphOrigin; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.ebean.event.readaudit.ReadEvent; -import com.avaje.ebean.plugin.BeanType; -import com.avaje.ebeaninternal.api.BindParams; -import com.avaje.ebeaninternal.api.CQueryPlanKey; -import com.avaje.ebeaninternal.api.HashQuery; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionList; -import com.avaje.ebeaninternal.api.SpiExpressionValidation; -import com.avaje.ebeaninternal.api.SpiNamedParam; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.api.SpiQuerySecondary; -import com.avaje.ebeaninternal.server.autotune.ProfilingListener; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.TableJoin; -import com.avaje.ebeaninternal.server.expression.DefaultExpressionList; -import com.avaje.ebeaninternal.server.expression.SimpleExpression; -import com.avaje.ebeaninternal.server.query.CancelableQuery; -import com.avaje.ebeaninternal.server.query.NativeSqlQueryPlanKey; +import io.ebean.OrderBy; +import io.ebean.OrderBy.Property; +import io.ebean.EbeanServer; +import io.ebean.Expression; +import io.ebean.ExpressionFactory; +import io.ebean.ExpressionList; +import io.ebean.FetchConfig; +import io.ebean.FetchPath; +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.RawSql; +import io.ebean.Version; +import io.ebean.bean.CallStack; +import io.ebean.bean.ObjectGraphNode; +import io.ebean.bean.ObjectGraphOrigin; +import io.ebean.bean.PersistenceContext; +import io.ebean.event.BeanQueryRequest; +import io.ebean.event.readaudit.ReadEvent; +import io.ebean.plugin.BeanType; +import io.ebeaninternal.api.BindParams; +import io.ebeaninternal.api.CQueryPlanKey; +import io.ebeaninternal.api.HashQuery; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionList; +import io.ebeaninternal.api.SpiExpressionValidation; +import io.ebeaninternal.api.SpiNamedParam; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.api.SpiQuerySecondary; +import io.ebeaninternal.server.autotune.ProfilingListener; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.TableJoin; +import io.ebeaninternal.server.expression.DefaultExpressionList; +import io.ebeaninternal.server.expression.SimpleExpression; +import io.ebeaninternal.server.query.CancelableQuery; +import io.ebeaninternal.server.query.NativeSqlQueryPlanKey; import java.sql.Timestamp; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmUpdate.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmUpdate.java rename to src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java index 3939c9a87..9948e8361 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmUpdate.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebeaninternal.api.BindParams; -import com.avaje.ebeaninternal.api.SpiUpdate; +import io.ebean.EbeanServer; +import io.ebeaninternal.api.BindParams; +import io.ebeaninternal.api.SpiUpdate; import java.io.Serializable; diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultRelationalQuery.java rename to src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java index 02968bb99..51946773e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultRelationalQuery.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.SqlRow; -import com.avaje.ebeaninternal.api.BindParams; -import com.avaje.ebeaninternal.api.SpiSqlQuery; +import io.ebean.EbeanServer; +import io.ebean.SqlRow; +import io.ebeaninternal.api.BindParams; +import io.ebeaninternal.api.SpiSqlQuery; import java.util.List; import java.util.function.Consumer; diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultUpdateQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultUpdateQuery.java rename to src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java index b58636ed3..b99250331 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultUpdateQuery.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultUpdateQuery.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; -import com.avaje.ebean.ExpressionList; -import com.avaje.ebean.UpdateQuery; +import io.ebean.ExpressionList; +import io.ebean.UpdateQuery; /** * Default implementation of UpdateQuery. diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/NaturalKeyBindParam.java b/src/main/java/io/ebeaninternal/server/querydefn/NaturalKeyBindParam.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/querydefn/NaturalKeyBindParam.java rename to src/main/java/io/ebeaninternal/server/querydefn/NaturalKeyBindParam.java index 9aa75f67d..3655a3ef4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/NaturalKeyBindParam.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/NaturalKeyBindParam.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; public class NaturalKeyBindParam { diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/ONamedParam.java b/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/querydefn/ONamedParam.java rename to src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java index 261361da3..42689ab67 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/ONamedParam.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; -import com.avaje.ebeaninternal.api.SpiNamedParam; +import io.ebeaninternal.api.SpiNamedParam; import javax.persistence.PersistenceException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java rename to src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java index b9706d23a..7621d51f6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssoc; -import com.avaje.ebeaninternal.server.el.ElPropertyDeploy; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; -import com.avaje.ebeaninternal.server.query.SplitName; +import io.ebean.FetchConfig; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanPropertyAssoc; +import io.ebeaninternal.server.el.ElPropertyDeploy; +import io.ebeaninternal.server.el.ElPropertyValue; +import io.ebeaninternal.server.query.SplitName; import javax.persistence.PersistenceException; import java.io.Serializable; diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java rename to src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java index 5fa81c4d8..0314b55b6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; import javax.persistence.PersistenceException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java similarity index 81% rename from src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java rename to src/main/java/io/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java index 2f61869d1..7d4bd55ad 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.SqlLimitRequest; -import com.avaje.ebeaninternal.api.SpiQuery; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.SqlLimitRequest; +import io.ebeaninternal.api.SpiQuery; public class OrmQueryLimitRequest implements SqlLimitRequest { diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKey.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKey.java rename to src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java index 10e2fae98..eee0b6e4c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKey.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; -import com.avaje.ebean.OrderBy; -import com.avaje.ebean.RawSql; -import com.avaje.ebeaninternal.api.BindParams; -import com.avaje.ebeaninternal.api.CQueryPlanKey; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.deploy.TableJoin; +import io.ebean.OrderBy; +import io.ebean.RawSql; +import io.ebeaninternal.api.BindParams; +import io.ebeaninternal.api.CQueryPlanKey; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.deploy.TableJoin; /** * Query plan key for ORM queries. diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryProperties.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryProperties.java rename to src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java index c22b06e34..2a017047b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryProperties.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java @@ -1,18 +1,18 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; -import com.avaje.ebean.ExpressionFactory; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.OrderBy; -import com.avaje.ebean.Query; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionFactory; -import com.avaje.ebeaninternal.api.SpiExpressionList; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.expression.FilterExprPath; -import com.avaje.ebeaninternal.server.expression.FilterExpressionList; -import com.avaje.ebeaninternal.server.expression.Same; -import com.avaje.ebeaninternal.server.query.SplitName; +import io.ebean.ExpressionFactory; +import io.ebean.FetchConfig; +import io.ebean.OrderBy; +import io.ebean.Query; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionFactory; +import io.ebeaninternal.api.SpiExpressionList; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.expression.FilterExprPath; +import io.ebeaninternal.server.expression.FilterExpressionList; +import io.ebeaninternal.server.expression.Same; +import io.ebeaninternal.server.query.SplitName; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java rename to src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java index 31eb2555a..d4d70148d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebeaninternal.server.lib.util.StringHelper; +import io.ebean.FetchConfig; +import io.ebeaninternal.server.lib.util.StringHelper; import java.util.LinkedHashSet; diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQuerySecondary.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQuerySecondary.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQuerySecondary.java rename to src/main/java/io/ebeaninternal/server/querydefn/OrmQuerySecondary.java index f423d05bd..738566597 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQuerySecondary.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQuerySecondary.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; -import com.avaje.ebeaninternal.api.SpiQuerySecondary; +import io.ebeaninternal.api.SpiQuerySecondary; import java.util.List; diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmUpdateProperties.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmUpdateProperties.java rename to src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java index 08ff01d7f..8c7980882 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmUpdateProperties.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.server.deploy.DeployParser; -import com.avaje.ebeaninternal.server.persist.Binder; -import com.avaje.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.server.deploy.DeployParser; +import io.ebeaninternal.server.persist.Binder; +import io.ebeaninternal.server.type.DataBind; import java.sql.SQLException; import java.util.LinkedHashMap; diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/SimpleTextParser.java b/src/main/java/io/ebeaninternal/server/querydefn/SimpleTextParser.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/querydefn/SimpleTextParser.java rename to src/main/java/io/ebeaninternal/server/querydefn/SimpleTextParser.java index cfae419ca..849234e8c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/SimpleTextParser.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/SimpleTextParser.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; public class SimpleTextParser { @@ -166,4 +166,4 @@ public class SimpleTextParser { } } } -} \ No newline at end of file +} diff --git a/src/main/java/io/ebeaninternal/server/querydefn/package-info.java b/src/main/java/io/ebeaninternal/server/querydefn/package-info.java new file mode 100644 index 000000000..587e0342f --- /dev/null +++ b/src/main/java/io/ebeaninternal/server/querydefn/package-info.java @@ -0,0 +1 @@ +package io.ebeaninternal.server.querydefn; diff --git a/src/main/java/com/avaje/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java b/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java rename to src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java index 6f04e2cb6..4646b646c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java +++ b/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.readaudit; +package io.ebeaninternal.server.readaudit; -import com.avaje.ebean.event.readaudit.ReadAuditLogger; -import com.avaje.ebean.event.readaudit.ReadAuditQueryPlan; -import com.avaje.ebean.event.readaudit.ReadEvent; -import com.avaje.ebean.text.json.EJson; +import io.ebean.event.readaudit.ReadAuditLogger; +import io.ebean.event.readaudit.ReadAuditQueryPlan; +import io.ebean.event.readaudit.ReadEvent; +import io.ebean.text.json.EJson; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import org.slf4j.Logger; diff --git a/src/main/java/com/avaje/ebeaninternal/server/readaudit/DefaultReadAuditPrepare.java b/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditPrepare.java similarity index 71% rename from src/main/java/com/avaje/ebeaninternal/server/readaudit/DefaultReadAuditPrepare.java rename to src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditPrepare.java index 6a5e881ca..dee68efbd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/readaudit/DefaultReadAuditPrepare.java +++ b/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditPrepare.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.readaudit; +package io.ebeaninternal.server.readaudit; -import com.avaje.ebean.event.readaudit.ReadAuditPrepare; -import com.avaje.ebean.event.readaudit.ReadEvent; +import io.ebean.event.readaudit.ReadAuditPrepare; +import io.ebean.event.readaudit.ReadEvent; /** * A placeholder implementation for ReadAuditPrepare. diff --git a/src/main/java/com/avaje/ebeaninternal/server/text/csv/CsvUtilReader.java b/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java similarity index 99% rename from src/main/java/com/avaje/ebeaninternal/server/text/csv/CsvUtilReader.java rename to src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java index 161df976e..19528e979 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/text/csv/CsvUtilReader.java +++ b/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.text.csv; +package io.ebeaninternal.server.text.csv; // Original name: au.com.bytecode.opencsv.CSVReader // rbygrave: Made some Java Generics tweaks to remove warnings diff --git a/src/main/java/com/avaje/ebeaninternal/server/text/csv/TCsvReader.java b/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/text/csv/TCsvReader.java rename to src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java index fffcff5b6..25c28557c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/text/csv/TCsvReader.java +++ b/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java @@ -1,17 +1,17 @@ -package com.avaje.ebeaninternal.server.text.csv; +package io.ebeaninternal.server.text.csv; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.plugin.ExpressionPath; -import com.avaje.ebean.text.StringParser; -import com.avaje.ebean.text.TextException; -import com.avaje.ebean.text.TimeStringParser; -import com.avaje.ebean.text.csv.CsvCallback; -import com.avaje.ebean.text.csv.CsvReader; -import com.avaje.ebean.text.csv.DefaultCsvCallback; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; +import io.ebean.EbeanServer; +import io.ebean.bean.EntityBean; +import io.ebean.plugin.ExpressionPath; +import io.ebean.text.StringParser; +import io.ebean.text.TextException; +import io.ebean.text.TimeStringParser; +import io.ebean.text.csv.CsvCallback; +import io.ebean.text.csv.CsvReader; +import io.ebean.text.csv.DefaultCsvCallback; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.el.ElPropertyValue; import java.io.Reader; import java.sql.Types; diff --git a/src/main/java/io/ebeaninternal/server/text/csv/package-info.java b/src/main/java/io/ebeaninternal/server/text/csv/package-info.java new file mode 100644 index 000000000..039bc09f3 --- /dev/null +++ b/src/main/java/io/ebeaninternal/server/text/csv/package-info.java @@ -0,0 +1 @@ +package io.ebeaninternal.server.text.csv; diff --git a/src/main/java/com/avaje/ebeaninternal/server/text/json/DJsonBeanReader.java b/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java similarity index 81% rename from src/main/java/com/avaje/ebeaninternal/server/text/json/DJsonBeanReader.java rename to src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java index e6e2e720a..7d56c44d1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/text/json/DJsonBeanReader.java +++ b/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.text.json; +package io.ebeaninternal.server.text.json; -import com.avaje.ebean.PersistenceIOException; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebean.text.json.JsonBeanReader; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebean.PersistenceIOException; +import io.ebean.bean.PersistenceContext; +import io.ebean.text.json.JsonBeanReader; +import io.ebeaninternal.server.deploy.BeanDescriptor; import com.fasterxml.jackson.core.JsonParser; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/text/json/DJsonContext.java b/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/text/json/DJsonContext.java rename to src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java index eef1f1d8f..fcf863000 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/text/json/DJsonContext.java +++ b/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java @@ -1,21 +1,21 @@ -package com.avaje.ebeaninternal.server.text.json; +package io.ebeaninternal.server.text.json; -import com.avaje.ebean.FetchPath; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebean.plugin.BeanType; -import com.avaje.ebean.text.json.EJson; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.ebean.text.json.JsonIOException; -import com.avaje.ebean.text.json.JsonReadOptions; -import com.avaje.ebean.text.json.JsonWriteBeanVisitor; -import com.avaje.ebean.text.json.JsonWriteOptions; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.type.TypeManager; -import com.avaje.ebeaninternal.util.ParamTypeHelper; -import com.avaje.ebeaninternal.util.ParamTypeHelper.ManyType; -import com.avaje.ebeaninternal.util.ParamTypeHelper.TypeInfo; +import io.ebean.FetchPath; +import io.ebean.bean.EntityBean; +import io.ebean.config.JsonConfig; +import io.ebean.plugin.BeanType; +import io.ebean.text.json.EJson; +import io.ebean.text.json.JsonContext; +import io.ebean.text.json.JsonIOException; +import io.ebean.text.json.JsonReadOptions; +import io.ebean.text.json.JsonWriteBeanVisitor; +import io.ebean.text.json.JsonWriteOptions; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.type.TypeManager; +import io.ebeaninternal.util.ParamTypeHelper; +import io.ebeaninternal.util.ParamTypeHelper.ManyType; +import io.ebeaninternal.util.ParamTypeHelper.TypeInfo; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParseException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/text/json/DJsonScalar.java b/src/main/java/io/ebeaninternal/server/text/json/DJsonScalar.java similarity index 81% rename from src/main/java/com/avaje/ebeaninternal/server/text/json/DJsonScalar.java rename to src/main/java/io/ebeaninternal/server/text/json/DJsonScalar.java index ed63ca3aa..1b347be23 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/text/json/DJsonScalar.java +++ b/src/main/java/io/ebeaninternal/server/text/json/DJsonScalar.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.text.json; +package io.ebeaninternal.server.text.json; -import com.avaje.ebeaninternal.server.type.ScalarType; -import com.avaje.ebeaninternal.server.type.TypeManager; +import io.ebeaninternal.server.type.ScalarType; +import io.ebeaninternal.server.type.TypeManager; import com.fasterxml.jackson.core.JsonGenerator; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/text/json/PathStack.java b/src/main/java/io/ebeaninternal/server/text/json/PathStack.java similarity index 79% rename from src/main/java/com/avaje/ebeaninternal/server/text/json/PathStack.java rename to src/main/java/io/ebeaninternal/server/text/json/PathStack.java index 9d17f0541..7da49f6ad 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/text/json/PathStack.java +++ b/src/main/java/io/ebeaninternal/server/text/json/PathStack.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.text.json; +package io.ebeaninternal.server.text.json; -import com.avaje.ebeaninternal.server.util.ArrayStack; +import io.ebeaninternal.server.util.ArrayStack; public class PathStack extends ArrayStack { diff --git a/src/main/java/com/avaje/ebeaninternal/server/text/json/ReadJson.java b/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/text/json/ReadJson.java rename to src/main/java/io/ebeaninternal/server/text/json/ReadJson.java index 782ddd7e5..60bcae529 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/text/json/ReadJson.java +++ b/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java @@ -1,14 +1,14 @@ -package com.avaje.ebeaninternal.server.text.json; +package io.ebeaninternal.server.text.json; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebean.text.json.JsonReadBeanVisitor; -import com.avaje.ebean.text.json.JsonReadOptions; -import com.avaje.ebeaninternal.api.LoadContext; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.loadcontext.DLoadContext; -import com.avaje.ebeaninternal.server.transaction.DefaultPersistenceContext; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.bean.PersistenceContext; +import io.ebean.text.json.JsonReadBeanVisitor; +import io.ebean.text.json.JsonReadOptions; +import io.ebeaninternal.api.LoadContext; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.loadcontext.DLoadContext; +import io.ebeaninternal.server.transaction.DefaultPersistenceContext; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/com/avaje/ebeaninternal/server/text/json/WriteJson.java b/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/text/json/WriteJson.java rename to src/main/java/io/ebeaninternal/server/text/json/WriteJson.java index 8f69d4b60..45cdd3ba9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/text/json/WriteJson.java +++ b/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java @@ -1,16 +1,16 @@ -package com.avaje.ebeaninternal.server.text.json; +package io.ebeaninternal.server.text.json; -import com.avaje.ebean.FetchPath; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebean.text.json.EJson; -import com.avaje.ebean.text.json.JsonIOException; -import com.avaje.ebean.text.json.JsonWriteBeanVisitor; -import com.avaje.ebean.text.json.JsonWriter; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.util.ArrayStack; +import io.ebean.FetchPath; +import io.ebean.bean.EntityBean; +import io.ebean.config.JsonConfig; +import io.ebean.text.json.EJson; +import io.ebean.text.json.JsonIOException; +import io.ebean.text.json.JsonWriteBeanVisitor; +import io.ebean.text.json.JsonWriter; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.util.ArrayStack; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/AutoCommitJdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/AutoCommitJdbcTransaction.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/AutoCommitJdbcTransaction.java rename to src/main/java/io/ebeaninternal/server/transaction/AutoCommitJdbcTransaction.java index e8ed698b9..398e8a336 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/AutoCommitJdbcTransaction.java +++ b/src/main/java/io/ebeaninternal/server/transaction/AutoCommitJdbcTransaction.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; import java.sql.Connection; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/AutoCommitTransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/AutoCommitTransactionManager.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/AutoCommitTransactionManager.java rename to src/main/java/io/ebeaninternal/server/transaction/AutoCommitTransactionManager.java index a00d1df54..ca862ebfa 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/AutoCommitTransactionManager.java +++ b/src/main/java/io/ebeaninternal/server/transaction/AutoCommitTransactionManager.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.SpiTransaction; import java.sql.Connection; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPersistIdMap.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java similarity index 85% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPersistIdMap.java rename to src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java index dbe4c0f68..ecfbc31ee 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPersistIdMap.java +++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebeaninternal.server.core.PersistRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.core.PersistRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.io.Serializable; import java.util.Collection; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPersistIds.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPersistIds.java rename to src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java index 6a109fe7e..e53994bda 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPersistIds.java +++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.cluster.BinaryMessage; -import com.avaje.ebeaninternal.server.cluster.BinaryMessageList; -import com.avaje.ebeaninternal.server.core.PersistRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.id.IdBinder; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.cluster.BinaryMessage; +import io.ebeaninternal.server.cluster.BinaryMessageList; +import io.ebeaninternal.server.core.PersistRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.id.IdBinder; import java.io.DataInput; import java.io.DataOutputStream; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/BulkEventListenerMap.java b/src/main/java/io/ebeaninternal/server/transaction/BulkEventListenerMap.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/BulkEventListenerMap.java rename to src/main/java/io/ebeaninternal/server/transaction/BulkEventListenerMap.java index ca634cf73..65c2755ba 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/BulkEventListenerMap.java +++ b/src/main/java/io/ebeaninternal/server/transaction/BulkEventListenerMap.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebean.event.BulkTableEvent; -import com.avaje.ebean.event.BulkTableEventListener; +import io.ebean.event.BulkTableEvent; +import io.ebean.event.BulkTableEventListener; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/DataSourceSupplier.java b/src/main/java/io/ebeaninternal/server/transaction/DataSourceSupplier.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/DataSourceSupplier.java rename to src/main/java/io/ebeaninternal/server/transaction/DataSourceSupplier.java index c124de22d..406d34c6b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/DataSourceSupplier.java +++ b/src/main/java/io/ebeaninternal/server/transaction/DataSourceSupplier.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; import javax.sql.DataSource; import java.sql.Connection; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultPersistenceContext.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultPersistenceContext.java rename to src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java index 41a4dc6ad..79e507db9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultPersistenceContext.java +++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebeaninternal.api.Monitor; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.api.Monitor; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java rename to src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java index 1fe16d81a..be66113d9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java +++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.SpiTransaction; /** * Manages the transaction scoping using a Ebean thread local. diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java rename to src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java index 2b255d106..6b45833ac 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java +++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.transaction.TransactionMap.State; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.transaction.TransactionMap.State; /** * Used to store Transactions in a ThreadLocal. diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/DeleteByIdMap.java b/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/DeleteByIdMap.java rename to src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java index 72ce09be7..5dfe723e2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/DeleteByIdMap.java +++ b/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebean.annotation.DocStoreMode; -import com.avaje.ebeaninternal.server.cache.CacheChangeSet; -import com.avaje.ebeaninternal.server.core.PersistRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; -import com.avaje.ebeanservice.docstore.api.support.DocStoreDeleteEvent; +import io.ebean.annotation.DocStoreMode; +import io.ebeaninternal.server.cache.CacheChangeSet; +import io.ebeaninternal.server.core.PersistRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeanservice.docstore.api.DocStoreUpdates; +import io.ebeanservice.docstore.api.support.DocStoreDeleteEvent; import java.io.Serializable; import java.util.Collection; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java rename to src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java index a90647b38..30378dc3c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java +++ b/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; import java.sql.Connection; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/DocStoreTransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/DocStoreTransactionManager.java rename to src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java index 751bfd2f5..53f1f5c04 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/DocStoreTransactionManager.java +++ b/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.SpiTransaction; import java.sql.Connection; import java.util.concurrent.atomic.AtomicLong; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/ExplicitJdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/ExplicitJdbcTransaction.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/ExplicitJdbcTransaction.java rename to src/main/java/io/ebeaninternal/server/transaction/ExplicitJdbcTransaction.java index fd33ea3ee..e46ebc986 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/ExplicitJdbcTransaction.java +++ b/src/main/java/io/ebeaninternal/server/transaction/ExplicitJdbcTransaction.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/ExplicitTransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/ExplicitTransactionManager.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/ExplicitTransactionManager.java rename to src/main/java/io/ebeaninternal/server/transaction/ExplicitTransactionManager.java index 9dde0d7fb..8d082c3e3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/ExplicitTransactionManager.java +++ b/src/main/java/io/ebeaninternal/server/transaction/ExplicitTransactionManager.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebeaninternal.api.SpiTransaction; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebeaninternal.api.SpiTransaction; import java.sql.Connection; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/ExternalJdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/ExternalJdbcTransaction.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/ExternalJdbcTransaction.java rename to src/main/java/io/ebeaninternal/server/transaction/ExternalJdbcTransaction.java index b5f14bab5..25cfb588f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/ExternalJdbcTransaction.java +++ b/src/main/java/io/ebeaninternal/server/transaction/ExternalJdbcTransaction.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; import javax.persistence.PersistenceException; import javax.persistence.RollbackException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java rename to src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java index 403af20c1..a507d1d90 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java +++ b/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebean.config.ExternalTransactionManager; -import com.avaje.ebeaninternal.api.SpiTransaction; +import io.ebean.config.ExternalTransactionManager; +import io.ebeaninternal.api.SpiTransaction; /** * A TransactionScopeManager aware of external transaction managers. diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java rename to src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java index 1b9d04c0b..bfa7f6e8e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java @@ -1,21 +1,21 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebean.TransactionCallback; -import com.avaje.ebean.annotation.DocStoreMode; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebean.config.PersistBatch; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.dbplatform.DatabasePlatform.OnQueryOnly; -import com.avaje.ebean.event.changelog.BeanChange; -import com.avaje.ebean.event.changelog.ChangeSet; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.api.TransactionEvent; -import com.avaje.ebeaninternal.server.core.PersistDeferredRelationship; -import com.avaje.ebeaninternal.server.core.PersistRequest; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.lib.util.Str; -import com.avaje.ebeaninternal.server.persist.BatchControl; -import com.avaje.ebeanservice.docstore.api.*; +import io.ebean.TransactionCallback; +import io.ebean.annotation.DocStoreMode; +import io.ebean.bean.PersistenceContext; +import io.ebean.PersistBatch; +import io.ebean.config.ServerConfig; +import io.ebean.config.dbplatform.DatabasePlatform.OnQueryOnly; +import io.ebean.event.changelog.BeanChange; +import io.ebean.event.changelog.ChangeSet; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.TransactionEvent; +import io.ebeaninternal.server.core.PersistDeferredRelationship; +import io.ebeaninternal.server.core.PersistRequest; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.lib.util.Str; +import io.ebeaninternal.server.persist.BatchControl; +import io.ebeanservice.docstore.api.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/JtaTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/JtaTransaction.java rename to src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java index d1b4f0f29..f8b3fec84 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/JtaTransaction.java +++ b/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; import javax.persistence.PersistenceException; import javax.sql.DataSource; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/JtaTransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/JtaTransactionManager.java rename to src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java index 0917a56d3..99abff78a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/JtaTransactionManager.java +++ b/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebean.config.ExternalTransactionManager; -import com.avaje.ebeaninternal.api.SpiTransaction; +import io.ebean.config.ExternalTransactionManager; +import io.ebeaninternal.api.SpiTransaction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/NoopPersistenceContext.java b/src/main/java/io/ebeaninternal/server/transaction/NoopPersistenceContext.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/NoopPersistenceContext.java rename to src/main/java/io/ebeaninternal/server/transaction/NoopPersistenceContext.java index 503833fd9..e66dc8512 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/NoopPersistenceContext.java +++ b/src/main/java/io/ebeaninternal/server/transaction/NoopPersistenceContext.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebean.bean.PersistenceContext; +import io.ebean.bean.PersistenceContext; /** * PersistenceContext used with scope of NONE. diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/PostCommitProcessing.java b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/PostCommitProcessing.java rename to src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java index 2ecb1a2bf..637482a2c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/PostCommitProcessing.java +++ b/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java @@ -1,15 +1,15 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebean.annotation.DocStoreMode; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.api.TransactionEvent; -import com.avaje.ebeaninternal.api.TransactionEventTable; -import com.avaje.ebeaninternal.api.TransactionEventTable.TableIUD; -import com.avaje.ebeaninternal.server.cache.CacheChangeSet; -import com.avaje.ebeaninternal.server.cluster.ClusterManager; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptorManager; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; +import io.ebean.annotation.DocStoreMode; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.TransactionEvent; +import io.ebeaninternal.api.TransactionEventTable; +import io.ebeaninternal.api.TransactionEventTable.TableIUD; +import io.ebeaninternal.server.cache.CacheChangeSet; +import io.ebeaninternal.server.cluster.ClusterManager; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanDescriptorManager; +import io.ebeanservice.docstore.api.DocStoreUpdates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/RemoteTransactionEvent.java b/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/RemoteTransactionEvent.java rename to src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java index 3d2735bce..b658a29a3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/RemoteTransactionEvent.java +++ b/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.TransactionEventTable.TableIUD; -import com.avaje.ebeaninternal.server.cluster.BinaryMessageList; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.TransactionEventTable.TableIUD; +import io.ebeaninternal.server.cluster.BinaryMessageList; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/TChangeLogHolder.java b/src/main/java/io/ebeaninternal/server/transaction/TChangeLogHolder.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/TChangeLogHolder.java rename to src/main/java/io/ebeaninternal/server/transaction/TChangeLogHolder.java index 7ef2f7aa7..b97a004ea 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/TChangeLogHolder.java +++ b/src/main/java/io/ebeaninternal/server/transaction/TChangeLogHolder.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebean.event.changelog.BeanChange; -import com.avaje.ebean.event.changelog.ChangeSet; -import com.avaje.ebean.event.changelog.TxnState; -import com.avaje.ebeaninternal.api.SpiTransaction; +import io.ebean.event.changelog.BeanChange; +import io.ebean.event.changelog.ChangeSet; +import io.ebean.event.changelog.TxnState; +import io.ebeaninternal.api.SpiTransaction; import java.util.UUID; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionFactory.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionFactory.java rename to src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java index dcc371a65..a1593736d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionFactory.java +++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.util.JdbcClose; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.util.JdbcClose; import org.slf4j.Logger; import javax.persistence.PersistenceException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionFactoryBasic.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionFactoryBasic.java rename to src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java index 3e510ec2c..004ebf33d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionFactoryBasic.java +++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.util.JdbcClose; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.util.JdbcClose; import javax.persistence.PersistenceException; import javax.sql.DataSource; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionFactoryTenant.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionFactoryTenant.java rename to src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java index c95f95012..bb8259f1e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionFactoryTenant.java +++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebean.config.CurrentTenantProvider; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.util.JdbcClose; +import io.ebean.config.CurrentTenantProvider; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.util.JdbcClose; import javax.persistence.PersistenceException; import java.sql.Connection; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionManager.java rename to src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java index 9b93dea63..426e10671 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionManager.java +++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java @@ -1,21 +1,21 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.config.CurrentTenantProvider; -import com.avaje.ebean.config.PersistBatch; -import com.avaje.ebean.config.dbplatform.DatabasePlatform.OnQueryOnly; -import com.avaje.ebean.event.changelog.ChangeLogListener; -import com.avaje.ebean.event.changelog.ChangeLogPrepare; -import com.avaje.ebean.event.changelog.ChangeSet; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.api.TransactionEvent; -import com.avaje.ebeaninternal.api.TransactionEventTable; -import com.avaje.ebeaninternal.api.TransactionEventTable.TableIUD; -import com.avaje.ebeaninternal.server.cluster.ClusterManager; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptorManager; -import com.avaje.ebeanservice.docstore.api.DocStoreTransaction; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdateProcessor; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; +import io.ebean.BackgroundExecutor; +import io.ebean.config.CurrentTenantProvider; +import io.ebean.PersistBatch; +import io.ebean.config.dbplatform.DatabasePlatform.OnQueryOnly; +import io.ebean.event.changelog.ChangeLogListener; +import io.ebean.event.changelog.ChangeLogPrepare; +import io.ebean.event.changelog.ChangeSet; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.TransactionEvent; +import io.ebeaninternal.api.TransactionEventTable; +import io.ebeaninternal.api.TransactionEventTable.TableIUD; +import io.ebeaninternal.server.cluster.ClusterManager; +import io.ebeaninternal.server.deploy.BeanDescriptorManager; +import io.ebeanservice.docstore.api.DocStoreTransaction; +import io.ebeanservice.docstore.api.DocStoreUpdateProcessor; +import io.ebeanservice.docstore.api.DocStoreUpdates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionManagerOptions.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java similarity index 75% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionManagerOptions.java rename to src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java index 8dad95f74..7b62882c4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionManagerOptions.java +++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManagerOptions.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebean.BackgroundExecutor; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebeaninternal.server.cluster.ClusterManager; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptorManager; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdateProcessor; +import io.ebean.BackgroundExecutor; +import io.ebean.config.ServerConfig; +import io.ebeaninternal.server.cluster.ClusterManager; +import io.ebeaninternal.server.deploy.BeanDescriptorManager; +import io.ebeanservice.docstore.api.DocStoreUpdateProcessor; /** * Objects supplied for constructing the TransactionManager. diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionMap.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionMap.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionMap.java rename to src/main/java/io/ebeaninternal/server/transaction/TransactionMap.java index e4f43fcde..75e301d98 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionMap.java +++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionMap.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.SpiTransaction; import javax.persistence.PersistenceException; import java.util.HashMap; diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionScopeManager.java rename to src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java index 8dc880280..e83b8a955 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionScopeManager.java +++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.api.SpiTransactionScopeManager; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.api.SpiTransactionScopeManager; /** * Manages the Transactions typically held in a ThreadLocal. diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/package.html b/src/main/java/io/ebeaninternal/server/transaction/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/transaction/package.html rename to src/main/java/io/ebeaninternal/server/transaction/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ArrayElementConverter.java b/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/type/ArrayElementConverter.java rename to src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java index 349c3757b..9cad99fc8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ArrayElementConverter.java +++ b/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.util.UUID; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/AttributeConverterAdapter.java b/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/type/AttributeConverterAdapter.java rename to src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java index d7bb7e397..d72dd6f9c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/AttributeConverterAdapter.java +++ b/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.ScalarTypeConverter; +import io.ebean.config.ScalarTypeConverter; import javax.persistence.AttributeConverter; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ConvertInetAddresses.java b/src/main/java/io/ebeaninternal/server/type/ConvertInetAddresses.java similarity index 99% rename from src/main/java/com/avaje/ebeaninternal/server/type/ConvertInetAddresses.java rename to src/main/java/io/ebeaninternal/server/type/ConvertInetAddresses.java index b576e7ebb..0def46612 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ConvertInetAddresses.java +++ b/src/main/java/io/ebeaninternal/server/type/ConvertInetAddresses.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; /* * Copyright (C) 2008 Google Inc. diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/DataBind.java b/src/main/java/io/ebeaninternal/server/type/DataBind.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/type/DataBind.java rename to src/main/java/io/ebeaninternal/server/type/DataBind.java index 20616339b..e408bc588 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/DataBind.java +++ b/src/main/java/io/ebeaninternal/server/type/DataBind.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.timezone.DataTimeZone; +import io.ebeaninternal.server.core.timezone.DataTimeZone; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -166,4 +166,4 @@ public class DataBind { pstmt.setArray(++pos, array); } -} \ No newline at end of file +} diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/DataEncryptSupport.java b/src/main/java/io/ebeaninternal/server/type/DataEncryptSupport.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/type/DataEncryptSupport.java rename to src/main/java/io/ebeaninternal/server/type/DataEncryptSupport.java index 37504d291..32d87cd91 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/DataEncryptSupport.java +++ b/src/main/java/io/ebeaninternal/server/type/DataEncryptSupport.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.EncryptKey; -import com.avaje.ebean.config.EncryptKeyManager; -import com.avaje.ebean.config.Encryptor; +import io.ebean.config.EncryptKey; +import io.ebean.config.EncryptKeyManager; +import io.ebean.config.Encryptor; public class DataEncryptSupport { diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/DataReader.java b/src/main/java/io/ebeaninternal/server/type/DataReader.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/type/DataReader.java rename to src/main/java/io/ebeaninternal/server/type/DataReader.java index a0112a488..0b56b7b39 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/DataReader.java +++ b/src/main/java/io/ebeaninternal/server/type/DataReader.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.io.InputStream; import java.math.BigDecimal; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/DateTimeJsonParser.java b/src/main/java/io/ebeaninternal/server/type/DateTimeJsonParser.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/type/DateTimeJsonParser.java rename to src/main/java/io/ebeaninternal/server/type/DateTimeJsonParser.java index 85dc06232..89e5a5bbb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/DateTimeJsonParser.java +++ b/src/main/java/io/ebeaninternal/server/type/DateTimeJsonParser.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.sql.Timestamp; import java.text.ParseException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/DecimalUtils.java b/src/main/java/io/ebeaninternal/server/type/DecimalUtils.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/type/DecimalUtils.java rename to src/main/java/io/ebeaninternal/server/type/DecimalUtils.java index b47696547..60e3f6d6e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/DecimalUtils.java +++ b/src/main/java/io/ebeaninternal/server/type/DecimalUtils.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; /* * Copyright 2013 FasterXML.com @@ -86,4 +86,4 @@ public final class DecimalUtils { public static int extractNanosecondDecimal(BigDecimal value, long integer) { return value.subtract(new BigDecimal(integer)).multiply(ONE_BILLION).intValue(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeFactory.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeFactory.java rename to src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java index 8a67211a2..8d669aed6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeFactory.java +++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebean.config.JsonConfig; +import io.ebean.config.ServerConfig; +import io.ebeaninternal.server.core.BasicTypeConverter; import java.math.BigInteger; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java rename to src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index a4692dd98..fecf2a9c8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java +++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -1,19 +1,19 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.annotation.DbArray; -import com.avaje.ebean.annotation.DbEnumType; -import com.avaje.ebean.annotation.DbEnumValue; -import com.avaje.ebean.annotation.EnumValue; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebean.config.Platform; -import com.avaje.ebean.config.ScalarTypeConverter; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.dbplatform.DatabasePlatform; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.dbmigration.DbOffline; -import com.avaje.ebean.plugin.ExtraTypeFactory; -import com.avaje.ebeaninternal.server.core.bootup.BootupClasses; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.annotation.DbArray; +import io.ebean.annotation.DbEnumType; +import io.ebean.annotation.DbEnumValue; +import io.ebean.annotation.EnumValue; +import io.ebean.config.JsonConfig; +import io.ebean.Platform; +import io.ebean.config.ScalarTypeConverter; +import io.ebean.config.ServerConfig; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.dbmigration.DbOffline; +import io.ebean.plugin.ExtraTypeFactory; +import io.ebeaninternal.server.core.bootup.BootupClasses; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.joda.time.DateMidnight; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbIntegerMap.java b/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbIntegerMap.java rename to src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java index 483cf1a5a..6f8b20dd6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbIntegerMap.java +++ b/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import javax.persistence.PersistenceException; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbStringMap.java b/src/main/java/io/ebeaninternal/server/type/EnumToDbStringMap.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbStringMap.java rename to src/main/java/io/ebeaninternal/server/type/EnumToDbStringMap.java index 335b4197c..9497f6dbd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbStringMap.java +++ b/src/main/java/io/ebeaninternal/server/type/EnumToDbStringMap.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.sql.SQLException; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbValueMap.java b/src/main/java/io/ebeaninternal/server/type/EnumToDbValueMap.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbValueMap.java rename to src/main/java/io/ebeaninternal/server/type/EnumToDbValueMap.java index 53c56172e..33191acde 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbValueMap.java +++ b/src/main/java/io/ebeaninternal/server/type/EnumToDbValueMap.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.sql.SQLException; import java.util.HashMap; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/LongToTimestampConverter.java b/src/main/java/io/ebeaninternal/server/type/LongToTimestampConverter.java similarity index 78% rename from src/main/java/com/avaje/ebeaninternal/server/type/LongToTimestampConverter.java rename to src/main/java/io/ebeaninternal/server/type/LongToTimestampConverter.java index b553d550c..6eda1a940 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/LongToTimestampConverter.java +++ b/src/main/java/io/ebeaninternal/server/type/LongToTimestampConverter.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.ScalarTypeConverter; +import io.ebean.config.ScalarTypeConverter; import java.sql.Timestamp; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareCollection.java b/src/main/java/io/ebeaninternal/server/type/ModifyAwareCollection.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareCollection.java rename to src/main/java/io/ebeaninternal/server/type/ModifyAwareCollection.java index 308e6118b..710cab5df 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareCollection.java +++ b/src/main/java/io/ebeaninternal/server/type/ModifyAwareCollection.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.util.Collection; import java.util.Iterator; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareFlag.java b/src/main/java/io/ebeaninternal/server/type/ModifyAwareFlag.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareFlag.java rename to src/main/java/io/ebeaninternal/server/type/ModifyAwareFlag.java index 31081879f..066652fd8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareFlag.java +++ b/src/main/java/io/ebeaninternal/server/type/ModifyAwareFlag.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; /** * Detects when content has been modified and as such needs to be persisted (included in an update). diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareIterator.java b/src/main/java/io/ebeaninternal/server/type/ModifyAwareIterator.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareIterator.java rename to src/main/java/io/ebeaninternal/server/type/ModifyAwareIterator.java index 1b3151cb4..18f055764 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareIterator.java +++ b/src/main/java/io/ebeaninternal/server/type/ModifyAwareIterator.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.util.Iterator; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareList.java b/src/main/java/io/ebeaninternal/server/type/ModifyAwareList.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareList.java rename to src/main/java/io/ebeaninternal/server/type/ModifyAwareList.java index 7dd01366f..7bd8b88d2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareList.java +++ b/src/main/java/io/ebeaninternal/server/type/ModifyAwareList.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.util.Collection; import java.util.Iterator; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareListIterator.java b/src/main/java/io/ebeaninternal/server/type/ModifyAwareListIterator.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareListIterator.java rename to src/main/java/io/ebeaninternal/server/type/ModifyAwareListIterator.java index 2b5bdc362..81732d44f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareListIterator.java +++ b/src/main/java/io/ebeaninternal/server/type/ModifyAwareListIterator.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.util.ListIterator; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareMap.java b/src/main/java/io/ebeaninternal/server/type/ModifyAwareMap.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareMap.java rename to src/main/java/io/ebeaninternal/server/type/ModifyAwareMap.java index 36693628a..f0bc0a1f1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareMap.java +++ b/src/main/java/io/ebeaninternal/server/type/ModifyAwareMap.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.util.Collection; import java.util.Map; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareOwner.java b/src/main/java/io/ebeaninternal/server/type/ModifyAwareOwner.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareOwner.java rename to src/main/java/io/ebeaninternal/server/type/ModifyAwareOwner.java index fe2d6f85a..2333bbd79 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareOwner.java +++ b/src/main/java/io/ebeaninternal/server/type/ModifyAwareOwner.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; /** * Owner object notified when a modification is detected. diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareSet.java b/src/main/java/io/ebeaninternal/server/type/ModifyAwareSet.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareSet.java rename to src/main/java/io/ebeaninternal/server/type/ModifyAwareSet.java index fbfdff06b..4affcbc41 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareSet.java +++ b/src/main/java/io/ebeaninternal/server/type/ModifyAwareSet.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.util.Set; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareType.java b/src/main/java/io/ebeaninternal/server/type/ModifyAwareType.java similarity index 57% rename from src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareType.java rename to src/main/java/io/ebeaninternal/server/type/ModifyAwareType.java index a30ec5c1e..653e27153 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareType.java +++ b/src/main/java/io/ebeaninternal/server/type/ModifyAwareType.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; public interface ModifyAwareType { diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/PlatformArrayTypeFactory.java b/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeFactory.java similarity index 86% rename from src/main/java/com/avaje/ebeaninternal/server/type/PlatformArrayTypeFactory.java rename to src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeFactory.java index ba6a9fe17..90251fae7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/PlatformArrayTypeFactory.java +++ b/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeFactory.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.lang.reflect.Type; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/PostgresHelper.java b/src/main/java/io/ebeaninternal/server/type/PostgresHelper.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/type/PostgresHelper.java rename to src/main/java/io/ebeaninternal/server/type/PostgresHelper.java index e1d53bf09..b79a8d483 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/PostgresHelper.java +++ b/src/main/java/io/ebeaninternal/server/type/PostgresHelper.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.postgresql.util.PGobject; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/RsetDataReader.java b/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/type/RsetDataReader.java rename to src/main/java/io/ebeaninternal/server/type/RsetDataReader.java index da81e01b1..d5aaee43a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/RsetDataReader.java +++ b/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.Message; -import com.avaje.ebeaninternal.server.core.timezone.DataTimeZone; +import io.ebeaninternal.server.core.Message; +import io.ebeaninternal.server.core.timezone.DataTimeZone; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/RsetDataReaderIndexed.java b/src/main/java/io/ebeaninternal/server/type/RsetDataReaderIndexed.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/type/RsetDataReaderIndexed.java rename to src/main/java/io/ebeaninternal/server/type/RsetDataReaderIndexed.java index 6fc8df7e3..1f0c854d9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/RsetDataReaderIndexed.java +++ b/src/main/java/io/ebeaninternal/server/type/RsetDataReaderIndexed.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.timezone.DataTimeZone; +import io.ebeaninternal.server.core.timezone.DataTimeZone; import java.sql.ResultSet; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarDataReader.java b/src/main/java/io/ebeaninternal/server/type/ScalarDataReader.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarDataReader.java rename to src/main/java/io/ebeaninternal/server/type/ScalarDataReader.java index e8ff48855..00787b823 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarDataReader.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarDataReader.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarHelp.java b/src/main/java/io/ebeaninternal/server/type/ScalarHelp.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarHelp.java rename to src/main/java/io/ebeaninternal/server/type/ScalarHelp.java index 8735a4a7f..cf561e426 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarHelp.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarHelp.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.io.DataOutput; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarType.java b/src/main/java/io/ebeaninternal/server/type/ScalarType.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarType.java rename to src/main/java/io/ebeaninternal/server/type/ScalarType.java index a54727a18..9c4082a61 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarType.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarType.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.StringFormatter; -import com.avaje.ebean.text.StringParser; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.text.StringFormatter; +import io.ebean.text.StringParser; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeArrayList.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeArrayList.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java index ff6a51a53..70e904098 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeArrayList.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.json.EJson; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.text.json.EJson; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeArrayListH2.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeArrayListH2.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java index 3c620a369..5c8de33cb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeArrayListH2.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import java.lang.reflect.Type; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBase.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBase.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java index b7d3ad9a9..6f0cd1fd0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBase.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; /** * Base ScalarType object. diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDate.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java index 8a213d464..82af4bcf1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDate.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java index 66157010c..8beec2b27 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseDateTime.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.config.JsonConfig; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseVarchar.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseVarchar.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java index fabc01fe2..155e6eb6e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBaseVarchar.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.text.TextException; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBigDecimal.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBigDecimal.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java index 4e9da66af..86e27de90 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBigDecimal.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBool.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBool.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBool.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeBool.java index 07d2178e1..a64663837 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBool.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBool.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; /** * Boolean ScalarType's must implement to support DDL default values etc. diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBoolean.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBoolean.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java index b23d85daf..5b59e2920 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBoolean.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.text.TextException; +import io.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeByte.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeByte.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java index 3c07a429e..1dc439beb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeByte.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.text.TextException; +import io.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBase.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBase.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java index 1381d8305..5c51d3908 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBase.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.text.TextException; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBinary.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBinary.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java index 22809599a..78224cb51 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBinary.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.sql.SQLException; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBlob.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBlob.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java index d963be69d..0da7fe016 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesBlob.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.sql.SQLException; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java index b921318b3..a434b7c34 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java index 6aa95f9fe..ce5d8fe37 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.sql.SQLException; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java index e1ee46889..7cfd61974 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.sql.SQLException; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeCalendar.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeCalendar.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java index f392fa614..8c311f542 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeCalendar.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebean.config.JsonConfig; +import io.ebeaninternal.server.core.BasicTypeConverter; import java.sql.Date; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeChar.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeChar.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java index c983b1214..04790eec0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeChar.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeaninternal.server.core.BasicTypeConverter; import java.sql.SQLException; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeCharArray.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeCharArray.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java index 3206c8ffe..868d272c6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeCharArray.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeaninternal.server.core.BasicTypeConverter; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeClass.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeClass.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java index 8ee8f8b30..4d5987dd2 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeClass.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import javax.persistence.PersistenceException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeClob.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeClob.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeClob.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeClob.java index e4c1d09e8..5b10769f3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeClob.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeClob.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeaninternal.server.core.BasicTypeConverter; import java.sql.SQLException; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeCurrency.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeCurrency.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java index 70cdcb3cf..6ed58b133 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeCurrency.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.util.Currency; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDate.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java index d9acea851..fbe003746 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDate.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeaninternal.server.core.BasicTypeConverter; import java.sql.Date; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDayOfWeek.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDayOfWeek.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java index 5c2a9a8a9..31a46c3fc 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDayOfWeek.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.sql.SQLException; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDouble.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDouble.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java index dd1be180f..cf161b889 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDouble.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java index 478515765..778435676 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDuration.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.text.TextException; +import io.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java index d629ece79..1961a5fb7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeaninternal.server.core.BasicTypeConverter; import java.math.BigDecimal; import java.sql.SQLException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java index 22c12ce9f..92d60623c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnum.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java similarity index 83% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnum.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java index 2f158cb40..f01229e9d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnum.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.util.Set; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java index dbf2276fd..bf7699c94 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.text.TextException; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java index 120957e62..c44e22d2e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.sql.SQLException; import java.util.Iterator; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFile.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFile.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java index 3f227602d..bb282adab 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFile.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.text.TextException; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import org.slf4j.Logger; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFloat.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFloat.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java index 3408df068..8246f1952 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeFloat.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInetAddress.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInetAddress.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java index e0ca0e0f9..c710b7d75 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInetAddress.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; +import io.ebean.text.TextException; import java.net.InetAddress; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstant.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstant.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java index 8715efb17..a5d7c0c2a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstant.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; +import io.ebean.config.JsonConfig; import java.sql.Timestamp; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInteger.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInteger.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java index 063406a81..6a4caddcd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeInteger.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.text.TextException; +import io.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java index 358ece675..a60d88f56 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeaninternal.server.core.BasicTypeConverter; import org.joda.time.DateMidnight; import java.sql.Date; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaDateTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaDateTime.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java index 2f2e554a0..171cd2c25 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaDateTime.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebean.config.JsonConfig; +import io.ebeaninternal.server.core.BasicTypeConverter; import org.joda.time.DateTime; import java.sql.Timestamp; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java index 3209f34bf..82a7bc1ee 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeaninternal.server.core.BasicTypeConverter; import org.joda.time.LocalDate; import java.sql.Date; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java index 1d3c516a0..cf5d5aac3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebean.config.JsonConfig; +import io.ebeaninternal.server.core.BasicTypeConverter; import org.joda.time.LocalDateTime; import java.sql.Timestamp; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java index fd33c984b..66d3be8e3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java index 7f4c2549f..37b3b1223 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeaninternal.server.core.BasicTypeConverter; import org.joda.time.DateTimeZone; import org.joda.time.LocalTime; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonCollection.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonCollection.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java index 8f0d8df5b..929ebce0c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonCollection.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import java.io.DataInput; import java.io.DataOutput; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonList.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonList.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java index b157a1c64..d57a64c3f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonList.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.text.json.EJson; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.text.json.EJson; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java index 29134f32b..6d7bf9c61 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.text.TextException; -import com.avaje.ebean.text.json.EJson; -import com.avaje.ebeaninternal.util.EncodeUtil; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.text.TextException; +import io.ebean.text.json.EJson; +import io.ebeaninternal.util.EncodeUtil; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java index c5e4405ba..4abe8de4a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbPlatformType; import java.sql.SQLException; import java.util.Map; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNode.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNode.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java index 70abd5ad5..83626f03b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNode.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; -import com.avaje.ebeaninternal.util.EncodeUtil; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.text.TextException; +import io.ebeaninternal.util.EncodeUtil; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java index 90ae1c8f4..ed69fc9fc 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbPlatformType; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java index f4d229dff..22ebc9fd8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonSet.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonSet.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java index b6f11fac2..17ce80ef9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonSet.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.text.json.EJson; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.text.json.EJson; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDate.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java index 76f7fc33a..bcb482bae 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDate.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeaninternal.server.core.BasicTypeConverter; import java.sql.Date; import java.sql.Timestamp; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTime.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java index e9142ca92..46c38cdaa 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTime.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; +import io.ebean.config.JsonConfig; import java.sql.Timestamp; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTime.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java index c9fc34d57..f4449b718 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTime.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.text.TextException; +import io.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java index cecaa40d4..9a39e3222 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeaninternal.server.core.BasicTypeConverter; import java.sql.SQLException; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocale.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocale.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java index 05c876b85..438ddaf6a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocale.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.util.Locale; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLogicalType.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLogicalType.java similarity index 81% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLogicalType.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeLogicalType.java index 328ae72a0..2634d0cef 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLogicalType.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLogicalType.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; /** * Marks types that can be mapped differently to different DB platforms. diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLong.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLong.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java index a5b4145d5..a57662d28 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLong.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLongToTimestamp.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongToTimestamp.java similarity index 75% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLongToTimestamp.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeLongToTimestamp.java index 51c1eda9d..3a48dd786 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLongToTimestamp.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongToTimestamp.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; +import io.ebean.config.JsonConfig; import java.sql.Timestamp; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLongVarchar.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLongVarchar.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java index ee56eefe4..e192a33e1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeLongVarchar.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.sql.SQLException; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMathBigInteger.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMathBigInteger.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java index 04f152f9f..b4a8b3e06 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMathBigInteger.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonth.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonth.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java index 3c4384a2b..c4605cad9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonth.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.sql.SQLException; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java index d8943b03e..0afa5e865 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDay.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java index c53a3de42..f870e96f5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; +import io.ebean.config.JsonConfig; import java.sql.Timestamp; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetTime.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java index 9a7eb403a..2cb3a6f35 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetTime.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.time.OffsetTime; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePath.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypePath.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePath.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypePath.java index 56b13abda..c5ca8951d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePath.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypePath.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstore.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstore.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java index bd5f37f09..060000b8e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstore.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebean.text.TextException; -import com.avaje.ebean.text.json.EJson; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.text.TextException; +import io.ebean.text.json.EJson; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeShort.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeShort.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java index be598ef33..1d0a9f220 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeShort.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.text.TextException; +import io.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeString.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeString.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java index 1c8638404..164a55fcf 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeString.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java similarity index 92% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTime.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java index f310e918d..543732266 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTime.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTimeZone.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTimeZone.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java index c20392b73..17acc14c0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTimeZone.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.util.TimeZone; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTimestamp.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTimestamp.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java index 07ddc9fd8..f5bc88a79 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeTimestamp.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebean.config.JsonConfig; +import io.ebeaninternal.server.core.BasicTypeConverter; import java.sql.SQLException; import java.sql.Timestamp; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeURI.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeURI.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java index f319068ff..504f95454 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeURI.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; +import io.ebean.text.TextException; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeURL.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java similarity index 90% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeURL.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java index 0d09b7e0a..b9ae39870 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeURL.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; +import io.ebean.text.TextException; import java.net.MalformedURLException; import java.net.URL; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBase.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java similarity index 89% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBase.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java index 09722e001..1dfdfcc0f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBase.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.dbplatform.DbPlatformType; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBinary.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBinary.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java index 34fad2b61..29e318120 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDBinary.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeaninternal.server.core.BasicTypeConverter; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDNative.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDNative.java similarity index 87% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDNative.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDNative.java index 44fa8dd96..cf96f2704 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDNative.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDNative.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbPlatformType; import java.sql.SQLException; import java.util.UUID; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java index bc112d271..6e036eee8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.sql.SQLException; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUtilDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUtilDate.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java index 73521d746..034a77902 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeUtilDate.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebean.config.JsonConfig; +import io.ebeaninternal.server.core.BasicTypeConverter; import java.sql.SQLException; import java.sql.Timestamp; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeWrapper.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java similarity index 96% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeWrapper.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java index 324161a42..fac3e8efe 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeWrapper.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.ScalarTypeConverter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.config.ScalarTypeConverter; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYear.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java similarity index 91% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYear.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java index 87339e1f4..19d84059e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYear.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebean.text.TextException; +import io.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDate.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java index feac3737d..0feff27e0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDate.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.core.BasicTypeConverter; +import io.ebeaninternal.server.core.BasicTypeConverter; import java.sql.Date; import java.sql.Timestamp; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneId.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneId.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java index b31424a5d..01a0c61d0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneId.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.time.ZoneId; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneOffset.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java similarity index 93% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneOffset.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java index 89fc92b41..420cf1ce6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneOffset.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.time.ZoneOffset; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTime.java rename to src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java index 543f1fb60..67f08f880 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTime.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; +import io.ebean.config.JsonConfig; import java.sql.Timestamp; import java.sql.Types; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/SimpleAesEncryptor.java b/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/type/SimpleAesEncryptor.java rename to src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java index 1af0d1c4a..7ccb38005 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/SimpleAesEncryptor.java +++ b/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.EncryptKey; -import com.avaje.ebean.config.Encryptor; +import io.ebean.config.EncryptKey; +import io.ebean.config.Encryptor; import javax.crypto.Cipher; import javax.crypto.spec.IvParameterSpec; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/TypeManager.java b/src/main/java/io/ebeaninternal/server/type/TypeManager.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/type/TypeManager.java rename to src/main/java/io/ebeaninternal/server/type/TypeManager.java index 72d5bf8a9..6deee5612 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/TypeManager.java +++ b/src/main/java/io/ebeaninternal/server/type/TypeManager.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.annotation.DbArray; +import io.ebean.annotation.DbArray; import java.lang.reflect.Type; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/TypeReflectHelper.java b/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/type/TypeReflectHelper.java rename to src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java index 0504961d2..232608502 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/TypeReflectHelper.java +++ b/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/package.html b/src/main/java/io/ebeaninternal/server/type/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/type/package.html rename to src/main/java/io/ebeaninternal/server/type/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/server/util/ArrayStack.java b/src/main/java/io/ebeaninternal/server/util/ArrayStack.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/server/util/ArrayStack.java rename to src/main/java/io/ebeaninternal/server/util/ArrayStack.java index 0be14e20d..2f7ecbea4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/util/ArrayStack.java +++ b/src/main/java/io/ebeaninternal/server/util/ArrayStack.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.util; +package io.ebeaninternal.server.util; import java.util.ArrayList; import java.util.EmptyStackException; diff --git a/src/main/java/com/avaje/ebeaninternal/server/util/BindParamsParser.java b/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/server/util/BindParamsParser.java rename to src/main/java/io/ebeaninternal/server/util/BindParamsParser.java index 933e3f81b..125590c45 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/util/BindParamsParser.java +++ b/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.util; +package io.ebeaninternal.server.util; -import com.avaje.ebean.config.EncryptKey; -import com.avaje.ebeaninternal.api.BindParams; -import com.avaje.ebeaninternal.api.BindParams.OrderedList; -import com.avaje.ebeaninternal.api.BindParams.Param; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebean.config.EncryptKey; +import io.ebeaninternal.api.BindParams; +import io.ebeaninternal.api.BindParams.OrderedList; +import io.ebeaninternal.api.BindParams.Param; +import io.ebeaninternal.server.deploy.BeanDescriptor; import javax.persistence.PersistenceException; import java.util.Collection; diff --git a/src/main/java/com/avaje/ebeaninternal/server/util/Md5.java b/src/main/java/io/ebeaninternal/server/util/Md5.java similarity index 94% rename from src/main/java/com/avaje/ebeaninternal/server/util/Md5.java rename to src/main/java/io/ebeaninternal/server/util/Md5.java index e51b16cbb..7e17d65b6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/util/Md5.java +++ b/src/main/java/io/ebeaninternal/server/util/Md5.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.util; +package io.ebeaninternal.server.util; import java.security.MessageDigest; diff --git a/src/main/java/com/avaje/ebeaninternal/server/util/package.html b/src/main/java/io/ebeaninternal/server/util/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/server/util/package.html rename to src/main/java/io/ebeaninternal/server/util/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/util/EncodeUtil.java b/src/main/java/io/ebeaninternal/util/EncodeUtil.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/util/EncodeUtil.java rename to src/main/java/io/ebeaninternal/util/EncodeUtil.java index 765adefe8..2fd4fc5b1 100644 --- a/src/main/java/com/avaje/ebeaninternal/util/EncodeUtil.java +++ b/src/main/java/io/ebeaninternal/util/EncodeUtil.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.util; +package io.ebeaninternal.util; import java.io.UnsupportedEncodingException; diff --git a/src/main/java/com/avaje/ebeaninternal/util/IOUtils.java b/src/main/java/io/ebeaninternal/util/IOUtils.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/util/IOUtils.java rename to src/main/java/io/ebeaninternal/util/IOUtils.java index 41a74b8e8..44e34cca4 100644 --- a/src/main/java/com/avaje/ebeaninternal/util/IOUtils.java +++ b/src/main/java/io/ebeaninternal/util/IOUtils.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.util; +package io.ebeaninternal.util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeaninternal/util/JdbcClose.java b/src/main/java/io/ebeaninternal/util/JdbcClose.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/util/JdbcClose.java rename to src/main/java/io/ebeaninternal/util/JdbcClose.java index 2461050e2..4fc2432e7 100644 --- a/src/main/java/com/avaje/ebeaninternal/util/JdbcClose.java +++ b/src/main/java/io/ebeaninternal/util/JdbcClose.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.util; +package io.ebeaninternal.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/avaje/ebeaninternal/util/ParamTypeHelper.java b/src/main/java/io/ebeaninternal/util/ParamTypeHelper.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/util/ParamTypeHelper.java rename to src/main/java/io/ebeaninternal/util/ParamTypeHelper.java index 1c317a79c..63af496c9 100644 --- a/src/main/java/com/avaje/ebeaninternal/util/ParamTypeHelper.java +++ b/src/main/java/io/ebeaninternal/util/ParamTypeHelper.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.util; +package io.ebeaninternal.util; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/src/main/java/com/avaje/ebeaninternal/util/SortByClause.java b/src/main/java/io/ebeaninternal/util/SortByClause.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/util/SortByClause.java rename to src/main/java/io/ebeaninternal/util/SortByClause.java index dde8dd930..6d8099721 100644 --- a/src/main/java/com/avaje/ebeaninternal/util/SortByClause.java +++ b/src/main/java/io/ebeaninternal/util/SortByClause.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.util; +package io.ebeaninternal.util; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeaninternal/util/SortByClauseParser.java b/src/main/java/io/ebeaninternal/util/SortByClauseParser.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/util/SortByClauseParser.java rename to src/main/java/io/ebeaninternal/util/SortByClauseParser.java index bf2020e5a..98bb40bd8 100644 --- a/src/main/java/com/avaje/ebeaninternal/util/SortByClauseParser.java +++ b/src/main/java/io/ebeaninternal/util/SortByClauseParser.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.util; +package io.ebeaninternal.util; -import com.avaje.ebeaninternal.util.SortByClause.Property; +import io.ebeaninternal.util.SortByClause.Property; public final class SortByClauseParser { diff --git a/src/main/java/com/avaje/ebeaninternal/util/ValueUtil.java b/src/main/java/io/ebeaninternal/util/ValueUtil.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/util/ValueUtil.java rename to src/main/java/io/ebeaninternal/util/ValueUtil.java index bfbee88d7..a93da76cf 100644 --- a/src/main/java/com/avaje/ebeaninternal/util/ValueUtil.java +++ b/src/main/java/io/ebeaninternal/util/ValueUtil.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.util; +package io.ebeaninternal.util; import java.math.BigDecimal; import java.net.URL; diff --git a/src/main/java/com/avaje/ebeaninternal/util/package.html b/src/main/java/io/ebeaninternal/util/package.html similarity index 100% rename from src/main/java/com/avaje/ebeaninternal/util/package.html rename to src/main/java/io/ebeaninternal/util/package.html diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/XmlMappingReader.java b/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java similarity index 84% rename from src/main/java/com/avaje/ebeaninternal/xmlmapping/XmlMappingReader.java rename to src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java index 72c29da08..e9e598e42 100644 --- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/XmlMappingReader.java +++ b/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.xmlmapping; +package io.ebeaninternal.xmlmapping; -import com.avaje.ebeaninternal.xmlmapping.model.XmEbean; +import io.ebeaninternal.xmlmapping.model.XmEbean; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/ObjectFactory.java b/src/main/java/io/ebeaninternal/xmlmapping/model/ObjectFactory.java similarity index 88% rename from src/main/java/com/avaje/ebeaninternal/xmlmapping/model/ObjectFactory.java rename to src/main/java/io/ebeaninternal/xmlmapping/model/ObjectFactory.java index 84f91d529..7d10dde8d 100644 --- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/ObjectFactory.java +++ b/src/main/java/io/ebeaninternal/xmlmapping/model/ObjectFactory.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.xmlmapping.model; +package io.ebeaninternal.xmlmapping.model; import javax.xml.bind.annotation.XmlRegistry; @@ -6,7 +6,7 @@ import javax.xml.bind.annotation.XmlRegistry; /** * This object contains factory methods for each * Java content interface and Java element interface - * generated in the com.avaje.ebeaninternal.xmlmapping.model package. + * generated in the io.ebeaninternal.xmlmapping.model package. *

    An ObjectFactory allows you to programatically * construct new instances of the Java representation * for XML content. The Java representation of XML @@ -21,7 +21,7 @@ public class ObjectFactory { /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.avaje.ebeaninternal.xmlmapping.model + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: io.ebeaninternal.xmlmapping.model */ public ObjectFactory() { } diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmAliasMapping.java b/src/main/java/io/ebeaninternal/xmlmapping/model/XmAliasMapping.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmAliasMapping.java rename to src/main/java/io/ebeaninternal/xmlmapping/model/XmAliasMapping.java index 35d69b86c..82f4da7d6 100644 --- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmAliasMapping.java +++ b/src/main/java/io/ebeaninternal/xmlmapping/model/XmAliasMapping.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.xmlmapping.model; +package io.ebeaninternal.xmlmapping.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmColumnMapping.java b/src/main/java/io/ebeaninternal/xmlmapping/model/XmColumnMapping.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmColumnMapping.java rename to src/main/java/io/ebeaninternal/xmlmapping/model/XmColumnMapping.java index 6c9a94526..a992971cb 100644 --- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmColumnMapping.java +++ b/src/main/java/io/ebeaninternal/xmlmapping/model/XmColumnMapping.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.xmlmapping.model; +package io.ebeaninternal.xmlmapping.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEbean.java b/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEbean.java rename to src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java index bb8b4aae2..d1bc12236 100644 --- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEbean.java +++ b/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.xmlmapping.model; +package io.ebeaninternal.xmlmapping.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEntity.java b/src/main/java/io/ebeaninternal/xmlmapping/model/XmEntity.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEntity.java rename to src/main/java/io/ebeaninternal/xmlmapping/model/XmEntity.java index 622d15c2e..daf352993 100644 --- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEntity.java +++ b/src/main/java/io/ebeaninternal/xmlmapping/model/XmEntity.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.xmlmapping.model; +package io.ebeaninternal.xmlmapping.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmNamedQuery.java b/src/main/java/io/ebeaninternal/xmlmapping/model/XmNamedQuery.java similarity index 97% rename from src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmNamedQuery.java rename to src/main/java/io/ebeaninternal/xmlmapping/model/XmNamedQuery.java index 88a018618..644075c7b 100644 --- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmNamedQuery.java +++ b/src/main/java/io/ebeaninternal/xmlmapping/model/XmNamedQuery.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.xmlmapping.model; +package io.ebeaninternal.xmlmapping.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmQuery.java b/src/main/java/io/ebeaninternal/xmlmapping/model/XmQuery.java similarity index 95% rename from src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmQuery.java rename to src/main/java/io/ebeaninternal/xmlmapping/model/XmQuery.java index bf669bbb0..236cd3817 100644 --- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmQuery.java +++ b/src/main/java/io/ebeaninternal/xmlmapping/model/XmQuery.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.xmlmapping.model; +package io.ebeaninternal.xmlmapping.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmRawSql.java b/src/main/java/io/ebeaninternal/xmlmapping/model/XmRawSql.java similarity index 98% rename from src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmRawSql.java rename to src/main/java/io/ebeaninternal/xmlmapping/model/XmRawSql.java index 9fd3237a0..52455aa49 100644 --- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmRawSql.java +++ b/src/main/java/io/ebeaninternal/xmlmapping/model/XmRawSql.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.xmlmapping.model; +package io.ebeaninternal.xmlmapping.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/package-info.java b/src/main/java/io/ebeaninternal/xmlmapping/model/package-info.java similarity index 76% rename from src/main/java/com/avaje/ebeaninternal/xmlmapping/model/package-info.java rename to src/main/java/io/ebeaninternal/xmlmapping/model/package-info.java index 88e0fda8f..1822923b4 100644 --- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/package-info.java +++ b/src/main/java/io/ebeaninternal/xmlmapping/model/package-info.java @@ -1,2 +1,2 @@ @javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/ebean", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package com.avaje.ebeaninternal.xmlmapping.model; +package io.ebeaninternal.xmlmapping.model; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/DocQueryRequest.java b/src/main/java/io/ebeanservice/docstore/api/DocQueryRequest.java similarity index 74% rename from src/main/java/com/avaje/ebeanservice/docstore/api/DocQueryRequest.java rename to src/main/java/io/ebeanservice/docstore/api/DocQueryRequest.java index 42fa4ddd2..dadf5b114 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/DocQueryRequest.java +++ b/src/main/java/io/ebeanservice/docstore/api/DocQueryRequest.java @@ -1,7 +1,7 @@ -package com.avaje.ebeanservice.docstore.api; +package io.ebeanservice.docstore.api; -import com.avaje.ebean.text.json.JsonReadOptions; -import com.avaje.ebeaninternal.api.SpiQuery; +import io.ebean.text.json.JsonReadOptions; +import io.ebeaninternal.api.SpiQuery; /** * A Query request for the document store. diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreBeanAdapter.java b/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java similarity index 91% rename from src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreBeanAdapter.java rename to src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java index 73e1c3e6f..f79d4436c 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreBeanAdapter.java +++ b/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java @@ -1,11 +1,11 @@ -package com.avaje.ebeanservice.docstore.api; +package io.ebeanservice.docstore.api; -import com.avaje.ebean.Query; -import com.avaje.ebean.annotation.DocStoreMode; -import com.avaje.ebean.plugin.BeanDocType; -import com.avaje.ebeaninternal.server.core.PersistRequest; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeanservice.docstore.api.mapping.DocumentMapping; +import io.ebean.Query; +import io.ebean.annotation.DocStoreMode; +import io.ebean.plugin.BeanDocType; +import io.ebeaninternal.server.core.PersistRequest; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeanservice.docstore.api.mapping.DocumentMapping; import java.io.IOException; import java.util.Set; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreFactory.java b/src/main/java/io/ebeanservice/docstore/api/DocStoreFactory.java similarity index 65% rename from src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreFactory.java rename to src/main/java/io/ebeanservice/docstore/api/DocStoreFactory.java index 1579e2e70..676fe3f10 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreFactory.java +++ b/src/main/java/io/ebeanservice/docstore/api/DocStoreFactory.java @@ -1,8 +1,8 @@ -package com.avaje.ebeanservice.docstore.api; +package io.ebeanservice.docstore.api; -import com.avaje.ebean.plugin.SpiServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebean.plugin.SpiServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; /** * Creates the integration components for DocStore integration. diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreIntegration.java b/src/main/java/io/ebeanservice/docstore/api/DocStoreIntegration.java similarity index 77% rename from src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreIntegration.java rename to src/main/java/io/ebeanservice/docstore/api/DocStoreIntegration.java index 5a6911788..f4ed229a4 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreIntegration.java +++ b/src/main/java/io/ebeanservice/docstore/api/DocStoreIntegration.java @@ -1,6 +1,6 @@ -package com.avaje.ebeanservice.docstore.api; +package io.ebeanservice.docstore.api; -import com.avaje.ebean.DocumentStore; +import io.ebean.DocumentStore; /** * All the required features for DocStore integration. diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreQueryUpdate.java b/src/main/java/io/ebeanservice/docstore/api/DocStoreQueryUpdate.java similarity index 91% rename from src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreQueryUpdate.java rename to src/main/java/io/ebeanservice/docstore/api/DocStoreQueryUpdate.java index ba377dd91..5d86fe050 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreQueryUpdate.java +++ b/src/main/java/io/ebeanservice/docstore/api/DocStoreQueryUpdate.java @@ -1,4 +1,4 @@ -package com.avaje.ebeanservice.docstore.api; +package io.ebeanservice.docstore.api; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreTransaction.java b/src/main/java/io/ebeanservice/docstore/api/DocStoreTransaction.java similarity index 93% rename from src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreTransaction.java rename to src/main/java/io/ebeanservice/docstore/api/DocStoreTransaction.java index ea2e81a77..a0f22f35d 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreTransaction.java +++ b/src/main/java/io/ebeanservice/docstore/api/DocStoreTransaction.java @@ -1,4 +1,4 @@ -package com.avaje.ebeanservice.docstore.api; +package io.ebeanservice.docstore.api; /** * A document store transaction. diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdate.java b/src/main/java/io/ebeanservice/docstore/api/DocStoreUpdate.java similarity index 90% rename from src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdate.java rename to src/main/java/io/ebeanservice/docstore/api/DocStoreUpdate.java index d07774033..3408e47e2 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdate.java +++ b/src/main/java/io/ebeanservice/docstore/api/DocStoreUpdate.java @@ -1,4 +1,4 @@ -package com.avaje.ebeanservice.docstore.api; +package io.ebeanservice.docstore.api; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdateContext.java b/src/main/java/io/ebeanservice/docstore/api/DocStoreUpdateContext.java similarity index 85% rename from src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdateContext.java rename to src/main/java/io/ebeanservice/docstore/api/DocStoreUpdateContext.java index b6494710b..52066fd01 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdateContext.java +++ b/src/main/java/io/ebeanservice/docstore/api/DocStoreUpdateContext.java @@ -1,4 +1,4 @@ -package com.avaje.ebeanservice.docstore.api; +package io.ebeanservice.docstore.api; /** * The doc store specific context/transaction used to collect updates to send to the document store. diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdateProcessor.java b/src/main/java/io/ebeanservice/docstore/api/DocStoreUpdateProcessor.java similarity index 87% rename from src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdateProcessor.java rename to src/main/java/io/ebeanservice/docstore/api/DocStoreUpdateProcessor.java index d8cd16124..8f0d0b9ef 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdateProcessor.java +++ b/src/main/java/io/ebeanservice/docstore/api/DocStoreUpdateProcessor.java @@ -1,6 +1,7 @@ -package com.avaje.ebeanservice.docstore.api; +package io.ebeanservice.docstore.api; -import com.avaje.ebean.plugin.BeanType; +import io.ebean.Transaction; +import io.ebean.plugin.BeanType; import java.io.IOException; @@ -34,7 +35,7 @@ public interface DocStoreUpdateProcessor { /** * Create a document store transaction hinting at the batch size. *

    - * The batch size can be set via {@link com.avaje.ebean.Transaction#setDocStoreBatchSize(int)} + * The batch size can be set via {@link Transaction#setDocStoreBatchSize(int)} */ DocStoreTransaction createTransaction(int batchSize); diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdates.java b/src/main/java/io/ebeanservice/docstore/api/DocStoreUpdates.java similarity index 94% rename from src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdates.java rename to src/main/java/io/ebeanservice/docstore/api/DocStoreUpdates.java index 9c5668ce6..9f2fff8d5 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdates.java +++ b/src/main/java/io/ebeanservice/docstore/api/DocStoreUpdates.java @@ -1,7 +1,7 @@ -package com.avaje.ebeanservice.docstore.api; +package io.ebeanservice.docstore.api; -import com.avaje.ebean.DocStoreQueueEntry; -import com.avaje.ebean.DocStoreQueueEntry.Action; +import io.ebean.DocStoreQueueEntry; +import io.ebean.DocStoreQueueEntry.Action; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/DocumentNotFoundException.java b/src/main/java/io/ebeanservice/docstore/api/DocumentNotFoundException.java similarity index 88% rename from src/main/java/com/avaje/ebeanservice/docstore/api/DocumentNotFoundException.java rename to src/main/java/io/ebeanservice/docstore/api/DocumentNotFoundException.java index 0bf95b34e..0a926e42c 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/DocumentNotFoundException.java +++ b/src/main/java/io/ebeanservice/docstore/api/DocumentNotFoundException.java @@ -1,4 +1,4 @@ -package com.avaje.ebeanservice.docstore.api; +package io.ebeanservice.docstore.api; /** * Can be thrown when a document is unexpectedly not found in a document store. diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocMappingBuilder.java b/src/main/java/io/ebeanservice/docstore/api/mapping/DocMappingBuilder.java similarity index 93% rename from src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocMappingBuilder.java rename to src/main/java/io/ebeanservice/docstore/api/mapping/DocMappingBuilder.java index 91495aa48..0e81da86f 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocMappingBuilder.java +++ b/src/main/java/io/ebeanservice/docstore/api/mapping/DocMappingBuilder.java @@ -1,9 +1,9 @@ -package com.avaje.ebeanservice.docstore.api.mapping; +package io.ebeanservice.docstore.api.mapping; -import com.avaje.ebean.annotation.DocMapping; -import com.avaje.ebean.annotation.DocStore; -import com.avaje.ebean.text.PathProperties; -import com.avaje.ebeaninternal.server.query.SplitName; +import io.ebean.annotation.DocMapping; +import io.ebean.annotation.DocStore; +import io.ebean.text.PathProperties; +import io.ebeaninternal.server.query.SplitName; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java b/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java similarity index 88% rename from src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java rename to src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java index b7942253a..5ff1b2cc3 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java +++ b/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java @@ -1,6 +1,6 @@ -package com.avaje.ebeanservice.docstore.api.mapping; +package io.ebeanservice.docstore.api.mapping; -import com.avaje.ebeaninternal.server.text.json.PathStack; +import io.ebeaninternal.server.text.json.PathStack; /** * Adapter for DocPropertyVisitor that does not do anything. diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyMapping.java b/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyMapping.java similarity index 96% rename from src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyMapping.java rename to src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyMapping.java index cfc4c871d..045fbf5cf 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyMapping.java +++ b/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyMapping.java @@ -1,6 +1,6 @@ -package com.avaje.ebeanservice.docstore.api.mapping; +package io.ebeanservice.docstore.api.mapping; -import com.avaje.ebean.annotation.DocMapping; +import io.ebean.annotation.DocMapping; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyOptions.java b/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java similarity index 97% rename from src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyOptions.java rename to src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java index 8a0841104..e9bc51d20 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyOptions.java +++ b/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java @@ -1,7 +1,7 @@ -package com.avaje.ebeanservice.docstore.api.mapping; +package io.ebeanservice.docstore.api.mapping; -import com.avaje.ebean.annotation.DocMapping; -import com.avaje.ebean.annotation.DocProperty; +import io.ebean.annotation.DocMapping; +import io.ebean.annotation.DocProperty; /** * Options for mapping a property for document storage. diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyType.java b/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyType.java similarity index 94% rename from src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyType.java rename to src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyType.java index 039512090..52595defb 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyType.java +++ b/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyType.java @@ -1,4 +1,4 @@ -package com.avaje.ebeanservice.docstore.api.mapping; +package io.ebeanservice.docstore.api.mapping; /** * Types as defined for document store property types. diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyVisitor.java b/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyVisitor.java similarity index 93% rename from src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyVisitor.java rename to src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyVisitor.java index 6ce9540a7..dafdf4ebd 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocPropertyVisitor.java +++ b/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyVisitor.java @@ -1,4 +1,4 @@ -package com.avaje.ebeanservice.docstore.api.mapping; +package io.ebeanservice.docstore.api.mapping; /** * Used to visit the properties in a document structure. diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocumentMapping.java b/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java similarity index 95% rename from src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocumentMapping.java rename to src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java index 15d32cc72..0b5787451 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/mapping/DocumentMapping.java +++ b/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java @@ -1,6 +1,6 @@ -package com.avaje.ebeanservice.docstore.api.mapping; +package io.ebeanservice.docstore.api.mapping; -import com.avaje.ebean.FetchPath; +import io.ebean.FetchPath; /** * Mapping for a document stored in a doc store (like ElasticSearch). diff --git a/src/main/java/io/ebeanservice/docstore/api/mapping/package-info.java b/src/main/java/io/ebeanservice/docstore/api/mapping/package-info.java new file mode 100644 index 000000000..165d43611 --- /dev/null +++ b/src/main/java/io/ebeanservice/docstore/api/mapping/package-info.java @@ -0,0 +1,4 @@ +/** + * Mapping for document store integration. + */ +package io.ebeanservice.docstore.api.mapping; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/package-info.java b/src/main/java/io/ebeanservice/docstore/api/package-info.java similarity index 57% rename from src/main/java/com/avaje/ebeanservice/docstore/api/package-info.java rename to src/main/java/io/ebeanservice/docstore/api/package-info.java index 75b533f11..cb715c72d 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/package-info.java +++ b/src/main/java/io/ebeanservice/docstore/api/package-info.java @@ -1,4 +1,4 @@ /** * The service API for document store integration. */ -package com.avaje.ebeanservice.docstore.api; \ No newline at end of file +package io.ebeanservice.docstore.api; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java b/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java similarity index 89% rename from src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java rename to src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java index 949d98a12..228fdfc90 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java +++ b/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java @@ -1,23 +1,23 @@ -package com.avaje.ebeanservice.docstore.api.support; +package io.ebeanservice.docstore.api.support; -import com.avaje.ebean.FetchPath; -import com.avaje.ebean.Query; -import com.avaje.ebean.annotation.DocStore; -import com.avaje.ebean.annotation.DocStoreMode; -import com.avaje.ebean.plugin.BeanType; -import com.avaje.ebean.text.PathProperties; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.core.PersistRequest; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.InheritInfo; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; -import com.avaje.ebeanservice.docstore.api.DocStoreBeanAdapter; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdateContext; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; -import com.avaje.ebeanservice.docstore.api.mapping.DocMappingBuilder; -import com.avaje.ebeanservice.docstore.api.mapping.DocumentMapping; +import io.ebean.FetchPath; +import io.ebean.Query; +import io.ebean.annotation.DocStore; +import io.ebean.annotation.DocStoreMode; +import io.ebean.plugin.BeanType; +import io.ebean.text.PathProperties; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.core.PersistRequest; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.InheritInfo; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebeanservice.docstore.api.DocStoreBeanAdapter; +import io.ebeanservice.docstore.api.DocStoreUpdateContext; +import io.ebeanservice.docstore.api.DocStoreUpdates; +import io.ebeanservice.docstore.api.mapping.DocMappingBuilder; +import io.ebeanservice.docstore.api.mapping.DocumentMapping; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java b/src/main/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java similarity index 74% rename from src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java rename to src/main/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java index fe7812b14..9c758b426 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java +++ b/src/main/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java @@ -1,9 +1,9 @@ -package com.avaje.ebeanservice.docstore.api.support; +package io.ebeanservice.docstore.api.support; -import com.avaje.ebean.plugin.BeanType; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdate; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdateContext; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; +import io.ebean.plugin.BeanType; +import io.ebeanservice.docstore.api.DocStoreUpdate; +import io.ebeanservice.docstore.api.DocStoreUpdateContext; +import io.ebeanservice.docstore.api.DocStoreUpdates; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidation.java b/src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidation.java similarity index 74% rename from src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidation.java rename to src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidation.java index fdab9dc0b..3a8e22403 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidation.java +++ b/src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidation.java @@ -1,7 +1,7 @@ -package com.avaje.ebeanservice.docstore.api.support; +package io.ebeanservice.docstore.api.support; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeanservice.docstore.api.DocStoreUpdates; /** * Checks if a persist request means an embedded/nested object in another document needs updating. diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidationProperties.java b/src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidationProperties.java similarity index 81% rename from src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidationProperties.java rename to src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidationProperties.java index 01e2e1fe1..56b8cf39d 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidationProperties.java +++ b/src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidationProperties.java @@ -1,7 +1,7 @@ -package com.avaje.ebeanservice.docstore.api.support; +package io.ebeanservice.docstore.api.support; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeanservice.docstore.api.DocStoreUpdates; /** * Checks if a persist request means an embedded/nested object in another document needs updating. diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEvent.java b/src/main/java/io/ebeanservice/docstore/api/support/DocStoreIndexEvent.java similarity index 76% rename from src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEvent.java rename to src/main/java/io/ebeanservice/docstore/api/support/DocStoreIndexEvent.java index 335ee5307..20354a94c 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEvent.java +++ b/src/main/java/io/ebeanservice/docstore/api/support/DocStoreIndexEvent.java @@ -1,9 +1,9 @@ -package com.avaje.ebeanservice.docstore.api.support; +package io.ebeanservice.docstore.api.support; -import com.avaje.ebean.plugin.BeanType; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdate; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdateContext; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; +import io.ebean.plugin.BeanType; +import io.ebeanservice.docstore.api.DocStoreUpdate; +import io.ebeanservice.docstore.api.DocStoreUpdateContext; +import io.ebeanservice.docstore.api.DocStoreUpdates; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStructure.java b/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java similarity index 89% rename from src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStructure.java rename to src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java index 34ed95ebf..cad53baf2 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStructure.java +++ b/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java @@ -1,9 +1,9 @@ -package com.avaje.ebeanservice.docstore.api.support; +package io.ebeanservice.docstore.api.support; -import com.avaje.ebean.FetchPath; -import com.avaje.ebean.text.PathProperties; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssoc; +import io.ebean.FetchPath; +import io.ebean.text.PathProperties; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanPropertyAssoc; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/support/package-info.java b/src/main/java/io/ebeanservice/docstore/api/support/package-info.java similarity index 52% rename from src/main/java/com/avaje/ebeanservice/docstore/api/support/package-info.java rename to src/main/java/io/ebeanservice/docstore/api/support/package-info.java index 0c0a8c6d1..b2aa41e8e 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/support/package-info.java +++ b/src/main/java/io/ebeanservice/docstore/api/support/package-info.java @@ -1,4 +1,4 @@ /** * Support objects for implementing integration. */ -package com.avaje.ebeanservice.docstore.api.support; \ No newline at end of file +package io.ebeanservice.docstore.api.support; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStore.java b/src/main/java/io/ebeanservice/docstore/none/NoneDocStore.java similarity index 90% rename from src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStore.java rename to src/main/java/io/ebeanservice/docstore/none/NoneDocStore.java index 9bbd8d32b..b5200f78d 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStore.java +++ b/src/main/java/io/ebeanservice/docstore/none/NoneDocStore.java @@ -1,10 +1,10 @@ -package com.avaje.ebeanservice.docstore.none; +package io.ebeanservice.docstore.none; -import com.avaje.ebean.DocStoreQueueEntry; -import com.avaje.ebean.DocumentStore; -import com.avaje.ebean.PagedList; -import com.avaje.ebean.Query; -import com.avaje.ebeanservice.docstore.api.DocQueryRequest; +import io.ebean.DocStoreQueueEntry; +import io.ebean.DocumentStore; +import io.ebean.PagedList; +import io.ebean.Query; +import io.ebeanservice.docstore.api.DocQueryRequest; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java b/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java similarity index 77% rename from src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java rename to src/main/java/io/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java index b53816ba3..de513f3c6 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java +++ b/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java @@ -1,10 +1,10 @@ -package com.avaje.ebeanservice.docstore.none; +package io.ebeanservice.docstore.none; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdateContext; -import com.avaje.ebeanservice.docstore.api.support.DocStoreBeanBaseAdapter; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebeanservice.docstore.api.DocStoreUpdateContext; +import io.ebeanservice.docstore.api.support.DocStoreBeanBaseAdapter; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStoreFactory.java b/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreFactory.java similarity index 59% rename from src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStoreFactory.java rename to src/main/java/io/ebeanservice/docstore/none/NoneDocStoreFactory.java index f67527331..7a9d18568 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStoreFactory.java +++ b/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreFactory.java @@ -1,13 +1,13 @@ -package com.avaje.ebeanservice.docstore.none; +package io.ebeanservice.docstore.none; -import com.avaje.ebean.DocumentStore; -import com.avaje.ebean.plugin.SpiServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; -import com.avaje.ebeanservice.docstore.api.DocStoreBeanAdapter; -import com.avaje.ebeanservice.docstore.api.DocStoreFactory; -import com.avaje.ebeanservice.docstore.api.DocStoreIntegration; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdateProcessor; +import io.ebean.DocumentStore; +import io.ebean.plugin.SpiServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebeanservice.docstore.api.DocStoreBeanAdapter; +import io.ebeanservice.docstore.api.DocStoreFactory; +import io.ebeanservice.docstore.api.DocStoreIntegration; +import io.ebeanservice.docstore.api.DocStoreUpdateProcessor; /** * A stub implementation of DocStoreFactory that will barf if the docStore features are used. diff --git a/src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStoreUpdateProcessor.java b/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreUpdateProcessor.java similarity index 69% rename from src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStoreUpdateProcessor.java rename to src/main/java/io/ebeanservice/docstore/none/NoneDocStoreUpdateProcessor.java index c5ec2b9b0..c5c3d7854 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStoreUpdateProcessor.java +++ b/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreUpdateProcessor.java @@ -1,10 +1,10 @@ -package com.avaje.ebeanservice.docstore.none; +package io.ebeanservice.docstore.none; -import com.avaje.ebean.plugin.BeanType; -import com.avaje.ebeanservice.docstore.api.DocStoreQueryUpdate; -import com.avaje.ebeanservice.docstore.api.DocStoreTransaction; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdateProcessor; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; +import io.ebean.plugin.BeanType; +import io.ebeanservice.docstore.api.DocStoreQueryUpdate; +import io.ebeanservice.docstore.api.DocStoreTransaction; +import io.ebeanservice.docstore.api.DocStoreUpdateProcessor; +import io.ebeanservice.docstore.api.DocStoreUpdates; import java.io.IOException; diff --git a/src/main/java/com/avaje/ebeanservice/docstore/none/package-info.java b/src/main/java/io/ebeanservice/docstore/none/package-info.java similarity index 84% rename from src/main/java/com/avaje/ebeanservice/docstore/none/package-info.java rename to src/main/java/io/ebeanservice/docstore/none/package-info.java index 2b6a86465..1fc269f3b 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/none/package-info.java +++ b/src/main/java/io/ebeanservice/docstore/none/package-info.java @@ -5,4 +5,4 @@ * and if there is an attempt to use the document store features an error will be thrown. *

    */ -package com.avaje.ebeanservice.docstore.none; \ No newline at end of file +package io.ebeanservice.docstore.none; diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF index e76e941dd..c485fd12d 100644 --- a/src/main/resources/META-INF/MANIFEST.MF +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -1,67 +1,26 @@ Manifest-Version: 1.0 -Premain-Class: com.avaje.ebean.enhance.agent.Transformer +Premain-Class: io.ebean.enhance.agent.Transformer Bundle-ManifestVersion: 2 Bundle-Name: Ebean-ORM Bundle-SymbolicName: com.avaje.ebean Bundle-Version: 4.2.0 Bundle-ClassPath: . Bundle-Vendor: avaje -Export-Package: com.avaje.ebean, - com.avaje.ebean.annotation, - com.avaje.ebean.bean, - com.avaje.ebean.cache, - com.avaje.ebean.common, - com.avaje.ebean.config, - com.avaje.ebean.config.dbplatform, - com.avaje.ebean.event, - com.avaje.ebean.meta, - com.avaje.ebean.text, - com.avaje.ebean.text.csv, - com.avaje.ebean.text.json, - com.avaje.ebean.util, - com.avaje.ebeaninternal.api, - com.avaje.ebeaninternal.jdbc, - com.avaje.ebeaninternal.server.autofetch, - com.avaje.ebeaninternal.server.cache, - com.avaje.ebeaninternal.server.cluster, - com.avaje.ebeaninternal.server.cluster.mcast, - com.avaje.ebeaninternal.server.cluster.socket, - com.avaje.ebeaninternal.server.core, - com.avaje.ebeaninternal.server.ddl, - com.avaje.ebeaninternal.server.deploy, - com.avaje.ebeaninternal.server.deploy.generatedproperty, - com.avaje.ebeaninternal.server.deploy.id, - com.avaje.ebeaninternal.server.deploy.meta, - com.avaje.ebeaninternal.server.deploy.parse, - com.avaje.ebeaninternal.server.el, - com.avaje.ebeaninternal.server.expression, - com.avaje.ebeaninternal.server.idgen, - com.avaje.ebeaninternal.server.jdbc, - com.avaje.ebeaninternal.server.jmx, - com.avaje.ebeaninternal.server.lib, - com.avaje.ebeaninternal.server.lib.resource, - com.avaje.ebeaninternal.server.lib.sql, - com.avaje.ebeaninternal.server.lib.thread, - com.avaje.ebeaninternal.server.lib.util, - com.avaje.ebeaninternal.server.loadcontext, - com.avaje.ebeaninternal.server.persist, - com.avaje.ebeaninternal.server.persist.dml, - com.avaje.ebeaninternal.server.persist.dmlbind, - com.avaje.ebeaninternal.server.query, - com.avaje.ebeaninternal.server.querydefn, - com.avaje.ebeaninternal.server.properties, - com.avaje.ebeaninternal.server.resource, - com.avaje.ebeaninternal.server.text.csv, - com.avaje.ebeaninternal.server.text.json, - com.avaje.ebeaninternal.server.transaction, - com.avaje.ebeaninternal.server.type, - com.avaje.ebeaninternal.server.type.reflect, - com.avaje.ebeaninternal.server.util, - com.avaje.ebeaninternal.util -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Require-Bundle: - org.slf4j.api;bundle-version="1.7.2", - com.springsource.org.joda.time;bundle-version="1.6.0" +Export-Package: io.ebean, + io.ebean.annotation, + io.ebean.bean, + io.ebean.cache, + io.ebean.common, + io.ebean.config, + io.ebean.config.dbplatform, + io.ebean.event, + io.ebean.meta, + io.ebean.text, + io.ebean.text.csv, + io.ebean.text.json, + io.ebean.util +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: org.slf4j.api;bundle-version="1.7.2" Import-Package: javax.persistence;version="2.0.0" diff --git a/src/main/resources/com/avaje/ebeaninternal/api/message.properties b/src/main/resources/io/ebeaninternal/api/message.properties similarity index 100% rename from src/main/resources/com/avaje/ebeaninternal/api/message.properties rename to src/main/resources/io/ebeaninternal/api/message.properties diff --git a/src/test/java/com/avaje/tests/basic/TestManyOneInterface.java b/src/test/java/com/avaje/tests/basic/TestManyOneInterface.java deleted file mode 100644 index fc722e4a3..000000000 --- a/src/test/java/com/avaje/tests/basic/TestManyOneInterface.java +++ /dev/null @@ -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(); - - } -} diff --git a/src/test/java/com/avaje/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java similarity index 93% rename from src/test/java/com/avaje/ebean/BaseTestCase.java rename to src/test/java/io/ebean/BaseTestCase.java index 253f2f9cc..8ee3e6fb5 100644 --- a/src/test/java/com/avaje/ebean/BaseTestCase.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/ColumnMappingTest.java b/src/test/java/io/ebean/ColumnMappingTest.java similarity index 97% rename from src/test/java/com/avaje/ebean/ColumnMappingTest.java rename to src/test/java/io/ebean/ColumnMappingTest.java index 6c77bd2da..d8c44c5d2 100644 --- a/src/test/java/com/avaje/ebean/ColumnMappingTest.java +++ b/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()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/ColumnTest.java b/src/test/java/io/ebean/ColumnTest.java similarity index 97% rename from src/test/java/com/avaje/ebean/ColumnTest.java rename to src/test/java/io/ebean/ColumnTest.java index 191b33b51..57e7ed694 100644 --- a/src/test/java/com/avaje/ebean/ColumnTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/EbeanServerFactory_MultiTenancy_Test.java b/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java similarity index 85% rename from src/test/java/com/avaje/ebean/EbeanServerFactory_MultiTenancy_Test.java rename to src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java index 921b6f4e0..231f2129a 100644 --- a/src/test/java/com/avaje/ebean/EbeanServerFactory_MultiTenancy_Test.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/EbeanServerFactory_ServerConfigStart_Test.java b/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java similarity index 89% rename from src/test/java/com/avaje/ebean/EbeanServerFactory_ServerConfigStart_Test.java rename to src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java index e30a39682..369f01cdd 100644 --- a/src/test/java/com/avaje/ebean/EbeanServerFactory_ServerConfigStart_Test.java +++ b/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; } } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/EbeanServer_deleteAllByIdTest.java b/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java similarity index 95% rename from src/test/java/com/avaje/ebean/EbeanServer_deleteAllByIdTest.java rename to src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java index ef83795cc..16aeb3555 100644 --- a/src/test/java/com/avaje/ebean/EbeanServer_deleteAllByIdTest.java +++ b/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); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/EbeanServer_deleteByIdTest.java b/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java similarity index 94% rename from src/test/java/com/avaje/ebean/EbeanServer_deleteByIdTest.java rename to src/test/java/io/ebean/EbeanServer_deleteByIdTest.java index 987c2c61a..28ae8c0ff 100644 --- a/src/test/java/com/avaje/ebean/EbeanServer_deleteByIdTest.java +++ b/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); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/EbeanServer_deleteTest.java b/src/test/java/io/ebean/EbeanServer_deleteTest.java similarity index 89% rename from src/test/java/com/avaje/ebean/EbeanServer_deleteTest.java rename to src/test/java/io/ebean/EbeanServer_deleteTest.java index 48d3ce3ba..03ba59dd2 100644 --- a/src/test/java/com/avaje/ebean/EbeanServer_deleteTest.java +++ b/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); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/EbeanServer_eqlTest.java b/src/test/java/io/ebean/EbeanServer_eqlTest.java similarity index 96% rename from src/test/java/com/avaje/ebean/EbeanServer_eqlTest.java rename to src/test/java/io/ebean/EbeanServer_eqlTest.java index aa16871c9..b436c3eb6 100644 --- a/src/test/java/com/avaje/ebean/EbeanServer_eqlTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/EbeanServer_refresh.java b/src/test/java/io/ebean/EbeanServer_refresh.java similarity index 87% rename from src/test/java/com/avaje/ebean/EbeanServer_refresh.java rename to src/test/java/io/ebean/EbeanServer_refresh.java index d04eb0a05..1c1188ea4 100644 --- a/src/test/java/com/avaje/ebean/EbeanServer_refresh.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/EbeanServer_saveAllTest.java b/src/test/java/io/ebean/EbeanServer_saveAllTest.java similarity index 97% rename from src/test/java/com/avaje/ebean/EbeanServer_saveAllTest.java rename to src/test/java/io/ebean/EbeanServer_saveAllTest.java index e08f91f08..c3f357461 100644 --- a/src/test/java/com/avaje/ebean/EbeanServer_saveAllTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/FetchConfigTest.java b/src/test/java/io/ebean/FetchConfigTest.java similarity index 98% rename from src/test/java/com/avaje/ebean/FetchConfigTest.java rename to src/test/java/io/ebean/FetchConfigTest.java index 071f0a43f..a88e1e4be 100644 --- a/src/test/java/com/avaje/ebean/FetchConfigTest.java +++ b/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()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/MyCurrentUserProvider.java b/src/test/java/io/ebean/MyCurrentUserProvider.java similarity index 88% rename from src/test/java/com/avaje/ebean/MyCurrentUserProvider.java rename to src/test/java/io/ebean/MyCurrentUserProvider.java index 3c28a9651..f4c2d9a0c 100644 --- a/src/test/java/com/avaje/ebean/MyCurrentUserProvider.java +++ b/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. diff --git a/src/test/java/com/avaje/ebean/PrimaryServerTest.java b/src/test/java/io/ebean/PrimaryServerTest.java similarity index 93% rename from src/test/java/com/avaje/ebean/PrimaryServerTest.java rename to src/test/java/io/ebean/PrimaryServerTest.java index fb4b73afb..67e6ea46f 100644 --- a/src/test/java/com/avaje/ebean/PrimaryServerTest.java +++ b/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()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/PropertyTest.java b/src/test/java/io/ebean/PropertyTest.java similarity index 96% rename from src/test/java/com/avaje/ebean/PropertyTest.java rename to src/test/java/io/ebean/PropertyTest.java index 1d5d19781..77d22c439 100644 --- a/src/test/java/com/avaje/ebean/PropertyTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/RawSqlKeyTest.java b/src/test/java/io/ebean/RawSqlKeyTest.java similarity index 96% rename from src/test/java/com/avaje/ebean/RawSqlKeyTest.java rename to src/test/java/io/ebean/RawSqlKeyTest.java index 626b98753..c798ecd3f 100644 --- a/src/test/java/com/avaje/ebean/RawSqlKeyTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/SqlRowBooleanTest.java b/src/test/java/io/ebean/SqlRowBooleanTest.java similarity index 79% rename from src/test/java/com/avaje/ebean/SqlRowBooleanTest.java rename to src/test/java/io/ebean/SqlRowBooleanTest.java index 35b767c52..cac63099d 100644 --- a/src/test/java/com/avaje/ebean/SqlRowBooleanTest.java +++ b/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(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/TestDirtyProperties.java b/src/test/java/io/ebean/TestDirtyProperties.java similarity index 94% rename from src/test/java/com/avaje/ebean/TestDirtyProperties.java rename to src/test/java/io/ebean/TestDirtyProperties.java index 788304a1a..fabd51f38 100644 --- a/src/test/java/com/avaje/ebean/TestDirtyProperties.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/TestFilterWithEnum.java b/src/test/java/io/ebean/TestFilterWithEnum.java similarity index 79% rename from src/test/java/com/avaje/ebean/TestFilterWithEnum.java rename to src/test/java/io/ebean/TestFilterWithEnum.java index 39881f4b9..c3805107f 100644 --- a/src/test/java/com/avaje/ebean/TestFilterWithEnum.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/TestPropertyChangeListener.java b/src/test/java/io/ebean/TestPropertyChangeListener.java similarity index 90% rename from src/test/java/com/avaje/ebean/TestPropertyChangeListener.java rename to src/test/java/io/ebean/TestPropertyChangeListener.java index 49c7a23e5..722e0f8ca 100644 --- a/src/test/java/com/avaje/ebean/TestPropertyChangeListener.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/TestRawSqlBuilder.java b/src/test/java/io/ebean/TestRawSqlBuilder.java similarity index 97% rename from src/test/java/com/avaje/ebean/TestRawSqlBuilder.java rename to src/test/java/io/ebean/TestRawSqlBuilder.java index 01171720d..62a02615a 100644 --- a/src/test/java/com/avaje/ebean/TestRawSqlBuilder.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/TestRawSqlBuilderDistinct.java b/src/test/java/io/ebean/TestRawSqlBuilderDistinct.java similarity index 85% rename from src/test/java/com/avaje/ebean/TestRawSqlBuilderDistinct.java rename to src/test/java/io/ebean/TestRawSqlBuilderDistinct.java index 292e41050..e11526efb 100644 --- a/src/test/java/com/avaje/ebean/TestRawSqlBuilderDistinct.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/TestRawSqlColumnParsing.java b/src/test/java/io/ebean/TestRawSqlColumnParsing.java similarity index 97% rename from src/test/java/com/avaje/ebean/TestRawSqlColumnParsing.java rename to src/test/java/io/ebean/TestRawSqlColumnParsing.java index a7824456e..a04b93269 100644 --- a/src/test/java/com/avaje/ebean/TestRawSqlColumnParsing.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/TestUnsetLoadedProperties.java b/src/test/java/io/ebean/TestUnsetLoadedProperties.java similarity index 95% rename from src/test/java/com/avaje/ebean/TestUnsetLoadedProperties.java rename to src/test/java/io/ebean/TestUnsetLoadedProperties.java index 50d055848..12cf0a255 100644 --- a/src/test/java/com/avaje/ebean/TestUnsetLoadedProperties.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/TextExpressionListTest.java b/src/test/java/io/ebean/TextExpressionListTest.java similarity index 91% rename from src/test/java/com/avaje/ebean/TextExpressionListTest.java rename to src/test/java/io/ebean/TextExpressionListTest.java index 50d096b46..04d7d108c 100644 --- a/src/test/java/com/avaje/ebean/TextExpressionListTest.java +++ b/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 { diff --git a/src/test/java/com/avaje/ebean/TxScopeTest.java b/src/test/java/io/ebean/TxScopeTest.java similarity index 95% rename from src/test/java/com/avaje/ebean/TxScopeTest.java rename to src/test/java/io/ebean/TxScopeTest.java index 046c5b1e9..87c8317c0 100644 --- a/src/test/java/com/avaje/ebean/TxScopeTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/UpdateQueryTest.java b/src/test/java/io/ebean/UpdateQueryTest.java similarity index 97% rename from src/test/java/com/avaje/ebean/UpdateQueryTest.java rename to src/test/java/io/ebean/UpdateQueryTest.java index 74cb6f878..732e3239c 100644 --- a/src/test/java/com/avaje/ebean/UpdateQueryTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/bean/EntityBeanInterceptTest.java b/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java similarity index 88% rename from src/test/java/com/avaje/ebean/bean/EntityBeanInterceptTest.java rename to src/test/java/io/ebean/bean/EntityBeanInterceptTest.java index 16fb3b063..a85a90d57 100644 --- a/src/test/java/com/avaje/ebean/bean/EntityBeanInterceptTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/common/BeanListTest.java b/src/test/java/io/ebean/common/BeanListTest.java similarity index 98% rename from src/test/java/com/avaje/ebean/common/BeanListTest.java rename to src/test/java/io/ebean/common/BeanListTest.java index cd7225b3b..509a76aa1 100644 --- a/src/test/java/com/avaje/ebean/common/BeanListTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/common/BeanMapTest.java b/src/test/java/io/ebean/common/BeanMapTest.java similarity index 98% rename from src/test/java/com/avaje/ebean/common/BeanMapTest.java rename to src/test/java/io/ebean/common/BeanMapTest.java index c10195ccc..cd890988d 100644 --- a/src/test/java/com/avaje/ebean/common/BeanMapTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/common/BeanSetTest.java b/src/test/java/io/ebean/common/BeanSetTest.java similarity index 98% rename from src/test/java/com/avaje/ebean/common/BeanSetTest.java rename to src/test/java/io/ebean/common/BeanSetTest.java index 3f6432c8a..2a775dac7 100644 --- a/src/test/java/com/avaje/ebean/common/BeanSetTest.java +++ b/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); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/config/DbConstraintNamingTest.java b/src/test/java/io/ebean/config/DbConstraintNamingTest.java similarity index 98% rename from src/test/java/com/avaje/ebean/config/DbConstraintNamingTest.java rename to src/test/java/io/ebean/config/DbConstraintNamingTest.java index 88ecf927f..6edd88322 100644 --- a/src/test/java/com/avaje/ebean/config/DbConstraintNamingTest.java +++ b/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"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/config/DbMigrationConfigTest.java b/src/test/java/io/ebean/config/DbMigrationConfigTest.java similarity index 98% rename from src/test/java/com/avaje/ebean/config/DbMigrationConfigTest.java rename to src/test/java/io/ebean/config/DbMigrationConfigTest.java index d6b15e196..10cd3721a 100644 --- a/src/test/java/com/avaje/ebean/config/DbMigrationConfigTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/config/DocStoreConfigTest.java b/src/test/java/io/ebean/config/DocStoreConfigTest.java similarity index 96% rename from src/test/java/com/avaje/ebean/config/DocStoreConfigTest.java rename to src/test/java/io/ebean/config/DocStoreConfigTest.java index 033d78c68..454656344 100644 --- a/src/test/java/com/avaje/ebean/config/DocStoreConfigTest.java +++ b/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()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/config/MatchingNamingConventionTest.java b/src/test/java/io/ebean/config/MatchingNamingConventionTest.java similarity index 95% rename from src/test/java/com/avaje/ebean/config/MatchingNamingConventionTest.java rename to src/test/java/io/ebean/config/MatchingNamingConventionTest.java index 47ee2c814..7360dfd51 100644 --- a/src/test/java/com/avaje/ebean/config/MatchingNamingConventionTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/config/PropertiesWrapperTest.java b/src/test/java/io/ebean/config/PropertiesWrapperTest.java similarity index 98% rename from src/test/java/com/avaje/ebean/config/PropertiesWrapperTest.java rename to src/test/java/io/ebean/config/PropertiesWrapperTest.java index c1ad49dc6..c094b836b 100644 --- a/src/test/java/com/avaje/ebean/config/PropertiesWrapperTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/config/PropertyMapTest.java b/src/test/java/io/ebean/config/PropertyMapTest.java similarity index 92% rename from src/test/java/com/avaje/ebean/config/PropertyMapTest.java rename to src/test/java/io/ebean/config/PropertyMapTest.java index 78ff20143..e4d19a3ef 100644 --- a/src/test/java/com/avaje/ebean/config/PropertyMapTest.java +++ b/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}")); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java similarity index 97% rename from src/test/java/com/avaje/ebean/config/ServerConfigTest.java rename to src/test/java/io/ebean/config/ServerConfigTest.java index 63435d9f5..5e0e829b2 100644 --- a/src/test/java/com/avaje/ebean/config/ServerConfigTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/config/UnderscoreNamingConventionTest.java b/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java similarity index 95% rename from src/test/java/com/avaje/ebean/config/UnderscoreNamingConventionTest.java rename to src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java index add4ed97a..359ce4d40 100644 --- a/src/test/java/com/avaje/ebean/config/UnderscoreNamingConventionTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java b/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java similarity index 95% rename from src/test/java/com/avaje/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java rename to src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java index 413f48b6c..d4fb59cd9 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java b/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java similarity index 95% rename from src/test/java/com/avaje/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java rename to src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java index 66298d7c3..25f479643 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/DatabasePlatformTest.java b/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java similarity index 85% rename from src/test/java/com/avaje/ebean/config/dbplatform/DatabasePlatformTest.java rename to src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java index 687c0385e..5f7c11486 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/DatabasePlatformTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeLookupTest.java b/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java similarity index 97% rename from src/test/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeLookupTest.java rename to src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java index a20752ebc..5d71bc7e0 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeLookupTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeParserTest.java b/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java similarity index 97% rename from src/test/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeParserTest.java rename to src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java index 66e3d60c2..cf964d033 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeParserTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/DbTypeMapTest.java b/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java similarity index 92% rename from src/test/java/com/avaje/ebean/config/dbplatform/DbTypeMapTest.java rename to src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java index 9572820f9..7ea2e5e20 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/DbTypeMapTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/H2PlatformTest.java b/src/test/java/io/ebean/config/dbplatform/H2PlatformTest.java similarity index 82% rename from src/test/java/com/avaje/ebean/config/dbplatform/H2PlatformTest.java rename to src/test/java/io/ebean/config/dbplatform/H2PlatformTest.java index b0a15a4ca..d0a454912 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/H2PlatformTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/MySqlHistorySupportTest.java b/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java similarity index 87% rename from src/test/java/com/avaje/ebean/config/dbplatform/MySqlHistorySupportTest.java rename to src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java index cb92df997..e6413305e 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/MySqlHistorySupportTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/MySqlPlatformTest.java b/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java similarity index 83% rename from src/test/java/com/avaje/ebean/config/dbplatform/MySqlPlatformTest.java rename to src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java index 31c8ea0bb..5478859f0 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/MySqlPlatformTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/OraclePlatformTest.java b/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java similarity index 86% rename from src/test/java/com/avaje/ebean/config/dbplatform/OraclePlatformTest.java rename to src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java index 1508a5861..6fc6acd0a 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/OraclePlatformTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/PostgresHistorySupportTest.java b/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java similarity index 88% rename from src/test/java/com/avaje/ebean/config/dbplatform/PostgresHistorySupportTest.java rename to src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java index 37e70a8d0..2c851cbdc 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/PostgresHistorySupportTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/PostgresPlatformTest.java b/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java similarity index 86% rename from src/test/java/com/avaje/ebean/config/dbplatform/PostgresPlatformTest.java rename to src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java index de87db647..be5e41a39 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/PostgresPlatformTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/DbMigrationTest.java b/src/test/java/io/ebean/dbmigration/DbMigrationTest.java similarity index 88% rename from src/test/java/com/avaje/ebean/dbmigration/DbMigrationTest.java rename to src/test/java/io/ebean/dbmigration/DbMigrationTest.java index f453e06fc..e2e933e44 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/DbMigrationTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/BaseDdlHandlerTest.java b/src/test/java/io/ebean/dbmigration/ddlgeneration/BaseDdlHandlerTest.java similarity index 90% rename from src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/BaseDdlHandlerTest.java rename to src/test/java/io/ebean/dbmigration/ddlgeneration/BaseDdlHandlerTest.java index 517b92c50..0e5fe1ca8 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/BaseDdlHandlerTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/Helper.java b/src/test/java/io/ebean/dbmigration/ddlgeneration/Helper.java similarity index 84% rename from src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/Helper.java rename to src/test/java/io/ebean/dbmigration/ddlgeneration/Helper.java index acd195dcf..9918bce8e 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/Helper.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java b/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java similarity index 88% rename from src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java rename to src/test/java/io/ebean/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java index 89f13f2c9..aae2d6256 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java b/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java similarity index 88% rename from src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java rename to src/test/java/io/ebean/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java index 153f233d1..5f835695a 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java +++ b/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"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java b/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java similarity index 70% rename from src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java rename to src/test/java/io/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java index 174a8fe32..d1f0c6de3 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java b/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java similarity index 93% rename from src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java rename to src/test/java/io/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java index 6864e0383..424772504 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java +++ b/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]"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/IndexSetTest.java b/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/IndexSetTest.java similarity index 81% rename from src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/IndexSetTest.java rename to src/test/java/io/ebean/dbmigration/ddlgeneration/platform/IndexSetTest.java index 67e88740e..94e46aae6 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/IndexSetTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java similarity index 92% rename from src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java rename to src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java index 845f927a8..8cb72ad12 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java +++ b/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.*; diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java b/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java similarity index 75% rename from src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java rename to src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java index 7c77c3ccd..5462b62e5 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_dropUniqueConstraintTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java b/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java similarity index 92% rename from src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java rename to src/test/java/io/ebean/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java index 03c48b11e..b5e671624 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java b/src/test/java/io/ebean/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java similarity index 85% rename from src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java rename to src/test/java/io/ebean/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java index 712e660ee..c1cfc1f99 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java b/src/test/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java similarity index 91% rename from src/test/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java rename to src/test/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java index 5da4f95b3..171b5969c 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/EntryTest.java b/src/test/java/io/ebean/dbmigration/model/EntryTest.java similarity index 96% rename from src/test/java/com/avaje/ebean/dbmigration/model/EntryTest.java rename to src/test/java/io/ebean/dbmigration/model/EntryTest.java index 1ca6d29c8..9f9d9b4be 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/EntryTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/MColumnTest.java b/src/test/java/io/ebean/dbmigration/model/MColumnTest.java similarity index 98% rename from src/test/java/com/avaje/ebean/dbmigration/model/MColumnTest.java rename to src/test/java/io/ebean/dbmigration/model/MColumnTest.java index d722ffb17..856aeb80b 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/MColumnTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/MTableTest.java b/src/test/java/io/ebean/dbmigration/model/MTableTest.java similarity index 94% rename from src/test/java/com/avaje/ebean/dbmigration/model/MTableTest.java rename to src/test/java/io/ebean/dbmigration/model/MTableTest.java index 3686b8847..29a6e8543 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/MTableTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/MigrationVersionTest.java b/src/test/java/io/ebean/dbmigration/model/MigrationVersionTest.java similarity index 99% rename from src/test/java/com/avaje/ebean/dbmigration/model/MigrationVersionTest.java rename to src/test/java/io/ebean/dbmigration/model/MigrationVersionTest.java index 76f33f4cf..191eabacc 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/MigrationVersionTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/ModelContainerApplyTest.java b/src/test/java/io/ebean/dbmigration/model/ModelContainerApplyTest.java similarity index 75% rename from src/test/java/com/avaje/ebean/dbmigration/model/ModelContainerApplyTest.java rename to src/test/java/io/ebean/dbmigration/model/ModelContainerApplyTest.java index f82c563cc..b60ad6a16 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/ModelContainerApplyTest.java +++ b/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"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/ModelContainerTest.java b/src/test/java/io/ebean/dbmigration/model/ModelContainerTest.java similarity index 94% rename from src/test/java/com/avaje/ebean/dbmigration/model/ModelContainerTest.java rename to src/test/java/io/ebean/dbmigration/model/ModelContainerTest.java index d669edc95..ed6d43f49 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/ModelContainerTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/ModelDiffTest.java b/src/test/java/io/ebean/dbmigration/model/ModelDiffTest.java similarity index 94% rename from src/test/java/com/avaje/ebean/dbmigration/model/ModelDiffTest.java rename to src/test/java/io/ebean/dbmigration/model/ModelDiffTest.java index aa6638f7f..d66e3ec4a 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/ModelDiffTest.java +++ b/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"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/PendingDropsTest.java b/src/test/java/io/ebean/dbmigration/model/PendingDropsTest.java similarity index 97% rename from src/test/java/com/avaje/ebean/dbmigration/model/PendingDropsTest.java rename to src/test/java/io/ebean/dbmigration/model/PendingDropsTest.java index 235e258b4..aa1a79617 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/PendingDropsTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/build/ModelBuildBeanVisitorTest.java b/src/test/java/io/ebean/dbmigration/model/build/ModelBuildBeanVisitorTest.java similarity index 66% rename from src/test/java/com/avaje/ebean/dbmigration/model/build/ModelBuildBeanVisitorTest.java rename to src/test/java/io/ebean/dbmigration/model/build/ModelBuildBeanVisitorTest.java index 23c3c7f76..d3379c65b 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/build/ModelBuildBeanVisitorTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/build/ModelBuild_compoundKeyTest.java b/src/test/java/io/ebean/dbmigration/model/build/ModelBuild_compoundKeyTest.java similarity index 72% rename from src/test/java/com/avaje/ebean/dbmigration/model/build/ModelBuild_compoundKeyTest.java rename to src/test/java/io/ebean/dbmigration/model/build/ModelBuild_compoundKeyTest.java index 9e5452c67..5cd97130b 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/build/ModelBuild_compoundKeyTest.java +++ b/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); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/build/ModelBuild_explicitSequencesTest.java b/src/test/java/io/ebean/dbmigration/model/build/ModelBuild_explicitSequencesTest.java similarity index 77% rename from src/test/java/com/avaje/ebean/dbmigration/model/build/ModelBuild_explicitSequencesTest.java rename to src/test/java/io/ebean/dbmigration/model/build/ModelBuild_explicitSequencesTest.java index fa3fe09e7..c3833feec 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/build/ModelBuild_explicitSequencesTest.java +++ b/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 { } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/event/BeanFindControllerTest.java b/src/test/java/io/ebean/event/BeanFindControllerTest.java similarity index 89% rename from src/test/java/com/avaje/ebean/event/BeanFindControllerTest.java rename to src/test/java/io/ebean/event/BeanFindControllerTest.java index 3100b9e47..31753aaa0 100644 --- a/src/test/java/com/avaje/ebean/event/BeanFindControllerTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/event/BeanPersistControllerTest.java b/src/test/java/io/ebean/event/BeanPersistControllerTest.java similarity index 95% rename from src/test/java/com/avaje/ebean/event/BeanPersistControllerTest.java rename to src/test/java/io/ebean/event/BeanPersistControllerTest.java index c1a6b02f6..6af5decc2 100644 --- a/src/test/java/com/avaje/ebean/event/BeanPersistControllerTest.java +++ b/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 { } } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/event/BeanPostLoadTest.java b/src/test/java/io/ebean/event/BeanPostLoadTest.java similarity index 86% rename from src/test/java/com/avaje/ebean/event/BeanPostLoadTest.java rename to src/test/java/io/ebean/event/BeanPostLoadTest.java index 3acb39469..cff041423 100644 --- a/src/test/java/com/avaje/ebean/event/BeanPostLoadTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/event/readaudit/ReadAuditQueryPlanTest.java b/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java similarity index 94% rename from src/test/java/com/avaje/ebean/event/readaudit/ReadAuditQueryPlanTest.java rename to src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java index c3140fd93..bcb3fac30 100644 --- a/src/test/java/com/avaje/ebean/event/readaudit/ReadAuditQueryPlanTest.java +++ b/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")); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/json/EJsonTests.java b/src/test/java/io/ebean/json/EJsonTests.java similarity index 97% rename from src/test/java/com/avaje/ebean/json/EJsonTests.java rename to src/test/java/io/ebean/json/EJsonTests.java index d367c23e1..8006367c3 100644 --- a/src/test/java/com/avaje/ebean/json/EJsonTests.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/plugin/BeanTypeTest.java b/src/test/java/io/ebean/plugin/BeanTypeTest.java similarity index 90% rename from src/test/java/com/avaje/ebean/plugin/BeanTypeTest.java rename to src/test/java/io/ebean/plugin/BeanTypeTest.java index 730a04285..3794431d4 100644 --- a/src/test/java/com/avaje/ebean/plugin/BeanTypeTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/plugin/ExpressionPathTest.java b/src/test/java/io/ebean/plugin/ExpressionPathTest.java similarity index 94% rename from src/test/java/com/avaje/ebean/plugin/ExpressionPathTest.java rename to src/test/java/io/ebean/plugin/ExpressionPathTest.java index 7654fc6b9..050cdb3d4 100644 --- a/src/test/java/com/avaje/ebean/plugin/ExpressionPathTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/plugin/PropertyTest.java b/src/test/java/io/ebean/plugin/PropertyTest.java similarity index 88% rename from src/test/java/com/avaje/ebean/plugin/PropertyTest.java rename to src/test/java/io/ebean/plugin/PropertyTest.java index 80c49713d..953293d7e 100644 --- a/src/test/java/com/avaje/ebean/plugin/PropertyTest.java +++ b/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"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/plugin/SpiServerTest.java b/src/test/java/io/ebean/plugin/SpiServerTest.java similarity index 90% rename from src/test/java/com/avaje/ebean/plugin/SpiServerTest.java rename to src/test/java/io/ebean/plugin/SpiServerTest.java index f79f27cd9..9def37ee7 100644 --- a/src/test/java/com/avaje/ebean/plugin/SpiServerTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/server/type/MyDayOfWeek.java b/src/test/java/io/ebean/server/type/MyDayOfWeek.java similarity index 80% rename from src/test/java/com/avaje/ebean/server/type/MyDayOfWeek.java rename to src/test/java/io/ebean/server/type/MyDayOfWeek.java index b7710be00..6b5697733 100644 --- a/src/test/java/com/avaje/ebean/server/type/MyDayOfWeek.java +++ b/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. diff --git a/src/test/java/com/avaje/ebean/server/type/MyEnum.java b/src/test/java/io/ebean/server/type/MyEnum.java similarity index 82% rename from src/test/java/com/avaje/ebean/server/type/MyEnum.java rename to src/test/java/io/ebean/server/type/MyEnum.java index 50579a7cf..d72a853db 100644 --- a/src/test/java/com/avaje/ebean/server/type/MyEnum.java +++ b/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). diff --git a/src/test/java/com/avaje/ebean/server/type/TestTypeManager.java b/src/test/java/io/ebean/server/type/TestTypeManager.java similarity index 85% rename from src/test/java/com/avaje/ebean/server/type/TestTypeManager.java rename to src/test/java/io/ebean/server/type/TestTypeManager.java index 5cc5372e3..cace36412 100644 --- a/src/test/java/com/avaje/ebean/server/type/TestTypeManager.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/text/PathPropertiesTests.java b/src/test/java/io/ebean/text/PathPropertiesTests.java similarity index 98% rename from src/test/java/com/avaje/ebean/text/PathPropertiesTests.java rename to src/test/java/io/ebean/text/PathPropertiesTests.java index 81f94a5c7..6942cdbd0 100644 --- a/src/test/java/com/avaje/ebean/text/PathPropertiesTests.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/text/json/JsonBeanReaderTest.java b/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java similarity index 92% rename from src/test/java/com/avaje/ebean/text/json/JsonBeanReaderTest.java rename to src/test/java/io/ebean/text/json/JsonBeanReaderTest.java index b7dad8a27..2047a0b0b 100644 --- a/src/test/java/com/avaje/ebean/text/json/JsonBeanReaderTest.java +++ b/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); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/text/json/JsonContextTest.java b/src/test/java/io/ebean/text/json/JsonContextTest.java similarity index 95% rename from src/test/java/com/avaje/ebean/text/json/JsonContextTest.java rename to src/test/java/io/ebean/text/json/JsonContextTest.java index 738f42650..d6fd854b7 100644 --- a/src/test/java/com/avaje/ebean/text/json/JsonContextTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/text/json/JsonWriteOptionsTests.java b/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java similarity index 96% rename from src/test/java/com/avaje/ebean/text/json/JsonWriteOptionsTests.java rename to src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java index d8dfd8842..1714d0ddb 100644 --- a/src/test/java/com/avaje/ebean/text/json/JsonWriteOptionsTests.java +++ b/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; diff --git a/src/test/java/com/avaje/ebean/util/CamelCaseHelperTest.java b/src/test/java/io/ebean/util/CamelCaseHelperTest.java similarity index 97% rename from src/test/java/com/avaje/ebean/util/CamelCaseHelperTest.java rename to src/test/java/io/ebean/util/CamelCaseHelperTest.java index 77997fe58..b06ebc55c 100644 --- a/src/test/java/com/avaje/ebean/util/CamelCaseHelperTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebeaninternal/api/BindParamsTest.java b/src/test/java/io/ebeaninternal/api/BindParamsTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/api/BindParamsTest.java rename to src/test/java/io/ebeaninternal/api/BindParamsTest.java index 50ffe0680..0705324c1 100644 --- a/src/test/java/com/avaje/ebeaninternal/api/BindParamsTest.java +++ b/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()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/api/HashQueryPlanBuilderTest.java b/src/test/java/io/ebeaninternal/api/HashQueryPlanBuilderTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/api/HashQueryPlanBuilderTest.java rename to src/test/java/io/ebeaninternal/api/HashQueryPlanBuilderTest.java index 20473c058..9aa3bcf00 100644 --- a/src/test/java/com/avaje/ebeaninternal/api/HashQueryPlanBuilderTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebeaninternal/api/HashQueryPlanTest.java b/src/test/java/io/ebeaninternal/api/HashQueryPlanTest.java similarity index 97% rename from src/test/java/com/avaje/ebeaninternal/api/HashQueryPlanTest.java rename to src/test/java/io/ebeaninternal/api/HashQueryPlanTest.java index d49e9f6a7..9d4a6b244 100644 --- a/src/test/java/com/avaje/ebeaninternal/api/HashQueryPlanTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java similarity index 90% rename from src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java rename to src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index af816ab28..0f7a48d56 100644 --- a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java +++ b/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; diff --git a/src/test/java/com/avaje/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java b/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java rename to src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java index 6f119f017..b6e71e8e5 100644 --- a/src/test/java/com/avaje/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java +++ b/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"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlReaderTest.java b/src/test/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReaderTest.java similarity index 84% rename from src/test/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlReaderTest.java rename to src/test/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReaderTest.java index a8afbec00..7a7425b8b 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlReaderTest.java +++ b/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(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/cache/CacheBeanDataTest.java b/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java similarity index 84% rename from src/test/java/com/avaje/ebeaninternal/server/cache/CacheBeanDataTest.java rename to src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java index 93303dafe..6ac8e78b7 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/cache/CacheBeanDataTest.java +++ b/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; diff --git a/src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java b/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java similarity index 79% rename from src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java rename to src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java index 4c2da302e..3dc2077fb 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java +++ b/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java @@ -1,13 +1,13 @@ -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.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.transaction.DefaultPersistenceContext; -import com.avaje.tests.model.basic.Address; -import com.avaje.tests.model.basic.Car; -import com.avaje.tests.model.basic.Customer; +import io.ebean.BaseTestCase; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.transaction.DefaultPersistenceContext; +import org.tests.model.basic.Address; +import org.tests.model.basic.Car; +import org.tests.model.basic.Customer; import org.junit.Test; import java.sql.Date; diff --git a/src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java b/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java similarity index 90% rename from src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java rename to src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java index 44f40cf5c..2f541be17 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java +++ b/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.transaction.DefaultPersistenceContext; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; -import com.avaje.tests.model.basic.TBytesOnly; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.transaction.DefaultPersistenceContext; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.TBytesOnly; import org.junit.Test; import java.io.ByteArrayInputStream; diff --git a/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolderTest.java b/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java similarity index 88% rename from src/test/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolderTest.java rename to src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java index cc9a55188..42e90d062 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolderTest.java +++ b/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebean.cache.ServerCacheFactory; -import com.avaje.ebean.cache.ServerCacheOptions; -import com.avaje.ebean.cache.ServerCacheType; -import com.avaje.ebean.config.CurrentTenantProvider; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Customer; +import io.ebean.cache.ServerCache; +import io.ebean.cache.ServerCacheFactory; +import io.ebean.cache.ServerCacheOptions; +import io.ebean.cache.ServerCacheType; +import io.ebean.config.CurrentTenantProvider; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; import org.junit.Test; import java.util.function.Supplier; diff --git a/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java b/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java similarity index 82% rename from src/test/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java rename to src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java index f6e24611f..beefe1f47 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java +++ b/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebean.cache.ServerCacheOptions; -import com.avaje.ebean.cache.ServerCacheType; -import com.avaje.tests.model.basic.Article; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.Product; +import io.ebean.cache.ServerCacheOptions; +import io.ebean.cache.ServerCacheType; +import org.tests.model.basic.Article; +import org.tests.model.basic.Order; +import org.tests.model.basic.Product; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java similarity index 69% rename from src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java rename to src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java index fb82f658c..759c1c455 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java +++ b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebean.cache.ServerCacheFactory; -import com.avaje.ebean.cache.ServerCacheOptions; -import com.avaje.ebean.config.CurrentTenantProvider; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Customer; +import io.ebean.cache.ServerCacheFactory; +import io.ebean.cache.ServerCacheOptions; +import io.ebean.config.CurrentTenantProvider; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; @@ -25,24 +25,24 @@ public class DefaultServerCacheManagerTest { DefaultServerCache cache = cache(manager, Customer.class); - assertThat(cache.getName()).isEqualTo("com.avaje.tests.model.basic.Customer_B"); + assertThat(cache.getName()).isEqualTo("org.tests.model.basic.Customer_B"); DefaultServerCache cache1 = cache(manager, Customer.class); assertThat(cache1).isSameAs(cache); DefaultServerCache cache2 = cache(manager, Contact.class); assertThat(cache1).isNotSameAs(cache2); - assertThat(cache2.getName()).isEqualTo("com.avaje.tests.model.basic.Contact_B"); + assertThat(cache2.getName()).isEqualTo("org.tests.model.basic.Contact_B"); DefaultServerCache natKeyCache = (DefaultServerCache) manager.getNaturalKeyCache(Customer.class).get(); - assertThat(natKeyCache.getName()).isEqualTo("com.avaje.tests.model.basic.Customer_N"); + assertThat(natKeyCache.getName()).isEqualTo("org.tests.model.basic.Customer_N"); DefaultServerCache queryCache = (DefaultServerCache) manager.getQueryCache(Customer.class).get(); - assertThat(queryCache.getName()).isEqualTo("com.avaje.tests.model.basic.Customer_Q"); + assertThat(queryCache.getName()).isEqualTo("org.tests.model.basic.Customer_Q"); DefaultServerCache collCache = (DefaultServerCache) manager.getCollectionIdsCache(Customer.class, "contacts").get(); - assertThat(collCache.getName()).isEqualTo("com.avaje.tests.model.basic.Customer.contacts_C"); + assertThat(collCache.getName()).isEqualTo("org.tests.model.basic.Customer.contacts_C"); } private DefaultServerCache cache(DefaultServerCacheManager manager, Class beanType) { @@ -54,12 +54,12 @@ public class DefaultServerCacheManagerTest { tenantId = "ten1"; DefaultServerCache cache = cache(multiTenantManager, Customer.class); - assertThat(cache.getName()).isEqualTo("com.avaje.tests.model.basic.Customer_ten1_B"); + assertThat(cache.getName()).isEqualTo("org.tests.model.basic.Customer_ten1_B"); tenantId = "ten2"; DefaultServerCache cache1 = cache(multiTenantManager, Customer.class); assertThat(cache1).isNotSameAs(cache); - assertThat(cache1.getName()).isEqualTo("com.avaje.tests.model.basic.Customer_ten2_B"); + assertThat(cache1.getName()).isEqualTo("org.tests.model.basic.Customer_ten2_B"); } @Test diff --git a/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCacheTest.java b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCacheTest.java rename to src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java index 40f7ad26d..32e1063e0 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCacheTest.java +++ b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebean.cache.ServerCacheOptions; +import io.ebean.cache.ServerCacheOptions; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java similarity index 89% rename from src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java rename to src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java index 788125f93..2bb0b3774 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java +++ b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.cache; +package io.ebeaninternal.server.cache; -import com.avaje.ebean.cache.ServerCacheOptions; -import com.avaje.ebean.cache.ServerCacheStatistics; +import io.ebean.cache.ServerCacheOptions; +import io.ebean.cache.ServerCacheStatistics; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java b/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java similarity index 79% rename from src/test/java/com/avaje/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java rename to src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java index 36543c8c7..d4d714482 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java +++ b/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.changelog; +package io.ebeaninternal.server.changelog; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.event.changelog.BeanChange; -import com.avaje.ebean.event.changelog.ChangeSet; -import com.avaje.ebean.text.json.JsonContext; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.event.changelog.BeanChange; +import io.ebean.event.changelog.ChangeSet; +import io.ebean.text.json.JsonContext; import org.junit.Test; import java.io.StringWriter; @@ -38,4 +38,4 @@ public class ChangeJsonBuilderTest extends BaseTestCase { } } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java b/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java similarity index 69% rename from src/test/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java rename to src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java index 2030a8d6c..e13ff7615 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java +++ b/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.changelog; +package io.ebeaninternal.server.changelog; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.event.changelog.ChangeSet; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.event.changelog.ChangeSet; import org.junit.Test; public class DefaultChangeLogListenerTest extends BaseTestCase { @@ -23,4 +23,4 @@ public class DefaultChangeLogListenerTest extends BaseTestCase { changeLogListener.log(changeSet); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java b/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java similarity index 86% rename from src/test/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java rename to src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java index d71f60adc..3ebcebea4 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java +++ b/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.changelog; +package io.ebeaninternal.server.changelog; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.event.changelog.ChangeLogFilter; -import com.avaje.tests.inheritance.model.ProductConfiguration; -import com.avaje.tests.model.basic.Address; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Country; -import com.avaje.tests.model.basic.Customer; +import io.ebean.BaseTestCase; +import io.ebean.event.changelog.ChangeLogFilter; +import org.tests.inheritance.model.ProductConfiguration; +import org.tests.model.basic.Address; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Country; +import org.tests.model.basic.Customer; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/ebeaninternal/server/changelog/Helper.java b/src/test/java/io/ebeaninternal/server/changelog/Helper.java similarity index 86% rename from src/test/java/com/avaje/ebeaninternal/server/changelog/Helper.java rename to src/test/java/io/ebeaninternal/server/changelog/Helper.java index de37b64b9..de7b22b56 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/changelog/Helper.java +++ b/src/test/java/io/ebeaninternal/server/changelog/Helper.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.changelog; +package io.ebeaninternal.server.changelog; -import com.avaje.ebean.ValuePair; -import com.avaje.ebean.event.changelog.BeanChange; -import com.avaje.ebean.event.changelog.ChangeSet; -import com.avaje.ebean.event.changelog.ChangeType; -import com.avaje.ebean.event.changelog.TxnState; +import io.ebean.ValuePair; +import io.ebean.event.changelog.BeanChange; +import io.ebean.event.changelog.ChangeSet; +import io.ebean.event.changelog.ChangeType; +import io.ebean.event.changelog.TxnState; import org.jetbrains.annotations.NotNull; import java.sql.Timestamp; diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/BasicTypeConverterTest.java b/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java similarity index 94% rename from src/test/java/com/avaje/ebeaninternal/server/core/BasicTypeConverterTest.java rename to src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java index 442e0c65f..f4a77caf1 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/BasicTypeConverterTest.java +++ b/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java b/src/test/java/io/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java rename to src/test/java/io/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java index 801a02b72..bd9234318 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java +++ b/src/test/java/io/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java b/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java rename to src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java index 05cd0f840..463729a96 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java +++ b/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.Query; -import com.avaje.ebeaninternal.server.querydefn.DefaultOrmQuery; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; -import com.avaje.tests.model.basic.Order; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import io.ebean.Query; +import io.ebeaninternal.server.querydefn.DefaultOrmQuery; +import io.ebeaninternal.server.querydefn.OrmQueryDetail; +import org.tests.model.basic.Order; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/DefaultServer_getReferenceTest.java b/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java similarity index 82% rename from src/test/java/com/avaje/ebeaninternal/server/core/DefaultServer_getReferenceTest.java rename to src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java index 49ce761c1..4ee4d6012 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/DefaultServer_getReferenceTest.java +++ b/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Car; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; -import com.avaje.tests.model.basic.Vehicle; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Car; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.Vehicle; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -70,4 +70,4 @@ public class DefaultServer_getReferenceTest extends BaseTestCase { Ebean.delete(car); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/OrmQueryRequestTestHelper.java b/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java similarity index 71% rename from src/test/java/com/avaje/ebeaninternal/server/core/OrmQueryRequestTestHelper.java rename to src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java index 453084c6c..88d21ea38 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/OrmQueryRequestTestHelper.java +++ b/src/test/java/io/ebeaninternal/server/core/OrmQueryRequestTestHelper.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebeaninternal.api.SpiQuery; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebeaninternal.api.SpiQuery; public class OrmQueryRequestTestHelper { diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/PostgresCastTest.java b/src/test/java/io/ebeaninternal/server/core/PostgresCastTest.java similarity index 94% rename from src/test/java/com/avaje/ebeaninternal/server/core/PostgresCastTest.java rename to src/test/java/io/ebeaninternal/server/core/PostgresCastTest.java index ee657bc14..f8e43263f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/PostgresCastTest.java +++ b/src/test/java/io/ebeaninternal/server/core/PostgresCastTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; import org.junit.Test; @@ -25,4 +25,4 @@ public class PostgresCastTest { assertThat(PostgresCast.cast("", true)).isEqualTo(""); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpInsertSimple.java b/src/test/java/io/ebeaninternal/server/core/TestDiffHelpInsertSimple.java similarity index 74% rename from src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpInsertSimple.java rename to src/test/java/io/ebeaninternal/server/core/TestDiffHelpInsertSimple.java index 94b99b5b2..791425dee 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpInsertSimple.java +++ b/src/test/java/io/ebeaninternal/server/core/TestDiffHelpInsertSimple.java @@ -1,15 +1,15 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.ValuePair; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.Order.Status; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.ValuePair; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.Order.Status; import org.junit.Test; import java.sql.Date; diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpInsertWithEmbedded.java b/src/test/java/io/ebeaninternal/server/core/TestDiffHelpInsertWithEmbedded.java similarity index 85% rename from src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpInsertWithEmbedded.java rename to src/test/java/io/ebeaninternal/server/core/TestDiffHelpInsertWithEmbedded.java index 100bb015b..5f277dfec 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpInsertWithEmbedded.java +++ b/src/test/java/io/ebeaninternal/server/core/TestDiffHelpInsertWithEmbedded.java @@ -1,14 +1,14 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.ValuePair; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.tests.model.embedded.EMain; -import com.avaje.tests.model.embedded.Eembeddable; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.ValuePair; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.tests.model.embedded.EMain; +import org.tests.model.embedded.Eembeddable; import org.junit.Test; import java.util.Map; diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpSimple.java b/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java similarity index 91% rename from src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpSimple.java rename to src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java index c53139b1b..5ab4b56ee 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpSimple.java +++ b/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java @@ -1,14 +1,14 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.ValuePair; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.Order.Status; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.ValuePair; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.Order.Status; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java b/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java similarity index 91% rename from src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java rename to src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java index b7001ac1f..9162609d9 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java +++ b/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.core; +package io.ebeaninternal.server.core; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.ValuePair; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.tests.model.embedded.EMain; -import com.avaje.tests.model.embedded.Eembeddable; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.ValuePair; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.tests.model.embedded.EMain; +import org.tests.model.embedded.Eembeddable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/bootup/DistillPackagesTest.java b/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/server/core/bootup/DistillPackagesTest.java rename to src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java index 42d74df56..615d0433f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/bootup/DistillPackagesTest.java +++ b/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.core.bootup; +package io.ebeaninternal.server.core.bootup; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/bootup/ManifestReaderTest.java b/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java similarity index 92% rename from src/test/java/com/avaje/ebeaninternal/server/core/bootup/ManifestReaderTest.java rename to src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java index c8736a147..88e1ef05f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/bootup/ManifestReaderTest.java +++ b/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.core.bootup; +package io.ebeaninternal.server.core.bootup; import org.junit.Test; @@ -27,4 +27,4 @@ public class ManifestReaderTest { return ManifestReader.readManifests(classLoader, path); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanCascadeInfoTest.java b/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java similarity index 97% rename from src/test/java/com/avaje/ebeaninternal/server/deploy/BeanCascadeInfoTest.java rename to src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java index 67b6ed937..3a0527381 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanCascadeInfoTest.java +++ b/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorTest.java b/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java similarity index 87% rename from src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorTest.java rename to src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java index c1f42db66..795ffe6f4 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorTest.java +++ b/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.plugin.Property; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; +import io.ebean.BaseTestCase; +import io.ebean.bean.EntityBean; +import io.ebean.plugin.Property; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; import org.junit.Test; import java.util.Collection; diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java b/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java similarity index 84% rename from src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java rename to src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java index e78e0a813..b2ddea188 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java +++ b/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyAdapter; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyMapping; -import com.avaje.ebeanservice.docstore.api.mapping.DocumentMapping; -import com.avaje.tests.model.basic.Order; +import io.ebean.BaseTestCase; +import io.ebeanservice.docstore.api.mapping.DocPropertyAdapter; +import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; +import io.ebeanservice.docstore.api.mapping.DocumentMapping; +import org.tests.model.basic.Order; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java b/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java similarity index 88% rename from src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java rename to src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java index 7803284f1..04c3641d6 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java +++ b/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.EbeanServerFactory; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.event.AbstractBeanPersistListener; -import com.avaje.ebean.event.BeanPersistAdapter; -import com.avaje.ebean.event.BeanPersistListener; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.tests.model.basic.EBasic; +import io.ebean.EbeanServerFactory; +import io.ebean.config.ServerConfig; +import io.ebean.event.AbstractBeanPersistListener; +import io.ebean.event.BeanPersistAdapter; +import io.ebean.event.BeanPersistListener; +import io.ebeaninternal.api.SpiEbeanServer; +import org.tests.model.basic.EBasic; import org.junit.Test; import static org.junit.Assert.*; diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java b/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java similarity index 76% rename from src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java rename to src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java index 9a6e07b5f..4ea84d989 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java +++ b/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.EBasic; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebeaninternal.api.SpiEbeanServer; +import org.tests.model.basic.Customer; +import org.tests.model.basic.EBasic; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java similarity index 85% rename from src/test/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java rename to src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java index 273f11793..f7ffd16f5 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java +++ b/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.EntityBean; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java b/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java similarity index 92% rename from src/test/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java rename to src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java index b1251d555..5f4080163 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java +++ b/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/DetermineAggPathTest.java b/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/server/deploy/DetermineAggPathTest.java rename to src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java index bfe31d2a5..5330d3ab6 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/DetermineAggPathTest.java +++ b/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; import org.junit.Test; @@ -31,4 +31,4 @@ public class DetermineAggPathTest { assertThat(paths.paths).isEqualTo(new String[]{"person", "contacts"}); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/TableJoinColumnTest.java b/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java similarity index 92% rename from src/test/java/com/avaje/ebeaninternal/server/deploy/TableJoinColumnTest.java rename to src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java index 9c9f9679d..770aba39f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/TableJoinColumnTest.java +++ b/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; +import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -46,4 +46,4 @@ public class TableJoinColumnTest { assertThat(col).isEqualTo(col2); assertThat(col.hashCode()).isEqualTo(col2.hashCode()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/TableJoinTest.java b/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java similarity index 90% rename from src/test/java/com/avaje/ebeaninternal/server/deploy/TableJoinTest.java rename to src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java index 0b0758ca3..e29f58dd8 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/TableJoinTest.java +++ b/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoin; -import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; +import io.ebeaninternal.server.deploy.meta.DeployTableJoin; +import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -64,4 +64,4 @@ public class TableJoinTest { assertThat(join1.hashCode()).isNotEqualTo(join2.hashCode()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java b/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java similarity index 85% rename from src/test/java/com/avaje/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java rename to src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java index eda5c7373..bbd9325a9 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java +++ b/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java @@ -1,15 +1,15 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.composite.RCustomer; -import com.avaje.tests.model.composite.RCustomerKey; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebeaninternal.api.SpiEbeanServer; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.composite.RCustomer; +import org.tests.model.composite.RCustomerKey; import org.junit.Test; import java.sql.Timestamp; diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java b/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java similarity index 73% rename from src/test/java/com/avaje/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java rename to src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java index 00c602947..611c20fef 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java +++ b/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java @@ -1,13 +1,13 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Customer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.bean.BeanCollection; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebeaninternal.api.SpiEbeanServer; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java b/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java similarity index 75% rename from src/test/java/com/avaje/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java rename to src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java index 4b15049d9..012c13c39 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java +++ b/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.tests.model.mappedsuper.ASimpleBean; -import com.avaje.tests.model.mappedsuper.NotEnhancedMappedSuper; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.bean.EntityBean; +import org.tests.model.mappedsuper.ASimpleBean; +import org.tests.model.mappedsuper.NotEnhancedMappedSuper; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java b/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java similarity index 73% rename from src/test/java/com/avaje/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java rename to src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java index 5e62a1e3d..6493f1abd 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java +++ b/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.deploy; +package io.ebeaninternal.server.deploy; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.BeanState; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.Ebean; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java b/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java similarity index 92% rename from src/test/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java rename to src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java index e17e19d19..e91507a96 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java +++ b/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.config.ClassLoadConfig; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebean.config.ClassLoadConfig; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import org.junit.Test; import java.sql.Timestamp; @@ -65,4 +65,4 @@ public class InsertTimestampFactoryTest { assertTrue(value instanceof java.util.Date); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java b/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java similarity index 92% rename from src/test/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java rename to src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java index 5ff3b7741..800423fc8 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java +++ b/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.deploy.generatedproperty; +package io.ebeaninternal.server.deploy.generatedproperty; -import com.avaje.ebean.config.ClassLoadConfig; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebean.config.ClassLoadConfig; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import org.junit.Test; import java.sql.Timestamp; diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java similarity index 98% rename from src/test/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java index efd439120..c0c7b4f7f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; import org.jetbrains.annotations.NotNull; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/BaseExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java similarity index 56% rename from src/test/java/com/avaje/ebeaninternal/server/expression/BaseExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java index 5da0e4876..98c187307 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/BaseExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.tests.model.basic.Order; +import io.ebean.BaseTestCase; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.tests.model.basic.Order; public abstract class BaseExpressionTest extends BaseTestCase { @@ -10,4 +10,4 @@ public abstract class BaseExpressionTest extends BaseTestCase { BeanDescriptor desc = getBeanDescriptor(Order.class); return new DefaultExpressionRequest(desc); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/BetweenExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/server/expression/BetweenExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java index bec8bca44..6509e9d5b 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/BetweenExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpression; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; @@ -66,4 +66,4 @@ public class BetweenExpressionTest extends BaseExpressionTest { assertThat(exp0.isSameByBind(exp1)).isTrue(); assertThat(exp1.isSameByBind(exp0)).isTrue(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java index 1e08d89d5..48b2c1a28 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; import org.jetbrains.annotations.NotNull; import org.junit.Test; @@ -42,4 +42,4 @@ public class BetweenPropertyExpressionTest { assertThat(exp("a", "b", 10).isSameByBind(exp("a", "b", 20))).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java index 03d8c388e..197c92012 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; import org.junit.Test; @@ -47,4 +47,4 @@ public class CaseInsensitiveEqualExpressionTest { assertThat(exp("a", "10").isSameByBind(exp("b", "20"))).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java similarity index 81% rename from src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java index bf62014f3..1e99f074c 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java @@ -1,18 +1,18 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.LikeType; -import com.avaje.ebean.Query; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.tests.model.basic.Address; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.LikeType; +import io.ebean.Query; +import io.ebean.bean.EntityBean; +import io.ebean.event.BeanQueryRequest; +import io.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.tests.model.basic.Address; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java b/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java rename to src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java index c19788624..9244d229e 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.Expression; +import io.ebean.Expression; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; @@ -71,4 +71,4 @@ public class DefaultExpressionFactoryTest { Expression expression = factory.ieq("name", null); assertThat(expression).isInstanceOf(NoopExpression.class); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionListTest.java b/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionListTest.java rename to src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java index e0cce5945..0cc3423bf 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionListTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.ExpressionList; +import io.ebean.ExpressionList; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/ExistsQueryExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java similarity index 97% rename from src/test/java/com/avaje/ebeaninternal/server/expression/ExistsQueryExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java index 9144703ab..8a2fe2290 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/ExistsQueryExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/IdExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java similarity index 93% rename from src/test/java/com/avaje/ebeaninternal/server/expression/IdExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java index e4836e0b9..097051a9f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/IdExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; import org.jetbrains.annotations.NotNull; @@ -38,4 +38,4 @@ public class IdExpressionTest { assertThat(exp(10).isSameByBind(exp(20))).isFalse(); assertThat(exp(10).isSameByBind(exp("junk"))).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/IdInExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/server/expression/IdInExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java index 9d4793684..cefa12f4d 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/IdInExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; import org.jetbrains.annotations.NotNull; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/InExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java similarity index 97% rename from src/test/java/com/avaje/ebeaninternal/server/expression/InExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java index a4b0df3cb..7f8c24777 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/InExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.HashQueryPlanBuilder; +import io.ebeaninternal.api.HashQueryPlanBuilder; import org.jetbrains.annotations.NotNull; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/InQueryExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java similarity index 97% rename from src/test/java/com/avaje/ebeaninternal/server/expression/InQueryExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java index 168f0a5b2..9aa91ce45 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/InQueryExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; import org.jetbrains.annotations.NotNull; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java b/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java similarity index 90% rename from src/test/java/com/avaje/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java rename to src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java index 68998ee0c..f0c22fdd6 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/JsonPathExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java similarity index 97% rename from src/test/java/com/avaje/ebeaninternal/server/expression/JsonPathExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java index 5dda9c091..c7f2aa1c0 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/JsonPathExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; import org.jetbrains.annotations.NotNull; import org.junit.Test; @@ -78,4 +78,4 @@ public class JsonPathExpressionTest { assertThat(exp("a", "path", Op.EQ, 10).isSameByBind(exp("a", "path", Op.LT, null))).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/JunctionExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java similarity index 91% rename from src/test/java/com/avaje/ebeaninternal/server/expression/JunctionExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java index 70342fc2a..b1c38c5c6 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/JunctionExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.Expr; -import com.avaje.ebean.Expression; -import com.avaje.ebean.Junction; +import io.ebean.Expr; +import io.ebean.Expression; +import io.ebean.Junction; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/LikeExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/server/expression/LikeExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java index 9c21352b4..bc0718ec0 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/LikeExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.LikeType; +import io.ebean.LikeType; import org.jetbrains.annotations.NotNull; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/LogicExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/server/expression/LogicExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java index a126f341c..648a3fcfd 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/LogicExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.Expr; -import com.avaje.ebean.Expression; -import com.avaje.tests.model.basic.Order; +import io.ebean.Expr; +import io.ebean.Expression; +import org.tests.model.basic.Order; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/NoopExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java similarity index 88% rename from src/test/java/com/avaje/ebeaninternal/server/expression/NoopExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java index 7e9c896a3..32f8d58bc 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/NoopExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Customer; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/NotExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java similarity index 89% rename from src/test/java/com/avaje/ebeaninternal/server/expression/NotExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java index 638f74aaa..a1cf6ed85 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/NotExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.Expression; +import io.ebean.Expression; import org.junit.Test; -import static com.avaje.ebean.Expr.eq; +import static io.ebean.Expr.eq; import static org.assertj.core.api.StrictAssertions.assertThat; public class NotExpressionTest { diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/NullExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java similarity index 92% rename from src/test/java/com/avaje/ebeaninternal/server/expression/NullExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java index 45bd468dc..2ad676ad5 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/NullExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.ManyWhereJoins; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.tests.model.basic.Order; +import io.ebeaninternal.api.ManyWhereJoins; +import io.ebeaninternal.api.SpiExpression; +import org.tests.model.basic.Order; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/PrepareDocNestedTest.java b/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/server/expression/PrepareDocNestedTest.java rename to src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java index 9449a0d86..2ecec367e 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/PrepareDocNestedTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.ExpressionList; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.tests.model.basic.Order; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.ExpressionList; +import io.ebeaninternal.api.SpiExpression; +import org.tests.model.basic.Order; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/RawExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/server/expression/RawExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java index f5382dc6d..c45e54125 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/RawExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; import org.jetbrains.annotations.NotNull; import org.junit.Test; @@ -47,4 +47,4 @@ public class RawExpressionTest { assertThat(exp("a", 10, 20).isSameByBind(exp("a", 10))).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/SameTest.java b/src/test/java/io/ebeaninternal/server/expression/SameTest.java similarity index 93% rename from src/test/java/com/avaje/ebeaninternal/server/expression/SameTest.java rename to src/test/java/io/ebeaninternal/server/expression/SameTest.java index 35c9afed0..f5cd05852 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/SameTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/SameTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; import org.junit.Test; @@ -26,4 +26,4 @@ public class SameTest { assertThat(Same.sameByValue("a", null)).isFalse(); assertThat(Same.sameByValue(null, "a")).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/SimpleExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/server/expression/SimpleExpressionTest.java rename to src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java index b6fd1be47..fe3cf770b 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/SimpleExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; import org.jetbrains.annotations.NotNull; @@ -55,4 +55,4 @@ public class SimpleExpressionTest extends BaseExpressionTest { assertThat(exp("a", Op.EQ, 10).isSameByBind(exp("a", Op.EQ, "junk"))).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/TDSpiExpressionRequest.java b/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java similarity index 80% rename from src/test/java/com/avaje/ebeaninternal/server/expression/TDSpiExpressionRequest.java rename to src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java index 52aa9c185..97a59617d 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/TDSpiExpressionRequest.java +++ b/src/test/java/io/ebeaninternal/server/expression/TDSpiExpressionRequest.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.expression; +package io.ebeaninternal.server.expression; -import com.avaje.ebeaninternal.api.SpiExpressionRequest; -import com.avaje.ebeaninternal.server.core.DbExpressionHandler; -import com.avaje.ebeaninternal.server.core.SpiOrmQueryRequest; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.api.SpiExpressionRequest; +import io.ebeaninternal.server.core.DbExpressionHandler; +import io.ebeaninternal.server.core.SpiOrmQueryRequest; +import io.ebeaninternal.server.deploy.BeanDescriptor; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/com/avaje/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java similarity index 97% rename from src/test/java/com/avaje/ebeaninternal/server/grammer/EqlParserTest.java rename to src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java index fd75611e6..5d79d6063 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/grammer/EqlParserTest.java +++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.grammer; +package io.ebeaninternal.server.grammer; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebeaninternal.api.SpiQuery; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.Arrays; diff --git a/src/test/java/com/avaje/ebeaninternal/server/grammer/ParseFetchConfigTest.java b/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java similarity index 92% rename from src/test/java/com/avaje/ebeaninternal/server/grammer/ParseFetchConfigTest.java rename to src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java index 123f13d1b..8e40bcc34 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/grammer/ParseFetchConfigTest.java +++ b/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.grammer; +package io.ebeaninternal.server.grammer; -import com.avaje.ebean.FetchConfig; +import io.ebean.FetchConfig; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -43,4 +43,4 @@ public class ParseFetchConfigTest { FetchConfig lazy = ParseFetchConfig.parse("query(50)"); assertThat(lazy.getQueryBatchSize()).isEqualTo(50); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/lib/ShutdownManagerTest.java b/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java similarity index 81% rename from src/test/java/com/avaje/ebeaninternal/server/lib/ShutdownManagerTest.java rename to src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java index 30b7a283d..429e660cd 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/lib/ShutdownManagerTest.java +++ b/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.lib; +package io.ebeaninternal.server.lib; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java b/src/test/java/io/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java similarity index 82% rename from src/test/java/com/avaje/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java rename to src/test/java/io/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java index ca247f553..dbdd0de5f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java +++ b/src/test/java/io/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.lib.sql; +package io.ebeaninternal.server.lib.sql; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebeaninternal.server.core.DefaultBackgroundExecutor; -import com.avaje.tests.model.basic.Customer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebeaninternal.server.core.DefaultBackgroundExecutor; +import org.tests.model.basic.Customer; import org.junit.Test; public class TestDataSourceMaxWithEntity extends BaseTestCase { diff --git a/src/test/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContextTest.java b/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java similarity index 91% rename from src/test/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContextTest.java rename to src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java index e3531aa19..bad3b37a2 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContextTest.java +++ b/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.loadcontext; +package io.ebeaninternal.server.loadcontext; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.Query; -import com.avaje.ebeaninternal.server.core.OrmQueryRequest; -import com.avaje.ebeaninternal.server.core.OrmQueryRequestTestHelper; -import com.avaje.tests.model.basic.Order; +import io.ebean.BaseTestCase; +import io.ebean.FetchConfig; +import io.ebean.Query; +import io.ebeaninternal.server.core.OrmQueryRequest; +import io.ebeaninternal.server.core.OrmQueryRequestTestHelper; +import org.tests.model.basic.Order; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolderTest.java b/src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java similarity index 70% rename from src/test/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolderTest.java rename to src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java index c1452e1b8..4af908aea 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolderTest.java +++ b/src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.persist; +package io.ebeaninternal.server.persist; -import com.avaje.ebeaninternal.api.TDSpiEbeanServer; -import com.avaje.ebeaninternal.server.core.PersistRequest; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanManager; -import com.avaje.tests.model.basic.Customer; +import io.ebeaninternal.api.TDSpiEbeanServer; +import io.ebeaninternal.server.core.PersistRequest; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanManager; +import org.tests.model.basic.Customer; import org.junit.Test; import org.mockito.Mockito; @@ -37,4 +37,4 @@ public class BatchedBeanHolderTest { assertEquals(0, size); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/query/DefaultSqlRowTest.java b/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java similarity index 91% rename from src/test/java/com/avaje/ebeaninternal/server/query/DefaultSqlRowTest.java rename to src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java index 45848dbf2..9888fa842 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/query/DefaultSqlRowTest.java +++ b/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; import org.junit.Test; @@ -19,4 +19,4 @@ public class DefaultSqlRowTest { row.remove("foo"); assertThat(row.isEmpty()).isTrue(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedListTest.java b/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java similarity index 91% rename from src/test/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedListTest.java rename to src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java index 23165829e..f2f5d4a53 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedListTest.java +++ b/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.tests.model.basic.Order; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebeaninternal.api.SpiQuery; +import org.tests.model.basic.Order; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -102,4 +102,4 @@ public class LimitOffsetPagedListTest { return (SpiQuery) server.find(Order.class); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/query/OrderVersionDescTest.java b/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/server/query/OrderVersionDescTest.java rename to src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java index 391a657c2..00bdc25ea 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/query/OrderVersionDescTest.java +++ b/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.Version; +import io.ebean.Version; import org.junit.Test; import java.sql.Timestamp; diff --git a/src/test/java/com/avaje/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java b/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java similarity index 97% rename from src/test/java/com/avaje/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java rename to src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java index 2d8c10083..88dc9a99f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java +++ b/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; import org.jetbrains.annotations.NotNull; @@ -58,4 +58,4 @@ public class RawSqlQueryPlanKeyTest { return new RawSqlQueryPlanKey(sql, rawSql, rowNumberIncluded, logWhereSql); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/query/SplitNameTest.java b/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java similarity index 97% rename from src/test/java/com/avaje/ebeaninternal/server/query/SplitNameTest.java rename to src/test/java/io/ebeaninternal/server/query/SplitNameTest.java index b46751cda..93603ea72 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/query/SplitNameTest.java +++ b/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java b/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java similarity index 86% rename from src/test/java/com/avaje/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java rename to src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java index a294e06fb..d95e46fca 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java +++ b/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java @@ -1,15 +1,15 @@ -package com.avaje.ebeaninternal.server.query; +package io.ebeaninternal.server.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.FutureIds; -import com.avaje.ebean.FutureList; -import com.avaje.ebean.FutureRowCount; -import com.avaje.ebean.Query; -import com.avaje.ebean.Transaction; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.FutureIds; +import io.ebean.FutureList; +import io.ebean.FutureRowCount; +import io.ebean.Query; +import io.ebean.Transaction; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java b/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java rename to src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java index b6a24fa40..435586b3c 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java +++ b/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Order; +import io.ebean.Ebean; +import org.tests.model.basic.Order; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java similarity index 97% rename from src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java rename to src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java index 1d215347c..6f27685a2 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java +++ b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; -import com.avaje.ebean.BaseTestCase; +import io.ebean.BaseTestCase; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailTest.java b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java similarity index 97% rename from src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailTest.java rename to src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java index 285a9a5f7..ed9ed004f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailTest.java +++ b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.tests.model.basic.Order; +import io.ebean.BaseTestCase; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.tests.model.basic.Order; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java similarity index 97% rename from src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java rename to src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java index 611f9e55b..69ae03464 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java +++ b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java @@ -1,15 +1,15 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; -import com.avaje.ebean.OrderBy; -import com.avaje.ebeaninternal.api.SpiExpression; -import com.avaje.ebeaninternal.api.SpiExpressionList; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.deploy.TableJoin; -import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoin; -import com.avaje.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; -import com.avaje.ebeaninternal.server.expression.BaseExpressionTest; -import com.avaje.tests.model.basic.Customer; +import io.ebean.OrderBy; +import io.ebeaninternal.api.SpiExpression; +import io.ebeaninternal.api.SpiExpressionList; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.deploy.TableJoin; +import io.ebeaninternal.server.deploy.meta.DeployTableJoin; +import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; +import io.ebeaninternal.server.expression.BaseExpressionTest; +import org.tests.model.basic.Customer; import org.jetbrains.annotations.NotNull; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java similarity index 98% rename from src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java rename to src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java index fbc800db3..f15cffc38 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java +++ b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; import org.junit.Test; @@ -128,4 +128,4 @@ public class OrmQueryPropertiesParserTest { assertThat(res.fetchConfig.getQueryBatchSize()).isEqualTo(-1); assertThat(res.included).isNull(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java similarity index 97% rename from src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java rename to src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java index 2731fc18d..c80899781 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java +++ b/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.querydefn; +package io.ebeaninternal.server.querydefn; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/rawsql/TestRawSqlParsing.java b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java similarity index 78% rename from src/test/java/com/avaje/ebeaninternal/server/rawsql/TestRawSqlParsing.java rename to src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java index 361b99164..814aa66f9 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/rawsql/TestRawSqlParsing.java +++ b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.rawsql; +package io.ebeaninternal.server.rawsql; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSql.Sql; -import com.avaje.ebean.RawSqlBuilder; +import io.ebean.RawSql; +import io.ebean.RawSql.Sql; +import io.ebean.RawSqlBuilder; import junit.framework.TestCase; public class TestRawSqlParsing extends TestCase { diff --git a/src/test/java/com/avaje/ebeaninternal/server/text/json/TestJsonWriteVisitor.java b/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java similarity index 84% rename from src/test/java/com/avaje/ebeaninternal/server/text/json/TestJsonWriteVisitor.java rename to src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java index 2d9288e4d..bc065946a 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/text/json/TestJsonWriteVisitor.java +++ b/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java @@ -1,16 +1,16 @@ -package com.avaje.ebeaninternal.server.text.json; +package io.ebeaninternal.server.text.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.ebean.text.json.JsonWriteBeanVisitor; -import com.avaje.ebean.text.json.JsonWriteOptions; -import com.avaje.ebean.text.json.JsonWriter; -import com.avaje.tests.model.basic.Address; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Country; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.json.JsonContext; +import io.ebean.text.json.JsonWriteBeanVisitor; +import io.ebean.text.json.JsonWriteOptions; +import io.ebean.text.json.JsonWriter; +import org.tests.model.basic.Address; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Country; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.math.BigDecimal; diff --git a/src/test/java/com/avaje/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java b/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java similarity index 80% rename from src/test/java/com/avaje/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java rename to src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java index 5faec58e6..b6a623109 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java +++ b/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java @@ -1,14 +1,14 @@ -package com.avaje.ebeaninternal.server.text.json; +package io.ebeaninternal.server.text.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.ebean.text.json.JsonReadBeanVisitor; -import com.avaje.ebean.text.json.JsonReadOptions; -import com.avaje.tests.model.basic.Address; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.json.JsonContext; +import io.ebean.text.json.JsonReadBeanVisitor; +import io.ebean.text.json.JsonReadOptions; +import org.tests.model.basic.Address; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.io.StringReader; diff --git a/src/test/java/com/avaje/ebeaninternal/server/text/json/WriteJsonDirtyTest.java b/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java similarity index 82% rename from src/test/java/com/avaje/ebeaninternal/server/text/json/WriteJsonDirtyTest.java rename to src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java index 819fb62db..90804cc71 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/text/json/WriteJsonDirtyTest.java +++ b/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java @@ -1,11 +1,11 @@ -package com.avaje.ebeaninternal.server.text.json; +package io.ebeaninternal.server.text.json; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.Ebean; +import io.ebean.bean.EntityBean; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/text/json/WriteJsonTest.java b/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java similarity index 92% rename from src/test/java/com/avaje/ebeaninternal/server/text/json/WriteJsonTest.java rename to src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java index e347b2533..284d30d75 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/text/json/WriteJsonTest.java +++ b/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.text.json; +package io.ebeaninternal.server.text.json; -import com.avaje.ebean.FetchPath; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebean.text.PathProperties; +import io.ebean.FetchPath; +import io.ebean.config.JsonConfig; +import io.ebean.text.PathProperties; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java b/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java similarity index 93% rename from src/test/java/com/avaje/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java rename to src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java index dd2a13ff3..0e450a846 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java +++ b/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java @@ -1,10 +1,10 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebean.bean.PersistenceContextUtil; -import com.avaje.tests.model.basic.Car; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Vehicle; +import io.ebean.bean.PersistenceContext; +import io.ebean.bean.PersistenceContextUtil; +import org.tests.model.basic.Car; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Vehicle; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; @@ -159,4 +159,4 @@ public class DefaultPersistenceContextTest { pc.clear(Customer.class, 43); assertThat(pc.size(Customer.class)).isEqualTo(0); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/transaction/JdbcTransactionTest.java b/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java similarity index 85% rename from src/test/java/com/avaje/ebeaninternal/server/transaction/JdbcTransactionTest.java rename to src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java index 7b6b35a6b..313cfc0a1 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/transaction/JdbcTransactionTest.java +++ b/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java @@ -1,12 +1,12 @@ -package com.avaje.ebeaninternal.server.transaction; +package io.ebeaninternal.server.transaction; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebean.cache.ServerCacheManager; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.EBasic; +import io.ebean.Ebean; +import io.ebean.Transaction; +import io.ebean.cache.ServerCache; +import io.ebean.cache.ServerCacheManager; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; +import org.tests.model.basic.EBasic; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ConvertInetAddressTest.java b/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/server/type/ConvertInetAddressTest.java rename to src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java index 1cf8a89cc..96243a427 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ConvertInetAddressTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ConvertInetAddressesTest.java b/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/server/type/ConvertInetAddressesTest.java rename to src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java index 972a5ad51..0c78eb178 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ConvertInetAddressesTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.junit.Test; @@ -43,4 +43,4 @@ public class ConvertInetAddressesTest { assertEquals(loopbackAddress, inetAddress); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/DateTimeJsonParserTest.java b/src/test/java/io/ebeaninternal/server/type/DateTimeJsonParserTest.java similarity index 97% rename from src/test/java/com/avaje/ebeaninternal/server/type/DateTimeJsonParserTest.java rename to src/test/java/io/ebeaninternal/server/type/DateTimeJsonParserTest.java index f158bc681..a82e8a417 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/DateTimeJsonParserTest.java +++ b/src/test/java/io/ebeaninternal/server/type/DateTimeJsonParserTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.junit.Test; @@ -68,4 +68,4 @@ public class DateTimeJsonParserTest { Timestamp timestamp = parser.parse(input); return parser.format(timestamp); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/DecimalUtilsTest.java b/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/server/type/DecimalUtilsTest.java rename to src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java index 3ac3dca3b..d90cfb26e 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/DecimalUtilsTest.java +++ b/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.junit.Test; @@ -41,4 +41,4 @@ public class DecimalUtilsTest { assertEquals("PT5M23.0015S", duration1.toString()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/DefaultTypeFactoryTest.java b/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java similarity index 93% rename from src/test/java/com/avaje/ebeaninternal/server/type/DefaultTypeFactoryTest.java rename to src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java index 323e644ef..471f6ce7e 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/DefaultTypeFactoryTest.java +++ b/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/DefaultTypeManagerTest.java b/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java similarity index 80% rename from src/test/java/com/avaje/ebeaninternal/server/type/DefaultTypeManagerTest.java rename to src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java index 55d2fb231..635f64d04 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/DefaultTypeManagerTest.java +++ b/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java @@ -1,8 +1,8 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.dbplatform.postgres.PostgresPlatform; -import com.avaje.ebeaninternal.server.core.bootup.BootupClasses; +import io.ebean.config.ServerConfig; +import io.ebean.config.dbplatform.postgres.PostgresPlatform; +import io.ebeaninternal.server.core.bootup.BootupClasses; import org.junit.Test; import static org.junit.Assert.assertFalse; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/JsonTester.java b/src/test/java/io/ebeaninternal/server/type/JsonTester.java similarity index 89% rename from src/test/java/com/avaje/ebeaninternal/server/type/JsonTester.java rename to src/test/java/io/ebeaninternal/server/type/JsonTester.java index 5fd9d493b..83257d69c 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/JsonTester.java +++ b/src/test/java/io/ebeaninternal/server/type/JsonTester.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebeaninternal.server.text.json.WriteJson; +import io.ebean.config.JsonConfig; +import io.ebeaninternal.server.text.json.WriteJson; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareListTest.java b/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java similarity index 99% rename from src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareListTest.java rename to src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java index 2e6a2dc6d..76aa28b69 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareListTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareMapTest.java b/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java similarity index 98% rename from src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareMapTest.java rename to src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java index b6fb8d94a..622a2eca1 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareMapTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeArrayListTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java similarity index 89% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeArrayListTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java index 22398359e..698d45531 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeArrayListTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.junit.Test; @@ -17,4 +17,4 @@ public class ScalarTypeArrayListTest { ScalarType scalarType = ScalarTypeArrayList.factory().typeFor(Long.class); scalarType.read(mock); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeBooleanTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java similarity index 82% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeBooleanTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java index 04c4ed125..2347e913c 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeBooleanTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.tests.model.basic.TOne; +import io.ebean.Ebean; +import io.ebean.text.json.JsonContext; +import org.tests.model.basic.TOne; import org.junit.Test; import static org.junit.Assert.*; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java similarity index 91% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDateTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java index 55f86c213..14b0e8b4d 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDateTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java index 8b75ba954..d31050174 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; +import io.ebean.text.TextException; import org.junit.Test; import java.io.ByteArrayInputStream; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java index 6ae6d1a13..82f60a2be 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; +import io.ebean.text.TextException; import org.junit.Test; import java.io.ByteArrayInputStream; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstantTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java similarity index 97% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstantTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java index 926cc4e1c..f358a131f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstantTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; +import io.ebean.config.JsonConfig; import org.junit.Test; import java.io.ByteArrayInputStream; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java index 83e8f85a9..d303c9552 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.joda.time.LocalDate; import org.junit.Test; @@ -53,4 +53,4 @@ public class ScalarTypeJodaLocalDateTest { assertThat(beanType).isEqualTo(localDate); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java similarity index 92% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java index 9febb2a31..3c8205602 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; +import io.ebean.config.JsonConfig; import org.joda.time.DateTimeZone; import org.joda.time.LocalDateTime; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java similarity index 92% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java index 73446a8e7..64d3d93aa 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java @@ -1,7 +1,7 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.TJodaEntity; +import io.ebean.Ebean; +import org.tests.model.basic.TJodaEntity; import org.joda.time.DateTimeZone; import org.joda.time.LocalDateTime; import org.joda.time.LocalTime; @@ -60,4 +60,4 @@ public class ScalarTypeJodaLocalTimeTest { assertEquals(bean1.getLocalTime(), now); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java index 8ca29d809..92386ba4a 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java index 3e6c8bf9d..120f20ff4 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; +import io.ebean.config.JsonConfig; import org.junit.Test; import java.sql.Timestamp; @@ -87,4 +87,4 @@ public class ScalarTypeLocalDateTimeTest { jsonTester = new JsonTester(typeIso); jsonTester.test(now); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java index c4b1dbeb9..ef2db5270 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; +import io.ebean.text.TextException; import org.junit.Test; import java.io.ByteArrayInputStream; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java index c7b08cc86..b2f42946a 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; +import io.ebean.text.TextException; import org.junit.Test; import java.io.ByteArrayInputStream; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDayTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java similarity index 97% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDayTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java index 18b3f6d87..83f28acd3 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDayTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java index 615cde86e..1f2ae9ebf 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; +import io.ebean.config.JsonConfig; import org.junit.Test; import java.sql.Timestamp; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java similarity index 94% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java index 12aa1b0fe..a4dbe0bcc 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.junit.Test; @@ -36,4 +36,4 @@ public class ScalarTypeOffsetTimeTest { assertEquals(now, offsetTime); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePathTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePathTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java index 25a0c04bb..549004463 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePathTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java similarity index 98% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java index 21209cda6..4a055adc6 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java index 81c807fc7..d449a2a1a 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.junit.Test; @@ -51,4 +51,4 @@ public class ScalarTypeYearMonthDateTest { assertEquals(date, val1); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java similarity index 96% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java index 7552dd21c..72732eea6 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.text.TextException; +import io.ebean.text.TextException; import org.junit.Test; import java.io.ByteArrayInputStream; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneIdTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java similarity index 94% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneIdTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java index daddf28d7..a48ed0427 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneIdTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java index d233a7418..65b544f5f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.junit.Test; @@ -43,4 +43,4 @@ public class ScalarTypeZoneOffsetTest { assertEquals(offset, val1); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java similarity index 95% rename from src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java rename to src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java index 13cdb9c8a..b5494963b 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.config.JsonConfig; +import io.ebean.config.JsonConfig; import org.junit.Test; import java.sql.Timestamp; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/TestBinaryUUID.java b/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java similarity index 87% rename from src/test/java/com/avaje/ebeaninternal/server/type/TestBinaryUUID.java rename to src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java index 25a8e9917..986f5f829 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/TestBinaryUUID.java +++ b/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.SqlRow; -import com.avaje.tests.model.basic.UUOne; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.SqlRow; +import org.tests.model.basic.UUOne; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/TestEnumToBeanType.java b/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java similarity index 79% rename from src/test/java/com/avaje/ebeaninternal/server/type/TestEnumToBeanType.java rename to src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java index 39515a80f..366adcc58 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/TestEnumToBeanType.java +++ b/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java @@ -1,9 +1,9 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; -import com.avaje.ebeaninternal.server.type.ScalarTypeEnumStandard.OrdinalEnum; -import com.avaje.ebeaninternal.server.type.ScalarTypeEnumStandard.StringEnum; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; +import io.ebeaninternal.server.type.ScalarTypeEnumStandard.OrdinalEnum; +import io.ebeaninternal.server.type.ScalarTypeEnumStandard.StringEnum; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java b/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java similarity index 90% rename from src/test/java/com/avaje/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java rename to src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java index 9bc8b3631..29640283e 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java +++ b/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.type; +package io.ebeaninternal.server.type; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/server/util/ArrayStackTest.java b/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java similarity index 98% rename from src/test/java/com/avaje/ebeaninternal/server/util/ArrayStackTest.java rename to src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java index 9ca1e943a..2b9661727 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/util/ArrayStackTest.java +++ b/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.util; +package io.ebeaninternal.server.util; import org.junit.Test; @@ -100,4 +100,4 @@ public class ArrayStackTest { assertThat(stack.contains("1")).isTrue(); assertThat(stack.contains("2")).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/util/BindParamsParserTest.java b/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java similarity index 91% rename from src/test/java/com/avaje/ebeaninternal/server/util/BindParamsParserTest.java rename to src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java index 522ca81b4..6b57334f4 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/util/BindParamsParserTest.java +++ b/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.server.util; +package io.ebeaninternal.server.util; -import com.avaje.ebeaninternal.api.BindParams; +import io.ebeaninternal.api.BindParams; import org.junit.Test; import java.util.Arrays; @@ -32,4 +32,4 @@ public class BindParamsParserTest { assertEquals("delete from foo where id in (?,?,?,?)", sql1); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/util/Md5Test.java b/src/test/java/io/ebeaninternal/server/util/Md5Test.java similarity index 87% rename from src/test/java/com/avaje/ebeaninternal/server/util/Md5Test.java rename to src/test/java/io/ebeaninternal/server/util/Md5Test.java index ccf719454..d9db27d3d 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/util/Md5Test.java +++ b/src/test/java/io/ebeaninternal/server/util/Md5Test.java @@ -1,4 +1,4 @@ -package com.avaje.ebeaninternal.server.util; +package io.ebeaninternal.server.util; import org.junit.Test; diff --git a/src/test/java/com/avaje/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java b/src/test/java/io/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java similarity index 76% rename from src/test/java/com/avaje/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java rename to src/test/java/io/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java index 72371a959..135304a42 100644 --- a/src/test/java/com/avaje/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java +++ b/src/test/java/io/ebeaninternal/xmlmapping/model/XmlMappingReaderTest.java @@ -1,6 +1,6 @@ -package com.avaje.ebeaninternal.xmlmapping.model; +package io.ebeaninternal.xmlmapping.model; -import com.avaje.ebeaninternal.xmlmapping.XmlMappingReader; +import io.ebeaninternal.xmlmapping.XmlMappingReader; import org.junit.Test; import java.io.InputStream; @@ -18,4 +18,4 @@ public class XmlMappingReaderTest { assertNotNull(testMapping); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java b/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java similarity index 78% rename from src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java rename to src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java index 83c2d6d36..bcfdfeaeb 100644 --- a/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java +++ b/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java @@ -1,14 +1,14 @@ -package com.avaje.ebeanservice.docstore.api.support; +package io.ebeanservice.docstore.api.support; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Query; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.core.PersistRequestBean; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdateContext; -import com.avaje.tests.model.basic.Order; +import io.ebean.BaseTestCase; +import io.ebean.Query; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.core.PersistRequestBean; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; +import io.ebeanservice.docstore.api.DocStoreUpdateContext; +import org.tests.model.basic.Order; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java b/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java similarity index 82% rename from src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java rename to src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java index 5d3e61013..b60040078 100644 --- a/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java +++ b/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java @@ -1,12 +1,12 @@ -package com.avaje.ebeanservice.docstore.api.support; +package io.ebeanservice.docstore.api.support; -import com.avaje.ebean.DocStoreQueueEntry; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.plugin.BeanDocType; -import com.avaje.ebean.plugin.BeanType; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; -import com.avaje.tests.model.basic.Order; +import io.ebean.DocStoreQueueEntry; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.plugin.BeanDocType; +import io.ebean.plugin.BeanType; +import io.ebeanservice.docstore.api.DocStoreUpdates; +import org.tests.model.basic.Order; import org.assertj.core.api.StrictAssertions; import org.junit.Test; import org.mockito.Mockito; diff --git a/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java b/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java similarity index 82% rename from src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java rename to src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java index b487f6499..c214f22ef 100644 --- a/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java +++ b/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java @@ -1,12 +1,12 @@ -package com.avaje.ebeanservice.docstore.api.support; +package io.ebeanservice.docstore.api.support; -import com.avaje.ebean.DocStoreQueueEntry; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.plugin.BeanDocType; -import com.avaje.ebean.plugin.BeanType; -import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; -import com.avaje.tests.model.basic.Order; +import io.ebean.DocStoreQueueEntry; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.plugin.BeanDocType; +import io.ebean.plugin.BeanType; +import io.ebeanservice.docstore.api.DocStoreUpdates; +import org.tests.model.basic.Order; import org.junit.Test; import org.mockito.Mockito; diff --git a/src/test/java/com/avaje/Main.java b/src/test/java/org/Main.java similarity index 89% rename from src/test/java/com/avaje/Main.java rename to src/test/java/org/Main.java index 0b3ad39a6..b27f856be 100644 --- a/src/test/java/com/avaje/Main.java +++ b/src/test/java/org/Main.java @@ -1,7 +1,7 @@ -package com.avaje; +package org; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; +import io.ebean.Ebean; +import io.ebean.EbeanServer; import javax.sql.DataSource; import java.sql.Connection; diff --git a/src/test/java/org/avaje/test/model/inheritmany/test/TestInheritWithMany.java b/src/test/java/org/avaje/test/model/inheritmany/test/TestInheritWithMany.java index f332cd5e7..391b13660 100644 --- a/src/test/java/org/avaje/test/model/inheritmany/test/TestInheritWithMany.java +++ b/src/test/java/org/avaje/test/model/inheritmany/test/TestInheritWithMany.java @@ -1,15 +1,15 @@ package org.avaje.test.model.inheritmany.test; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.InheritInfo; -import com.avaje.tests.model.inheritmany.IMRelated; -import com.avaje.tests.model.inheritmany.IMRoot; -import com.avaje.tests.model.inheritmany.IMRootOne; -import com.avaje.tests.model.inheritmany.IMRootTwo; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.InheritInfo; +import org.tests.model.inheritmany.IMRelated; +import org.tests.model.inheritmany.IMRoot; +import org.tests.model.inheritmany.IMRootOne; +import org.tests.model.inheritmany.IMRootTwo; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/avaje/test/model/rawsql/inherit/ParentAggregate.java b/src/test/java/org/avaje/test/model/rawsql/inherit/ParentAggregate.java index fcc813ae5..77e71e983 100644 --- a/src/test/java/org/avaje/test/model/rawsql/inherit/ParentAggregate.java +++ b/src/test/java/org/avaje/test/model/rawsql/inherit/ParentAggregate.java @@ -1,6 +1,6 @@ package org.avaje.test.model.rawsql.inherit; -import com.avaje.ebean.annotation.Sql; +import io.ebean.annotation.Sql; import javax.persistence.Entity; import javax.persistence.OneToOne; diff --git a/src/test/java/org/example/ModUuidGenerator.java b/src/test/java/org/example/ModUuidGenerator.java index b34b26b61..dcf08ec85 100644 --- a/src/test/java/org/example/ModUuidGenerator.java +++ b/src/test/java/org/example/ModUuidGenerator.java @@ -1,6 +1,6 @@ package org.example; -import com.avaje.ebean.config.IdGenerator; +import io.ebean.config.IdGenerator; import org.avaje.moduuid.ModUUID; /** diff --git a/src/test/java/com/avaje/tests/autofetch/AutofetchEmbeddedTest.java b/src/test/java/org/tests/autofetch/AutofetchEmbeddedTest.java similarity index 90% rename from src/test/java/com/avaje/tests/autofetch/AutofetchEmbeddedTest.java rename to src/test/java/org/tests/autofetch/AutofetchEmbeddedTest.java index 4d3df1ec8..d0ac10f07 100644 --- a/src/test/java/com/avaje/tests/autofetch/AutofetchEmbeddedTest.java +++ b/src/test/java/org/tests/autofetch/AutofetchEmbeddedTest.java @@ -1,9 +1,9 @@ -package com.avaje.tests.autofetch; +package org.tests.autofetch; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.embedded.EMain; -import com.avaje.tests.model.embedded.Eembeddable; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.embedded.EMain; +import org.tests.model.embedded.Eembeddable; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/com/avaje/tests/autofetch/MainAutoFetchExcludeLazyLobs.java b/src/test/java/org/tests/autofetch/MainAutoFetchExcludeLazyLobs.java similarity index 83% rename from src/test/java/com/avaje/tests/autofetch/MainAutoFetchExcludeLazyLobs.java rename to src/test/java/org/tests/autofetch/MainAutoFetchExcludeLazyLobs.java index 296e334fd..0b0bc790f 100644 --- a/src/test/java/com/avaje/tests/autofetch/MainAutoFetchExcludeLazyLobs.java +++ b/src/test/java/org/tests/autofetch/MainAutoFetchExcludeLazyLobs.java @@ -1,7 +1,7 @@ -package com.avaje.tests.autofetch; +package org.tests.autofetch; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.EBasicClob; +import io.ebean.Ebean; +import org.tests.model.basic.EBasicClob; import java.util.List; diff --git a/src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java b/src/test/java/org/tests/autofetch/MainAutoQueryTune1.java similarity index 78% rename from src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java rename to src/test/java/org/tests/autofetch/MainAutoQueryTune1.java index f720fa691..f7dfdcb55 100644 --- a/src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java +++ b/src/test/java/org/tests/autofetch/MainAutoQueryTune1.java @@ -1,8 +1,8 @@ -package com.avaje.tests.autofetch; +package org.tests.autofetch; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.Ebean; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import java.util.List; diff --git a/src/test/java/com/avaje/tests/autofetch/TunedQueryInfoTest.java b/src/test/java/org/tests/autofetch/TunedQueryInfoTest.java similarity index 87% rename from src/test/java/com/avaje/tests/autofetch/TunedQueryInfoTest.java rename to src/test/java/org/tests/autofetch/TunedQueryInfoTest.java index a785e9dfe..31a28083d 100644 --- a/src/test/java/com/avaje/tests/autofetch/TunedQueryInfoTest.java +++ b/src/test/java/org/tests/autofetch/TunedQueryInfoTest.java @@ -1,18 +1,18 @@ -package com.avaje.tests.autofetch; +package org.tests.autofetch; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Query; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.ebean.cache.ServerCacheManager; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.autotune.model.Origin; -import com.avaje.ebeaninternal.server.autotune.service.TunedQueryInfo; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Query; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import io.ebean.cache.ServerCacheManager; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.autotune.model.Origin; +import io.ebeaninternal.server.autotune.service.TunedQueryInfo; +import io.ebeaninternal.server.querydefn.OrmQueryDetail; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.avaje.ebeantest.LoggedSqlCollector; import org.jetbrains.annotations.NotNull; import org.junit.Assert; diff --git a/src/test/java/com/avaje/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java b/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java similarity index 80% rename from src/test/java/com/avaje/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java rename to src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java index 60f829223..f34b02f4d 100644 --- a/src/test/java/com/avaje/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java +++ b/src/test/java/org/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java @@ -1,14 +1,14 @@ -package com.avaje.tests.autofetch; +package org.tests.autofetch; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Query; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.tests.model.basic.Address; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +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.avaje.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/MainDbBoolean.java b/src/test/java/org/tests/basic/MainDbBoolean.java similarity index 89% rename from src/test/java/com/avaje/tests/basic/MainDbBoolean.java rename to src/test/java/org/tests/basic/MainDbBoolean.java index d0e9905a4..3715760c5 100644 --- a/src/test/java/com/avaje/tests/basic/MainDbBoolean.java +++ b/src/test/java/org/tests/basic/MainDbBoolean.java @@ -1,14 +1,14 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.EbeanServerFactory; -import com.avaje.ebean.Query; -import com.avaje.ebean.SqlRow; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.config.dbplatform.postgres.PostgresPlatform; -import com.avaje.tests.model.basic.TOne; -import com.avaje.tests.model.basic.TSDetail; -import com.avaje.tests.model.basic.TSMaster; +import io.ebean.EbeanServer; +import io.ebean.EbeanServerFactory; +import io.ebean.Query; +import io.ebean.SqlRow; +import io.ebean.config.ServerConfig; +import io.ebean.config.dbplatform.postgres.PostgresPlatform; +import org.tests.model.basic.TOne; +import org.tests.model.basic.TSDetail; +import org.tests.model.basic.TSMaster; import org.avaje.datasource.DataSourceConfig; import org.junit.Assert; diff --git a/src/test/java/com/avaje/tests/basic/MyTestDataSourcePoolListener.java b/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java similarity index 94% rename from src/test/java/com/avaje/tests/basic/MyTestDataSourcePoolListener.java rename to src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java index 1459c4e90..fb24af23a 100644 --- a/src/test/java/com/avaje/tests/basic/MyTestDataSourcePoolListener.java +++ b/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java @@ -1,4 +1,4 @@ -package com.avaje.tests.basic; +package org.tests.basic; import org.avaje.datasource.DataSourcePoolListener; diff --git a/src/test/java/com/avaje/tests/basic/TestAnnotationBase.java b/src/test/java/org/tests/basic/TestAnnotationBase.java similarity index 92% rename from src/test/java/com/avaje/tests/basic/TestAnnotationBase.java rename to src/test/java/org/tests/basic/TestAnnotationBase.java index 94b46ab79..b080ab806 100644 --- a/src/test/java/com/avaje/tests/basic/TestAnnotationBase.java +++ b/src/test/java/org/tests/basic/TestAnnotationBase.java @@ -1,13 +1,13 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.annotation.EbeanDDL; -import com.avaje.ebean.annotation.Where; -import com.avaje.ebean.config.Platform; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.parse.AnnotationBase; -import com.avaje.tests.model.basic.ValidationGroupSomething; +import io.ebean.BaseTestCase; +import io.ebean.annotation.EbeanDDL; +import io.ebean.annotation.Where; +import io.ebean.Platform; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.parse.AnnotationBase; +import org.tests.model.basic.ValidationGroupSomething; import org.junit.Test; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/basic/TestAssocOneEqExpression.java b/src/test/java/org/tests/basic/TestAssocOneEqExpression.java similarity index 70% rename from src/test/java/com/avaje/tests/basic/TestAssocOneEqExpression.java rename to src/test/java/org/tests/basic/TestAssocOneEqExpression.java index 1e26e7a11..9d4ad50c7 100644 --- a/src/test/java/com/avaje/tests/basic/TestAssocOneEqExpression.java +++ b/src/test/java/org/tests/basic/TestAssocOneEqExpression.java @@ -1,12 +1,12 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Address; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Address; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestBatchLazy.java b/src/test/java/org/tests/basic/TestBatchLazy.java similarity index 67% rename from src/test/java/com/avaje/tests/basic/TestBatchLazy.java rename to src/test/java/org/tests/basic/TestBatchLazy.java index b79513816..a81bf1596 100644 --- a/src/test/java/com/avaje/tests/basic/TestBatchLazy.java +++ b/src/test/java/org/tests/basic/TestBatchLazy.java @@ -1,12 +1,12 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -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.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderDetail; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/basic/TestBatchLazyMany.java b/src/test/java/org/tests/basic/TestBatchLazyMany.java similarity index 75% rename from src/test/java/com/avaje/tests/basic/TestBatchLazyMany.java rename to src/test/java/org/tests/basic/TestBatchLazyMany.java index 6dd0699f9..8b29b6cb5 100644 --- a/src/test/java/com/avaje/tests/basic/TestBatchLazyMany.java +++ b/src/test/java/org/tests/basic/TestBatchLazyMany.java @@ -1,9 +1,9 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; public class TestBatchLazyMany extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/TestBeanReferenceRefresh.java b/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java similarity index 77% rename from src/test/java/com/avaje/tests/basic/TestBeanReferenceRefresh.java rename to src/test/java/org/tests/basic/TestBeanReferenceRefresh.java index bd7948d7b..4827e46f0 100644 --- a/src/test/java/com/avaje/tests/basic/TestBeanReferenceRefresh.java +++ b/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java @@ -1,12 +1,12 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.Order.Status; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.cache.ServerCache; +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.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestDeleteByIdCollection.java b/src/test/java/org/tests/basic/TestDeleteByIdCollection.java similarity index 88% rename from src/test/java/com/avaje/tests/basic/TestDeleteByIdCollection.java rename to src/test/java/org/tests/basic/TestDeleteByIdCollection.java index 088197310..db14f8a62 100644 --- a/src/test/java/com/avaje/tests/basic/TestDeleteByIdCollection.java +++ b/src/test/java/org/tests/basic/TestDeleteByIdCollection.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -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.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestDeleteCascadingOneToMany.java b/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java similarity index 67% rename from src/test/java/com/avaje/tests/basic/TestDeleteCascadingOneToMany.java rename to src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java index 3dbb5a0a3..92ae96a59 100644 --- a/src/test/java/com/avaje/tests/basic/TestDeleteCascadingOneToMany.java +++ b/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java @@ -1,8 +1,8 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Article; -import com.avaje.tests.model.basic.Section; +import io.ebean.Ebean; +import org.tests.model.basic.Article; +import org.tests.model.basic.Section; import junit.framework.TestCase; public class TestDeleteCascadingOneToMany extends TestCase { diff --git a/src/test/java/com/avaje/tests/basic/TestDeleteImportedPartial.java b/src/test/java/org/tests/basic/TestDeleteImportedPartial.java similarity index 80% rename from src/test/java/com/avaje/tests/basic/TestDeleteImportedPartial.java rename to src/test/java/org/tests/basic/TestDeleteImportedPartial.java index c9a02dba3..d77c3624d 100644 --- a/src/test/java/com/avaje/tests/basic/TestDeleteImportedPartial.java +++ b/src/test/java/org/tests/basic/TestDeleteImportedPartial.java @@ -1,9 +1,9 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.PFile; -import com.avaje.tests.model.basic.PFileContent; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.PFile; +import org.tests.model.basic.PFileContent; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestDeleteOneToOne.java b/src/test/java/org/tests/basic/TestDeleteOneToOne.java similarity index 85% rename from src/test/java/com/avaje/tests/basic/TestDeleteOneToOne.java rename to src/test/java/org/tests/basic/TestDeleteOneToOne.java index 5fe5106e3..6f3151099 100644 --- a/src/test/java/com/avaje/tests/basic/TestDeleteOneToOne.java +++ b/src/test/java/org/tests/basic/TestDeleteOneToOne.java @@ -1,9 +1,9 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.PersistentFile; -import com.avaje.tests.model.basic.PersistentFileContent; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.PersistentFile; +import org.tests.model.basic.PersistentFileContent; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestDeleteOneToOneMultiple.java b/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java similarity index 82% rename from src/test/java/com/avaje/tests/basic/TestDeleteOneToOneMultiple.java rename to src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java index fe546bdc5..fc4e38b01 100644 --- a/src/test/java/com/avaje/tests/basic/TestDeleteOneToOneMultiple.java +++ b/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java @@ -1,9 +1,9 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.PFile; -import com.avaje.tests.model.basic.PFileContent; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.PFile; +import org.tests.model.basic.PFileContent; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestDeletePartialNoVersion.java b/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java similarity index 86% rename from src/test/java/com/avaje/tests/basic/TestDeletePartialNoVersion.java rename to src/test/java/org/tests/basic/TestDeletePartialNoVersion.java index 376b9c8e4..f04a872e8 100644 --- a/src/test/java/com/avaje/tests/basic/TestDeletePartialNoVersion.java +++ b/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java @@ -1,8 +1,8 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.TMapSuperEntity; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.TMapSuperEntity; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestDynamicUpdate.java b/src/test/java/org/tests/basic/TestDynamicUpdate.java similarity index 84% rename from src/test/java/com/avaje/tests/basic/TestDynamicUpdate.java rename to src/test/java/org/tests/basic/TestDynamicUpdate.java index 4aede36f0..ac6764edb 100644 --- a/src/test/java/com/avaje/tests/basic/TestDynamicUpdate.java +++ b/src/test/java/org/tests/basic/TestDynamicUpdate.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.BeanState; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.tests.model.embedded.EMain; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import org.tests.model.embedded.EMain; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestEnhancementCollectionInitialisation.java b/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java similarity index 66% rename from src/test/java/com/avaje/tests/basic/TestEnhancementCollectionInitialisation.java rename to src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java index 6b0e6d5b1..94895a77b 100644 --- a/src/test/java/com/avaje/tests/basic/TestEnhancementCollectionInitialisation.java +++ b/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.BeanState; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.Ebean; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestErrorBindLog.java b/src/test/java/org/tests/basic/TestErrorBindLog.java similarity index 74% rename from src/test/java/com/avaje/tests/basic/TestErrorBindLog.java rename to src/test/java/org/tests/basic/TestErrorBindLog.java index cf393dd8e..0b90f485a 100644 --- a/src/test/java/com/avaje/tests/basic/TestErrorBindLog.java +++ b/src/test/java/org/tests/basic/TestErrorBindLog.java @@ -1,8 +1,8 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Order; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Order; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestExplicitInsert.java b/src/test/java/org/tests/basic/TestExplicitInsert.java similarity index 87% rename from src/test/java/com/avaje/tests/basic/TestExplicitInsert.java rename to src/test/java/org/tests/basic/TestExplicitInsert.java index 3c585a08c..c6f8fb287 100644 --- a/src/test/java/com/avaje/tests/basic/TestExplicitInsert.java +++ b/src/test/java/org/tests/basic/TestExplicitInsert.java @@ -1,11 +1,11 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.EBasic; -import com.avaje.tests.model.basic.MyEBasicConfigStartup; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import org.tests.model.basic.Customer; +import org.tests.model.basic.EBasic; +import org.tests.model.basic.MyEBasicConfigStartup; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestFetchId.java b/src/test/java/org/tests/basic/TestFetchId.java similarity index 75% rename from src/test/java/com/avaje/tests/basic/TestFetchId.java rename to src/test/java/org/tests/basic/TestFetchId.java index 1b4a09d84..68993e7d1 100644 --- a/src/test/java/com/avaje/tests/basic/TestFetchId.java +++ b/src/test/java/org/tests/basic/TestFetchId.java @@ -1,11 +1,11 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FutureIds; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FutureIds; +import io.ebean.Query; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/basic/TestIUDVanilla.java b/src/test/java/org/tests/basic/TestIUDVanilla.java similarity index 86% rename from src/test/java/com/avaje/tests/basic/TestIUDVanilla.java rename to src/test/java/org/tests/basic/TestIUDVanilla.java index 5fd6051a0..0fea46371 100644 --- a/src/test/java/com/avaje/tests/basic/TestIUDVanilla.java +++ b/src/test/java/org/tests/basic/TestIUDVanilla.java @@ -1,8 +1,8 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.EBasicVer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.EBasicVer; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestInEmpty.java b/src/test/java/org/tests/basic/TestInEmpty.java similarity index 81% rename from src/test/java/com/avaje/tests/basic/TestInEmpty.java rename to src/test/java/org/tests/basic/TestInEmpty.java index 91a4afd70..af4055d4f 100644 --- a/src/test/java/com/avaje/tests/basic/TestInEmpty.java +++ b/src/test/java/org/tests/basic/TestInEmpty.java @@ -1,9 +1,9 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Order; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/basic/TestInheritRef.java b/src/test/java/org/tests/basic/TestInheritRef.java similarity index 83% rename from src/test/java/com/avaje/tests/basic/TestInheritRef.java rename to src/test/java/org/tests/basic/TestInheritRef.java index 28c16ce99..e345bc8d3 100644 --- a/src/test/java/com/avaje/tests/basic/TestInheritRef.java +++ b/src/test/java/org/tests/basic/TestInheritRef.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Car; -import com.avaje.tests.model.basic.Truck; -import com.avaje.tests.model.basic.Vehicle; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Car; +import org.tests.model.basic.Truck; +import org.tests.model.basic.Vehicle; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestJodaType.java b/src/test/java/org/tests/basic/TestJodaType.java similarity index 71% rename from src/test/java/com/avaje/tests/basic/TestJodaType.java rename to src/test/java/org/tests/basic/TestJodaType.java index 5215a339a..59eeda3a0 100644 --- a/src/test/java/com/avaje/tests/basic/TestJodaType.java +++ b/src/test/java/org/tests/basic/TestJodaType.java @@ -1,12 +1,12 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.type.ScalarType; -import com.avaje.tests.model.basic.TJodaEntity; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.type.ScalarType; +import org.tests.model.basic.TJodaEntity; import org.joda.time.LocalTime; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestJoinInheritance.java b/src/test/java/org/tests/basic/TestJoinInheritance.java similarity index 86% rename from src/test/java/com/avaje/tests/basic/TestJoinInheritance.java rename to src/test/java/org/tests/basic/TestJoinInheritance.java index d06b57527..0bfb8af45 100644 --- a/src/test/java/com/avaje/tests/basic/TestJoinInheritance.java +++ b/src/test/java/org/tests/basic/TestJoinInheritance.java @@ -1,12 +1,12 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Address; -import com.avaje.tests.model.basic.Car; -import com.avaje.tests.model.basic.Trip; -import com.avaje.tests.model.basic.Vehicle; -import com.avaje.tests.model.basic.VehicleDriver; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Address; +import org.tests.model.basic.Car; +import org.tests.model.basic.Trip; +import org.tests.model.basic.Vehicle; +import org.tests.model.basic.VehicleDriver; import org.junit.Test; import java.sql.Timestamp; diff --git a/src/test/java/com/avaje/tests/basic/TestLazyLoadEmptyOneToMany.java b/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java similarity index 70% rename from src/test/java/com/avaje/tests/basic/TestLazyLoadEmptyOneToMany.java rename to src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java index 091dd3586..edadea7ba 100644 --- a/src/test/java/com/avaje/tests/basic/TestLazyLoadEmptyOneToMany.java +++ b/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +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; diff --git a/src/test/java/com/avaje/tests/basic/TestLazyLoadInCache.java b/src/test/java/org/tests/basic/TestLazyLoadInCache.java similarity index 82% rename from src/test/java/com/avaje/tests/basic/TestLazyLoadInCache.java rename to src/test/java/org/tests/basic/TestLazyLoadInCache.java index 271cdb80e..b837a7d58 100644 --- a/src/test/java/com/avaje/tests/basic/TestLazyLoadInCache.java +++ b/src/test/java/org/tests/basic/TestLazyLoadInCache.java @@ -1,11 +1,11 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.BeanState; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Address; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.Ebean; +import org.tests.model.basic.Address; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.Map; diff --git a/src/test/java/com/avaje/tests/basic/TestLimitQuery.java b/src/test/java/org/tests/basic/TestLimitQuery.java similarity index 93% rename from src/test/java/com/avaje/tests/basic/TestLimitQuery.java rename to src/test/java/org/tests/basic/TestLimitQuery.java index f727496d4..be00b4e35 100644 --- a/src/test/java/com/avaje/tests/basic/TestLimitQuery.java +++ b/src/test/java/org/tests/basic/TestLimitQuery.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestLoadBeanCache.java b/src/test/java/org/tests/basic/TestLoadBeanCache.java similarity index 73% rename from src/test/java/com/avaje/tests/basic/TestLoadBeanCache.java rename to src/test/java/org/tests/basic/TestLoadBeanCache.java index f3ee0cdde..1962ddede 100644 --- a/src/test/java/com/avaje/tests/basic/TestLoadBeanCache.java +++ b/src/test/java/org/tests/basic/TestLoadBeanCache.java @@ -1,9 +1,9 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Country; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Country; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestLogTransLogOnError.java b/src/test/java/org/tests/basic/TestLogTransLogOnError.java similarity index 86% rename from src/test/java/com/avaje/tests/basic/TestLogTransLogOnError.java rename to src/test/java/org/tests/basic/TestLogTransLogOnError.java index 1789bf2df..785d51e68 100644 --- a/src/test/java/com/avaje/tests/basic/TestLogTransLogOnError.java +++ b/src/test/java/org/tests/basic/TestLogTransLogOnError.java @@ -1,11 +1,11 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.EBasicVer; -import com.avaje.tests.model.basic.Order; -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.EBasicVer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestM2MCascadeOne.java b/src/test/java/org/tests/basic/TestM2MCascadeOne.java similarity index 76% rename from src/test/java/com/avaje/tests/basic/TestM2MCascadeOne.java rename to src/test/java/org/tests/basic/TestM2MCascadeOne.java index bb63f5c2f..851d8bc6b 100644 --- a/src/test/java/com/avaje/tests/basic/TestM2MCascadeOne.java +++ b/src/test/java/org/tests/basic/TestM2MCascadeOne.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.MRole; -import com.avaje.tests.model.basic.MUser; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.MRole; +import org.tests.model.basic.MUser; import org.junit.Test; public class TestM2MCascadeOne extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java b/src/test/java/org/tests/basic/TestM2MVanilla.java similarity index 91% rename from src/test/java/com/avaje/tests/basic/TestM2MVanilla.java rename to src/test/java/org/tests/basic/TestM2MVanilla.java index a43a8443d..6eb8d2af2 100644 --- a/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java +++ b/src/test/java/org/tests/basic/TestM2MVanilla.java @@ -1,11 +1,11 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.SqlUpdate; -import com.avaje.tests.model.basic.MRole; -import com.avaje.tests.model.basic.MUser; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.SqlUpdate; +import org.tests.model.basic.MRole; +import org.tests.model.basic.MUser; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestManyLazyLoad.java b/src/test/java/org/tests/basic/TestManyLazyLoad.java similarity index 85% rename from src/test/java/com/avaje/tests/basic/TestManyLazyLoad.java rename to src/test/java/org/tests/basic/TestManyLazyLoad.java index d05a006f3..3d1b932e2 100644 --- a/src/test/java/com/avaje/tests/basic/TestManyLazyLoad.java +++ b/src/test/java/org/tests/basic/TestManyLazyLoad.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.OrderDetail; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderDetail; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.sql.Date; diff --git a/src/test/java/org/tests/basic/TestManyOneInterface.java b/src/test/java/org/tests/basic/TestManyOneInterface.java new file mode 100644 index 000000000..ab847eb93 --- /dev/null +++ b/src/test/java/org/tests/basic/TestManyOneInterface.java @@ -0,0 +1,31 @@ +package org.tests.basic; + +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.ResetBasicData; +import org.tests.model.interfaces.Address; +import org.tests.model.interfaces.IAddress; +import org.tests.model.interfaces.IPerson; +import org.tests.model.interfaces.Person; +import org.junit.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(); + + } +} diff --git a/src/test/java/com/avaje/tests/basic/TestMappedSuper.java b/src/test/java/org/tests/basic/TestMappedSuper.java similarity index 80% rename from src/test/java/com/avaje/tests/basic/TestMappedSuper.java rename to src/test/java/org/tests/basic/TestMappedSuper.java index 2e9bc6c11..904523378 100644 --- a/src/test/java/com/avaje/tests/basic/TestMappedSuper.java +++ b/src/test/java/org/tests/basic/TestMappedSuper.java @@ -1,8 +1,8 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.TMapSuperEntity; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.TMapSuperEntity; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestMetaAnnotation.java b/src/test/java/org/tests/basic/TestMetaAnnotation.java similarity index 90% rename from src/test/java/com/avaje/tests/basic/TestMetaAnnotation.java rename to src/test/java/org/tests/basic/TestMetaAnnotation.java index 8d782b9a5..8ce5c2441 100644 --- a/src/test/java/com/avaje/tests/basic/TestMetaAnnotation.java +++ b/src/test/java/org/tests/basic/TestMetaAnnotation.java @@ -1,9 +1,9 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Address; -import com.avaje.tests.model.basic.metaannotation.SizeMedium; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Address; +import org.tests.model.basic.metaannotation.SizeMedium; import org.junit.Test; import javax.persistence.PersistenceException; diff --git a/src/test/java/com/avaje/tests/basic/TestMultipleOneToOneIUD.java b/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java similarity index 84% rename from src/test/java/com/avaje/tests/basic/TestMultipleOneToOneIUD.java rename to src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java index c1d5b0296..64e913279 100644 --- a/src/test/java/com/avaje/tests/basic/TestMultipleOneToOneIUD.java +++ b/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.OCar; -import com.avaje.tests.model.basic.OEngine; -import com.avaje.tests.model.basic.OGearBox; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.OCar; +import org.tests.model.basic.OEngine; +import org.tests.model.basic.OGearBox; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestNonUpdateProperty.java b/src/test/java/org/tests/basic/TestNonUpdateProperty.java similarity index 70% rename from src/test/java/com/avaje/tests/basic/TestNonUpdateProperty.java rename to src/test/java/org/tests/basic/TestNonUpdateProperty.java index 4f68a9e58..08678b83d 100644 --- a/src/test/java/com/avaje/tests/basic/TestNonUpdateProperty.java +++ b/src/test/java/org/tests/basic/TestNonUpdateProperty.java @@ -1,8 +1,8 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.MNonUpdPropEntity; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.MNonUpdPropEntity; import org.junit.Test; public class TestNonUpdateProperty extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/TestOrderByAnnotation.java b/src/test/java/org/tests/basic/TestOrderByAnnotation.java similarity index 71% rename from src/test/java/com/avaje/tests/basic/TestOrderByAnnotation.java rename to src/test/java/org/tests/basic/TestOrderByAnnotation.java index a6ce21681..db5623394 100644 --- a/src/test/java/com/avaje/tests/basic/TestOrderByAnnotation.java +++ b/src/test/java/org/tests/basic/TestOrderByAnnotation.java @@ -1,11 +1,11 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountFormula.java b/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java similarity index 71% rename from src/test/java/com/avaje/tests/basic/TestOrderTotalAmountFormula.java rename to src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java index bbd4ce10e..4a27102d4 100644 --- a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountFormula.java +++ b/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -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.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountReportBean.java b/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java similarity index 93% rename from src/test/java/com/avaje/tests/basic/TestOrderTotalAmountReportBean.java rename to src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java index 824c07170..b844cf9bb 100644 --- a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountReportBean.java +++ b/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java @@ -1,12 +1,12 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.tests.model.basic.OrderAggregate; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.RawSql; +import io.ebean.RawSqlBuilder; +import org.tests.model.basic.OrderAggregate; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountSql.java b/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java similarity index 79% rename from src/test/java/com/avaje/tests/basic/TestOrderTotalAmountSql.java rename to src/test/java/org/tests/basic/TestOrderTotalAmountSql.java index 744d9e45e..3bc6fef55 100644 --- a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountSql.java +++ b/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java @@ -1,9 +1,9 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.SqlRow; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.SqlRow; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestPersistenceContext.java b/src/test/java/org/tests/basic/TestPersistenceContext.java similarity index 88% rename from src/test/java/com/avaje/tests/basic/TestPersistenceContext.java rename to src/test/java/org/tests/basic/TestPersistenceContext.java index e75c7d3f5..a4d221d12 100644 --- a/src/test/java/com/avaje/tests/basic/TestPersistenceContext.java +++ b/src/test/java/org/tests/basic/TestPersistenceContext.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -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.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestQuery.java b/src/test/java/org/tests/basic/TestQuery.java similarity index 84% rename from src/test/java/com/avaje/tests/basic/TestQuery.java rename to src/test/java/org/tests/basic/TestQuery.java index 31af63bec..a14874ee3 100644 --- a/src/test/java/com/avaje/tests/basic/TestQuery.java +++ b/src/test/java/org/tests/basic/TestQuery.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java b/src/test/java/org/tests/basic/TestQueryWhereBetween.java similarity index 72% rename from src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java rename to src/test/java/org/tests/basic/TestQueryWhereBetween.java index 254f817de..042ce5756 100644 --- a/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java +++ b/src/test/java/org/tests/basic/TestQueryWhereBetween.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestQueryWithCache.java b/src/test/java/org/tests/basic/TestQueryWithCache.java similarity index 78% rename from src/test/java/com/avaje/tests/basic/TestQueryWithCache.java rename to src/test/java/org/tests/basic/TestQueryWithCache.java index ae387795b..3c4635683 100644 --- a/src/test/java/com/avaje/tests/basic/TestQueryWithCache.java +++ b/src/test/java/org/tests/basic/TestQueryWithCache.java @@ -1,15 +1,15 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebean.cache.ServerCacheManager; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.core.CacheOptions; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.tests.model.basic.Country; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.cache.ServerCache; +import io.ebean.cache.ServerCacheManager; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.core.CacheOptions; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.tests.model.basic.Country; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/tests/basic/TestReadOnlyPropagation.java b/src/test/java/org/tests/basic/TestReadOnlyPropagation.java similarity index 84% rename from src/test/java/com/avaje/tests/basic/TestReadOnlyPropagation.java rename to src/test/java/org/tests/basic/TestReadOnlyPropagation.java index f6b81185d..ba230e68c 100644 --- a/src/test/java/com/avaje/tests/basic/TestReadOnlyPropagation.java +++ b/src/test/java/org/tests/basic/TestReadOnlyPropagation.java @@ -1,13 +1,13 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.tests.model.basic.Address; -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.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.bean.BeanCollection; +import org.tests.model.basic.Address; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderDetail; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOne.java b/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java similarity index 81% rename from src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOne.java rename to src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java index 23be6218e..85b816b70 100644 --- a/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOne.java +++ b/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java @@ -1,9 +1,9 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.PersistentFile; -import com.avaje.tests.model.basic.PersistentFileContent; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.PersistentFile; +import org.tests.model.basic.PersistentFileContent; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOneMultiple.java b/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java similarity index 81% rename from src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOneMultiple.java rename to src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java index 70f841cda..91dd7fea9 100644 --- a/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOneMultiple.java +++ b/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java @@ -1,9 +1,9 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.PFile; -import com.avaje.tests.model.basic.PFileContent; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.PFile; +import org.tests.model.basic.PFileContent; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestSharedInstancePropagation.java b/src/test/java/org/tests/basic/TestSharedInstancePropagation.java similarity index 78% rename from src/test/java/com/avaje/tests/basic/TestSharedInstancePropagation.java rename to src/test/java/org/tests/basic/TestSharedInstancePropagation.java index fba85a8f4..d526cbd99 100644 --- a/src/test/java/com/avaje/tests/basic/TestSharedInstancePropagation.java +++ b/src/test/java/org/tests/basic/TestSharedInstancePropagation.java @@ -1,12 +1,12 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.OrderDetail; -import com.avaje.tests.model.basic.Product; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.bean.BeanCollection; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderDetail; +import org.tests.model.basic.Product; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/basic/TestTransient.java b/src/test/java/org/tests/basic/TestTransient.java similarity index 89% rename from src/test/java/com/avaje/tests/basic/TestTransient.java rename to src/test/java/org/tests/basic/TestTransient.java index e116cca44..95412b01e 100644 --- a/src/test/java/com/avaje/tests/basic/TestTransient.java +++ b/src/test/java/org/tests/basic/TestTransient.java @@ -1,9 +1,9 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.BeanState; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.Ebean; +import org.tests.model.basic.Customer; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/TestUpdateManyToOne.java b/src/test/java/org/tests/basic/TestUpdateManyToOne.java similarity index 74% rename from src/test/java/com/avaje/tests/basic/TestUpdateManyToOne.java rename to src/test/java/org/tests/basic/TestUpdateManyToOne.java index a1c94cb78..1a86cdcde 100644 --- a/src/test/java/com/avaje/tests/basic/TestUpdateManyToOne.java +++ b/src/test/java/org/tests/basic/TestUpdateManyToOne.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -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.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/basic/TestUuidInsert.java b/src/test/java/org/tests/basic/TestUuidInsert.java similarity index 69% rename from src/test/java/com/avaje/tests/basic/TestUuidInsert.java rename to src/test/java/org/tests/basic/TestUuidInsert.java index 20c1d0dc5..b0ae3fcc2 100644 --- a/src/test/java/com/avaje/tests/basic/TestUuidInsert.java +++ b/src/test/java/org/tests/basic/TestUuidInsert.java @@ -1,8 +1,8 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.TUuidEntity; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.TUuidEntity; import org.junit.Test; public class TestUuidInsert extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/TestUuidInsertMasterDetail.java b/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java similarity index 79% rename from src/test/java/com/avaje/tests/basic/TestUuidInsertMasterDetail.java rename to src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java index 5bf751c88..49e49fc12 100644 --- a/src/test/java/com/avaje/tests/basic/TestUuidInsertMasterDetail.java +++ b/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java @@ -1,9 +1,9 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.UUOne; -import com.avaje.tests.model.basic.UUTwo; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.UUOne; +import org.tests.model.basic.UUTwo; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/com/avaje/tests/basic/TestWhereAnnotation.java b/src/test/java/org/tests/basic/TestWhereAnnotation.java similarity index 71% rename from src/test/java/com/avaje/tests/basic/TestWhereAnnotation.java rename to src/test/java/org/tests/basic/TestWhereAnnotation.java index bae636eaa..e9f93c478 100644 --- a/src/test/java/com/avaje/tests/basic/TestWhereAnnotation.java +++ b/src/test/java/org/tests/basic/TestWhereAnnotation.java @@ -1,11 +1,11 @@ -package com.avaje.tests.basic; +package org.tests.basic; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/delete/TestDeleteByIdList.java b/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java similarity index 68% rename from src/test/java/com/avaje/tests/basic/delete/TestDeleteByIdList.java rename to src/test/java/org/tests/basic/delete/TestDeleteByIdList.java index 1cc18632b..4aec6a6d6 100644 --- a/src/test/java/com/avaje/tests/basic/delete/TestDeleteByIdList.java +++ b/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java @@ -1,12 +1,12 @@ -package com.avaje.tests.basic.delete; +package org.tests.basic.delete; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -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.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebeaninternal.api.SpiEbeanServer; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderDetail; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/delete/TestDeleteCascadeById.java b/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java similarity index 67% rename from src/test/java/com/avaje/tests/basic/delete/TestDeleteCascadeById.java rename to src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java index 2d1f05bbb..8a5ab99b0 100644 --- a/src/test/java/com/avaje/tests/basic/delete/TestDeleteCascadeById.java +++ b/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java @@ -1,12 +1,12 @@ -package com.avaje.tests.basic.delete; +package org.tests.basic.delete; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -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.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebeaninternal.api.SpiEbeanServer; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderDetail; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/encrypt/BasicEncryptKey.java b/src/test/java/org/tests/basic/encrypt/BasicEncryptKey.java similarity index 71% rename from src/test/java/com/avaje/tests/basic/encrypt/BasicEncryptKey.java rename to src/test/java/org/tests/basic/encrypt/BasicEncryptKey.java index e33b8779c..56a240696 100644 --- a/src/test/java/com/avaje/tests/basic/encrypt/BasicEncryptKey.java +++ b/src/test/java/org/tests/basic/encrypt/BasicEncryptKey.java @@ -1,6 +1,6 @@ -package com.avaje.tests.basic.encrypt; +package org.tests.basic.encrypt; -import com.avaje.ebean.config.EncryptKey; +import io.ebean.config.EncryptKey; public class BasicEncryptKey implements EncryptKey { diff --git a/src/test/java/com/avaje/tests/basic/encrypt/BasicEncyptKeyManager.java b/src/test/java/org/tests/basic/encrypt/BasicEncyptKeyManager.java similarity index 71% rename from src/test/java/com/avaje/tests/basic/encrypt/BasicEncyptKeyManager.java rename to src/test/java/org/tests/basic/encrypt/BasicEncyptKeyManager.java index b50b7e869..7eb4dfa83 100644 --- a/src/test/java/com/avaje/tests/basic/encrypt/BasicEncyptKeyManager.java +++ b/src/test/java/org/tests/basic/encrypt/BasicEncyptKeyManager.java @@ -1,7 +1,7 @@ -package com.avaje.tests.basic.encrypt; +package org.tests.basic.encrypt; -import com.avaje.ebean.config.EncryptKey; -import com.avaje.ebean.config.EncryptKeyManager; +import io.ebean.config.EncryptKey; +import io.ebean.config.EncryptKeyManager; public class BasicEncyptKeyManager implements EncryptKeyManager { diff --git a/src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java b/src/test/java/org/tests/basic/encrypt/TestEncrypt.java similarity index 86% rename from src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java rename to src/test/java/org/tests/basic/encrypt/TestEncrypt.java index 005ae1e65..296957b20 100644 --- a/src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java +++ b/src/test/java/org/tests/basic/encrypt/TestEncrypt.java @@ -1,13 +1,13 @@ -package com.avaje.tests.basic.encrypt; +package org.tests.basic.encrypt; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.SqlQuery; -import com.avaje.ebean.SqlRow; -import com.avaje.ebean.Update; -import com.avaje.ebean.config.dbplatform.DbEncrypt; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.tests.model.basic.EBasicEncrypt; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.SqlQuery; +import io.ebean.SqlRow; +import io.ebean.Update; +import io.ebean.config.dbplatform.DbEncrypt; +import io.ebeaninternal.api.SpiEbeanServer; +import org.tests.model.basic.EBasicEncrypt; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Ignore; diff --git a/src/test/java/com/avaje/tests/basic/encrypt/TestEncryptBinary.java b/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java similarity index 82% rename from src/test/java/com/avaje/tests/basic/encrypt/TestEncryptBinary.java rename to src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java index 85c02b8e0..6034cdcd3 100644 --- a/src/test/java/com/avaje/tests/basic/encrypt/TestEncryptBinary.java +++ b/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic.encrypt; +package org.tests.basic.encrypt; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.SqlQuery; -import com.avaje.ebean.SqlRow; -import com.avaje.tests.model.basic.EBasicEncryptBinary; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.SqlQuery; +import io.ebean.SqlRow; +import org.tests.model.basic.EBasicEncryptBinary; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/event/TestPreInsertValidation.java b/src/test/java/org/tests/basic/event/TestPreInsertValidation.java similarity index 86% rename from src/test/java/com/avaje/tests/basic/event/TestPreInsertValidation.java rename to src/test/java/org/tests/basic/event/TestPreInsertValidation.java index baf763554..9b025b0c3 100644 --- a/src/test/java/com/avaje/tests/basic/event/TestPreInsertValidation.java +++ b/src/test/java/org/tests/basic/event/TestPreInsertValidation.java @@ -1,9 +1,9 @@ -package com.avaje.tests.basic.event; +package org.tests.basic.event; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.TWithPreInsert; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.TWithPreInsert; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/event/TestQueryAdapter.java b/src/test/java/org/tests/basic/event/TestQueryAdapter.java similarity index 72% rename from src/test/java/com/avaje/tests/basic/event/TestQueryAdapter.java rename to src/test/java/org/tests/basic/event/TestQueryAdapter.java index 4c0499f0a..0a54baae9 100644 --- a/src/test/java/com/avaje/tests/basic/event/TestQueryAdapter.java +++ b/src/test/java/org/tests/basic/event/TestQueryAdapter.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic.event; +package org.tests.basic.event; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.ResetBasicData; -import com.avaje.tests.model.basic.TOne; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.TOne; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/join/TestSecondaryJoin.java b/src/test/java/org/tests/basic/join/TestSecondaryJoin.java similarity index 62% rename from src/test/java/com/avaje/tests/basic/join/TestSecondaryJoin.java rename to src/test/java/org/tests/basic/join/TestSecondaryJoin.java index ef16a8ed7..d36dd554f 100644 --- a/src/test/java/com/avaje/tests/basic/join/TestSecondaryJoin.java +++ b/src/test/java/org/tests/basic/join/TestSecondaryJoin.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic.join; +package org.tests.basic.join; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.Order.Status; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Order; +import org.tests.model.basic.Order.Status; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/basic/lob/TestBasicClobFetchEager.java b/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java similarity index 91% rename from src/test/java/com/avaje/tests/basic/lob/TestBasicClobFetchEager.java rename to src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java index d5254e70b..973f023b5 100644 --- a/src/test/java/com/avaje/tests/basic/lob/TestBasicClobFetchEager.java +++ b/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic.lob; +package org.tests.basic.lob; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.EBasicClobFetchEager; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Query; +import org.tests.model.basic.EBasicClobFetchEager; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/lob/TestBasicClobNoVer.java b/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java similarity index 89% rename from src/test/java/com/avaje/tests/basic/lob/TestBasicClobNoVer.java rename to src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java index 4ed721ae9..a0621ad39 100644 --- a/src/test/java/com/avaje/tests/basic/lob/TestBasicClobNoVer.java +++ b/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic.lob; +package org.tests.basic.lob; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.EBasicClobNoVer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Query; +import org.tests.model.basic.EBasicClobNoVer; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/lob/TestByteOnly.java b/src/test/java/org/tests/basic/lob/TestByteOnly.java similarity index 72% rename from src/test/java/com/avaje/tests/basic/lob/TestByteOnly.java rename to src/test/java/org/tests/basic/lob/TestByteOnly.java index f7c968950..d675cb6b7 100644 --- a/src/test/java/com/avaje/tests/basic/lob/TestByteOnly.java +++ b/src/test/java/org/tests/basic/lob/TestByteOnly.java @@ -1,8 +1,8 @@ -package com.avaje.tests.basic.lob; +package org.tests.basic.lob; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.TBytesOnly; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.TBytesOnly; import org.junit.Test; public class TestByteOnly extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/one2one/Booking.java b/src/test/java/org/tests/basic/one2one/Booking.java similarity index 97% rename from src/test/java/com/avaje/tests/basic/one2one/Booking.java rename to src/test/java/org/tests/basic/one2one/Booking.java index 5bed91968..20a6c468e 100644 --- a/src/test/java/com/avaje/tests/basic/one2one/Booking.java +++ b/src/test/java/org/tests/basic/one2one/Booking.java @@ -1,4 +1,4 @@ -package com.avaje.tests.basic.one2one; +package org.tests.basic.one2one; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/src/test/java/com/avaje/tests/basic/one2one/Invoice.java b/src/test/java/org/tests/basic/one2one/Invoice.java similarity index 96% rename from src/test/java/com/avaje/tests/basic/one2one/Invoice.java rename to src/test/java/org/tests/basic/one2one/Invoice.java index dd609be1a..631863de5 100644 --- a/src/test/java/com/avaje/tests/basic/one2one/Invoice.java +++ b/src/test/java/org/tests/basic/one2one/Invoice.java @@ -1,4 +1,4 @@ -package com.avaje.tests.basic.one2one; +package org.tests.basic.one2one; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/basic/one2one/TestOne2OneBookingInvoice.java b/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java similarity index 90% rename from src/test/java/com/avaje/tests/basic/one2one/TestOne2OneBookingInvoice.java rename to src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java index 1361025f4..d38f36435 100644 --- a/src/test/java/com/avaje/tests/basic/one2one/TestOne2OneBookingInvoice.java +++ b/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java @@ -1,7 +1,7 @@ -package com.avaje.tests.basic.one2one; +package org.tests.basic.one2one; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/one2one/TestOneToOneWheelTire.java b/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java similarity index 70% rename from src/test/java/com/avaje/tests/basic/one2one/TestOneToOneWheelTire.java rename to src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java index cc1126601..6203d3071 100644 --- a/src/test/java/com/avaje/tests/basic/one2one/TestOneToOneWheelTire.java +++ b/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java @@ -1,7 +1,7 @@ -package com.avaje.tests.basic.one2one; +package org.tests.basic.one2one; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.junit.Test; public class TestOneToOneWheelTire extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/one2one/Tire.java b/src/test/java/org/tests/basic/one2one/Tire.java similarity index 96% rename from src/test/java/com/avaje/tests/basic/one2one/Tire.java rename to src/test/java/org/tests/basic/one2one/Tire.java index 50ac16e82..98ded2763 100644 --- a/src/test/java/com/avaje/tests/basic/one2one/Tire.java +++ b/src/test/java/org/tests/basic/one2one/Tire.java @@ -1,4 +1,4 @@ -package com.avaje.tests.basic.one2one; +package org.tests.basic.one2one; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/basic/one2one/Wheel.java b/src/test/java/org/tests/basic/one2one/Wheel.java similarity index 95% rename from src/test/java/com/avaje/tests/basic/one2one/Wheel.java rename to src/test/java/org/tests/basic/one2one/Wheel.java index 00d5ceb77..2f07043dc 100644 --- a/src/test/java/com/avaje/tests/basic/one2one/Wheel.java +++ b/src/test/java/org/tests/basic/one2one/Wheel.java @@ -1,4 +1,4 @@ -package com.avaje.tests.basic.one2one; +package org.tests.basic.one2one; import javax.persistence.CascadeType; import javax.persistence.Entity; @@ -49,4 +49,4 @@ public class Wheel { public void setTire(Tire tire) { this.tire = tire; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/basic/type/BSimpleWithGen.java b/src/test/java/org/tests/basic/type/BSimpleWithGen.java similarity index 94% rename from src/test/java/com/avaje/tests/basic/type/BSimpleWithGen.java rename to src/test/java/org/tests/basic/type/BSimpleWithGen.java index e51bec781..a24e9a1ae 100644 --- a/src/test/java/com/avaje/tests/basic/type/BSimpleWithGen.java +++ b/src/test/java/org/tests/basic/type/BSimpleWithGen.java @@ -1,4 +1,4 @@ -package com.avaje.tests.basic.type; +package org.tests.basic.type; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/basic/type/TestEnumValueAnnotation.java b/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java similarity index 85% rename from src/test/java/com/avaje/tests/basic/type/TestEnumValueAnnotation.java rename to src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java index 8134a3009..0645aeb8d 100644 --- a/src/test/java/com/avaje/tests/basic/type/TestEnumValueAnnotation.java +++ b/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java @@ -1,13 +1,13 @@ -package com.avaje.tests.basic.type; +package org.tests.basic.type; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.SqlQuery; -import com.avaje.ebean.SqlRow; -import com.avaje.tests.model.basic.EBasic; -import com.avaje.tests.model.basic.EBasic.Status; -import com.avaje.tests.model.basic.EBasicEnumId; -import com.avaje.tests.model.basic.EBasicEnumInt; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.SqlQuery; +import io.ebean.SqlRow; +import org.tests.model.basic.EBasic; +import org.tests.model.basic.EBasic.Status; +import org.tests.model.basic.EBasicEnumId; +import org.tests.model.basic.EBasicEnumInt; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/type/TestExtraScalarTypes.java b/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java similarity index 87% rename from src/test/java/com/avaje/tests/basic/type/TestExtraScalarTypes.java rename to src/test/java/org/tests/basic/type/TestExtraScalarTypes.java index a1fad7d9c..6ed82e06d 100644 --- a/src/test/java/com/avaje/tests/basic/type/TestExtraScalarTypes.java +++ b/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java @@ -1,8 +1,8 @@ -package com.avaje.tests.basic.type; +package org.tests.basic.type; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.ESomeType; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.ESomeType; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/type/TestInetAddressType.java b/src/test/java/org/tests/basic/type/TestInetAddressType.java similarity index 90% rename from src/test/java/com/avaje/tests/basic/type/TestInetAddressType.java rename to src/test/java/org/tests/basic/type/TestInetAddressType.java index 8f5107076..679963693 100644 --- a/src/test/java/com/avaje/tests/basic/type/TestInetAddressType.java +++ b/src/test/java/org/tests/basic/type/TestInetAddressType.java @@ -1,8 +1,8 @@ -package com.avaje.tests.basic.type; +package org.tests.basic.type; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.EWithInetAddr; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.EWithInetAddr; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/type/TestQueryBooleanProperty.java b/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java similarity index 62% rename from src/test/java/com/avaje/tests/basic/type/TestQueryBooleanProperty.java rename to src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java index 7726880e4..043150526 100644 --- a/src/test/java/com/avaje/tests/basic/type/TestQueryBooleanProperty.java +++ b/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java @@ -1,8 +1,8 @@ -package com.avaje.tests.basic.type; +package org.tests.basic.type; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.TOne; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.TOne; import org.junit.Test; public class TestQueryBooleanProperty extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/type/TestSqlRowUUID.java b/src/test/java/org/tests/basic/type/TestSqlRowUUID.java similarity index 71% rename from src/test/java/com/avaje/tests/basic/type/TestSqlRowUUID.java rename to src/test/java/org/tests/basic/type/TestSqlRowUUID.java index ab97f7b8f..ad467e6ac 100644 --- a/src/test/java/com/avaje/tests/basic/type/TestSqlRowUUID.java +++ b/src/test/java/org/tests/basic/type/TestSqlRowUUID.java @@ -1,10 +1,10 @@ -package com.avaje.tests.basic.type; +package org.tests.basic.type; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.SqlQuery; -import com.avaje.ebean.SqlRow; -import com.avaje.tests.model.basic.TUuidEntity; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.SqlQuery; +import io.ebean.SqlRow; +import org.tests.model.basic.TUuidEntity; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/basic/type/TestTransientMap.java b/src/test/java/org/tests/basic/type/TestTransientMap.java similarity index 66% rename from src/test/java/com/avaje/tests/basic/type/TestTransientMap.java rename to src/test/java/org/tests/basic/type/TestTransientMap.java index 491818d6b..aebf7c69d 100644 --- a/src/test/java/com/avaje/tests/basic/type/TestTransientMap.java +++ b/src/test/java/org/tests/basic/type/TestTransientMap.java @@ -1,7 +1,7 @@ -package com.avaje.tests.basic.type; +package org.tests.basic.type; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.junit.Test; public class TestTransientMap extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertFlush.java b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java similarity index 87% rename from src/test/java/com/avaje/tests/batchinsert/TestBatchInsertFlush.java rename to src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java index 8cbd0f517..3c46acda3 100644 --- a/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertFlush.java +++ b/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java @@ -1,12 +1,12 @@ -package com.avaje.tests.batchinsert; +package org.tests.batchinsert; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.annotation.Transactional; -import com.avaje.ebean.config.PersistBatch; -import com.avaje.tests.model.basic.EBasicVer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Transaction; +import io.ebean.annotation.Transactional; +import io.ebean.PersistBatch; +import org.tests.model.basic.EBasicVer; import org.junit.Test; import java.sql.Timestamp; diff --git a/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertSimple.java b/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java similarity index 94% rename from src/test/java/com/avaje/tests/batchinsert/TestBatchInsertSimple.java rename to src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java index 919011958..1ca9bf5f4 100644 --- a/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertSimple.java +++ b/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java @@ -1,12 +1,12 @@ -package com.avaje.tests.batchinsert; +package org.tests.batchinsert; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.annotation.Transactional; -import com.avaje.ebean.config.PersistBatch; -import com.avaje.tests.model.basic.UTDetail; -import com.avaje.tests.model.basic.UTMaster; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Transaction; +import io.ebean.annotation.Transactional; +import io.ebean.PersistBatch; +import org.tests.model.basic.UTDetail; +import org.tests.model.basic.UTMaster; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java b/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java similarity index 80% rename from src/test/java/com/avaje/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java rename to src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java index fb710a0c3..b3c66c41f 100644 --- a/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java +++ b/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java @@ -1,10 +1,10 @@ -package com.avaje.tests.batchinsert; +package org.tests.batchinsert; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.config.PersistBatch; -import com.avaje.tests.model.basic.OCachedBean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Transaction; +import io.ebean.PersistBatch; +import org.tests.model.basic.OCachedBean; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java similarity index 88% rename from src/test/java/com/avaje/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java rename to src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java index 960613f51..e94a420ee 100644 --- a/src/test/java/com/avaje/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java +++ b/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java @@ -1,14 +1,14 @@ -package com.avaje.tests.batchinsert; +package org.tests.batchinsert; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.config.PersistBatch; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.ebeaninternal.server.persist.BatchControl; -import com.avaje.tests.model.basic.EBasicWithUniqueCon; -import com.avaje.tests.model.basic.EOptOneB; -import com.avaje.tests.model.basic.EOptOneC; +import io.ebean.BaseTestCase; +import io.ebean.EbeanServer; +import io.ebean.Transaction; +import io.ebean.PersistBatch; +import io.ebeaninternal.api.SpiTransaction; +import io.ebeaninternal.server.persist.BatchControl; +import org.tests.model.basic.EBasicWithUniqueCon; +import org.tests.model.basic.EOptOneB; +import org.tests.model.basic.EOptOneC; import org.assertj.core.api.Assertions; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/batchinsert/TestBatchSaveWithGetBeanId.java b/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java similarity index 75% rename from src/test/java/com/avaje/tests/batchinsert/TestBatchSaveWithGetBeanId.java rename to src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java index 7ffc0dac1..2fab37ff9 100644 --- a/src/test/java/com/avaje/tests/batchinsert/TestBatchSaveWithGetBeanId.java +++ b/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java @@ -1,10 +1,10 @@ -package com.avaje.tests.batchinsert; +package org.tests.batchinsert; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.annotation.Transactional; -import com.avaje.tests.model.basic.Customer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.annotation.Transactional; +import org.tests.model.basic.Customer; import org.junit.Test; import static org.junit.Assert.assertNotNull; diff --git a/src/test/java/com/avaje/tests/batchload/TestBasicLazy.java b/src/test/java/org/tests/batchload/TestBasicLazy.java similarity index 91% rename from src/test/java/com/avaje/tests/batchload/TestBasicLazy.java rename to src/test/java/org/tests/batchload/TestBasicLazy.java index e6c389e08..49c407e2e 100644 --- a/src/test/java/com/avaje/tests/batchload/TestBasicLazy.java +++ b/src/test/java/org/tests/batchload/TestBasicLazy.java @@ -1,16 +1,16 @@ -package com.avaje.tests.batchload; +package org.tests.batchload; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Expr; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.Transaction; -import com.avaje.tests.basic.MyTestDataSourcePoolListener; -import com.avaje.tests.model.basic.Address; -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.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Expr; +import io.ebean.FetchConfig; +import io.ebean.Transaction; +import org.tests.basic.MyTestDataSourcePoolListener; +import org.tests.model.basic.Address; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/batchload/TestBasicNavOnEmpty.java b/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java similarity index 67% rename from src/test/java/com/avaje/tests/batchload/TestBasicNavOnEmpty.java rename to src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java index 554881d5a..15e765a5f 100644 --- a/src/test/java/com/avaje/tests/batchload/TestBasicNavOnEmpty.java +++ b/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java @@ -1,9 +1,9 @@ -package com.avaje.tests.batchload; +package org.tests.batchload; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Customer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java b/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java similarity index 88% rename from src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java rename to src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java index e668ae1b5..58d378b97 100644 --- a/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java @@ -1,11 +1,11 @@ -package com.avaje.tests.batchload; +package org.tests.batchload; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebean.cache.ServerCacheManager; -import com.avaje.ebean.cache.ServerCacheStatistics; -import com.avaje.tests.model.basic.UUOne; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.cache.ServerCache; +import io.ebean.cache.ServerCacheManager; +import io.ebean.cache.ServerCacheStatistics; +import org.tests.model.basic.UUOne; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithDeleted.java b/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java similarity index 90% rename from src/test/java/com/avaje/tests/batchload/TestBatchLazyWithDeleted.java rename to src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java index 46a856427..1becb29bc 100644 --- a/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithDeleted.java +++ b/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java @@ -1,10 +1,10 @@ -package com.avaje.tests.batchload; +package org.tests.batchload; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.tests.model.basic.UUOne; -import com.avaje.tests.model.basic.UUTwo; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import org.tests.model.basic.UUOne; +import org.tests.model.basic.UUTwo; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/batchload/TestEmptyManyLazyLoad.java b/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java similarity index 57% rename from src/test/java/com/avaje/tests/batchload/TestEmptyManyLazyLoad.java rename to src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java index aba6a6bb4..5cbc25901 100644 --- a/src/test/java/com/avaje/tests/batchload/TestEmptyManyLazyLoad.java +++ b/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java @@ -1,11 +1,11 @@ -package com.avaje.tests.batchload; +package org.tests.batchload; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.Order.Status; -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.Order; +import org.tests.model.basic.Order.Status; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; public class TestEmptyManyLazyLoad extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/batchload/TestLazyJoin.java b/src/test/java/org/tests/batchload/TestLazyJoin.java similarity index 72% rename from src/test/java/com/avaje/tests/batchload/TestLazyJoin.java rename to src/test/java/org/tests/batchload/TestLazyJoin.java index 7afa59ad5..e452da0ce 100644 --- a/src/test/java/com/avaje/tests/batchload/TestLazyJoin.java +++ b/src/test/java/org/tests/batchload/TestLazyJoin.java @@ -1,12 +1,12 @@ -package com.avaje.tests.batchload; +package org.tests.batchload; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Address; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Address; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/batchload/TestLazyJoin2.java b/src/test/java/org/tests/batchload/TestLazyJoin2.java similarity index 85% rename from src/test/java/com/avaje/tests/batchload/TestLazyJoin2.java rename to src/test/java/org/tests/batchload/TestLazyJoin2.java index 27a832f8e..31d6027a7 100644 --- a/src/test/java/com/avaje/tests/batchload/TestLazyJoin2.java +++ b/src/test/java/org/tests/batchload/TestLazyJoin2.java @@ -1,13 +1,13 @@ -package com.avaje.tests.batchload; +package org.tests.batchload; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.tests.model.basic.Address; -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.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import org.tests.model.basic.Address; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/batchload/TestLazyLoadEmptyCollection.java b/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java similarity index 71% rename from src/test/java/com/avaje/tests/batchload/TestLazyLoadEmptyCollection.java rename to src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java index 9b1050b68..a11679e32 100644 --- a/src/test/java/com/avaje/tests/batchload/TestLazyLoadEmptyCollection.java +++ b/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java @@ -1,11 +1,11 @@ -package com.avaje.tests.batchload; +package org.tests.batchload; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistantBean.java b/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java similarity index 78% rename from src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistantBean.java rename to src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java index 1b26c7938..0beb20db4 100644 --- a/src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistantBean.java +++ b/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java @@ -1,8 +1,8 @@ -package com.avaje.tests.batchload; +package org.tests.batchload; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.UUOne; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.UUOne; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistentBean.java b/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java similarity index 78% rename from src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistentBean.java rename to src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java index 63b03d406..966080ba8 100644 --- a/src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistentBean.java +++ b/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java @@ -1,8 +1,8 @@ -package com.avaje.tests.batchload; +package org.tests.batchload; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.UUOne; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.UUOne; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/batchload/TestLoadOnDirty.java b/src/test/java/org/tests/batchload/TestLoadOnDirty.java similarity index 85% rename from src/test/java/com/avaje/tests/batchload/TestLoadOnDirty.java rename to src/test/java/org/tests/batchload/TestLoadOnDirty.java index 9be79a5b1..adb548a8b 100644 --- a/src/test/java/com/avaje/tests/batchload/TestLoadOnDirty.java +++ b/src/test/java/org/tests/batchload/TestLoadOnDirty.java @@ -1,12 +1,12 @@ -package com.avaje.tests.batchload; +package org.tests.batchload; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.BeanState; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.Ebean; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/batchload/TestQueryDisableLazyLoad.java b/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java similarity index 88% rename from src/test/java/com/avaje/tests/batchload/TestQueryDisableLazyLoad.java rename to src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java index fdd35e3a9..8a494ff0e 100644 --- a/src/test/java/com/avaje/tests/batchload/TestQueryDisableLazyLoad.java +++ b/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java @@ -1,10 +1,10 @@ -package com.avaje.tests.batchload; +package org.tests.batchload; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.OrderDetail; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderDetail; +import org.tests.model.basic.ResetBasicData; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/batchload/TestQueryJoin.java b/src/test/java/org/tests/batchload/TestQueryJoin.java similarity index 82% rename from src/test/java/com/avaje/tests/batchload/TestQueryJoin.java rename to src/test/java/org/tests/batchload/TestQueryJoin.java index dd30a94e9..905119b76 100644 --- a/src/test/java/com/avaje/tests/batchload/TestQueryJoin.java +++ b/src/test/java/org/tests/batchload/TestQueryJoin.java @@ -1,14 +1,14 @@ -package com.avaje.tests.batchload; +package org.tests.batchload; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.BeanState; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.tests.model.basic.Address; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.cache.ServerCache; +import org.tests.model.basic.Address; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java b/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java similarity index 94% rename from src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java rename to src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java index 315c5d40a..508ecb41e 100644 --- a/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java +++ b/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java @@ -1,11 +1,11 @@ -package com.avaje.tests.batchload; +package org.tests.batchload; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.OrderDetail; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderDetail; +import org.tests.model.basic.ResetBasicData; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/batchload/TestSecondQueryNoRows.java b/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java similarity index 75% rename from src/test/java/com/avaje/tests/batchload/TestSecondQueryNoRows.java rename to src/test/java/org/tests/batchload/TestSecondQueryNoRows.java index 64a588023..2ba7dd1d0 100644 --- a/src/test/java/com/avaje/tests/batchload/TestSecondQueryNoRows.java +++ b/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java @@ -1,9 +1,9 @@ -package com.avaje.tests.batchload; +package org.tests.batchload; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.tests.model.basic.Customer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import org.tests.model.basic.Customer; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/avaje/tests/batchload/TestSecondaryQueries.java b/src/test/java/org/tests/batchload/TestSecondaryQueries.java similarity index 93% rename from src/test/java/com/avaje/tests/batchload/TestSecondaryQueries.java rename to src/test/java/org/tests/batchload/TestSecondaryQueries.java index 0c3fb7bfc..2d0e61aee 100644 --- a/src/test/java/com/avaje/tests/batchload/TestSecondaryQueries.java +++ b/src/test/java/org/tests/batchload/TestSecondaryQueries.java @@ -1,13 +1,13 @@ -package com.avaje.tests.batchload; +package org.tests.batchload; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.Query; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import io.ebean.Query; +import io.ebeaninternal.api.SpiQuery; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/cache/TestBeanCache.java b/src/test/java/org/tests/cache/TestBeanCache.java similarity index 88% rename from src/test/java/com/avaje/tests/cache/TestBeanCache.java rename to src/test/java/org/tests/cache/TestBeanCache.java index 9497c641e..78d43e369 100644 --- a/src/test/java/com/avaje/tests/cache/TestBeanCache.java +++ b/src/test/java/org/tests/cache/TestBeanCache.java @@ -1,8 +1,8 @@ -package com.avaje.tests.cache; +package org.tests.cache; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.OCachedBean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.OCachedBean; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/cache/TestCacheBasic.java b/src/test/java/org/tests/cache/TestCacheBasic.java similarity index 94% rename from src/test/java/com/avaje/tests/cache/TestCacheBasic.java rename to src/test/java/org/tests/cache/TestCacheBasic.java index 3995f1d24..1ae302ef6 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheBasic.java +++ b/src/test/java/org/tests/cache/TestCacheBasic.java @@ -1,11 +1,11 @@ -package com.avaje.tests.cache; +package org.tests.cache; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebean.cache.ServerCacheStatistics; -import com.avaje.tests.model.basic.Country; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.cache.ServerCache; +import io.ebean.cache.ServerCacheStatistics; +import org.tests.model.basic.Country; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java b/src/test/java/org/tests/cache/TestCacheCollectionIds.java similarity index 95% rename from src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java rename to src/test/java/org/tests/cache/TestCacheCollectionIds.java index 31fb3ee27..6654ff896 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java +++ b/src/test/java/org/tests/cache/TestCacheCollectionIds.java @@ -1,15 +1,15 @@ -package com.avaje.tests.cache; +package org.tests.cache; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebean.cache.ServerCacheManager; -import com.avaje.ebeaninternal.server.cache.CachedManyIds; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Country; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.OCachedBean; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.cache.ServerCache; +import io.ebean.cache.ServerCacheManager; +import io.ebeaninternal.server.cache.CachedManyIds; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Country; +import org.tests.model.basic.Customer; +import org.tests.model.basic.OCachedBean; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/cache/TestCacheCustomer.java b/src/test/java/org/tests/cache/TestCacheCustomer.java similarity index 78% rename from src/test/java/com/avaje/tests/cache/TestCacheCustomer.java rename to src/test/java/org/tests/cache/TestCacheCustomer.java index 2746911aa..cb3f38022 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheCustomer.java +++ b/src/test/java/org/tests/cache/TestCacheCustomer.java @@ -1,12 +1,12 @@ -package com.avaje.tests.cache; +package org.tests.cache; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Address; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Country; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Address; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Country; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/cache/TestCacheDelete.java b/src/test/java/org/tests/cache/TestCacheDelete.java similarity index 86% rename from src/test/java/com/avaje/tests/cache/TestCacheDelete.java rename to src/test/java/org/tests/cache/TestCacheDelete.java index 90b0620b9..9af7aeae4 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheDelete.java +++ b/src/test/java/org/tests/cache/TestCacheDelete.java @@ -1,9 +1,9 @@ -package com.avaje.tests.cache; +package org.tests.cache; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.OCachedBean; -import com.avaje.tests.model.basic.OCachedBeanChild; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.OCachedBean; +import org.tests.model.basic.OCachedBeanChild; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java b/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java similarity index 86% rename from src/test/java/com/avaje/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java rename to src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java index ba0c82bf8..9a54e331c 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java +++ b/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java @@ -1,9 +1,9 @@ -package com.avaje.tests.cache; +package org.tests.cache; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; import org.junit.Test; import static org.junit.Assert.assertSame; diff --git a/src/test/java/com/avaje/tests/cache/TestCacheNaturalId.java b/src/test/java/org/tests/cache/TestCacheNaturalId.java similarity index 84% rename from src/test/java/com/avaje/tests/cache/TestCacheNaturalId.java rename to src/test/java/org/tests/cache/TestCacheNaturalId.java index 4fcc7a778..1188b1070 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheNaturalId.java +++ b/src/test/java/org/tests/cache/TestCacheNaturalId.java @@ -1,11 +1,11 @@ -package com.avaje.tests.cache; +package org.tests.cache; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebean.cache.ServerCacheStatistics; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.cache.ServerCache; +import io.ebean.cache.ServerCacheStatistics; +import org.tests.model.basic.Contact; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/cache/TestExternalNotification.java b/src/test/java/org/tests/cache/TestExternalNotification.java similarity index 85% rename from src/test/java/com/avaje/tests/cache/TestExternalNotification.java rename to src/test/java/org/tests/cache/TestExternalNotification.java index 1f3a1bea5..b55135f30 100644 --- a/src/test/java/com/avaje/tests/cache/TestExternalNotification.java +++ b/src/test/java/org/tests/cache/TestExternalNotification.java @@ -1,12 +1,12 @@ -package com.avaje.tests.cache; +package org.tests.cache; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.SqlUpdate; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebean.cache.ServerCacheManager; -import com.avaje.tests.model.basic.Country; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.SqlUpdate; +import io.ebean.cache.ServerCache; +import io.ebean.cache.ServerCacheManager; +import org.tests.model.basic.Country; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/avaje/tests/cache/TestL2CacheWithSharedBean.java b/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java similarity index 77% rename from src/test/java/com/avaje/tests/cache/TestL2CacheWithSharedBean.java rename to src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java index b2e746ee6..8a614c629 100644 --- a/src/test/java/com/avaje/tests/cache/TestL2CacheWithSharedBean.java +++ b/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java @@ -1,14 +1,14 @@ -package com.avaje.tests.cache; +package org.tests.cache; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.autotune.model.Origin; -import com.avaje.ebeaninternal.server.autotune.service.TunedQueryInfo; -import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; -import com.avaje.tests.model.basic.FeatureDescription; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.cache.ServerCache; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.autotune.model.Origin; +import io.ebeaninternal.server.autotune.service.TunedQueryInfo; +import io.ebeaninternal.server.querydefn.OrmQueryDetail; +import org.tests.model.basic.FeatureDescription; import org.jetbrains.annotations.NotNull; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/cache/TestQueryCache.java b/src/test/java/org/tests/cache/TestQueryCache.java similarity index 88% rename from src/test/java/com/avaje/tests/cache/TestQueryCache.java rename to src/test/java/org/tests/cache/TestQueryCache.java index a9552e4fc..58ae63923 100644 --- a/src/test/java/com/avaje/tests/cache/TestQueryCache.java +++ b/src/test/java/org/tests/cache/TestQueryCache.java @@ -1,12 +1,12 @@ -package com.avaje.tests.cache; +package org.tests.cache; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; -import com.avaje.tests.model.cache.EColAB; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.bean.BeanCollection; +import io.ebean.cache.ServerCache; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; +import org.tests.model.cache.EColAB; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/cache/TestQueryCacheCountry.java b/src/test/java/org/tests/cache/TestQueryCacheCountry.java similarity index 84% rename from src/test/java/com/avaje/tests/cache/TestQueryCacheCountry.java rename to src/test/java/org/tests/cache/TestQueryCacheCountry.java index 02a1e9d54..ae506051b 100644 --- a/src/test/java/com/avaje/tests/cache/TestQueryCacheCountry.java +++ b/src/test/java/org/tests/cache/TestQueryCacheCountry.java @@ -1,11 +1,11 @@ -package com.avaje.tests.cache; +package org.tests.cache; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebean.cache.ServerCacheStatistics; -import com.avaje.tests.model.basic.Country; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.cache.ServerCache; +import io.ebean.cache.ServerCacheStatistics; +import org.tests.model.basic.Country; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/cache/TestQueryCacheInsert.java b/src/test/java/org/tests/cache/TestQueryCacheInsert.java similarity index 78% rename from src/test/java/com/avaje/tests/cache/TestQueryCacheInsert.java rename to src/test/java/org/tests/cache/TestQueryCacheInsert.java index 966effe01..e74acbce6 100644 --- a/src/test/java/com/avaje/tests/cache/TestQueryCacheInsert.java +++ b/src/test/java/org/tests/cache/TestQueryCacheInsert.java @@ -1,9 +1,9 @@ -package com.avaje.tests.cache; +package org.tests.cache; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.tests.model.basic.EBasicVer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import org.tests.model.basic.EBasicVer; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/callable/TestMysqlCallable.java b/src/test/java/org/tests/callable/TestMysqlCallable.java similarity index 83% rename from src/test/java/com/avaje/tests/callable/TestMysqlCallable.java rename to src/test/java/org/tests/callable/TestMysqlCallable.java index 97cec9aba..11db943a6 100644 --- a/src/test/java/com/avaje/tests/callable/TestMysqlCallable.java +++ b/src/test/java/org/tests/callable/TestMysqlCallable.java @@ -1,10 +1,10 @@ -package com.avaje.tests.callable; +package org.tests.callable; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.CallableSql; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.tests.model.basic.EBasic; +import io.ebean.BaseTestCase; +import io.ebean.CallableSql; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import org.tests.model.basic.EBasic; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/cascade/TestPrivateOwned.java b/src/test/java/org/tests/cascade/TestPrivateOwned.java similarity index 90% rename from src/test/java/com/avaje/tests/cascade/TestPrivateOwned.java rename to src/test/java/org/tests/cascade/TestPrivateOwned.java index 03a2a0111..d5c7f6f92 100644 --- a/src/test/java/com/avaje/tests/cascade/TestPrivateOwned.java +++ b/src/test/java/org/tests/cascade/TestPrivateOwned.java @@ -1,10 +1,10 @@ -package com.avaje.tests.cascade; +package org.tests.cascade; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.tests.model.basic.TSDetail; -import com.avaje.tests.model.basic.TSMaster; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.bean.BeanCollection; +import org.tests.model.basic.TSDetail; +import org.tests.model.basic.TSMaster; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java b/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java similarity index 77% rename from src/test/java/com/avaje/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java rename to src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java index a172b09a1..42321dc43 100644 --- a/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java +++ b/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java @@ -1,9 +1,9 @@ -package com.avaje.tests.cascade; +package org.tests.cascade; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.TSDetail; -import com.avaje.tests.model.basic.TSMaster; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.TSDetail; +import org.tests.model.basic.TSMaster; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java b/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java similarity index 84% rename from src/test/java/com/avaje/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java rename to src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java index c30823498..462956d94 100644 --- a/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java +++ b/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java @@ -1,9 +1,9 @@ -package com.avaje.tests.cascade; +package org.tests.cascade; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.TSDetail; -import com.avaje.tests.model.basic.TSMaster; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.TSDetail; +import org.tests.model.basic.TSMaster; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedNoCascadeRemove.java b/src/test/java/org/tests/cascade/TestPrivateOwnedNoCascadeRemove.java similarity index 84% rename from src/test/java/com/avaje/tests/cascade/TestPrivateOwnedNoCascadeRemove.java rename to src/test/java/org/tests/cascade/TestPrivateOwnedNoCascadeRemove.java index e34df8bb7..d521f672f 100644 --- a/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedNoCascadeRemove.java +++ b/src/test/java/org/tests/cascade/TestPrivateOwnedNoCascadeRemove.java @@ -1,10 +1,10 @@ -package com.avaje.tests.cascade; +package org.tests.cascade; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.tests.model.basic.TSDetailTwo; -import com.avaje.tests.model.basic.TSMasterTwo; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.bean.BeanCollection; +import org.tests.model.basic.TSDetailTwo; +import org.tests.model.basic.TSMasterTwo; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/changelog/TestChangeLog.java b/src/test/java/org/tests/changelog/TestChangeLog.java similarity index 84% rename from src/test/java/com/avaje/tests/changelog/TestChangeLog.java rename to src/test/java/org/tests/changelog/TestChangeLog.java index ca3ca980a..5fb9f581b 100644 --- a/src/test/java/com/avaje/tests/changelog/TestChangeLog.java +++ b/src/test/java/org/tests/changelog/TestChangeLog.java @@ -1,17 +1,17 @@ -package com.avaje.tests.changelog; +package org.tests.changelog; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.EbeanServerFactory; -import com.avaje.ebean.annotation.ChangeLog; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.event.BeanPersistRequest; -import com.avaje.ebean.event.changelog.ChangeLogFilter; -import com.avaje.ebean.event.changelog.ChangeLogListener; -import com.avaje.ebean.event.changelog.ChangeLogPrepare; -import com.avaje.ebean.event.changelog.ChangeLogRegister; -import com.avaje.ebean.event.changelog.ChangeSet; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.tests.model.basic.EBasicChangeLog; +import io.ebean.BaseTestCase; +import io.ebean.EbeanServerFactory; +import io.ebean.annotation.ChangeLog; +import io.ebean.config.ServerConfig; +import io.ebean.event.BeanPersistRequest; +import io.ebean.event.changelog.ChangeLogFilter; +import io.ebean.event.changelog.ChangeLogListener; +import io.ebean.event.changelog.ChangeLogPrepare; +import io.ebean.event.changelog.ChangeLogRegister; +import io.ebean.event.changelog.ChangeSet; +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; diff --git a/src/test/java/com/avaje/tests/compositekeys/TestCKeyDelete.java b/src/test/java/org/tests/compositekeys/TestCKeyDelete.java similarity index 76% rename from src/test/java/com/avaje/tests/compositekeys/TestCKeyDelete.java rename to src/test/java/org/tests/compositekeys/TestCKeyDelete.java index bbba58725..6e8287e92 100644 --- a/src/test/java/com/avaje/tests/compositekeys/TestCKeyDelete.java +++ b/src/test/java/org/tests/compositekeys/TestCKeyDelete.java @@ -1,9 +1,9 @@ -package com.avaje.tests.compositekeys; +package org.tests.compositekeys; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.CKeyParent; -import com.avaje.tests.model.basic.CKeyParentId; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.CKeyParent; +import org.tests.model.basic.CKeyParentId; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/compositekeys/TestCKeyIdInExpression.java b/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java similarity index 82% rename from src/test/java/com/avaje/tests/compositekeys/TestCKeyIdInExpression.java rename to src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java index 0032314cd..bbe9dc767 100644 --- a/src/test/java/com/avaje/tests/compositekeys/TestCKeyIdInExpression.java +++ b/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java @@ -1,13 +1,13 @@ -package com.avaje.tests.compositekeys; +package org.tests.compositekeys; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Query; -import com.avaje.tests.model.composite.RCustomer; -import com.avaje.tests.model.composite.RCustomerKey; -import com.avaje.tests.model.composite.ROrder; -import com.avaje.tests.model.composite.ROrderPK; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Query; +import org.tests.model.composite.RCustomer; +import org.tests.model.composite.RCustomerKey; +import org.tests.model.composite.ROrder; +import org.tests.model.composite.ROrderPK; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java b/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java similarity index 86% rename from src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java rename to src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java index 94302bb6d..5c99ddedf 100644 --- a/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java +++ b/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java @@ -1,13 +1,13 @@ -package com.avaje.tests.compositekeys; +package org.tests.compositekeys; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.PagedList; -import com.avaje.ebean.Query; -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.Ebean; +import io.ebean.PagedList; +import io.ebean.Query; +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.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java b/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java similarity index 66% rename from src/test/java/com/avaje/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java rename to src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java index e4795aab2..028c9c9c6 100644 --- a/src/test/java/com/avaje/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java +++ b/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java @@ -1,9 +1,9 @@ -package com.avaje.tests.compositekeys; +package org.tests.compositekeys; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.compositekeys.db.CaoBean; -import com.avaje.tests.compositekeys.db.CaoKey; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.compositekeys.db.CaoBean; +import org.tests.compositekeys.db.CaoKey; import org.junit.Test; public class TestCaoCompositeKeyWithAnnotationOverrides extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/compositekeys/TestCore.java b/src/test/java/org/tests/compositekeys/TestCore.java similarity index 87% rename from src/test/java/com/avaje/tests/compositekeys/TestCore.java rename to src/test/java/org/tests/compositekeys/TestCore.java index 5c4e7f302..61ba5550a 100644 --- a/src/test/java/com/avaje/tests/compositekeys/TestCore.java +++ b/src/test/java/org/tests/compositekeys/TestCore.java @@ -1,17 +1,17 @@ -package com.avaje.tests.compositekeys; +package org.tests.compositekeys; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.Transaction; -import com.avaje.tests.compositekeys.db.Item; -import com.avaje.tests.compositekeys.db.ItemKey; -import com.avaje.tests.compositekeys.db.Region; -import com.avaje.tests.compositekeys.db.RegionKey; -import com.avaje.tests.compositekeys.db.SubType; -import com.avaje.tests.compositekeys.db.SubTypeKey; -import com.avaje.tests.compositekeys.db.Type; -import com.avaje.tests.compositekeys.db.TypeKey; -import com.avaje.tests.lib.EbeanTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.Transaction; +import org.tests.compositekeys.db.Item; +import org.tests.compositekeys.db.ItemKey; +import org.tests.compositekeys.db.Region; +import org.tests.compositekeys.db.RegionKey; +import org.tests.compositekeys.db.SubType; +import org.tests.compositekeys.db.SubTypeKey; +import org.tests.compositekeys.db.Type; +import org.tests.compositekeys.db.TypeKey; +import org.tests.lib.EbeanTestCase; import java.util.List; diff --git a/src/test/java/com/avaje/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java similarity index 95% rename from src/test/java/com/avaje/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java rename to src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java index eeefced8d..1996bb492 100644 --- a/src/test/java/com/avaje/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java +++ b/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java @@ -1,10 +1,10 @@ -package com.avaje.tests.compositekeys; +package org.tests.compositekeys; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/compositekeys/db/AuditInfo.java b/src/test/java/org/tests/compositekeys/db/AuditInfo.java similarity index 95% rename from src/test/java/com/avaje/tests/compositekeys/db/AuditInfo.java rename to src/test/java/org/tests/compositekeys/db/AuditInfo.java index 1986bb26c..c2f87d08d 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/AuditInfo.java +++ b/src/test/java/org/tests/compositekeys/db/AuditInfo.java @@ -1,4 +1,4 @@ -package com.avaje.tests.compositekeys.db; +package org.tests.compositekeys.db; import javax.persistence.Embeddable; import java.util.Date; diff --git a/src/test/java/com/avaje/tests/compositekeys/db/CaoBean.java b/src/test/java/org/tests/compositekeys/db/CaoBean.java similarity index 95% rename from src/test/java/com/avaje/tests/compositekeys/db/CaoBean.java rename to src/test/java/org/tests/compositekeys/db/CaoBean.java index 8978b3972..441035b6a 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/CaoBean.java +++ b/src/test/java/org/tests/compositekeys/db/CaoBean.java @@ -1,4 +1,4 @@ -package com.avaje.tests.compositekeys.db; +package org.tests.compositekeys.db; import javax.persistence.AttributeOverride; import javax.persistence.Column; diff --git a/src/test/java/com/avaje/tests/compositekeys/db/CaoKey.java b/src/test/java/org/tests/compositekeys/db/CaoKey.java similarity index 94% rename from src/test/java/com/avaje/tests/compositekeys/db/CaoKey.java rename to src/test/java/org/tests/compositekeys/db/CaoKey.java index 6a32dadc9..ee6350950 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/CaoKey.java +++ b/src/test/java/org/tests/compositekeys/db/CaoKey.java @@ -1,4 +1,4 @@ -package com.avaje.tests.compositekeys.db; +package org.tests.compositekeys.db; import javax.persistence.Embeddable; diff --git a/src/test/java/com/avaje/tests/compositekeys/db/Item.java b/src/test/java/org/tests/compositekeys/db/Item.java similarity index 95% rename from src/test/java/com/avaje/tests/compositekeys/db/Item.java rename to src/test/java/org/tests/compositekeys/db/Item.java index 4d72380df..4780e06ca 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/Item.java +++ b/src/test/java/org/tests/compositekeys/db/Item.java @@ -1,13 +1,11 @@ -package com.avaje.tests.compositekeys.db; +package org.tests.compositekeys.db; import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; import javax.persistence.ManyToOne; import javax.persistence.Version; diff --git a/src/test/java/com/avaje/tests/compositekeys/db/ItemKey.java b/src/test/java/org/tests/compositekeys/db/ItemKey.java similarity index 95% rename from src/test/java/com/avaje/tests/compositekeys/db/ItemKey.java rename to src/test/java/org/tests/compositekeys/db/ItemKey.java index 01a4cb07d..0f35d91ea 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/ItemKey.java +++ b/src/test/java/org/tests/compositekeys/db/ItemKey.java @@ -1,4 +1,4 @@ -package com.avaje.tests.compositekeys.db; +package org.tests.compositekeys.db; import javax.persistence.Column; import javax.persistence.Embeddable; diff --git a/src/test/java/com/avaje/tests/compositekeys/db/Parcel.java b/src/test/java/org/tests/compositekeys/db/Parcel.java similarity index 92% rename from src/test/java/com/avaje/tests/compositekeys/db/Parcel.java rename to src/test/java/org/tests/compositekeys/db/Parcel.java index 6d6a0e655..cb18bf8e5 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/Parcel.java +++ b/src/test/java/org/tests/compositekeys/db/Parcel.java @@ -1,4 +1,4 @@ -package com.avaje.tests.compositekeys.db; +package org.tests.compositekeys.db; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/compositekeys/db/ParcelLocation.java b/src/test/java/org/tests/compositekeys/db/ParcelLocation.java similarity index 95% rename from src/test/java/com/avaje/tests/compositekeys/db/ParcelLocation.java rename to src/test/java/org/tests/compositekeys/db/ParcelLocation.java index 7671e1157..4008006b0 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/ParcelLocation.java +++ b/src/test/java/org/tests/compositekeys/db/ParcelLocation.java @@ -1,4 +1,4 @@ -package com.avaje.tests.compositekeys.db; +package org.tests.compositekeys.db; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/compositekeys/db/Region.java b/src/test/java/org/tests/compositekeys/db/Region.java similarity index 96% rename from src/test/java/com/avaje/tests/compositekeys/db/Region.java rename to src/test/java/org/tests/compositekeys/db/Region.java index 6d65c9005..e75aae7de 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/Region.java +++ b/src/test/java/org/tests/compositekeys/db/Region.java @@ -1,4 +1,4 @@ -package com.avaje.tests.compositekeys.db; +package org.tests.compositekeys.db; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/compositekeys/db/RegionKey.java b/src/test/java/org/tests/compositekeys/db/RegionKey.java similarity index 94% rename from src/test/java/com/avaje/tests/compositekeys/db/RegionKey.java rename to src/test/java/org/tests/compositekeys/db/RegionKey.java index 263ebc044..50bee3c69 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/RegionKey.java +++ b/src/test/java/org/tests/compositekeys/db/RegionKey.java @@ -1,4 +1,4 @@ -package com.avaje.tests.compositekeys.db; +package org.tests.compositekeys.db; import javax.persistence.Embeddable; diff --git a/src/test/java/com/avaje/tests/compositekeys/db/SubType.java b/src/test/java/org/tests/compositekeys/db/SubType.java similarity index 93% rename from src/test/java/com/avaje/tests/compositekeys/db/SubType.java rename to src/test/java/org/tests/compositekeys/db/SubType.java index 73fa69912..d05a9ddc0 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/SubType.java +++ b/src/test/java/org/tests/compositekeys/db/SubType.java @@ -1,4 +1,4 @@ -package com.avaje.tests.compositekeys.db; +package org.tests.compositekeys.db; import javax.persistence.EmbeddedId; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/compositekeys/db/SubTypeKey.java b/src/test/java/org/tests/compositekeys/db/SubTypeKey.java similarity index 92% rename from src/test/java/com/avaje/tests/compositekeys/db/SubTypeKey.java rename to src/test/java/org/tests/compositekeys/db/SubTypeKey.java index a732ca06f..ef7cb7a06 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/SubTypeKey.java +++ b/src/test/java/org/tests/compositekeys/db/SubTypeKey.java @@ -1,4 +1,4 @@ -package com.avaje.tests.compositekeys.db; +package org.tests.compositekeys.db; import javax.persistence.Embeddable; diff --git a/src/test/java/com/avaje/tests/compositekeys/db/Type.java b/src/test/java/org/tests/compositekeys/db/Type.java similarity index 96% rename from src/test/java/com/avaje/tests/compositekeys/db/Type.java rename to src/test/java/org/tests/compositekeys/db/Type.java index 8d818ce16..0b5784b8a 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/Type.java +++ b/src/test/java/org/tests/compositekeys/db/Type.java @@ -1,4 +1,4 @@ -package com.avaje.tests.compositekeys.db; +package org.tests.compositekeys.db; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/compositekeys/db/TypeKey.java b/src/test/java/org/tests/compositekeys/db/TypeKey.java similarity index 94% rename from src/test/java/com/avaje/tests/compositekeys/db/TypeKey.java rename to src/test/java/org/tests/compositekeys/db/TypeKey.java index 9963b5196..cdbc87a45 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/TypeKey.java +++ b/src/test/java/org/tests/compositekeys/db/TypeKey.java @@ -1,4 +1,4 @@ -package com.avaje.tests.compositekeys.db; +package org.tests.compositekeys.db; import javax.persistence.Embeddable; diff --git a/src/test/java/com/avaje/tests/config/TestTableName.java b/src/test/java/org/tests/config/TestTableName.java similarity index 91% rename from src/test/java/com/avaje/tests/config/TestTableName.java rename to src/test/java/org/tests/config/TestTableName.java index 196691fd8..f42e98c09 100644 --- a/src/test/java/com/avaje/tests/config/TestTableName.java +++ b/src/test/java/org/tests/config/TestTableName.java @@ -1,7 +1,7 @@ -package com.avaje.tests.config; +package org.tests.config; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.config.TableName; +import io.ebean.BaseTestCase; +import io.ebean.config.TableName; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/contructor/TestProtectedConstructor.java b/src/test/java/org/tests/contructor/TestProtectedConstructor.java similarity index 77% rename from src/test/java/com/avaje/tests/contructor/TestProtectedConstructor.java rename to src/test/java/org/tests/contructor/TestProtectedConstructor.java index 668ab67a5..44f0175b8 100644 --- a/src/test/java/com/avaje/tests/contructor/TestProtectedConstructor.java +++ b/src/test/java/org/tests/contructor/TestProtectedConstructor.java @@ -1,11 +1,11 @@ -package com.avaje.tests.contructor; +package org.tests.contructor; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.BeanState; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.tests.model.basic.MProtectedConstructBean; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.bean.EntityBean; +import org.tests.model.basic.MProtectedConstructBean; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/ddd/iud/TestDExhEntityEl.java b/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java similarity index 98% rename from src/test/java/com/avaje/tests/ddd/iud/TestDExhEntityEl.java rename to src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java index 5510a7e44..92aaab8de 100644 --- a/src/test/java/com/avaje/tests/ddd/iud/TestDExhEntityEl.java +++ b/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java @@ -1,4 +1,4 @@ -package com.avaje.tests.ddd.iud; +package org.tests.ddd.iud; import junit.framework.TestCase; diff --git a/src/test/java/com/avaje/tests/ddd/iud/TestDPersonEl.java b/src/test/java/org/tests/ddd/iud/TestDPersonEl.java similarity index 74% rename from src/test/java/com/avaje/tests/ddd/iud/TestDPersonEl.java rename to src/test/java/org/tests/ddd/iud/TestDPersonEl.java index 8f8c7491f..13bd6e1c2 100644 --- a/src/test/java/com/avaje/tests/ddd/iud/TestDPersonEl.java +++ b/src/test/java/org/tests/ddd/iud/TestDPersonEl.java @@ -1,13 +1,13 @@ -package com.avaje.tests.ddd.iud; +package org.tests.ddd.iud; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.plugin.BeanType; -import com.avaje.ebean.plugin.ExpressionPath; -import com.avaje.ebean.plugin.SpiServer; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.tests.model.ddd.DPerson; -import com.avaje.tests.model.ivo.Money; +import io.ebean.Ebean; +import io.ebean.bean.EntityBean; +import io.ebean.plugin.BeanType; +import io.ebean.plugin.ExpressionPath; +import io.ebean.plugin.SpiServer; +import io.ebean.text.json.JsonContext; +import org.tests.model.ddd.DPerson; +import org.tests.model.ivo.Money; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/com/avaje/tests/ddd/iud/TestDPersonIUD.java b/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java similarity index 97% rename from src/test/java/com/avaje/tests/ddd/iud/TestDPersonIUD.java rename to src/test/java/org/tests/ddd/iud/TestDPersonIUD.java index f08ecd836..2e42510ca 100644 --- a/src/test/java/com/avaje/tests/ddd/iud/TestDPersonIUD.java +++ b/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java @@ -1,4 +1,4 @@ -package com.avaje.tests.ddd.iud; +package org.tests.ddd.iud; import junit.framework.TestCase; diff --git a/src/test/java/com/avaje/tests/ddl/MainDdlWithSchema.java b/src/test/java/org/tests/ddl/MainDdlWithSchema.java similarity index 75% rename from src/test/java/com/avaje/tests/ddl/MainDdlWithSchema.java rename to src/test/java/org/tests/ddl/MainDdlWithSchema.java index 87cecce69..94d9aeb4a 100644 --- a/src/test/java/com/avaje/tests/ddl/MainDdlWithSchema.java +++ b/src/test/java/org/tests/ddl/MainDdlWithSchema.java @@ -1,9 +1,9 @@ -package com.avaje.tests.ddl; +package org.tests.ddl; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.EbeanServerFactory; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.tests.model.basic.EBasic; +import io.ebean.EbeanServer; +import io.ebean.EbeanServerFactory; +import io.ebean.config.ServerConfig; +import org.tests.model.basic.EBasic; public class MainDdlWithSchema { diff --git a/src/test/java/com/avaje/tests/delete/TestDeleteByIdUsingModel.java b/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java similarity index 82% rename from src/test/java/com/avaje/tests/delete/TestDeleteByIdUsingModel.java rename to src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java index c71dabaf4..c0a63888b 100644 --- a/src/test/java/com/avaje/tests/delete/TestDeleteByIdUsingModel.java +++ b/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java @@ -1,7 +1,7 @@ -package com.avaje.tests.delete; +package org.tests.delete; -import com.avaje.ebean.BaseTestCase; -import com.avaje.tests.model.onetoone.Account; +import io.ebean.BaseTestCase; +import org.tests.model.onetoone.Account; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/avaje/tests/delete/TestDeleteByIdWithPersistenceContext.java b/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java similarity index 84% rename from src/test/java/com/avaje/tests/delete/TestDeleteByIdWithPersistenceContext.java rename to src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java index 9cf9172fa..bbf7a684b 100644 --- a/src/test/java/com/avaje/tests/delete/TestDeleteByIdWithPersistenceContext.java +++ b/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java @@ -1,10 +1,10 @@ -package com.avaje.tests.delete; +package org.tests.delete; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.tests.model.basic.Product; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import org.tests.model.basic.Product; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/delete/TestDeleteByQuery.java b/src/test/java/org/tests/delete/TestDeleteByQuery.java similarity index 88% rename from src/test/java/com/avaje/tests/delete/TestDeleteByQuery.java rename to src/test/java/org/tests/delete/TestDeleteByQuery.java index 1998bcb34..1e069b9c1 100644 --- a/src/test/java/com/avaje/tests/delete/TestDeleteByQuery.java +++ b/src/test/java/org/tests/delete/TestDeleteByQuery.java @@ -1,12 +1,12 @@ -package com.avaje.tests.delete; +package org.tests.delete; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Query; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/delete/TestDeleteWithoutOptimisticLocking.java b/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java similarity index 83% rename from src/test/java/com/avaje/tests/delete/TestDeleteWithoutOptimisticLocking.java rename to src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java index 51d0981b4..c92b78ac3 100644 --- a/src/test/java/com/avaje/tests/delete/TestDeleteWithoutOptimisticLocking.java +++ b/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java @@ -1,13 +1,13 @@ -package com.avaje.tests.delete; +package org.tests.delete; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.config.PersistBatch; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.EBasicVer; -import com.avaje.tests.model.converstation.Group; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Transaction; +import io.ebean.PersistBatch; +import org.tests.model.basic.Contact; +import org.tests.model.basic.EBasicVer; +import org.tests.model.converstation.Group; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; diff --git a/src/test/java/com/avaje/tests/draftable/DocLinkTest.java b/src/test/java/org/tests/draftable/DocLinkTest.java similarity index 96% rename from src/test/java/com/avaje/tests/draftable/DocLinkTest.java rename to src/test/java/org/tests/draftable/DocLinkTest.java index 67a11b18c..9a1b6536e 100644 --- a/src/test/java/com/avaje/tests/draftable/DocLinkTest.java +++ b/src/test/java/org/tests/draftable/DocLinkTest.java @@ -1,11 +1,11 @@ -package com.avaje.tests.draftable; +package org.tests.draftable; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Query; -import com.avaje.tests.model.draftable.Doc; -import com.avaje.tests.model.draftable.Link; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Query; +import org.tests.model.draftable.Doc; +import org.tests.model.draftable.Link; import org.assertj.core.api.StrictAssertions; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/draftable/LinkQueryPublishTest.java b/src/test/java/org/tests/draftable/LinkQueryPublishTest.java similarity index 84% rename from src/test/java/com/avaje/tests/draftable/LinkQueryPublishTest.java rename to src/test/java/org/tests/draftable/LinkQueryPublishTest.java index abc3491da..070371ee0 100644 --- a/src/test/java/com/avaje/tests/draftable/LinkQueryPublishTest.java +++ b/src/test/java/org/tests/draftable/LinkQueryPublishTest.java @@ -1,10 +1,10 @@ -package com.avaje.tests.draftable; +package org.tests.draftable; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.PagedList; -import com.avaje.ebean.Query; -import com.avaje.tests.model.draftable.Link; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.PagedList; +import io.ebean.Query; +import org.tests.model.draftable.Link; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/com/avaje/tests/draftable/OrganisationTest.java b/src/test/java/org/tests/draftable/OrganisationTest.java similarity index 91% rename from src/test/java/com/avaje/tests/draftable/OrganisationTest.java rename to src/test/java/org/tests/draftable/OrganisationTest.java index dc097c05a..5eb1361ae 100644 --- a/src/test/java/com/avaje/tests/draftable/OrganisationTest.java +++ b/src/test/java/org/tests/draftable/OrganisationTest.java @@ -1,10 +1,10 @@ -package com.avaje.tests.draftable; +package org.tests.draftable; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.tests.model.draftable.Document; -import com.avaje.tests.model.draftable.DocumentMedia; -import com.avaje.tests.model.draftable.Organisation; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import org.tests.model.draftable.Document; +import org.tests.model.draftable.DocumentMedia; +import org.tests.model.draftable.Organisation; import org.assertj.core.api.StrictAssertions; import org.jetbrains.annotations.NotNull; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/el/TestELBasic.java b/src/test/java/org/tests/el/TestELBasic.java similarity index 80% rename from src/test/java/com/avaje/tests/el/TestELBasic.java rename to src/test/java/org/tests/el/TestELBasic.java index ade408b0e..b58a75438 100644 --- a/src/test/java/com/avaje/tests/el/TestELBasic.java +++ b/src/test/java/org/tests/el/TestELBasic.java @@ -1,16 +1,16 @@ -package com.avaje.tests.el; +package org.tests.el; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanFkeyProperty; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.ebeaninternal.server.el.ElPropertyChain; -import com.avaje.ebeaninternal.server.el.ElPropertyDeploy; -import com.avaje.tests.model.basic.Customer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanFkeyProperty; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import io.ebeaninternal.server.el.ElPropertyChain; +import io.ebeaninternal.server.el.ElPropertyDeploy; +import org.tests.model.basic.Customer; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/el/TestPathExpression.java b/src/test/java/org/tests/el/TestPathExpression.java similarity index 87% rename from src/test/java/com/avaje/tests/el/TestPathExpression.java rename to src/test/java/org/tests/el/TestPathExpression.java index 22011e9fd..c5254a305 100644 --- a/src/test/java/com/avaje/tests/el/TestPathExpression.java +++ b/src/test/java/org/tests/el/TestPathExpression.java @@ -1,13 +1,13 @@ -package com.avaje.tests.el; +package org.tests.el; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.plugin.BeanType; -import com.avaje.ebean.plugin.ExpressionPath; -import com.avaje.ebean.plugin.SpiServer; -import com.avaje.tests.model.basic.Address; -import com.avaje.tests.model.basic.Country; -import com.avaje.tests.model.basic.Customer; +import io.ebean.Ebean; +import io.ebean.bean.EntityBean; +import io.ebean.plugin.BeanType; +import io.ebean.plugin.ExpressionPath; +import io.ebean.plugin.SpiServer; +import org.tests.model.basic.Address; +import org.tests.model.basic.Country; +import org.tests.model.basic.Customer; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/avaje/tests/el/TestUnderscoreParam.java b/src/test/java/org/tests/el/TestUnderscoreParam.java similarity index 73% rename from src/test/java/com/avaje/tests/el/TestUnderscoreParam.java rename to src/test/java/org/tests/el/TestUnderscoreParam.java index b79115345..923133291 100644 --- a/src/test/java/com/avaje/tests/el/TestUnderscoreParam.java +++ b/src/test/java/org/tests/el/TestUnderscoreParam.java @@ -1,8 +1,8 @@ -package com.avaje.tests.el; +package org.tests.el; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Customer; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/tests/enhancement/TestConstructorManyAddAll.java b/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java similarity index 64% rename from src/test/java/com/avaje/tests/enhancement/TestConstructorManyAddAll.java rename to src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java index d3288bf67..e328b3b8c 100644 --- a/src/test/java/com/avaje/tests/enhancement/TestConstructorManyAddAll.java +++ b/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java @@ -1,8 +1,8 @@ -package com.avaje.tests.enhancement; +package org.tests.enhancement; -import com.avaje.ebean.BaseTestCase; -import com.avaje.tests.model.basic.MRole; -import com.avaje.tests.model.basic.MUser; +import io.ebean.BaseTestCase; +import org.tests.model.basic.MRole; +import org.tests.model.basic.MUser; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/com/avaje/tests/enhancement/TestConstructorPutfieldReplacement.java b/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java similarity index 69% rename from src/test/java/com/avaje/tests/enhancement/TestConstructorPutfieldReplacement.java rename to src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java index e2b4d6f07..4b148c02e 100644 --- a/src/test/java/com/avaje/tests/enhancement/TestConstructorPutfieldReplacement.java +++ b/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java @@ -1,10 +1,10 @@ -package com.avaje.tests.enhancement; +package org.tests.enhancement; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.tests.model.basic.PFile; -import com.avaje.tests.model.basic.PFileContent; +import io.ebean.BaseTestCase; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import org.tests.model.basic.PFile; +import org.tests.model.basic.PFileContent; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/enhancement/TestEnhancementEquals.java b/src/test/java/org/tests/enhancement/TestEnhancementEquals.java similarity index 92% rename from src/test/java/com/avaje/tests/enhancement/TestEnhancementEquals.java rename to src/test/java/org/tests/enhancement/TestEnhancementEquals.java index cbc37ab71..10bd1b0d6 100644 --- a/src/test/java/com/avaje/tests/enhancement/TestEnhancementEquals.java +++ b/src/test/java/org/tests/enhancement/TestEnhancementEquals.java @@ -1,7 +1,7 @@ -package com.avaje.tests.enhancement; +package org.tests.enhancement; -import com.avaje.ebean.BaseTestCase; -import com.avaje.tests.model.basic.Product; +import io.ebean.BaseTestCase; +import org.tests.model.basic.Product; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/family/TestInheritance.java b/src/test/java/org/tests/family/TestInheritance.java similarity index 94% rename from src/test/java/com/avaje/tests/family/TestInheritance.java rename to src/test/java/org/tests/family/TestInheritance.java index 1403202d7..89766d916 100644 --- a/src/test/java/com/avaje/tests/family/TestInheritance.java +++ b/src/test/java/org/tests/family/TestInheritance.java @@ -1,13 +1,13 @@ -package com.avaje.tests.family; +package org.tests.family; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanProperty; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.tests.model.basic.EBasic; -import com.avaje.tests.model.family.ChildPerson; -import com.avaje.tests.model.family.GrandParentPerson; -import com.avaje.tests.model.family.ParentPerson; +import io.ebean.BaseTestCase; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanProperty; +import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; +import org.tests.model.basic.EBasic; +import org.tests.model.family.ChildPerson; +import org.tests.model.family.GrandParentPerson; +import org.tests.model.family.ParentPerson; import org.junit.Test; import static org.junit.Assert.*; diff --git a/src/test/java/com/avaje/tests/generated/TestGeneratedProperties.java b/src/test/java/org/tests/generated/TestGeneratedProperties.java similarity index 91% rename from src/test/java/com/avaje/tests/generated/TestGeneratedProperties.java rename to src/test/java/org/tests/generated/TestGeneratedProperties.java index 4e696bda8..293501ec6 100644 --- a/src/test/java/com/avaje/tests/generated/TestGeneratedProperties.java +++ b/src/test/java/org/tests/generated/TestGeneratedProperties.java @@ -1,8 +1,8 @@ -package com.avaje.tests.generated; +package org.tests.generated; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.EGenProps; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.EGenProps; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; diff --git a/src/test/java/com/avaje/tests/generated/TestGeneratedWho.java b/src/test/java/org/tests/generated/TestGeneratedWho.java similarity index 85% rename from src/test/java/com/avaje/tests/generated/TestGeneratedWho.java rename to src/test/java/org/tests/generated/TestGeneratedWho.java index f10088dbd..2a19c9b43 100644 --- a/src/test/java/com/avaje/tests/generated/TestGeneratedWho.java +++ b/src/test/java/org/tests/generated/TestGeneratedWho.java @@ -1,9 +1,9 @@ -package com.avaje.tests.generated; +package org.tests.generated; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.MyCurrentUserProvider; -import com.avaje.tests.model.EWhoProps; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.MyCurrentUserProvider; +import org.tests.model.EWhoProps; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/avaje/tests/genkey/TestGeneratedKeys.java b/src/test/java/org/tests/genkey/TestGeneratedKeys.java similarity index 86% rename from src/test/java/com/avaje/tests/genkey/TestGeneratedKeys.java rename to src/test/java/org/tests/genkey/TestGeneratedKeys.java index 2f313d942..78af8f844 100644 --- a/src/test/java/com/avaje/tests/genkey/TestGeneratedKeys.java +++ b/src/test/java/org/tests/genkey/TestGeneratedKeys.java @@ -1,7 +1,7 @@ -package com.avaje.tests.genkey; +package org.tests.genkey; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.TOne; +import io.ebean.Ebean; +import org.tests.model.basic.TOne; import junit.framework.TestCase; import org.junit.Assert; diff --git a/src/test/java/com/avaje/tests/genkey/TestSeqBatch.java b/src/test/java/org/tests/genkey/TestSeqBatch.java similarity index 67% rename from src/test/java/com/avaje/tests/genkey/TestSeqBatch.java rename to src/test/java/org/tests/genkey/TestSeqBatch.java index 04117d5fc..0c362d433 100644 --- a/src/test/java/com/avaje/tests/genkey/TestSeqBatch.java +++ b/src/test/java/org/tests/genkey/TestSeqBatch.java @@ -1,12 +1,12 @@ -package com.avaje.tests.genkey; +package org.tests.genkey; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.config.dbplatform.IdType; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.tests.model.basic.TOne; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.config.dbplatform.IdType; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.tests.model.basic.TOne; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/history/TestHistoryInsert.java b/src/test/java/org/tests/history/TestHistoryInsert.java similarity index 92% rename from src/test/java/com/avaje/tests/history/TestHistoryInsert.java rename to src/test/java/org/tests/history/TestHistoryInsert.java index f8c92fd24..7023bdbca 100644 --- a/src/test/java/com/avaje/tests/history/TestHistoryInsert.java +++ b/src/test/java/org/tests/history/TestHistoryInsert.java @@ -1,11 +1,11 @@ -package com.avaje.tests.history; +package org.tests.history; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.SqlQuery; -import com.avaje.ebean.SqlRow; -import com.avaje.ebean.Version; -import com.avaje.tests.model.converstation.User; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.SqlQuery; +import io.ebean.SqlRow; +import io.ebean.Version; +import org.tests.model.converstation.User; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/com/avaje/tests/idkeys/TestCustomId.java b/src/test/java/org/tests/idkeys/TestCustomId.java similarity index 81% rename from src/test/java/com/avaje/tests/idkeys/TestCustomId.java rename to src/test/java/org/tests/idkeys/TestCustomId.java index f98e9b1fb..2be6d1940 100644 --- a/src/test/java/com/avaje/tests/idkeys/TestCustomId.java +++ b/src/test/java/org/tests/idkeys/TestCustomId.java @@ -1,8 +1,8 @@ -package com.avaje.tests.idkeys; +package org.tests.idkeys; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.ECustomId; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.ECustomId; import org.avaje.moduuid.ModUUID; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/idkeys/TestGeneratedKeys.java b/src/test/java/org/tests/idkeys/TestGeneratedKeys.java similarity index 91% rename from src/test/java/com/avaje/tests/idkeys/TestGeneratedKeys.java rename to src/test/java/org/tests/idkeys/TestGeneratedKeys.java index b191c43f6..fcc74bf9b 100644 --- a/src/test/java/com/avaje/tests/idkeys/TestGeneratedKeys.java +++ b/src/test/java/org/tests/idkeys/TestGeneratedKeys.java @@ -1,12 +1,12 @@ -package com.avaje.tests.idkeys; +package org.tests.idkeys; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.config.Platform; -import com.avaje.ebean.config.dbplatform.IdType; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.tests.idkeys.db.GenKeyIdentity; -import com.avaje.tests.idkeys.db.GenKeySequence; -import com.avaje.tests.lib.EbeanTestCase; +import io.ebean.Transaction; +import io.ebean.Platform; +import io.ebean.config.dbplatform.IdType; +import io.ebeaninternal.api.SpiEbeanServer; +import org.tests.idkeys.db.GenKeyIdentity; +import org.tests.idkeys.db.GenKeySequence; +import org.tests.lib.EbeanTestCase; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/src/test/java/com/avaje/tests/idkeys/TestLazyLoad.java b/src/test/java/org/tests/idkeys/TestLazyLoad.java similarity index 87% rename from src/test/java/com/avaje/tests/idkeys/TestLazyLoad.java rename to src/test/java/org/tests/idkeys/TestLazyLoad.java index 504b29039..f97ae321e 100644 --- a/src/test/java/com/avaje/tests/idkeys/TestLazyLoad.java +++ b/src/test/java/org/tests/idkeys/TestLazyLoad.java @@ -1,7 +1,7 @@ -package com.avaje.tests.idkeys; +package org.tests.idkeys; -import com.avaje.tests.lib.EbeanTestCase; -import com.avaje.tests.model.basic.TOne; +import org.tests.lib.EbeanTestCase; +import org.tests.model.basic.TOne; import java.sql.SQLException; import java.util.List; diff --git a/src/test/java/com/avaje/tests/idkeys/TestPropertyChangeSupport.java b/src/test/java/org/tests/idkeys/TestPropertyChangeSupport.java similarity index 96% rename from src/test/java/com/avaje/tests/idkeys/TestPropertyChangeSupport.java rename to src/test/java/org/tests/idkeys/TestPropertyChangeSupport.java index da8cedd62..850c28ab3 100644 --- a/src/test/java/com/avaje/tests/idkeys/TestPropertyChangeSupport.java +++ b/src/test/java/org/tests/idkeys/TestPropertyChangeSupport.java @@ -1,9 +1,9 @@ -package com.avaje.tests.idkeys; +package org.tests.idkeys; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.tests.idkeys.db.AuditLog; -import com.avaje.tests.lib.EbeanTestCase; +import io.ebean.Transaction; +import io.ebean.bean.EntityBean; +import org.tests.idkeys.db.AuditLog; +import org.tests.lib.EbeanTestCase; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; diff --git a/src/test/java/com/avaje/tests/idkeys/TestSimpleIdInsert.java b/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java similarity index 87% rename from src/test/java/com/avaje/tests/idkeys/TestSimpleIdInsert.java rename to src/test/java/org/tests/idkeys/TestSimpleIdInsert.java index 2a48b4d06..25d72bae2 100644 --- a/src/test/java/com/avaje/tests/idkeys/TestSimpleIdInsert.java +++ b/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java @@ -1,8 +1,8 @@ -package com.avaje.tests.idkeys; +package org.tests.idkeys; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.ESimple; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.ESimple; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/idkeys/db/AuditLog.java b/src/test/java/org/tests/idkeys/db/AuditLog.java similarity index 96% rename from src/test/java/com/avaje/tests/idkeys/db/AuditLog.java rename to src/test/java/org/tests/idkeys/db/AuditLog.java index 37c1c352c..de7c27745 100644 --- a/src/test/java/com/avaje/tests/idkeys/db/AuditLog.java +++ b/src/test/java/org/tests/idkeys/db/AuditLog.java @@ -1,4 +1,4 @@ -package com.avaje.tests.idkeys.db; +package org.tests.idkeys.db; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/idkeys/db/GenKeyIdentity.java b/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java similarity index 94% rename from src/test/java/com/avaje/tests/idkeys/db/GenKeyIdentity.java rename to src/test/java/org/tests/idkeys/db/GenKeyIdentity.java index ca56c2645..2be7954db 100644 --- a/src/test/java/com/avaje/tests/idkeys/db/GenKeyIdentity.java +++ b/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java @@ -1,4 +1,4 @@ -package com.avaje.tests.idkeys.db; +package org.tests.idkeys.db; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/src/test/java/com/avaje/tests/idkeys/db/GenKeySequence.java b/src/test/java/org/tests/idkeys/db/GenKeySequence.java similarity index 95% rename from src/test/java/com/avaje/tests/idkeys/db/GenKeySequence.java rename to src/test/java/org/tests/idkeys/db/GenKeySequence.java index c615a9bfc..eb55ca796 100644 --- a/src/test/java/com/avaje/tests/idkeys/db/GenKeySequence.java +++ b/src/test/java/org/tests/idkeys/db/GenKeySequence.java @@ -1,4 +1,4 @@ -package com.avaje.tests.idkeys.db; +package org.tests.idkeys.db; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/src/test/java/com/avaje/tests/idkeys/db/GenKeyTable.java b/src/test/java/org/tests/idkeys/db/GenKeyTable.java similarity index 93% rename from src/test/java/com/avaje/tests/idkeys/db/GenKeyTable.java rename to src/test/java/org/tests/idkeys/db/GenKeyTable.java index 6282d656b..0d490881f 100644 --- a/src/test/java/com/avaje/tests/idkeys/db/GenKeyTable.java +++ b/src/test/java/org/tests/idkeys/db/GenKeyTable.java @@ -1,4 +1,4 @@ -package com.avaje.tests.idkeys.db; +package org.tests.idkeys.db; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/src/test/java/com/avaje/tests/inheritance/InnerReport.java b/src/test/java/org/tests/inheritance/InnerReport.java similarity index 95% rename from src/test/java/com/avaje/tests/inheritance/InnerReport.java rename to src/test/java/org/tests/inheritance/InnerReport.java index 8936ade24..2a8449c8e 100644 --- a/src/test/java/com/avaje/tests/inheritance/InnerReport.java +++ b/src/test/java/org/tests/inheritance/InnerReport.java @@ -1,4 +1,4 @@ -package com.avaje.tests.inheritance; +package org.tests.inheritance; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/inheritance/Stockforecast.java b/src/test/java/org/tests/inheritance/Stockforecast.java similarity index 93% rename from src/test/java/com/avaje/tests/inheritance/Stockforecast.java rename to src/test/java/org/tests/inheritance/Stockforecast.java index 2f1e22264..4ae802112 100644 --- a/src/test/java/com/avaje/tests/inheritance/Stockforecast.java +++ b/src/test/java/org/tests/inheritance/Stockforecast.java @@ -1,4 +1,4 @@ -package com.avaje.tests.inheritance; +package org.tests.inheritance; import javax.persistence.DiscriminatorColumn; import javax.persistence.DiscriminatorType; diff --git a/src/test/java/com/avaje/tests/inheritance/TestDuplcateKeyException.java b/src/test/java/org/tests/inheritance/TestDuplcateKeyException.java similarity index 83% rename from src/test/java/com/avaje/tests/inheritance/TestDuplcateKeyException.java rename to src/test/java/org/tests/inheritance/TestDuplcateKeyException.java index 11e4fb18b..e8cf6b1cd 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestDuplcateKeyException.java +++ b/src/test/java/org/tests/inheritance/TestDuplcateKeyException.java @@ -1,11 +1,11 @@ -package com.avaje.tests.inheritance; +package org.tests.inheritance; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.AttributeHolder; -import com.avaje.tests.model.basic.ListAttribute; -import com.avaje.tests.model.basic.ListAttributeValue; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.AttributeHolder; +import org.tests.model.basic.ListAttribute; +import org.tests.model.basic.ListAttributeValue; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/inheritance/TestInheritInsert.java b/src/test/java/org/tests/inheritance/TestInheritInsert.java similarity index 87% rename from src/test/java/com/avaje/tests/inheritance/TestInheritInsert.java rename to src/test/java/org/tests/inheritance/TestInheritInsert.java index fd9686b2f..66b1991f6 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestInheritInsert.java +++ b/src/test/java/org/tests/inheritance/TestInheritInsert.java @@ -1,14 +1,14 @@ -package com.avaje.tests.inheritance; +package org.tests.inheritance; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Car; -import com.avaje.tests.model.basic.CarAccessory; -import com.avaje.tests.model.basic.CarFuse; -import com.avaje.tests.model.basic.Truck; -import com.avaje.tests.model.basic.Vehicle; -import com.avaje.tests.model.basic.VehicleDriver; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Car; +import org.tests.model.basic.CarAccessory; +import org.tests.model.basic.CarFuse; +import org.tests.model.basic.Truck; +import org.tests.model.basic.Vehicle; +import org.tests.model.basic.VehicleDriver; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/inheritance/TestInheritanceBatchLazyLoad.java b/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java similarity index 79% rename from src/test/java/com/avaje/tests/inheritance/TestInheritanceBatchLazyLoad.java rename to src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java index 72673263f..df91ad2de 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestInheritanceBatchLazyLoad.java +++ b/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java @@ -1,9 +1,9 @@ -package com.avaje.tests.inheritance; +package org.tests.inheritance; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Car; -import com.avaje.tests.model.basic.Truck; -import com.avaje.tests.model.basic.Vehicle; +import io.ebean.Ebean; +import org.tests.model.basic.Car; +import org.tests.model.basic.Truck; +import org.tests.model.basic.Vehicle; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/inheritance/TestInheritanceJoins.java b/src/test/java/org/tests/inheritance/TestInheritanceJoins.java similarity index 87% rename from src/test/java/com/avaje/tests/inheritance/TestInheritanceJoins.java rename to src/test/java/org/tests/inheritance/TestInheritanceJoins.java index acd8483bc..3ff1f3cc1 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestInheritanceJoins.java +++ b/src/test/java/org/tests/inheritance/TestInheritanceJoins.java @@ -1,12 +1,12 @@ -package com.avaje.tests.inheritance; +package org.tests.inheritance; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.tests.inheritance.model.CalculationResult; -import com.avaje.tests.inheritance.model.Configurations; -import com.avaje.tests.inheritance.model.GroupConfiguration; -import com.avaje.tests.inheritance.model.ProductConfiguration; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import org.tests.inheritance.model.CalculationResult; +import org.tests.inheritance.model.Configurations; +import org.tests.inheritance.model.GroupConfiguration; +import org.tests.inheritance.model.ProductConfiguration; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/inheritance/TestInheritanceOnMany.java b/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java similarity index 70% rename from src/test/java/com/avaje/tests/inheritance/TestInheritanceOnMany.java rename to src/test/java/org/tests/inheritance/TestInheritanceOnMany.java index 1900c0167..0ee549cac 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestInheritanceOnMany.java +++ b/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java @@ -1,14 +1,14 @@ -package com.avaje.tests.inheritance; +package org.tests.inheritance; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.BeanCollection.ModifyListenMode; -import com.avaje.ebean.common.BeanList; -import com.avaje.tests.model.basic.Animal; -import com.avaje.tests.model.basic.AnimalShelter; -import com.avaje.tests.model.basic.BigDog; -import com.avaje.tests.model.basic.Cat; -import com.avaje.tests.model.basic.Dog; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.bean.BeanCollection.ModifyListenMode; +import io.ebean.common.BeanList; +import org.tests.model.basic.Animal; +import org.tests.model.basic.AnimalShelter; +import org.tests.model.basic.BigDog; +import org.tests.model.basic.Cat; +import org.tests.model.basic.Dog; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/inheritance/TestInheritanceRawSql.java b/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java similarity index 78% rename from src/test/java/com/avaje/tests/inheritance/TestInheritanceRawSql.java rename to src/test/java/org/tests/inheritance/TestInheritanceRawSql.java index 75a19eb0a..5b7d88620 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestInheritanceRawSql.java +++ b/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java @@ -1,11 +1,11 @@ -package com.avaje.tests.inheritance; +package org.tests.inheritance; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.tests.model.basic.Truck; -import com.avaje.tests.model.basic.Vehicle; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.RawSql; +import io.ebean.RawSqlBuilder; +import org.tests.model.basic.Truck; +import org.tests.model.basic.Vehicle; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/inheritance/TestIntInherit.java b/src/test/java/org/tests/inheritance/TestIntInherit.java similarity index 81% rename from src/test/java/com/avaje/tests/inheritance/TestIntInherit.java rename to src/test/java/org/tests/inheritance/TestIntInherit.java index 20714f2d3..6ce07acd6 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestIntInherit.java +++ b/src/test/java/org/tests/inheritance/TestIntInherit.java @@ -1,10 +1,10 @@ -package com.avaje.tests.inheritance; +package org.tests.inheritance; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.TIntChild; -import com.avaje.tests.model.basic.TIntRoot; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.TIntChild; +import org.tests.model.basic.TIntRoot; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/inheritance/TestNpeOnDiscriminator.java b/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java similarity index 78% rename from src/test/java/com/avaje/tests/inheritance/TestNpeOnDiscriminator.java rename to src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java index 6feaab5cc..3dd088406 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestNpeOnDiscriminator.java +++ b/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java @@ -1,7 +1,7 @@ -package com.avaje.tests.inheritance; +package org.tests.inheritance; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.junit.Test; public class TestNpeOnDiscriminator extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/inheritance/TestSkippable.java b/src/test/java/org/tests/inheritance/TestSkippable.java similarity index 89% rename from src/test/java/com/avaje/tests/inheritance/TestSkippable.java rename to src/test/java/org/tests/inheritance/TestSkippable.java index 40e2657fe..40cbb2265 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestSkippable.java +++ b/src/test/java/org/tests/inheritance/TestSkippable.java @@ -1,10 +1,10 @@ -package com.avaje.tests.inheritance; +package org.tests.inheritance; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.AttributeHolder; -import com.avaje.tests.model.basic.ListAttribute; -import com.avaje.tests.model.basic.ListAttributeValue; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.AttributeHolder; +import org.tests.model.basic.ListAttribute; +import org.tests.model.basic.ListAttributeValue; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/com/avaje/tests/inheritance/cache/TestInheritanceCache.java b/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java similarity index 80% rename from src/test/java/com/avaje/tests/inheritance/cache/TestInheritanceCache.java rename to src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java index 26c05b1de..290bbaba1 100644 --- a/src/test/java/com/avaje/tests/inheritance/cache/TestInheritanceCache.java +++ b/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java @@ -1,10 +1,10 @@ -package com.avaje.tests.inheritance.cache; +package org.tests.inheritance.cache; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.cache.CInhOne; -import com.avaje.tests.model.basic.cache.CInhRoot; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.cache.CInhOne; +import org.tests.model.basic.cache.CInhRoot; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; diff --git a/src/test/java/com/avaje/tests/inheritance/company/domain/AbstractBar.java b/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java similarity index 96% rename from src/test/java/com/avaje/tests/inheritance/company/domain/AbstractBar.java rename to src/test/java/org/tests/inheritance/company/domain/AbstractBar.java index 1f79ff2f3..0f580744a 100644 --- a/src/test/java/com/avaje/tests/inheritance/company/domain/AbstractBar.java +++ b/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java @@ -1,4 +1,4 @@ -package com.avaje.tests.inheritance.company.domain; +package org.tests.inheritance.company.domain; import javax.persistence.DiscriminatorColumn; import javax.persistence.DiscriminatorType; diff --git a/src/test/java/com/avaje/tests/inheritance/company/domain/ConcreteBar.java b/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java similarity index 81% rename from src/test/java/com/avaje/tests/inheritance/company/domain/ConcreteBar.java rename to src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java index effc0bc4e..b192290cf 100644 --- a/src/test/java/com/avaje/tests/inheritance/company/domain/ConcreteBar.java +++ b/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java @@ -1,4 +1,4 @@ -package com.avaje.tests.inheritance.company.domain; +package org.tests.inheritance.company.domain; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/inheritance/company/domain/Foo.java b/src/test/java/org/tests/inheritance/company/domain/Foo.java similarity index 93% rename from src/test/java/com/avaje/tests/inheritance/company/domain/Foo.java rename to src/test/java/org/tests/inheritance/company/domain/Foo.java index e7fa432ba..8bc2dbf1a 100644 --- a/src/test/java/com/avaje/tests/inheritance/company/domain/Foo.java +++ b/src/test/java/org/tests/inheritance/company/domain/Foo.java @@ -1,4 +1,4 @@ -package com.avaje.tests.inheritance.company.domain; +package org.tests.inheritance.company.domain; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/src/test/java/com/avaje/tests/inheritance/company/domain/TestInheritAbstract.java b/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java similarity index 89% rename from src/test/java/com/avaje/tests/inheritance/company/domain/TestInheritAbstract.java rename to src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java index a6ecbd779..4e4e5b64a 100644 --- a/src/test/java/com/avaje/tests/inheritance/company/domain/TestInheritAbstract.java +++ b/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java @@ -1,7 +1,7 @@ -package com.avaje.tests.inheritance.company.domain; +package org.tests.inheritance.company.domain; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; +import io.ebean.Ebean; +import io.ebean.EbeanServer; import junit.framework.TestCase; import org.junit.Assert; diff --git a/src/test/java/com/avaje/tests/inheritance/model/AbstractBaseClass.java b/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java similarity index 84% rename from src/test/java/com/avaje/tests/inheritance/model/AbstractBaseClass.java rename to src/test/java/org/tests/inheritance/model/AbstractBaseClass.java index 3545ddc24..ae914d0c7 100644 --- a/src/test/java/com/avaje/tests/inheritance/model/AbstractBaseClass.java +++ b/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java @@ -1,4 +1,4 @@ -package com.avaje.tests.inheritance.model; +package org.tests.inheritance.model; import javax.persistence.MappedSuperclass; diff --git a/src/test/java/com/avaje/tests/inheritance/model/CalculationResult.java b/src/test/java/org/tests/inheritance/model/CalculationResult.java similarity index 96% rename from src/test/java/com/avaje/tests/inheritance/model/CalculationResult.java rename to src/test/java/org/tests/inheritance/model/CalculationResult.java index 68966ad81..9cde2d7f3 100644 --- a/src/test/java/com/avaje/tests/inheritance/model/CalculationResult.java +++ b/src/test/java/org/tests/inheritance/model/CalculationResult.java @@ -1,4 +1,4 @@ -package com.avaje.tests.inheritance.model; +package org.tests.inheritance.model; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/src/test/java/com/avaje/tests/inheritance/model/Configuration.java b/src/test/java/org/tests/inheritance/model/Configuration.java similarity index 91% rename from src/test/java/com/avaje/tests/inheritance/model/Configuration.java rename to src/test/java/org/tests/inheritance/model/Configuration.java index 79a994669..6ff1ac6ab 100644 --- a/src/test/java/com/avaje/tests/inheritance/model/Configuration.java +++ b/src/test/java/org/tests/inheritance/model/Configuration.java @@ -1,6 +1,6 @@ -package com.avaje.tests.inheritance.model; +package org.tests.inheritance.model; -import com.avaje.ebean.annotation.ChangeLog; +import io.ebean.annotation.ChangeLog; import javax.persistence.Column; import javax.persistence.DiscriminatorColumn; diff --git a/src/test/java/com/avaje/tests/inheritance/model/Configurations.java b/src/test/java/org/tests/inheritance/model/Configurations.java similarity index 95% rename from src/test/java/com/avaje/tests/inheritance/model/Configurations.java rename to src/test/java/org/tests/inheritance/model/Configurations.java index 485541f8a..e8b4c194c 100644 --- a/src/test/java/com/avaje/tests/inheritance/model/Configurations.java +++ b/src/test/java/org/tests/inheritance/model/Configurations.java @@ -1,4 +1,4 @@ -package com.avaje.tests.inheritance.model; +package org.tests.inheritance.model; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/inheritance/model/GroupConfiguration.java b/src/test/java/org/tests/inheritance/model/GroupConfiguration.java similarity index 94% rename from src/test/java/com/avaje/tests/inheritance/model/GroupConfiguration.java rename to src/test/java/org/tests/inheritance/model/GroupConfiguration.java index 71ca65e87..e1b90aef4 100644 --- a/src/test/java/com/avaje/tests/inheritance/model/GroupConfiguration.java +++ b/src/test/java/org/tests/inheritance/model/GroupConfiguration.java @@ -1,4 +1,4 @@ -package com.avaje.tests.inheritance.model; +package org.tests.inheritance.model; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/inheritance/model/ProductConfiguration.java b/src/test/java/org/tests/inheritance/model/ProductConfiguration.java similarity index 94% rename from src/test/java/com/avaje/tests/inheritance/model/ProductConfiguration.java rename to src/test/java/org/tests/inheritance/model/ProductConfiguration.java index b5968f921..3ff22d7bb 100644 --- a/src/test/java/com/avaje/tests/inheritance/model/ProductConfiguration.java +++ b/src/test/java/org/tests/inheritance/model/ProductConfiguration.java @@ -1,4 +1,4 @@ -package com.avaje.tests.inheritance.model; +package org.tests.inheritance.model; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/insert/MainDbCopy.java b/src/test/java/org/tests/insert/MainDbCopy.java similarity index 68% rename from src/test/java/com/avaje/tests/insert/MainDbCopy.java rename to src/test/java/org/tests/insert/MainDbCopy.java index 6860193ca..094a5d321 100644 --- a/src/test/java/com/avaje/tests/insert/MainDbCopy.java +++ b/src/test/java/org/tests/insert/MainDbCopy.java @@ -1,9 +1,9 @@ -package com.avaje.tests.insert; +package org.tests.insert; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.tests.model.basic.EBasic; -import com.avaje.tests.model.basic.EBasic.Status; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import org.tests.model.basic.EBasic; +import org.tests.model.basic.EBasic.Status; public class MainDbCopy { diff --git a/src/test/java/com/avaje/tests/insert/TestInsertCollection.java b/src/test/java/org/tests/insert/TestInsertCollection.java similarity index 93% rename from src/test/java/com/avaje/tests/insert/TestInsertCollection.java rename to src/test/java/org/tests/insert/TestInsertCollection.java index ec7d5cff5..87b5d98cf 100644 --- a/src/test/java/com/avaje/tests/insert/TestInsertCollection.java +++ b/src/test/java/org/tests/insert/TestInsertCollection.java @@ -1,8 +1,8 @@ -package com.avaje.tests.insert; +package org.tests.insert; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Customer; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/insert/TestInsertOnStringKey.java b/src/test/java/org/tests/insert/TestInsertOnStringKey.java similarity index 79% rename from src/test/java/com/avaje/tests/insert/TestInsertOnStringKey.java rename to src/test/java/org/tests/insert/TestInsertOnStringKey.java index 0078679ce..1a856001d 100644 --- a/src/test/java/com/avaje/tests/insert/TestInsertOnStringKey.java +++ b/src/test/java/org/tests/insert/TestInsertOnStringKey.java @@ -1,9 +1,9 @@ -package com.avaje.tests.insert; +package org.tests.insert; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.orderentity.OrderEntity; -import com.avaje.tests.model.orderentity.OrderItemEntity; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.orderentity.OrderEntity; +import org.tests.model.orderentity.OrderItemEntity; import org.junit.Test; import java.math.BigDecimal; diff --git a/src/test/java/com/avaje/tests/insert/TestSaveWithDaylightSavings.java b/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java similarity index 98% rename from src/test/java/com/avaje/tests/insert/TestSaveWithDaylightSavings.java rename to src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java index 000ded5fd..20d320a80 100644 --- a/src/test/java/com/avaje/tests/insert/TestSaveWithDaylightSavings.java +++ b/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java @@ -1,6 +1,6 @@ -package com.avaje.tests.insert; +package org.tests.insert; -import com.avaje.ebean.BaseTestCase; +import io.ebean.BaseTestCase; import org.junit.Test; import java.sql.SQLException; diff --git a/src/test/java/com/avaje/tests/iud/TestCarWheelIud.java b/src/test/java/org/tests/iud/TestCarWheelIud.java similarity index 79% rename from src/test/java/com/avaje/tests/iud/TestCarWheelIud.java rename to src/test/java/org/tests/iud/TestCarWheelIud.java index 5962e7c9f..621260342 100644 --- a/src/test/java/com/avaje/tests/iud/TestCarWheelIud.java +++ b/src/test/java/org/tests/iud/TestCarWheelIud.java @@ -1,10 +1,10 @@ -package com.avaje.tests.iud; +package org.tests.iud; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.carwheel.Car; -import com.avaje.tests.model.carwheel.Tire; -import com.avaje.tests.model.carwheel.Wheel; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.carwheel.Car; +import org.tests.model.carwheel.Tire; +import org.tests.model.carwheel.Wheel; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/com/avaje/tests/iud/TestInfoOneToOne.java b/src/test/java/org/tests/iud/TestInfoOneToOne.java similarity index 89% rename from src/test/java/com/avaje/tests/iud/TestInfoOneToOne.java rename to src/test/java/org/tests/iud/TestInfoOneToOne.java index 66ab160c6..9fad6d8ec 100644 --- a/src/test/java/com/avaje/tests/iud/TestInfoOneToOne.java +++ b/src/test/java/org/tests/iud/TestInfoOneToOne.java @@ -1,9 +1,9 @@ -package com.avaje.tests.iud; +package org.tests.iud; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.info.InfoCompany; -import com.avaje.tests.model.info.InfoCustomer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.info.InfoCompany; +import org.tests.model.info.InfoCustomer; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/tests/iud/TestInsertQueryUpdate.java b/src/test/java/org/tests/iud/TestInsertQueryUpdate.java similarity index 79% rename from src/test/java/com/avaje/tests/iud/TestInsertQueryUpdate.java rename to src/test/java/org/tests/iud/TestInsertQueryUpdate.java index a80090543..333c638a5 100644 --- a/src/test/java/com/avaje/tests/iud/TestInsertQueryUpdate.java +++ b/src/test/java/org/tests/iud/TestInsertQueryUpdate.java @@ -1,9 +1,9 @@ -package com.avaje.tests.iud; +package org.tests.iud; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.BeanState; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.EBasicVer; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.Ebean; +import org.tests.model.basic.EBasicVer; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/iud/TestInsertUpdateTrans.java b/src/test/java/org/tests/iud/TestInsertUpdateTrans.java similarity index 86% rename from src/test/java/com/avaje/tests/iud/TestInsertUpdateTrans.java rename to src/test/java/org/tests/iud/TestInsertUpdateTrans.java index d5bbdf3a7..01f79b933 100644 --- a/src/test/java/com/avaje/tests/iud/TestInsertUpdateTrans.java +++ b/src/test/java/org/tests/iud/TestInsertUpdateTrans.java @@ -1,8 +1,8 @@ -package com.avaje.tests.iud; +package org.tests.iud; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.EBasicVer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.EBasicVer; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/json/TestDbJson_List.java b/src/test/java/org/tests/json/TestDbJson_List.java similarity index 96% rename from src/test/java/com/avaje/tests/json/TestDbJson_List.java rename to src/test/java/org/tests/json/TestDbJson_List.java index c751f4057..e7417f26f 100644 --- a/src/test/java/com/avaje/tests/json/TestDbJson_List.java +++ b/src/test/java/org/tests/json/TestDbJson_List.java @@ -1,9 +1,9 @@ -package com.avaje.tests.json; +package org.tests.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.json.EBasicJsonList; -import com.avaje.tests.model.json.PlainBean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.json.EBasicJsonList; +import org.tests.model.json.PlainBean; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/json/TestJsonMapBasic.java b/src/test/java/org/tests/json/TestJsonMapBasic.java similarity index 91% rename from src/test/java/com/avaje/tests/json/TestJsonMapBasic.java rename to src/test/java/org/tests/json/TestJsonMapBasic.java index e2542e12e..202205dd8 100644 --- a/src/test/java/com/avaje/tests/json/TestJsonMapBasic.java +++ b/src/test/java/org/tests/json/TestJsonMapBasic.java @@ -1,9 +1,9 @@ -package com.avaje.tests.json; +package org.tests.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.EJson; -import com.avaje.tests.model.json.EBasicJsonMap; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.json.EJson; +import org.tests.model.json.EBasicJsonMap; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/com/avaje/tests/json/TestJsonMapBlob.java b/src/test/java/org/tests/json/TestJsonMapBlob.java similarity index 83% rename from src/test/java/com/avaje/tests/json/TestJsonMapBlob.java rename to src/test/java/org/tests/json/TestJsonMapBlob.java index 0933d9564..25091d91c 100644 --- a/src/test/java/com/avaje/tests/json/TestJsonMapBlob.java +++ b/src/test/java/org/tests/json/TestJsonMapBlob.java @@ -1,9 +1,9 @@ -package com.avaje.tests.json; +package org.tests.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.EJson; -import com.avaje.tests.model.json.EBasicJsonMapBlob; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.json.EJson; +import org.tests.model.json.EBasicJsonMapBlob; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/com/avaje/tests/json/TestJsonMapClob.java b/src/test/java/org/tests/json/TestJsonMapClob.java similarity index 83% rename from src/test/java/com/avaje/tests/json/TestJsonMapClob.java rename to src/test/java/org/tests/json/TestJsonMapClob.java index f5ea2bff8..ecf21b7fe 100644 --- a/src/test/java/com/avaje/tests/json/TestJsonMapClob.java +++ b/src/test/java/org/tests/json/TestJsonMapClob.java @@ -1,9 +1,9 @@ -package com.avaje.tests.json; +package org.tests.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.EJson; -import com.avaje.tests.model.json.EBasicJsonMapClob; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.json.EJson; +import org.tests.model.json.EBasicJsonMapClob; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/com/avaje/tests/json/TestJsonMapJsonB.java b/src/test/java/org/tests/json/TestJsonMapJsonB.java similarity index 83% rename from src/test/java/com/avaje/tests/json/TestJsonMapJsonB.java rename to src/test/java/org/tests/json/TestJsonMapJsonB.java index f65226c14..d33efe02f 100644 --- a/src/test/java/com/avaje/tests/json/TestJsonMapJsonB.java +++ b/src/test/java/org/tests/json/TestJsonMapJsonB.java @@ -1,9 +1,9 @@ -package com.avaje.tests.json; +package org.tests.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.EJson; -import com.avaje.tests.model.json.EBasicJsonMapJsonB; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.json.EJson; +import org.tests.model.json.EBasicJsonMapJsonB; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/com/avaje/tests/json/TestJsonMapVarchar.java b/src/test/java/org/tests/json/TestJsonMapVarchar.java similarity index 83% rename from src/test/java/com/avaje/tests/json/TestJsonMapVarchar.java rename to src/test/java/org/tests/json/TestJsonMapVarchar.java index 5e7e62939..96b775ef3 100644 --- a/src/test/java/com/avaje/tests/json/TestJsonMapVarchar.java +++ b/src/test/java/org/tests/json/TestJsonMapVarchar.java @@ -1,9 +1,9 @@ -package com.avaje.tests.json; +package org.tests.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.EJson; -import com.avaje.tests.model.json.EBasicJsonMapVarchar; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.json.EJson; +import org.tests.model.json.EBasicJsonMapVarchar; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/com/avaje/tests/json/TestJsonNodeBasic.java b/src/test/java/org/tests/json/TestJsonNodeBasic.java similarity index 95% rename from src/test/java/com/avaje/tests/json/TestJsonNodeBasic.java rename to src/test/java/org/tests/json/TestJsonNodeBasic.java index 462adaf70..34d2255eb 100644 --- a/src/test/java/com/avaje/tests/json/TestJsonNodeBasic.java +++ b/src/test/java/org/tests/json/TestJsonNodeBasic.java @@ -1,8 +1,8 @@ -package com.avaje.tests.json; +package org.tests.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.json.EBasicJsonNode; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.json.EBasicJsonNode; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/json/TestJsonNodeBlob.java b/src/test/java/org/tests/json/TestJsonNodeBlob.java similarity index 92% rename from src/test/java/com/avaje/tests/json/TestJsonNodeBlob.java rename to src/test/java/org/tests/json/TestJsonNodeBlob.java index 353594e17..07b712e3c 100644 --- a/src/test/java/com/avaje/tests/json/TestJsonNodeBlob.java +++ b/src/test/java/org/tests/json/TestJsonNodeBlob.java @@ -1,8 +1,8 @@ -package com.avaje.tests.json; +package org.tests.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.json.EBasicJsonNodeBlob; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.json.EBasicJsonNodeBlob; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/json/TestJsonNodeJsonb.java b/src/test/java/org/tests/json/TestJsonNodeJsonb.java similarity index 92% rename from src/test/java/com/avaje/tests/json/TestJsonNodeJsonb.java rename to src/test/java/org/tests/json/TestJsonNodeJsonb.java index b9215f5c9..aa8d694c1 100644 --- a/src/test/java/com/avaje/tests/json/TestJsonNodeJsonb.java +++ b/src/test/java/org/tests/json/TestJsonNodeJsonb.java @@ -1,8 +1,8 @@ -package com.avaje.tests.json; +package org.tests.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.json.EBasicJsonNodeJsonB; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.json.EBasicJsonNodeJsonB; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/json/TestJsonNodeVarchar.java b/src/test/java/org/tests/json/TestJsonNodeVarchar.java similarity index 92% rename from src/test/java/com/avaje/tests/json/TestJsonNodeVarchar.java rename to src/test/java/org/tests/json/TestJsonNodeVarchar.java index 4b1ebab0b..83338f29b 100644 --- a/src/test/java/com/avaje/tests/json/TestJsonNodeVarchar.java +++ b/src/test/java/org/tests/json/TestJsonNodeVarchar.java @@ -1,8 +1,8 @@ -package com.avaje.tests.json; +package org.tests.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.json.EBasicJsonNodeVarchar; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.json.EBasicJsonNodeVarchar; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/json/TestUnmappedProperties.java b/src/test/java/org/tests/json/TestUnmappedProperties.java similarity index 89% rename from src/test/java/com/avaje/tests/json/TestUnmappedProperties.java rename to src/test/java/org/tests/json/TestUnmappedProperties.java index 86a9f53ce..095c4c011 100644 --- a/src/test/java/com/avaje/tests/json/TestUnmappedProperties.java +++ b/src/test/java/org/tests/json/TestUnmappedProperties.java @@ -1,8 +1,8 @@ -package com.avaje.tests.json; +package org.tests.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.json.EBasicJsonUnmapped; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.json.EBasicJsonUnmapped; import org.junit.Test; import java.util.LinkedHashMap; diff --git a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyList.java b/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java similarity index 84% rename from src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyList.java rename to src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java index f6e018c40..646060eef 100644 --- a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyList.java +++ b/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java @@ -1,9 +1,9 @@ -package com.avaje.tests.json.include; +package org.tests.json.include; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebean.text.json.JsonWriteOptions; -import com.avaje.tests.model.basic.Order; +import io.ebean.Ebean; +import io.ebean.config.JsonConfig; +import io.ebean.text.json.JsonWriteOptions; +import org.tests.model.basic.Order; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyMap.java b/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java similarity index 83% rename from src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyMap.java rename to src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java index 105d493c8..d0fc56e7e 100644 --- a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyMap.java +++ b/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java @@ -1,9 +1,9 @@ -package com.avaje.tests.json.include; +package org.tests.json.include; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebean.text.json.JsonWriteOptions; -import com.avaje.tests.model.json.EBasicJsonMap; +import io.ebean.Ebean; +import io.ebean.config.JsonConfig; +import io.ebean.text.json.JsonWriteOptions; +import org.tests.model.json.EBasicJsonMap; import org.junit.Test; import java.util.LinkedHashMap; diff --git a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptySet.java b/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java similarity index 83% rename from src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptySet.java rename to src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java index 2e35c79b2..b7bdb5be5 100644 --- a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptySet.java +++ b/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java @@ -1,9 +1,9 @@ -package com.avaje.tests.json.include; +package org.tests.json.include; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebean.text.json.JsonWriteOptions; -import com.avaje.tests.model.basic.AttributeHolder; +import io.ebean.Ebean; +import io.ebean.config.JsonConfig; +import io.ebean.text.json.JsonWriteOptions; +import org.tests.model.basic.AttributeHolder; import org.junit.Test; import java.util.LinkedHashSet; diff --git a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeNull.java b/src/test/java/org/tests/json/include/TestJsonExcludeNull.java similarity index 69% rename from src/test/java/com/avaje/tests/json/include/TestJsonExcludeNull.java rename to src/test/java/org/tests/json/include/TestJsonExcludeNull.java index f01533288..fea06e6bb 100644 --- a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeNull.java +++ b/src/test/java/org/tests/json/include/TestJsonExcludeNull.java @@ -1,9 +1,9 @@ -package com.avaje.tests.json.include; +package org.tests.json.include; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebean.text.json.JsonWriteOptions; -import com.avaje.tests.json.transientproperties.EJsonTransientObject; +import io.ebean.Ebean; +import io.ebean.config.JsonConfig; +import io.ebean.text.json.JsonWriteOptions; +import org.tests.json.transientproperties.EJsonTransientObject; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeTransientEmptyList.java b/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java similarity index 81% rename from src/test/java/com/avaje/tests/json/include/TestJsonExcludeTransientEmptyList.java rename to src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java index dd3d4713e..85a2a1455 100644 --- a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeTransientEmptyList.java +++ b/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java @@ -1,11 +1,11 @@ -package com.avaje.tests.json.include; +package org.tests.json.include; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.config.JsonConfig; -import com.avaje.ebean.text.PathProperties; -import com.avaje.ebean.text.json.JsonWriteOptions; -import com.avaje.tests.json.transientproperties.EJsonTransientEntityList; -import com.avaje.tests.json.transientproperties.EJsonTransientList; +import io.ebean.Ebean; +import io.ebean.config.JsonConfig; +import io.ebean.text.PathProperties; +import io.ebean.text.json.JsonWriteOptions; +import org.tests.json.transientproperties.EJsonTransientEntityList; +import org.tests.json.transientproperties.EJsonTransientList; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/com/avaje/tests/json/transientproperties/EJsonJacksonIgnore.java b/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java similarity index 86% rename from src/test/java/com/avaje/tests/json/transientproperties/EJsonJacksonIgnore.java rename to src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java index 888e8d491..c835041c2 100644 --- a/src/test/java/com/avaje/tests/json/transientproperties/EJsonJacksonIgnore.java +++ b/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java @@ -1,6 +1,6 @@ -package com.avaje.tests.json.transientproperties; +package org.tests.json.transientproperties; -import com.avaje.ebean.annotation.Sql; +import io.ebean.annotation.Sql; import com.fasterxml.jackson.annotation.JsonIgnore; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/json/transientproperties/EJsonTransientEntityList.java b/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java similarity index 85% rename from src/test/java/com/avaje/tests/json/transientproperties/EJsonTransientEntityList.java rename to src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java index 9059fd002..18cc8b854 100644 --- a/src/test/java/com/avaje/tests/json/transientproperties/EJsonTransientEntityList.java +++ b/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java @@ -1,7 +1,7 @@ -package com.avaje.tests.json.transientproperties; +package org.tests.json.transientproperties; -import com.avaje.ebean.annotation.Sql; -import com.avaje.tests.model.basic.Order; +import io.ebean.annotation.Sql; +import org.tests.model.basic.Order; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/json/transientproperties/EJsonTransientList.java b/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java similarity index 90% rename from src/test/java/com/avaje/tests/json/transientproperties/EJsonTransientList.java rename to src/test/java/org/tests/json/transientproperties/EJsonTransientList.java index f2d9645fe..cb9d46d8d 100644 --- a/src/test/java/com/avaje/tests/json/transientproperties/EJsonTransientList.java +++ b/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java @@ -1,6 +1,6 @@ -package com.avaje.tests.json.transientproperties; +package org.tests.json.transientproperties; -import com.avaje.ebean.annotation.Sql; +import io.ebean.annotation.Sql; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/json/transientproperties/EJsonTransientObject.java b/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java similarity index 90% rename from src/test/java/com/avaje/tests/json/transientproperties/EJsonTransientObject.java rename to src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java index 8065a2dc8..582702780 100644 --- a/src/test/java/com/avaje/tests/json/transientproperties/EJsonTransientObject.java +++ b/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java @@ -1,6 +1,6 @@ -package com.avaje.tests.json.transientproperties; +package org.tests.json.transientproperties; -import com.avaje.ebean.annotation.Sql; +import io.ebean.annotation.Sql; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/json/transientproperties/ModelA.java b/src/test/java/org/tests/json/transientproperties/ModelA.java similarity index 86% rename from src/test/java/com/avaje/tests/json/transientproperties/ModelA.java rename to src/test/java/org/tests/json/transientproperties/ModelA.java index 24e159b1c..3a2ae072c 100644 --- a/src/test/java/com/avaje/tests/json/transientproperties/ModelA.java +++ b/src/test/java/org/tests/json/transientproperties/ModelA.java @@ -1,6 +1,6 @@ -package com.avaje.tests.json.transientproperties; +package org.tests.json.transientproperties; -import com.avaje.ebean.annotation.Sql; +import io.ebean.annotation.Sql; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/json/transientproperties/ModelB.java b/src/test/java/org/tests/json/transientproperties/ModelB.java similarity index 81% rename from src/test/java/com/avaje/tests/json/transientproperties/ModelB.java rename to src/test/java/org/tests/json/transientproperties/ModelB.java index 8df6570e0..ea2eb71fb 100644 --- a/src/test/java/com/avaje/tests/json/transientproperties/ModelB.java +++ b/src/test/java/org/tests/json/transientproperties/ModelB.java @@ -1,7 +1,7 @@ -package com.avaje.tests.json.transientproperties; +package org.tests.json.transientproperties; -import com.avaje.ebean.annotation.Sql; +import io.ebean.annotation.Sql; import javax.persistence.Entity; @@ -28,4 +28,4 @@ public class ModelB { public void setTwoField(Integer twoField) { this.twoField = twoField; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/json/transientproperties/TestJacksonIgnore.java b/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java similarity index 92% rename from src/test/java/com/avaje/tests/json/transientproperties/TestJacksonIgnore.java rename to src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java index 10ee9e890..234e3aa8b 100644 --- a/src/test/java/com/avaje/tests/json/transientproperties/TestJacksonIgnore.java +++ b/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java @@ -1,6 +1,6 @@ -package com.avaje.tests.json.transientproperties; +package org.tests.json.transientproperties; -import com.avaje.ebean.Ebean; +import io.ebean.Ebean; import org.junit.Test; import static org.junit.Assert.*; diff --git a/src/test/java/com/avaje/tests/json/transientproperties/TestModelAJson.java b/src/test/java/org/tests/json/transientproperties/TestModelAJson.java similarity index 82% rename from src/test/java/com/avaje/tests/json/transientproperties/TestModelAJson.java rename to src/test/java/org/tests/json/transientproperties/TestModelAJson.java index decf2fba6..9e621fb03 100644 --- a/src/test/java/com/avaje/tests/json/transientproperties/TestModelAJson.java +++ b/src/test/java/org/tests/json/transientproperties/TestModelAJson.java @@ -1,7 +1,7 @@ -package com.avaje.tests.json.transientproperties; +package org.tests.json.transientproperties; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.PathProperties; +import io.ebean.Ebean; +import io.ebean.text.PathProperties; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/com/avaje/tests/json/transientproperties/TestTransientListProperty.java b/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java similarity index 86% rename from src/test/java/com/avaje/tests/json/transientproperties/TestTransientListProperty.java rename to src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java index 87240ce96..bf89a3482 100644 --- a/src/test/java/com/avaje/tests/json/transientproperties/TestTransientListProperty.java +++ b/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java @@ -1,6 +1,6 @@ -package com.avaje.tests.json.transientproperties; +package org.tests.json.transientproperties; -import com.avaje.ebean.Ebean; +import io.ebean.Ebean; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/avaje/tests/json/transientproperties/TestTransientObjectProperty.java b/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java similarity index 89% rename from src/test/java/com/avaje/tests/json/transientproperties/TestTransientObjectProperty.java rename to src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java index 9f2d3ccfe..cfd7e54c6 100644 --- a/src/test/java/com/avaje/tests/json/transientproperties/TestTransientObjectProperty.java +++ b/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java @@ -1,6 +1,6 @@ -package com.avaje.tests.json.transientproperties; +package org.tests.json.transientproperties; -import com.avaje.ebean.Ebean; +import io.ebean.Ebean; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/avaje/tests/level/Level1.java b/src/test/java/org/tests/level/Level1.java similarity index 97% rename from src/test/java/com/avaje/tests/level/Level1.java rename to src/test/java/org/tests/level/Level1.java index 9a0812265..4ddd33314 100644 --- a/src/test/java/com/avaje/tests/level/Level1.java +++ b/src/test/java/org/tests/level/Level1.java @@ -1,4 +1,4 @@ -package com.avaje.tests.level; +package org.tests.level; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/level/Level2.java b/src/test/java/org/tests/level/Level2.java similarity index 96% rename from src/test/java/com/avaje/tests/level/Level2.java rename to src/test/java/org/tests/level/Level2.java index 8243a343d..d49732c0c 100644 --- a/src/test/java/com/avaje/tests/level/Level2.java +++ b/src/test/java/org/tests/level/Level2.java @@ -1,4 +1,4 @@ -package com.avaje.tests.level; +package org.tests.level; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/level/Level3.java b/src/test/java/org/tests/level/Level3.java similarity index 92% rename from src/test/java/com/avaje/tests/level/Level3.java rename to src/test/java/org/tests/level/Level3.java index 37f8198ff..40393b38d 100644 --- a/src/test/java/com/avaje/tests/level/Level3.java +++ b/src/test/java/org/tests/level/Level3.java @@ -1,4 +1,4 @@ -package com.avaje.tests.level; +package org.tests.level; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/level/Level4.java b/src/test/java/org/tests/level/Level4.java similarity index 92% rename from src/test/java/com/avaje/tests/level/Level4.java rename to src/test/java/org/tests/level/Level4.java index 5408512e5..5ef9b6269 100644 --- a/src/test/java/com/avaje/tests/level/Level4.java +++ b/src/test/java/org/tests/level/Level4.java @@ -1,4 +1,4 @@ -package com.avaje.tests.level; +package org.tests.level; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/level/test/ManyToManyTest.java b/src/test/java/org/tests/level/test/ManyToManyTest.java similarity index 94% rename from src/test/java/com/avaje/tests/level/test/ManyToManyTest.java rename to src/test/java/org/tests/level/test/ManyToManyTest.java index 27fff78b0..52cf6098f 100644 --- a/src/test/java/com/avaje/tests/level/test/ManyToManyTest.java +++ b/src/test/java/org/tests/level/test/ManyToManyTest.java @@ -1,11 +1,11 @@ -package com.avaje.tests.level.test; +package org.tests.level.test; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.level.Level1; -import com.avaje.tests.level.Level2; -import com.avaje.tests.level.Level3; -import com.avaje.tests.level.Level4; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.level.Level1; +import org.tests.level.Level2; +import org.tests.level.Level3; +import org.tests.level.Level4; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/lib/EbeanTestCase.java b/src/test/java/org/tests/lib/EbeanTestCase.java similarity index 82% rename from src/test/java/com/avaje/tests/lib/EbeanTestCase.java rename to src/test/java/org/tests/lib/EbeanTestCase.java index f76175114..5adb2b604 100644 --- a/src/test/java/com/avaje/tests/lib/EbeanTestCase.java +++ b/src/test/java/org/tests/lib/EbeanTestCase.java @@ -1,10 +1,10 @@ -package com.avaje.tests.lib; +package org.tests.lib; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.config.Platform; -import com.avaje.ebeaninternal.api.SpiEbeanServer; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Transaction; +import io.ebean.Platform; +import io.ebeaninternal.api.SpiEbeanServer; import junit.framework.TestCase; import junit.framework.TestResult; diff --git a/src/test/java/com/avaje/tests/lib/TestMessage.java b/src/test/java/org/tests/lib/TestMessage.java similarity index 53% rename from src/test/java/com/avaje/tests/lib/TestMessage.java rename to src/test/java/org/tests/lib/TestMessage.java index 164323d07..ed20879ff 100644 --- a/src/test/java/com/avaje/tests/lib/TestMessage.java +++ b/src/test/java/org/tests/lib/TestMessage.java @@ -1,9 +1,11 @@ -package com.avaje.tests.lib; +package org.tests.lib; -import com.avaje.ebeaninternal.server.core.Message; +import io.ebeaninternal.server.core.Message; import org.junit.Assert; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + public class TestMessage { @Test @@ -13,7 +15,6 @@ public class TestMessage { String two = "two"; String m = Message.msg("fetch.error", one, two); - boolean b = m.startsWith("Query threw SQLException:one Query was:"); - Assert.assertTrue(b); + assertThat(m).contains("Query threw SQLException:one Query was:"); } } diff --git a/src/test/java/com/avaje/tests/lifecycle/TestLifecycleAnnotatedBean.java b/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java similarity index 94% rename from src/test/java/com/avaje/tests/lifecycle/TestLifecycleAnnotatedBean.java rename to src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java index 0ae59804c..aedba3185 100644 --- a/src/test/java/com/avaje/tests/lifecycle/TestLifecycleAnnotatedBean.java +++ b/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java @@ -1,10 +1,10 @@ -package com.avaje.tests.lifecycle; +package org.tests.lifecycle; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.tests.model.basic.EBasicWithLifecycle; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.tests.model.basic.EBasicWithLifecycle; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/tests/m2m/TestM2MDeleteCascadeFromParent.java b/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java similarity index 71% rename from src/test/java/com/avaje/tests/m2m/TestM2MDeleteCascadeFromParent.java rename to src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java index dc09ccba9..9865d7029 100644 --- a/src/test/java/com/avaje/tests/m2m/TestM2MDeleteCascadeFromParent.java +++ b/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java @@ -1,12 +1,12 @@ -package com.avaje.tests.m2m; +package org.tests.m2m; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.SqlQuery; -import com.avaje.ebean.SqlRow; -import com.avaje.tests.model.m2m.MnyA; -import com.avaje.tests.model.m2m.MnyB; -import com.avaje.tests.model.m2m.MnyC; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.SqlQuery; +import io.ebean.SqlRow; +import org.tests.model.m2m.MnyA; +import org.tests.model.m2m.MnyB; +import org.tests.model.m2m.MnyC; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/avaje/tests/m2m/TestM2MDeleteNoCascade.java b/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java similarity index 82% rename from src/test/java/com/avaje/tests/m2m/TestM2MDeleteNoCascade.java rename to src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java index dbb08cfe5..a3717b0b7 100644 --- a/src/test/java/com/avaje/tests/m2m/TestM2MDeleteNoCascade.java +++ b/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java @@ -1,9 +1,9 @@ -package com.avaje.tests.m2m; +package org.tests.m2m; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.MnocRole; -import com.avaje.tests.model.basic.MnocUser; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.MnocRole; +import org.tests.model.basic.MnocUser; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java b/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java similarity index 88% rename from src/test/java/com/avaje/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java rename to src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java index ed08702fa..b5a8f5137 100644 --- a/src/test/java/com/avaje/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java +++ b/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java @@ -1,10 +1,10 @@ -package com.avaje.tests.m2m; +package org.tests.m2m; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.m2m.Permission; -import com.avaje.tests.model.m2m.Role; -import com.avaje.tests.model.m2m.Tenant; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.m2m.Permission; +import org.tests.model.m2m.Role; +import org.tests.model.m2m.Tenant; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/m2m/TestM2MDeleteWithCascade.java b/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java similarity index 85% rename from src/test/java/com/avaje/tests/m2m/TestM2MDeleteWithCascade.java rename to src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java index 0a5043617..ac44be657 100644 --- a/src/test/java/com/avaje/tests/m2m/TestM2MDeleteWithCascade.java +++ b/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java @@ -1,9 +1,9 @@ -package com.avaje.tests.m2m; +package org.tests.m2m; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.MRole; -import com.avaje.tests.model.basic.MUser; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.MRole; +import org.tests.model.basic.MUser; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/m2m/TestM2MModifyTest.java b/src/test/java/org/tests/m2m/TestM2MModifyTest.java similarity index 84% rename from src/test/java/com/avaje/tests/m2m/TestM2MModifyTest.java rename to src/test/java/org/tests/m2m/TestM2MModifyTest.java index 084c13772..1f12f85c8 100644 --- a/src/test/java/com/avaje/tests/m2m/TestM2MModifyTest.java +++ b/src/test/java/org/tests/m2m/TestM2MModifyTest.java @@ -1,9 +1,9 @@ -package com.avaje.tests.m2m; +package org.tests.m2m; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.MRole; -import com.avaje.tests.model.basic.MUser; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.MRole; +import org.tests.model.basic.MUser; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/m2m/TestM2MMultipleLists.java b/src/test/java/org/tests/m2m/TestM2MMultipleLists.java similarity index 72% rename from src/test/java/com/avaje/tests/m2m/TestM2MMultipleLists.java rename to src/test/java/org/tests/m2m/TestM2MMultipleLists.java index e42fb973b..a1f9db3eb 100644 --- a/src/test/java/com/avaje/tests/m2m/TestM2MMultipleLists.java +++ b/src/test/java/org/tests/m2m/TestM2MMultipleLists.java @@ -1,9 +1,9 @@ -package com.avaje.tests.m2m; +package org.tests.m2m; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.m2m.MailBox; -import com.avaje.tests.model.m2m.MailUser; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.m2m.MailBox; +import org.tests.model.m2m.MailUser; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/avaje/tests/m2m/TestM2MSelfRelationship.java b/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java similarity index 76% rename from src/test/java/com/avaje/tests/m2m/TestM2MSelfRelationship.java rename to src/test/java/org/tests/m2m/TestM2MSelfRelationship.java index 05931d957..1683f5aa8 100644 --- a/src/test/java/com/avaje/tests/m2m/TestM2MSelfRelationship.java +++ b/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java @@ -1,8 +1,8 @@ -package com.avaje.tests.m2m; +package org.tests.m2m; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.m2m.MnyTopic; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.m2m.MnyTopic; import org.junit.Test; /** diff --git a/src/test/java/com/avaje/tests/m2m/TestM2mDeleteObject.java b/src/test/java/org/tests/m2m/TestM2mDeleteObject.java similarity index 90% rename from src/test/java/com/avaje/tests/m2m/TestM2mDeleteObject.java rename to src/test/java/org/tests/m2m/TestM2mDeleteObject.java index eda5da6db..9fed238ca 100644 --- a/src/test/java/com/avaje/tests/m2m/TestM2mDeleteObject.java +++ b/src/test/java/org/tests/m2m/TestM2mDeleteObject.java @@ -1,10 +1,10 @@ -package com.avaje.tests.m2m; +package org.tests.m2m; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.m2m.Permission; -import com.avaje.tests.model.m2m.Role; -import com.avaje.tests.model.m2m.Tenant; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.m2m.Permission; +import org.tests.model.m2m.Role; +import org.tests.model.m2m.Tenant; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/model/BaseModel.java b/src/test/java/org/tests/model/BaseModel.java similarity index 84% rename from src/test/java/com/avaje/tests/model/BaseModel.java rename to src/test/java/org/tests/model/BaseModel.java index 1dba311c2..da67d0375 100644 --- a/src/test/java/com/avaje/tests/model/BaseModel.java +++ b/src/test/java/org/tests/model/BaseModel.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model; +package org.tests.model; -import com.avaje.ebean.Model; -import com.avaje.ebean.annotation.WhenCreated; -import com.avaje.ebean.annotation.WhenModified; +import io.ebean.Model; +import io.ebean.annotation.WhenCreated; +import io.ebean.annotation.WhenModified; import javax.persistence.Id; import javax.persistence.MappedSuperclass; diff --git a/src/test/java/com/avaje/tests/model/EGenProps.java b/src/test/java/org/tests/model/EGenProps.java similarity index 94% rename from src/test/java/com/avaje/tests/model/EGenProps.java rename to src/test/java/org/tests/model/EGenProps.java index b5387d45a..f5dcadd43 100644 --- a/src/test/java/com/avaje/tests/model/EGenProps.java +++ b/src/test/java/org/tests/model/EGenProps.java @@ -1,9 +1,9 @@ -package com.avaje.tests.model; +package org.tests.model; -import com.avaje.ebean.annotation.CreatedTimestamp; -import com.avaje.ebean.annotation.UpdatedTimestamp; -import com.avaje.ebean.annotation.WhenCreated; -import com.avaje.ebean.annotation.WhenModified; +import io.ebean.annotation.CreatedTimestamp; +import io.ebean.annotation.UpdatedTimestamp; +import io.ebean.annotation.WhenCreated; +import io.ebean.annotation.WhenModified; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/EWhoProps.java b/src/test/java/org/tests/model/EWhoProps.java similarity index 87% rename from src/test/java/com/avaje/tests/model/EWhoProps.java rename to src/test/java/org/tests/model/EWhoProps.java index b4c269b20..54d3445d8 100644 --- a/src/test/java/com/avaje/tests/model/EWhoProps.java +++ b/src/test/java/org/tests/model/EWhoProps.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model; +package org.tests.model; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/EWhoPropsSuper.java b/src/test/java/org/tests/model/EWhoPropsSuper.java similarity index 85% rename from src/test/java/com/avaje/tests/model/EWhoPropsSuper.java rename to src/test/java/org/tests/model/EWhoPropsSuper.java index 7b2e0c881..156eb52d1 100644 --- a/src/test/java/com/avaje/tests/model/EWhoPropsSuper.java +++ b/src/test/java/org/tests/model/EWhoPropsSuper.java @@ -1,9 +1,9 @@ -package com.avaje.tests.model; +package org.tests.model; -import com.avaje.ebean.annotation.WhenCreated; -import com.avaje.ebean.annotation.WhenModified; -import com.avaje.ebean.annotation.WhoCreated; -import com.avaje.ebean.annotation.WhoModified; +import io.ebean.annotation.WhenCreated; +import io.ebean.annotation.WhenModified; +import io.ebean.annotation.WhoCreated; +import io.ebean.annotation.WhoModified; import javax.persistence.Id; import javax.persistence.MappedSuperclass; diff --git a/src/test/java/com/avaje/tests/model/array/EArrayBean.java b/src/test/java/org/tests/model/array/EArrayBean.java similarity index 94% rename from src/test/java/com/avaje/tests/model/array/EArrayBean.java rename to src/test/java/org/tests/model/array/EArrayBean.java index 678354139..417b9345a 100644 --- a/src/test/java/com/avaje/tests/model/array/EArrayBean.java +++ b/src/test/java/org/tests/model/array/EArrayBean.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.array; +package org.tests.model.array; -import com.avaje.ebean.annotation.DbArray; +import io.ebean.annotation.DbArray; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/array/TestDbArray_basic.java b/src/test/java/org/tests/model/array/TestDbArray_basic.java similarity index 96% rename from src/test/java/com/avaje/tests/model/array/TestDbArray_basic.java rename to src/test/java/org/tests/model/array/TestDbArray_basic.java index 1acc1b190..867c04b06 100644 --- a/src/test/java/com/avaje/tests/model/array/TestDbArray_basic.java +++ b/src/test/java/org/tests/model/array/TestDbArray_basic.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.array; +package org.tests.model.array; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/model/basic/Address.java b/src/test/java/org/tests/model/basic/Address.java similarity index 95% rename from src/test/java/com/avaje/tests/model/basic/Address.java rename to src/test/java/org/tests/model/basic/Address.java index 2f9cf523f..a7f6dbc3c 100644 --- a/src/test/java/com/avaje/tests/model/basic/Address.java +++ b/src/test/java/org/tests/model/basic/Address.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.tests.model.basic.metaannotation.SizeMedium; +import org.tests.model.basic.metaannotation.SizeMedium; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/Animal.java b/src/test/java/org/tests/model/basic/Animal.java similarity index 96% rename from src/test/java/com/avaje/tests/model/basic/Animal.java rename to src/test/java/org/tests/model/basic/Animal.java index 942e023f8..62e893506 100644 --- a/src/test/java/com/avaje/tests/model/basic/Animal.java +++ b/src/test/java/org/tests/model/basic/Animal.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Column; import javax.persistence.DiscriminatorColumn; diff --git a/src/test/java/com/avaje/tests/model/basic/AnimalShelter.java b/src/test/java/org/tests/model/basic/AnimalShelter.java similarity index 91% rename from src/test/java/com/avaje/tests/model/basic/AnimalShelter.java rename to src/test/java/org/tests/model/basic/AnimalShelter.java index 093386211..f585c9dde 100644 --- a/src/test/java/com/avaje/tests/model/basic/AnimalShelter.java +++ b/src/test/java/org/tests/model/basic/AnimalShelter.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.PrivateOwned; +import io.ebean.annotation.PrivateOwned; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/Article.java b/src/test/java/org/tests/model/basic/Article.java similarity index 88% rename from src/test/java/com/avaje/tests/model/basic/Article.java rename to src/test/java/org/tests/model/basic/Article.java index 4427c6aea..dd6e9e14c 100644 --- a/src/test/java/com/avaje/tests/model/basic/Article.java +++ b/src/test/java/org/tests/model/basic/Article.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Cache; -import com.avaje.ebean.annotation.CacheBeanTuning; +import io.ebean.annotation.Cache; +import io.ebean.annotation.CacheBeanTuning; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/Attribute.java b/src/test/java/org/tests/model/basic/Attribute.java similarity index 95% rename from src/test/java/com/avaje/tests/model/basic/Attribute.java rename to src/test/java/org/tests/model/basic/Attribute.java index 8dafe0929..49efb2b6e 100644 --- a/src/test/java/com/avaje/tests/model/basic/Attribute.java +++ b/src/test/java/org/tests/model/basic/Attribute.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.DiscriminatorColumn; import javax.persistence.DiscriminatorType; diff --git a/src/test/java/com/avaje/tests/model/basic/AttributeHolder.java b/src/test/java/org/tests/model/basic/AttributeHolder.java similarity index 94% rename from src/test/java/com/avaje/tests/model/basic/AttributeHolder.java rename to src/test/java/org/tests/model/basic/AttributeHolder.java index 0cc379729..080b87fa5 100644 --- a/src/test/java/com/avaje/tests/model/basic/AttributeHolder.java +++ b/src/test/java/org/tests/model/basic/AttributeHolder.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/BBookmark.java b/src/test/java/org/tests/model/basic/BBookmark.java similarity index 97% rename from src/test/java/com/avaje/tests/model/basic/BBookmark.java rename to src/test/java/org/tests/model/basic/BBookmark.java index a256ddca7..ddd7d283d 100644 --- a/src/test/java/com/avaje/tests/model/basic/BBookmark.java +++ b/src/test/java/org/tests/model/basic/BBookmark.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/src/test/java/com/avaje/tests/model/basic/BBookmarkUser.java b/src/test/java/org/tests/model/basic/BBookmarkUser.java similarity index 98% rename from src/test/java/com/avaje/tests/model/basic/BBookmarkUser.java rename to src/test/java/org/tests/model/basic/BBookmarkUser.java index 0194c373c..873af8096 100644 --- a/src/test/java/com/avaje/tests/model/basic/BBookmarkUser.java +++ b/src/test/java/org/tests/model/basic/BBookmarkUser.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/BWithQIdent.java b/src/test/java/org/tests/model/basic/BWithQIdent.java similarity index 94% rename from src/test/java/com/avaje/tests/model/basic/BWithQIdent.java rename to src/test/java/org/tests/model/basic/BWithQIdent.java index 1b50d0bb0..d101c2e0a 100644 --- a/src/test/java/com/avaje/tests/model/basic/BWithQIdent.java +++ b/src/test/java/org/tests/model/basic/BWithQIdent.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/BasicDomain.java b/src/test/java/org/tests/model/basic/BasicDomain.java similarity index 87% rename from src/test/java/com/avaje/tests/model/basic/BasicDomain.java rename to src/test/java/org/tests/model/basic/BasicDomain.java index cfe2f3187..86c39f5b4 100644 --- a/src/test/java/com/avaje/tests/model/basic/BasicDomain.java +++ b/src/test/java/org/tests/model/basic/BasicDomain.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.WhenCreated; -import com.avaje.ebean.annotation.WhenModified; +import io.ebean.annotation.WhenCreated; +import io.ebean.annotation.WhenModified; import javax.persistence.Id; import javax.persistence.MappedSuperclass; diff --git a/src/test/java/com/avaje/tests/model/basic/BeanWithTimeZone.java b/src/test/java/org/tests/model/basic/BeanWithTimeZone.java similarity index 93% rename from src/test/java/com/avaje/tests/model/basic/BeanWithTimeZone.java rename to src/test/java/org/tests/model/basic/BeanWithTimeZone.java index f85d701a6..89ae68bcd 100644 --- a/src/test/java/com/avaje/tests/model/basic/BeanWithTimeZone.java +++ b/src/test/java/org/tests/model/basic/BeanWithTimeZone.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/BigDog.java b/src/test/java/org/tests/model/basic/BigDog.java similarity index 89% rename from src/test/java/com/avaje/tests/model/basic/BigDog.java rename to src/test/java/org/tests/model/basic/BigDog.java index 162095940..ddd6e5459 100644 --- a/src/test/java/com/avaje/tests/model/basic/BigDog.java +++ b/src/test/java/org/tests/model/basic/BigDog.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/CKeyAssoc.java b/src/test/java/org/tests/model/basic/CKeyAssoc.java similarity index 91% rename from src/test/java/com/avaje/tests/model/basic/CKeyAssoc.java rename to src/test/java/org/tests/model/basic/CKeyAssoc.java index f8cf2d0ee..4a71909a8 100644 --- a/src/test/java/com/avaje/tests/model/basic/CKeyAssoc.java +++ b/src/test/java/org/tests/model/basic/CKeyAssoc.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/CKeyDetail.java b/src/test/java/org/tests/model/basic/CKeyDetail.java similarity index 95% rename from src/test/java/com/avaje/tests/model/basic/CKeyDetail.java rename to src/test/java/org/tests/model/basic/CKeyDetail.java index e11eb8621..aed4a10b9 100644 --- a/src/test/java/com/avaje/tests/model/basic/CKeyDetail.java +++ b/src/test/java/org/tests/model/basic/CKeyDetail.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/CKeyParent.java b/src/test/java/org/tests/model/basic/CKeyParent.java similarity index 97% rename from src/test/java/com/avaje/tests/model/basic/CKeyParent.java rename to src/test/java/org/tests/model/basic/CKeyParent.java index 1b75efc86..27b68e9c0 100644 --- a/src/test/java/com/avaje/tests/model/basic/CKeyParent.java +++ b/src/test/java/org/tests/model/basic/CKeyParent.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.CascadeType; import javax.persistence.EmbeddedId; diff --git a/src/test/java/com/avaje/tests/model/basic/CKeyParentId.java b/src/test/java/org/tests/model/basic/CKeyParentId.java similarity index 96% rename from src/test/java/com/avaje/tests/model/basic/CKeyParentId.java rename to src/test/java/org/tests/model/basic/CKeyParentId.java index 86f3c422d..b57313779 100644 --- a/src/test/java/com/avaje/tests/model/basic/CKeyParentId.java +++ b/src/test/java/org/tests/model/basic/CKeyParentId.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Embeddable; diff --git a/src/test/java/com/avaje/tests/model/basic/Car.java b/src/test/java/org/tests/model/basic/Car.java similarity index 94% rename from src/test/java/com/avaje/tests/model/basic/Car.java rename to src/test/java/org/tests/model/basic/Car.java index e97ebccb7..192e5ad93 100644 --- a/src/test/java/com/avaje/tests/model/basic/Car.java +++ b/src/test/java/org/tests/model/basic/Car.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.DbEnumValue; +import io.ebean.annotation.DbEnumValue; import javax.persistence.Column; import javax.persistence.DiscriminatorValue; diff --git a/src/test/java/com/avaje/tests/model/basic/CarAccessory.java b/src/test/java/org/tests/model/basic/CarAccessory.java similarity index 95% rename from src/test/java/com/avaje/tests/model/basic/CarAccessory.java rename to src/test/java/org/tests/model/basic/CarAccessory.java index 1087c12ca..37ee5720e 100644 --- a/src/test/java/com/avaje/tests/model/basic/CarAccessory.java +++ b/src/test/java/org/tests/model/basic/CarAccessory.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.ManyToOne; diff --git a/src/test/java/com/avaje/tests/model/basic/CarFuse.java b/src/test/java/org/tests/model/basic/CarFuse.java similarity index 91% rename from src/test/java/com/avaje/tests/model/basic/CarFuse.java rename to src/test/java/org/tests/model/basic/CarFuse.java index 1148180d9..df2aef5bf 100644 --- a/src/test/java/com/avaje/tests/model/basic/CarFuse.java +++ b/src/test/java/org/tests/model/basic/CarFuse.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/Cat.java b/src/test/java/org/tests/model/basic/Cat.java similarity index 88% rename from src/test/java/com/avaje/tests/model/basic/Cat.java rename to src/test/java/org/tests/model/basic/Cat.java index 8560b7e62..a94316b64 100644 --- a/src/test/java/com/avaje/tests/model/basic/Cat.java +++ b/src/test/java/org/tests/model/basic/Cat.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/Contact.java b/src/test/java/org/tests/model/basic/Contact.java similarity index 88% rename from src/test/java/com/avaje/tests/model/basic/Contact.java rename to src/test/java/org/tests/model/basic/Contact.java index d8c4e167c..e15f572b2 100644 --- a/src/test/java/com/avaje/tests/model/basic/Contact.java +++ b/src/test/java/org/tests/model/basic/Contact.java @@ -1,11 +1,11 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Cache; -import com.avaje.ebean.annotation.ChangeLog; -import com.avaje.ebean.annotation.CreatedTimestamp; -import com.avaje.ebean.annotation.DocEmbedded; -import com.avaje.ebean.annotation.DocStore; -import com.avaje.ebean.annotation.Index; +import io.ebean.annotation.Cache; +import io.ebean.annotation.ChangeLog; +import io.ebean.annotation.CreatedTimestamp; +import io.ebean.annotation.DocEmbedded; +import io.ebean.annotation.DocStore; +import io.ebean.annotation.Index; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/ContactGroup.java b/src/test/java/org/tests/model/basic/ContactGroup.java similarity index 88% rename from src/test/java/com/avaje/tests/model/basic/ContactGroup.java rename to src/test/java/org/tests/model/basic/ContactGroup.java index 1398ea0f9..1b2963624 100644 --- a/src/test/java/com/avaje/tests/model/basic/ContactGroup.java +++ b/src/test/java/org/tests/model/basic/ContactGroup.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/ContactNote.java b/src/test/java/org/tests/model/basic/ContactNote.java similarity index 95% rename from src/test/java/com/avaje/tests/model/basic/ContactNote.java rename to src/test/java/org/tests/model/basic/ContactNote.java index 29e0d34c1..ffe0b2e56 100644 --- a/src/test/java/com/avaje/tests/model/basic/ContactNote.java +++ b/src/test/java/org/tests/model/basic/ContactNote.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Lob; diff --git a/src/test/java/com/avaje/tests/model/basic/Country.java b/src/test/java/org/tests/model/basic/Country.java similarity index 72% rename from src/test/java/com/avaje/tests/model/basic/Country.java rename to src/test/java/org/tests/model/basic/Country.java index c2f300bbc..597a707b8 100644 --- a/src/test/java/com/avaje/tests/model/basic/Country.java +++ b/src/test/java/org/tests/model/basic/Country.java @@ -1,11 +1,11 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Cache; -import com.avaje.ebean.annotation.CacheBeanTuning; -import com.avaje.ebean.annotation.ChangeLog; -import com.avaje.ebean.annotation.ChangeLogInsertMode; -import com.avaje.ebean.annotation.DocStore; -import com.avaje.ebean.annotation.ReadAudit; +import io.ebean.annotation.Cache; +import io.ebean.annotation.CacheBeanTuning; +import io.ebean.annotation.ChangeLog; +import io.ebean.annotation.ChangeLogInsertMode; +import io.ebean.annotation.DocStore; +import io.ebean.annotation.ReadAudit; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/Customer.java b/src/test/java/org/tests/model/basic/Customer.java similarity index 89% rename from src/test/java/com/avaje/tests/model/basic/Customer.java rename to src/test/java/org/tests/model/basic/Customer.java index ac22eeb47..8334549e7 100644 --- a/src/test/java/com/avaje/tests/model/basic/Customer.java +++ b/src/test/java/org/tests/model/basic/Customer.java @@ -1,15 +1,15 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Cache; -import com.avaje.ebean.annotation.ChangeLog; -import com.avaje.ebean.annotation.ChangeLogInsertMode; -import com.avaje.ebean.annotation.DbComment; -import com.avaje.ebean.annotation.DbEnumValue; -import com.avaje.ebean.annotation.DocEmbedded; -import com.avaje.ebean.annotation.DocStore; -import com.avaje.ebean.annotation.JsonIgnore; -import com.avaje.ebean.annotation.Where; -import com.avaje.tests.model.basic.finder.CustomerFinder; +import io.ebean.annotation.Cache; +import io.ebean.annotation.ChangeLog; +import io.ebean.annotation.ChangeLogInsertMode; +import io.ebean.annotation.DbComment; +import io.ebean.annotation.DbEnumValue; +import io.ebean.annotation.DocEmbedded; +import io.ebean.annotation.DocStore; +import io.ebean.annotation.JsonIgnore; +import io.ebean.annotation.Where; +import org.tests.model.basic.finder.CustomerFinder; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/CustomerAggregate.java b/src/test/java/org/tests/model/basic/CustomerAggregate.java similarity index 90% rename from src/test/java/com/avaje/tests/model/basic/CustomerAggregate.java rename to src/test/java/org/tests/model/basic/CustomerAggregate.java index ad2dce6a2..56612bb0d 100644 --- a/src/test/java/com/avaje/tests/model/basic/CustomerAggregate.java +++ b/src/test/java/org/tests/model/basic/CustomerAggregate.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Sql; +import io.ebean.annotation.Sql; import javax.persistence.Entity; import javax.persistence.OneToOne; diff --git a/src/test/java/com/avaje/tests/model/basic/Dog.java b/src/test/java/org/tests/model/basic/Dog.java similarity index 93% rename from src/test/java/com/avaje/tests/model/basic/Dog.java rename to src/test/java/org/tests/model/basic/Dog.java index 38d761b61..7b2fad546 100644 --- a/src/test/java/com/avaje/tests/model/basic/Dog.java +++ b/src/test/java/org/tests/model/basic/Dog.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/EBasic.java b/src/test/java/org/tests/model/basic/EBasic.java similarity index 90% rename from src/test/java/com/avaje/tests/model/basic/EBasic.java rename to src/test/java/org/tests/model/basic/EBasic.java index d64e8d036..5b67551f8 100644 --- a/src/test/java/com/avaje/tests/model/basic/EBasic.java +++ b/src/test/java/org/tests/model/basic/EBasic.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.EnumValue; -import com.avaje.ebean.annotation.Index; +import io.ebean.annotation.EnumValue; +import io.ebean.annotation.Index; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/EBasicChangeLog.java b/src/test/java/org/tests/model/basic/EBasicChangeLog.java similarity index 84% rename from src/test/java/com/avaje/tests/model/basic/EBasicChangeLog.java rename to src/test/java/org/tests/model/basic/EBasicChangeLog.java index 3a5fb6033..88e3e4f10 100644 --- a/src/test/java/com/avaje/tests/model/basic/EBasicChangeLog.java +++ b/src/test/java/org/tests/model/basic/EBasicChangeLog.java @@ -1,12 +1,12 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Cache; -import com.avaje.ebean.annotation.ChangeLog; -import com.avaje.ebean.annotation.ReadAudit; -import com.avaje.ebean.annotation.WhenCreated; -import com.avaje.ebean.annotation.WhenModified; -import com.avaje.ebean.annotation.WhoCreated; -import com.avaje.ebean.annotation.WhoModified; +import io.ebean.annotation.Cache; +import io.ebean.annotation.ChangeLog; +import io.ebean.annotation.ReadAudit; +import io.ebean.annotation.WhenCreated; +import io.ebean.annotation.WhenModified; +import io.ebean.annotation.WhoCreated; +import io.ebean.annotation.WhoModified; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/EBasicClob.java b/src/test/java/org/tests/model/basic/EBasicClob.java similarity index 96% rename from src/test/java/com/avaje/tests/model/basic/EBasicClob.java rename to src/test/java/org/tests/model/basic/EBasicClob.java index 3ae2d6e8a..0541f1b3f 100644 --- a/src/test/java/com/avaje/tests/model/basic/EBasicClob.java +++ b/src/test/java/org/tests/model/basic/EBasicClob.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/EBasicClobFetchEager.java b/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java similarity index 97% rename from src/test/java/com/avaje/tests/model/basic/EBasicClobFetchEager.java rename to src/test/java/org/tests/model/basic/EBasicClobFetchEager.java index 197544806..b95d56bf8 100644 --- a/src/test/java/com/avaje/tests/model/basic/EBasicClobFetchEager.java +++ b/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Basic; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/EBasicClobNoVer.java b/src/test/java/org/tests/model/basic/EBasicClobNoVer.java similarity index 94% rename from src/test/java/com/avaje/tests/model/basic/EBasicClobNoVer.java rename to src/test/java/org/tests/model/basic/EBasicClobNoVer.java index cf1543c06..735ad796e 100644 --- a/src/test/java/com/avaje/tests/model/basic/EBasicClobNoVer.java +++ b/src/test/java/org/tests/model/basic/EBasicClobNoVer.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/EBasicEncrypt.java b/src/test/java/org/tests/model/basic/EBasicEncrypt.java similarity index 92% rename from src/test/java/com/avaje/tests/model/basic/EBasicEncrypt.java rename to src/test/java/org/tests/model/basic/EBasicEncrypt.java index a2bcdfea4..3e9e0c322 100644 --- a/src/test/java/com/avaje/tests/model/basic/EBasicEncrypt.java +++ b/src/test/java/org/tests/model/basic/EBasicEncrypt.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Encrypted; +import io.ebean.annotation.Encrypted; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/EBasicEncryptBinary.java b/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java similarity index 93% rename from src/test/java/com/avaje/tests/model/basic/EBasicEncryptBinary.java rename to src/test/java/org/tests/model/basic/EBasicEncryptBinary.java index 1ec8142f6..bd13f97e2 100644 --- a/src/test/java/com/avaje/tests/model/basic/EBasicEncryptBinary.java +++ b/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Encrypted; +import io.ebean.annotation.Encrypted; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/EBasicEnumId.java b/src/test/java/org/tests/model/basic/EBasicEnumId.java similarity index 90% rename from src/test/java/com/avaje/tests/model/basic/EBasicEnumId.java rename to src/test/java/org/tests/model/basic/EBasicEnumId.java index 441544f63..698f6eac2 100644 --- a/src/test/java/com/avaje/tests/model/basic/EBasicEnumId.java +++ b/src/test/java/org/tests/model/basic/EBasicEnumId.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.EnumValue; +import io.ebean.annotation.EnumValue; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/EBasicEnumInt.java b/src/test/java/org/tests/model/basic/EBasicEnumInt.java similarity index 90% rename from src/test/java/com/avaje/tests/model/basic/EBasicEnumInt.java rename to src/test/java/org/tests/model/basic/EBasicEnumInt.java index f138d0f27..7cccf2ac1 100644 --- a/src/test/java/com/avaje/tests/model/basic/EBasicEnumInt.java +++ b/src/test/java/org/tests/model/basic/EBasicEnumInt.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.DbEnumType; -import com.avaje.ebean.annotation.DbEnumValue; +import io.ebean.annotation.DbEnumType; +import io.ebean.annotation.DbEnumValue; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/EBasicNoDefaultConstructor.java b/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java similarity index 94% rename from src/test/java/com/avaje/tests/model/basic/EBasicNoDefaultConstructor.java rename to src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java index 21d40b1da..163827a18 100644 --- a/src/test/java/com/avaje/tests/model/basic/EBasicNoDefaultConstructor.java +++ b/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/EBasicVer.java b/src/test/java/org/tests/model/basic/EBasicVer.java similarity index 93% rename from src/test/java/com/avaje/tests/model/basic/EBasicVer.java rename to src/test/java/org/tests/model/basic/EBasicVer.java index 7c63183ef..ada7768fe 100644 --- a/src/test/java/com/avaje/tests/model/basic/EBasicVer.java +++ b/src/test/java/org/tests/model/basic/EBasicVer.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Cache; +import io.ebean.annotation.Cache; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/EBasicWithLifecycle.java b/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java similarity index 93% rename from src/test/java/com/avaje/tests/model/basic/EBasicWithLifecycle.java rename to src/test/java/org/tests/model/basic/EBasicWithLifecycle.java index 9dad6f02f..51bb57eac 100644 --- a/src/test/java/com/avaje/tests/model/basic/EBasicWithLifecycle.java +++ b/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.PostSoftDelete; -import com.avaje.ebean.annotation.PreSoftDelete; -import com.avaje.ebean.annotation.SoftDelete; +import io.ebean.annotation.PostSoftDelete; +import io.ebean.annotation.PreSoftDelete; +import io.ebean.annotation.SoftDelete; import javax.annotation.PostConstruct; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/EBasicWithUniqueCon.java b/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java similarity index 97% rename from src/test/java/com/avaje/tests/model/basic/EBasicWithUniqueCon.java rename to src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java index c45dea0ad..63c09d4de 100644 --- a/src/test/java/com/avaje/tests/model/basic/EBasicWithUniqueCon.java +++ b/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/ECustomId.java b/src/test/java/org/tests/model/basic/ECustomId.java similarity index 93% rename from src/test/java/com/avaje/tests/model/basic/ECustomId.java rename to src/test/java/org/tests/model/basic/ECustomId.java index 3bf488a4d..fc6c94d2c 100644 --- a/src/test/java/com/avaje/tests/model/basic/ECustomId.java +++ b/src/test/java/org/tests/model/basic/ECustomId.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/src/test/java/com/avaje/tests/model/basic/ENullCollection.java b/src/test/java/org/tests/model/basic/ENullCollection.java similarity index 95% rename from src/test/java/com/avaje/tests/model/basic/ENullCollection.java rename to src/test/java/org/tests/model/basic/ENullCollection.java index 2af94e3fb..8449d7d92 100644 --- a/src/test/java/com/avaje/tests/model/basic/ENullCollection.java +++ b/src/test/java/org/tests/model/basic/ENullCollection.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/ENullCollectionDetail.java b/src/test/java/org/tests/model/basic/ENullCollectionDetail.java similarity index 92% rename from src/test/java/com/avaje/tests/model/basic/ENullCollectionDetail.java rename to src/test/java/org/tests/model/basic/ENullCollectionDetail.java index 5322f6d91..8c84ef4e5 100644 --- a/src/test/java/com/avaje/tests/model/basic/ENullCollectionDetail.java +++ b/src/test/java/org/tests/model/basic/ENullCollectionDetail.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/EOptOneA.java b/src/test/java/org/tests/model/basic/EOptOneA.java similarity index 92% rename from src/test/java/com/avaje/tests/model/basic/EOptOneA.java rename to src/test/java/org/tests/model/basic/EOptOneA.java index 11b8be526..8a47cec81 100644 --- a/src/test/java/com/avaje/tests/model/basic/EOptOneA.java +++ b/src/test/java/org/tests/model/basic/EOptOneA.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.ManyToOne; diff --git a/src/test/java/com/avaje/tests/model/basic/EOptOneB.java b/src/test/java/org/tests/model/basic/EOptOneB.java similarity index 92% rename from src/test/java/com/avaje/tests/model/basic/EOptOneB.java rename to src/test/java/org/tests/model/basic/EOptOneB.java index 03b5440f9..6b94d1ecc 100644 --- a/src/test/java/com/avaje/tests/model/basic/EOptOneB.java +++ b/src/test/java/org/tests/model/basic/EOptOneB.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.ManyToOne; diff --git a/src/test/java/com/avaje/tests/model/basic/EOptOneC.java b/src/test/java/org/tests/model/basic/EOptOneC.java similarity index 89% rename from src/test/java/com/avaje/tests/model/basic/EOptOneC.java rename to src/test/java/org/tests/model/basic/EOptOneC.java index f58d222e1..15ac6809f 100644 --- a/src/test/java/com/avaje/tests/model/basic/EOptOneC.java +++ b/src/test/java/org/tests/model/basic/EOptOneC.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/ESimple.java b/src/test/java/org/tests/model/basic/ESimple.java similarity index 94% rename from src/test/java/com/avaje/tests/model/basic/ESimple.java rename to src/test/java/org/tests/model/basic/ESimple.java index ef8b0a755..fdf1aa9e5 100644 --- a/src/test/java/com/avaje/tests/model/basic/ESimple.java +++ b/src/test/java/org/tests/model/basic/ESimple.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/ESomeType.java b/src/test/java/org/tests/model/basic/ESomeType.java similarity index 95% rename from src/test/java/com/avaje/tests/model/basic/ESomeType.java rename to src/test/java/org/tests/model/basic/ESomeType.java index b1898b9fa..a09b9c8af 100644 --- a/src/test/java/com/avaje/tests/model/basic/ESomeType.java +++ b/src/test/java/org/tests/model/basic/ESomeType.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/ETransMany.java b/src/test/java/org/tests/model/basic/ETransMany.java similarity index 94% rename from src/test/java/com/avaje/tests/model/basic/ETransMany.java rename to src/test/java/org/tests/model/basic/ETransMany.java index c140ed868..75cc12edb 100644 --- a/src/test/java/com/avaje/tests/model/basic/ETransMany.java +++ b/src/test/java/org/tests/model/basic/ETransMany.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/EVanillaCollection.java b/src/test/java/org/tests/model/basic/EVanillaCollection.java similarity index 95% rename from src/test/java/com/avaje/tests/model/basic/EVanillaCollection.java rename to src/test/java/org/tests/model/basic/EVanillaCollection.java index 614a2bd1c..979a3ea28 100644 --- a/src/test/java/com/avaje/tests/model/basic/EVanillaCollection.java +++ b/src/test/java/org/tests/model/basic/EVanillaCollection.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/EVanillaCollectionDetail.java b/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java similarity index 92% rename from src/test/java/com/avaje/tests/model/basic/EVanillaCollectionDetail.java rename to src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java index b131ef3c2..414828a98 100644 --- a/src/test/java/com/avaje/tests/model/basic/EVanillaCollectionDetail.java +++ b/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/EWithInetAddr.java b/src/test/java/org/tests/model/basic/EWithInetAddr.java similarity index 95% rename from src/test/java/com/avaje/tests/model/basic/EWithInetAddr.java rename to src/test/java/org/tests/model/basic/EWithInetAddr.java index d96b4a1d4..3e823dc15 100644 --- a/src/test/java/com/avaje/tests/model/basic/EWithInetAddr.java +++ b/src/test/java/org/tests/model/basic/EWithInetAddr.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/FeatureDescription.java b/src/test/java/org/tests/model/basic/FeatureDescription.java similarity index 89% rename from src/test/java/com/avaje/tests/model/basic/FeatureDescription.java rename to src/test/java/org/tests/model/basic/FeatureDescription.java index 258704b5a..955b5f7f6 100644 --- a/src/test/java/com/avaje/tests/model/basic/FeatureDescription.java +++ b/src/test/java/org/tests/model/basic/FeatureDescription.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Cache; +import io.ebean.annotation.Cache; import javax.persistence.Entity; import javax.persistence.Id; @@ -41,4 +41,4 @@ public class FeatureDescription { public void setDescription(String description) { this.description = description; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/basic/ListAttribute.java b/src/test/java/org/tests/model/basic/ListAttribute.java similarity index 96% rename from src/test/java/com/avaje/tests/model/basic/ListAttribute.java rename to src/test/java/org/tests/model/basic/ListAttribute.java index a28829762..0633e254f 100644 --- a/src/test/java/com/avaje/tests/model/basic/ListAttribute.java +++ b/src/test/java/org/tests/model/basic/ListAttribute.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.CascadeType; import javax.persistence.DiscriminatorValue; diff --git a/src/test/java/com/avaje/tests/model/basic/ListAttributeValue.java b/src/test/java/org/tests/model/basic/ListAttributeValue.java similarity index 94% rename from src/test/java/com/avaje/tests/model/basic/ListAttributeValue.java rename to src/test/java/org/tests/model/basic/ListAttributeValue.java index b0a10ada6..8c88c06e9 100644 --- a/src/test/java/com/avaje/tests/model/basic/ListAttributeValue.java +++ b/src/test/java/org/tests/model/basic/ListAttributeValue.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.ManyToMany; diff --git a/src/test/java/com/avaje/tests/model/basic/MNonEnum.java b/src/test/java/org/tests/model/basic/MNonEnum.java similarity index 82% rename from src/test/java/com/avaje/tests/model/basic/MNonEnum.java rename to src/test/java/org/tests/model/basic/MNonEnum.java index 278d4488f..ec02d0129 100644 --- a/src/test/java/com/avaje/tests/model/basic/MNonEnum.java +++ b/src/test/java/org/tests/model/basic/MNonEnum.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; public enum MNonEnum { diff --git a/src/test/java/com/avaje/tests/model/basic/MNonUpdPropEntity.java b/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java similarity index 95% rename from src/test/java/com/avaje/tests/model/basic/MNonUpdPropEntity.java rename to src/test/java/org/tests/model/basic/MNonUpdPropEntity.java index 5d08849c1..bae5aa6dc 100644 --- a/src/test/java/com/avaje/tests/model/basic/MNonUpdPropEntity.java +++ b/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/MProtectedConstructBean.java b/src/test/java/org/tests/model/basic/MProtectedConstructBean.java similarity index 91% rename from src/test/java/com/avaje/tests/model/basic/MProtectedConstructBean.java rename to src/test/java/org/tests/model/basic/MProtectedConstructBean.java index 936af2c31..a04fb62f3 100644 --- a/src/test/java/com/avaje/tests/model/basic/MProtectedConstructBean.java +++ b/src/test/java/org/tests/model/basic/MProtectedConstructBean.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; @@ -12,7 +12,7 @@ public class MProtectedConstructBean { String name; // private MProtectedConstructBean() { -// +// // } public MProtectedConstructBean(String name) { diff --git a/src/test/java/com/avaje/tests/model/basic/MRole.java b/src/test/java/org/tests/model/basic/MRole.java similarity index 97% rename from src/test/java/com/avaje/tests/model/basic/MRole.java rename to src/test/java/org/tests/model/basic/MRole.java index 5ae7ef2f2..280a91ce0 100644 --- a/src/test/java/com/avaje/tests/model/basic/MRole.java +++ b/src/test/java/org/tests/model/basic/MRole.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/MUser.java b/src/test/java/org/tests/model/basic/MUser.java similarity index 97% rename from src/test/java/com/avaje/tests/model/basic/MUser.java rename to src/test/java/org/tests/model/basic/MUser.java index 21b22b2e5..a2e1a701c 100644 --- a/src/test/java/com/avaje/tests/model/basic/MUser.java +++ b/src/test/java/org/tests/model/basic/MUser.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/MUserType.java b/src/test/java/org/tests/model/basic/MUserType.java similarity index 93% rename from src/test/java/com/avaje/tests/model/basic/MUserType.java rename to src/test/java/org/tests/model/basic/MUserType.java index f0e045a46..9d147bcee 100644 --- a/src/test/java/com/avaje/tests/model/basic/MUserType.java +++ b/src/test/java/org/tests/model/basic/MUserType.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/MnocRole.java b/src/test/java/org/tests/model/basic/MnocRole.java similarity index 95% rename from src/test/java/com/avaje/tests/model/basic/MnocRole.java rename to src/test/java/org/tests/model/basic/MnocRole.java index c9c26381a..44c0ba5be 100644 --- a/src/test/java/com/avaje/tests/model/basic/MnocRole.java +++ b/src/test/java/org/tests/model/basic/MnocRole.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/MnocUser.java b/src/test/java/org/tests/model/basic/MnocUser.java similarity index 97% rename from src/test/java/com/avaje/tests/model/basic/MnocUser.java rename to src/test/java/org/tests/model/basic/MnocUser.java index d746716e8..3093c2f2b 100644 --- a/src/test/java/com/avaje/tests/model/basic/MnocUser.java +++ b/src/test/java/org/tests/model/basic/MnocUser.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/MyAdHoc.java b/src/test/java/org/tests/model/basic/MyAdHoc.java similarity index 84% rename from src/test/java/com/avaje/tests/model/basic/MyAdHoc.java rename to src/test/java/org/tests/model/basic/MyAdHoc.java index c1b0cfa72..7593dc6d0 100644 --- a/src/test/java/com/avaje/tests/model/basic/MyAdHoc.java +++ b/src/test/java/org/tests/model/basic/MyAdHoc.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Sql; +import io.ebean.annotation.Sql; import javax.persistence.Entity; import javax.persistence.ManyToOne; diff --git a/src/test/java/com/avaje/tests/model/basic/MyEBasicConfigStartup.java b/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java similarity index 85% rename from src/test/java/com/avaje/tests/model/basic/MyEBasicConfigStartup.java rename to src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java index e2e19b863..9fd6266d5 100644 --- a/src/test/java/com/avaje/tests/model/basic/MyEBasicConfigStartup.java +++ b/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java @@ -1,10 +1,10 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.event.AbstractBeanPersistListener; -import com.avaje.ebean.event.BulkTableEvent; -import com.avaje.ebean.event.BulkTableEventListener; -import com.avaje.ebean.event.ServerConfigStartup; +import io.ebean.config.ServerConfig; +import io.ebean.event.AbstractBeanPersistListener; +import io.ebean.event.BulkTableEvent; +import io.ebean.event.BulkTableEventListener; +import io.ebean.event.ServerConfigStartup; import java.util.HashSet; import java.util.Set; diff --git a/src/test/java/com/avaje/tests/model/basic/MyLobSize.java b/src/test/java/org/tests/model/basic/MyLobSize.java similarity index 96% rename from src/test/java/com/avaje/tests/model/basic/MyLobSize.java rename to src/test/java/org/tests/model/basic/MyLobSize.java index 10ba9f858..d189decb2 100644 --- a/src/test/java/com/avaje/tests/model/basic/MyLobSize.java +++ b/src/test/java/org/tests/model/basic/MyLobSize.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Basic; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/MyLobSizeJoinMany.java b/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java similarity index 95% rename from src/test/java/com/avaje/tests/model/basic/MyLobSizeJoinMany.java rename to src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java index 807c6919b..10c1bc385 100644 --- a/src/test/java/com/avaje/tests/model/basic/MyLobSizeJoinMany.java +++ b/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Basic; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/OCachedBean.java b/src/test/java/org/tests/model/basic/OCachedBean.java similarity index 93% rename from src/test/java/com/avaje/tests/model/basic/OCachedBean.java rename to src/test/java/org/tests/model/basic/OCachedBean.java index 4d2636696..8e8d2a976 100644 --- a/src/test/java/com/avaje/tests/model/basic/OCachedBean.java +++ b/src/test/java/org/tests/model/basic/OCachedBean.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Cache; +import io.ebean.annotation.Cache; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/OCachedBeanChild.java b/src/test/java/org/tests/model/basic/OCachedBeanChild.java similarity index 88% rename from src/test/java/com/avaje/tests/model/basic/OCachedBeanChild.java rename to src/test/java/org/tests/model/basic/OCachedBeanChild.java index 40a129284..a2f99e85e 100644 --- a/src/test/java/com/avaje/tests/model/basic/OCachedBeanChild.java +++ b/src/test/java/org/tests/model/basic/OCachedBeanChild.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Cache; +import io.ebean.annotation.Cache; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/OCar.java b/src/test/java/org/tests/model/basic/OCar.java similarity index 96% rename from src/test/java/com/avaje/tests/model/basic/OCar.java rename to src/test/java/org/tests/model/basic/OCar.java index b1734501e..db0ebf12c 100644 --- a/src/test/java/com/avaje/tests/model/basic/OCar.java +++ b/src/test/java/org/tests/model/basic/OCar.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/OEngine.java b/src/test/java/org/tests/model/basic/OEngine.java similarity index 96% rename from src/test/java/com/avaje/tests/model/basic/OEngine.java rename to src/test/java/org/tests/model/basic/OEngine.java index cfeb9d56e..2ef2d7bf8 100644 --- a/src/test/java/com/avaje/tests/model/basic/OEngine.java +++ b/src/test/java/org/tests/model/basic/OEngine.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/OGearBox.java b/src/test/java/org/tests/model/basic/OGearBox.java similarity index 96% rename from src/test/java/com/avaje/tests/model/basic/OGearBox.java rename to src/test/java/org/tests/model/basic/OGearBox.java index 1df6d9ad7..d6a2987d3 100644 --- a/src/test/java/com/avaje/tests/model/basic/OGearBox.java +++ b/src/test/java/org/tests/model/basic/OGearBox.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/Order.java b/src/test/java/org/tests/model/basic/Order.java similarity index 93% rename from src/test/java/com/avaje/tests/model/basic/Order.java rename to src/test/java/org/tests/model/basic/Order.java index c1f35cc6a..697802e2f 100644 --- a/src/test/java/com/avaje/tests/model/basic/Order.java +++ b/src/test/java/org/tests/model/basic/Order.java @@ -1,12 +1,12 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Cache; -import com.avaje.ebean.annotation.ChangeLog; -import com.avaje.ebean.annotation.DocEmbedded; -import com.avaje.ebean.annotation.DocStore; -import com.avaje.ebean.annotation.Formula; -import com.avaje.ebean.annotation.WhenCreated; -import com.avaje.ebean.annotation.Where; +import io.ebean.annotation.Cache; +import io.ebean.annotation.ChangeLog; +import io.ebean.annotation.DocEmbedded; +import io.ebean.annotation.DocStore; +import io.ebean.annotation.Formula; +import io.ebean.annotation.WhenCreated; +import io.ebean.annotation.Where; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/src/test/java/com/avaje/tests/model/basic/OrderAggregate.java b/src/test/java/org/tests/model/basic/OrderAggregate.java similarity index 93% rename from src/test/java/com/avaje/tests/model/basic/OrderAggregate.java rename to src/test/java/org/tests/model/basic/OrderAggregate.java index b64c6e887..d4f3da517 100644 --- a/src/test/java/com/avaje/tests/model/basic/OrderAggregate.java +++ b/src/test/java/org/tests/model/basic/OrderAggregate.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Sql; +import io.ebean.annotation.Sql; import javax.persistence.Entity; import javax.persistence.OneToOne; diff --git a/src/test/java/com/avaje/tests/model/basic/OrderDetail.java b/src/test/java/org/tests/model/basic/OrderDetail.java similarity index 94% rename from src/test/java/com/avaje/tests/model/basic/OrderDetail.java rename to src/test/java/org/tests/model/basic/OrderDetail.java index 272a2bff7..8d4060cc6 100644 --- a/src/test/java/com/avaje/tests/model/basic/OrderDetail.java +++ b/src/test/java/org/tests/model/basic/OrderDetail.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Cache; -import com.avaje.ebean.annotation.DocEmbedded; +import io.ebean.annotation.Cache; +import io.ebean.annotation.DocEmbedded; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/OrderShipment.java b/src/test/java/org/tests/model/basic/OrderShipment.java similarity index 94% rename from src/test/java/com/avaje/tests/model/basic/OrderShipment.java rename to src/test/java/org/tests/model/basic/OrderShipment.java index 8f2abe2e4..a587538a1 100644 --- a/src/test/java/com/avaje/tests/model/basic/OrderShipment.java +++ b/src/test/java/org/tests/model/basic/OrderShipment.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.ManyToOne; diff --git a/src/test/java/com/avaje/tests/model/basic/PFile.java b/src/test/java/org/tests/model/basic/PFile.java similarity index 96% rename from src/test/java/com/avaje/tests/model/basic/PFile.java rename to src/test/java/org/tests/model/basic/PFile.java index 2b2c1c907..ddac4e6c4 100644 --- a/src/test/java/com/avaje/tests/model/basic/PFile.java +++ b/src/test/java/org/tests/model/basic/PFile.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/PFileContent.java b/src/test/java/org/tests/model/basic/PFileContent.java similarity index 92% rename from src/test/java/com/avaje/tests/model/basic/PFileContent.java rename to src/test/java/org/tests/model/basic/PFileContent.java index b0a96aa22..eba148198 100644 --- a/src/test/java/com/avaje/tests/model/basic/PFileContent.java +++ b/src/test/java/org/tests/model/basic/PFileContent.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Lob; diff --git a/src/test/java/com/avaje/tests/model/basic/PersistentFile.java b/src/test/java/org/tests/model/basic/PersistentFile.java similarity index 96% rename from src/test/java/com/avaje/tests/model/basic/PersistentFile.java rename to src/test/java/org/tests/model/basic/PersistentFile.java index dc84c77e8..603cf43b4 100644 --- a/src/test/java/com/avaje/tests/model/basic/PersistentFile.java +++ b/src/test/java/org/tests/model/basic/PersistentFile.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/PersistentFileContent.java b/src/test/java/org/tests/model/basic/PersistentFileContent.java similarity index 96% rename from src/test/java/com/avaje/tests/model/basic/PersistentFileContent.java rename to src/test/java/org/tests/model/basic/PersistentFileContent.java index 591a65296..dce5b6a1e 100644 --- a/src/test/java/com/avaje/tests/model/basic/PersistentFileContent.java +++ b/src/test/java/org/tests/model/basic/PersistentFileContent.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/Person.java b/src/test/java/org/tests/model/basic/Person.java similarity index 97% rename from src/test/java/com/avaje/tests/model/basic/Person.java rename to src/test/java/org/tests/model/basic/Person.java index 72dd8051e..2c2cd00ee 100644 --- a/src/test/java/com/avaje/tests/model/basic/Person.java +++ b/src/test/java/org/tests/model/basic/Person.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -65,4 +65,4 @@ public class Person implements Serializable { this.phones = phones; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/basic/Phone.java b/src/test/java/org/tests/model/basic/Phone.java similarity index 97% rename from src/test/java/com/avaje/tests/model/basic/Phone.java rename to src/test/java/org/tests/model/basic/Phone.java index 9953ccbf5..f20d1106b 100644 --- a/src/test/java/com/avaje/tests/model/basic/Phone.java +++ b/src/test/java/org/tests/model/basic/Phone.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -56,4 +56,4 @@ public class Phone implements Serializable { this.person = person; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/basic/Product.java b/src/test/java/org/tests/model/basic/Product.java similarity index 86% rename from src/test/java/com/avaje/tests/model/basic/Product.java rename to src/test/java/org/tests/model/basic/Product.java index 05055c7ca..f8b0f0981 100644 --- a/src/test/java/com/avaje/tests/model/basic/Product.java +++ b/src/test/java/org/tests/model/basic/Product.java @@ -1,9 +1,9 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Cache; -import com.avaje.ebean.annotation.CacheQueryTuning; -import com.avaje.ebean.annotation.CreatedTimestamp; -import com.avaje.ebean.annotation.DocStore; +import io.ebean.annotation.Cache; +import io.ebean.annotation.CacheQueryTuning; +import io.ebean.annotation.CreatedTimestamp; +import io.ebean.annotation.DocStore; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/ResetBasicData.java b/src/test/java/org/tests/model/basic/ResetBasicData.java similarity index 98% rename from src/test/java/com/avaje/tests/model/basic/ResetBasicData.java rename to src/test/java/org/tests/model/basic/ResetBasicData.java index 07e5fbe20..da93c3c9f 100644 --- a/src/test/java/com/avaje/tests/model/basic/ResetBasicData.java +++ b/src/test/java/org/tests/model/basic/ResetBasicData.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.tests.model.basic.Order.Status; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import org.tests.model.basic.Order.Status; import java.sql.Date; import java.util.ArrayList; diff --git a/src/test/java/com/avaje/tests/model/basic/Section.java b/src/test/java/org/tests/model/basic/Section.java similarity index 94% rename from src/test/java/com/avaje/tests/model/basic/Section.java rename to src/test/java/org/tests/model/basic/Section.java index 016433f03..2b035c257 100644 --- a/src/test/java/com/avaje/tests/model/basic/Section.java +++ b/src/test/java/org/tests/model/basic/Section.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Cache; +import io.ebean.annotation.Cache; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/SomeEnum.java b/src/test/java/org/tests/model/basic/SomeEnum.java similarity index 86% rename from src/test/java/com/avaje/tests/model/basic/SomeEnum.java rename to src/test/java/org/tests/model/basic/SomeEnum.java index 15c18490d..3a07120bb 100644 --- a/src/test/java/com/avaje/tests/model/basic/SomeEnum.java +++ b/src/test/java/org/tests/model/basic/SomeEnum.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; public enum SomeEnum { diff --git a/src/test/java/com/avaje/tests/model/basic/SomeEnumBean.java b/src/test/java/org/tests/model/basic/SomeEnumBean.java similarity index 93% rename from src/test/java/com/avaje/tests/model/basic/SomeEnumBean.java rename to src/test/java/org/tests/model/basic/SomeEnumBean.java index a97a23749..26a516042 100644 --- a/src/test/java/com/avaje/tests/model/basic/SomeEnumBean.java +++ b/src/test/java/org/tests/model/basic/SomeEnumBean.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Enumerated; diff --git a/src/test/java/com/avaje/tests/model/basic/SomeObject.java b/src/test/java/org/tests/model/basic/SomeObject.java similarity index 90% rename from src/test/java/com/avaje/tests/model/basic/SomeObject.java rename to src/test/java/org/tests/model/basic/SomeObject.java index c5b53b5ea..3e8cb5522 100644 --- a/src/test/java/com/avaje/tests/model/basic/SomeObject.java +++ b/src/test/java/org/tests/model/basic/SomeObject.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; public class SomeObject { diff --git a/src/test/java/com/avaje/tests/model/basic/SubSection.java b/src/test/java/org/tests/model/basic/SubSection.java similarity index 85% rename from src/test/java/com/avaje/tests/model/basic/SubSection.java rename to src/test/java/org/tests/model/basic/SubSection.java index f596eb54d..b5e8888f2 100644 --- a/src/test/java/com/avaje/tests/model/basic/SubSection.java +++ b/src/test/java/org/tests/model/basic/SubSection.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Cache; +import io.ebean.annotation.Cache; import javax.persistence.Entity; import javax.persistence.ManyToOne; diff --git a/src/test/java/com/avaje/tests/model/basic/TBytesOnly.java b/src/test/java/org/tests/model/basic/TBytesOnly.java similarity index 93% rename from src/test/java/com/avaje/tests/model/basic/TBytesOnly.java rename to src/test/java/org/tests/model/basic/TBytesOnly.java index 8f9b54235..22551e37a 100644 --- a/src/test/java/com/avaje/tests/model/basic/TBytesOnly.java +++ b/src/test/java/org/tests/model/basic/TBytesOnly.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Basic; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/TIntChild.java b/src/test/java/org/tests/model/basic/TIntChild.java similarity index 92% rename from src/test/java/com/avaje/tests/model/basic/TIntChild.java rename to src/test/java/org/tests/model/basic/TIntChild.java index 1e22b0a71..9f084dc8d 100644 --- a/src/test/java/com/avaje/tests/model/basic/TIntChild.java +++ b/src/test/java/org/tests/model/basic/TIntChild.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/TIntRoot.java b/src/test/java/org/tests/model/basic/TIntRoot.java similarity index 94% rename from src/test/java/com/avaje/tests/model/basic/TIntRoot.java rename to src/test/java/org/tests/model/basic/TIntRoot.java index 4142f12cd..188a8e3f4 100644 --- a/src/test/java/com/avaje/tests/model/basic/TIntRoot.java +++ b/src/test/java/org/tests/model/basic/TIntRoot.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.DiscriminatorColumn; import javax.persistence.DiscriminatorType; diff --git a/src/test/java/com/avaje/tests/model/basic/TJodaEntity.java b/src/test/java/org/tests/model/basic/TJodaEntity.java similarity index 92% rename from src/test/java/com/avaje/tests/model/basic/TJodaEntity.java rename to src/test/java/org/tests/model/basic/TJodaEntity.java index f6c29e160..311a20424 100644 --- a/src/test/java/com/avaje/tests/model/basic/TJodaEntity.java +++ b/src/test/java/org/tests/model/basic/TJodaEntity.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import org.joda.time.LocalTime; diff --git a/src/test/java/com/avaje/tests/model/basic/TMapSuperEntity.java b/src/test/java/org/tests/model/basic/TMapSuperEntity.java similarity index 86% rename from src/test/java/com/avaje/tests/model/basic/TMapSuperEntity.java rename to src/test/java/org/tests/model/basic/TMapSuperEntity.java index aaffafd03..10d46ac47 100644 --- a/src/test/java/com/avaje/tests/model/basic/TMapSuperEntity.java +++ b/src/test/java/org/tests/model/basic/TMapSuperEntity.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.UpdateMode; +import io.ebean.annotation.UpdateMode; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/TMappedSuper2.java b/src/test/java/org/tests/model/basic/TMappedSuper2.java similarity index 95% rename from src/test/java/com/avaje/tests/model/basic/TMappedSuper2.java rename to src/test/java/org/tests/model/basic/TMappedSuper2.java index 18c35cf20..3a9150485 100644 --- a/src/test/java/com/avaje/tests/model/basic/TMappedSuper2.java +++ b/src/test/java/org/tests/model/basic/TMappedSuper2.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.MappedSuperclass; import javax.persistence.Transient; diff --git a/src/test/java/com/avaje/tests/model/basic/TOne.java b/src/test/java/org/tests/model/basic/TOne.java similarity index 95% rename from src/test/java/com/avaje/tests/model/basic/TOne.java rename to src/test/java/org/tests/model/basic/TOne.java index b7c8c5d63..13ae7e7e2 100644 --- a/src/test/java/com/avaje/tests/model/basic/TOne.java +++ b/src/test/java/org/tests/model/basic/TOne.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/TSDetail.java b/src/test/java/org/tests/model/basic/TSDetail.java similarity index 97% rename from src/test/java/com/avaje/tests/model/basic/TSDetail.java rename to src/test/java/org/tests/model/basic/TSDetail.java index 5f46cd3ec..5f02a1dfc 100644 --- a/src/test/java/com/avaje/tests/model/basic/TSDetail.java +++ b/src/test/java/org/tests/model/basic/TSDetail.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/src/test/java/com/avaje/tests/model/basic/TSDetailTwo.java b/src/test/java/org/tests/model/basic/TSDetailTwo.java similarity index 96% rename from src/test/java/com/avaje/tests/model/basic/TSDetailTwo.java rename to src/test/java/org/tests/model/basic/TSDetailTwo.java index 934c91cc5..4ef810351 100644 --- a/src/test/java/com/avaje/tests/model/basic/TSDetailTwo.java +++ b/src/test/java/org/tests/model/basic/TSDetailTwo.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/TSMaster.java b/src/test/java/org/tests/model/basic/TSMaster.java similarity index 97% rename from src/test/java/com/avaje/tests/model/basic/TSMaster.java rename to src/test/java/org/tests/model/basic/TSMaster.java index cf06de99c..7861490ff 100644 --- a/src/test/java/com/avaje/tests/model/basic/TSMaster.java +++ b/src/test/java/org/tests/model/basic/TSMaster.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/TSMasterTwo.java b/src/test/java/org/tests/model/basic/TSMasterTwo.java similarity index 94% rename from src/test/java/com/avaje/tests/model/basic/TSMasterTwo.java rename to src/test/java/org/tests/model/basic/TSMasterTwo.java index f78aa69ec..471e5ce07 100644 --- a/src/test/java/com/avaje/tests/model/basic/TSMasterTwo.java +++ b/src/test/java/org/tests/model/basic/TSMasterTwo.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.PrivateOwned; +import io.ebean.annotation.PrivateOwned; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/TUuidEntity.java b/src/test/java/org/tests/model/basic/TUuidEntity.java similarity index 91% rename from src/test/java/com/avaje/tests/model/basic/TUuidEntity.java rename to src/test/java/org/tests/model/basic/TUuidEntity.java index e35cb78f1..53ce83a4b 100644 --- a/src/test/java/com/avaje/tests/model/basic/TUuidEntity.java +++ b/src/test/java/org/tests/model/basic/TUuidEntity.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/TWithPreInsert.java b/src/test/java/org/tests/model/basic/TWithPreInsert.java similarity index 93% rename from src/test/java/com/avaje/tests/model/basic/TWithPreInsert.java rename to src/test/java/org/tests/model/basic/TWithPreInsert.java index a0bb3e37f..f93378240 100644 --- a/src/test/java/com/avaje/tests/model/basic/TWithPreInsert.java +++ b/src/test/java/org/tests/model/basic/TWithPreInsert.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/Trip.java b/src/test/java/org/tests/model/basic/Trip.java similarity index 96% rename from src/test/java/com/avaje/tests/model/basic/Trip.java rename to src/test/java/org/tests/model/basic/Trip.java index cb3c768db..07cb5ad0a 100644 --- a/src/test/java/com/avaje/tests/model/basic/Trip.java +++ b/src/test/java/org/tests/model/basic/Trip.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.ManyToOne; diff --git a/src/test/java/com/avaje/tests/model/basic/Truck.java b/src/test/java/org/tests/model/basic/Truck.java similarity index 92% rename from src/test/java/com/avaje/tests/model/basic/Truck.java rename to src/test/java/org/tests/model/basic/Truck.java index 43b6f12f4..4a063005b 100644 --- a/src/test/java/com/avaje/tests/model/basic/Truck.java +++ b/src/test/java/org/tests/model/basic/Truck.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.DbEnumValue; +import io.ebean.annotation.DbEnumValue; import javax.persistence.Column; import javax.persistence.DiscriminatorValue; diff --git a/src/test/java/com/avaje/tests/model/basic/TruckRef.java b/src/test/java/org/tests/model/basic/TruckRef.java similarity index 91% rename from src/test/java/com/avaje/tests/model/basic/TruckRef.java rename to src/test/java/org/tests/model/basic/TruckRef.java index f7375b430..56cbc171b 100644 --- a/src/test/java/com/avaje/tests/model/basic/TruckRef.java +++ b/src/test/java/org/tests/model/basic/TruckRef.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/UTDetail.java b/src/test/java/org/tests/model/basic/UTDetail.java similarity index 96% rename from src/test/java/com/avaje/tests/model/basic/UTDetail.java rename to src/test/java/org/tests/model/basic/UTDetail.java index 513b56361..560c14654 100644 --- a/src/test/java/com/avaje/tests/model/basic/UTDetail.java +++ b/src/test/java/org/tests/model/basic/UTDetail.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/UTMaster.java b/src/test/java/org/tests/model/basic/UTMaster.java similarity index 95% rename from src/test/java/com/avaje/tests/model/basic/UTMaster.java rename to src/test/java/org/tests/model/basic/UTMaster.java index 6a31d0bc3..7cec411fe 100644 --- a/src/test/java/com/avaje/tests/model/basic/UTMaster.java +++ b/src/test/java/org/tests/model/basic/UTMaster.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.Model; +import io.ebean.Model; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/UUOne.java b/src/test/java/org/tests/model/basic/UUOne.java similarity index 90% rename from src/test/java/com/avaje/tests/model/basic/UUOne.java rename to src/test/java/org/tests/model/basic/UUOne.java index 8541f7d26..8efe6da67 100644 --- a/src/test/java/com/avaje/tests/model/basic/UUOne.java +++ b/src/test/java/org/tests/model/basic/UUOne.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; -import com.avaje.ebean.annotation.Cache; +import io.ebean.annotation.Cache; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/UUTwo.java b/src/test/java/org/tests/model/basic/UUTwo.java similarity index 94% rename from src/test/java/com/avaje/tests/model/basic/UUTwo.java rename to src/test/java/org/tests/model/basic/UUTwo.java index 01885c6e0..cea9a9efd 100644 --- a/src/test/java/com/avaje/tests/model/basic/UUTwo.java +++ b/src/test/java/org/tests/model/basic/UUTwo.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/ValidationGroupSomething.java b/src/test/java/org/tests/model/basic/ValidationGroupSomething.java similarity index 84% rename from src/test/java/com/avaje/tests/model/basic/ValidationGroupSomething.java rename to src/test/java/org/tests/model/basic/ValidationGroupSomething.java index 6219556cc..434ef8e72 100644 --- a/src/test/java/com/avaje/tests/model/basic/ValidationGroupSomething.java +++ b/src/test/java/org/tests/model/basic/ValidationGroupSomething.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; /** * A javax validation group used to test conditional @NotNull constraints diff --git a/src/test/java/com/avaje/tests/model/basic/Vehicle.java b/src/test/java/org/tests/model/basic/Vehicle.java similarity index 96% rename from src/test/java/com/avaje/tests/model/basic/Vehicle.java rename to src/test/java/org/tests/model/basic/Vehicle.java index 3d63df5ad..4da993c42 100644 --- a/src/test/java/com/avaje/tests/model/basic/Vehicle.java +++ b/src/test/java/org/tests/model/basic/Vehicle.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.DiscriminatorColumn; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/VehicleDriver.java b/src/test/java/org/tests/model/basic/VehicleDriver.java similarity index 96% rename from src/test/java/com/avaje/tests/model/basic/VehicleDriver.java rename to src/test/java/org/tests/model/basic/VehicleDriver.java index a5e9c6710..00119e5ec 100644 --- a/src/test/java/com/avaje/tests/model/basic/VehicleDriver.java +++ b/src/test/java/org/tests/model/basic/VehicleDriver.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic; +package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.ManyToOne; diff --git a/src/test/java/com/avaje/tests/model/basic/cache/CInhOne.java b/src/test/java/org/tests/model/basic/cache/CInhOne.java similarity index 85% rename from src/test/java/com/avaje/tests/model/basic/cache/CInhOne.java rename to src/test/java/org/tests/model/basic/cache/CInhOne.java index ffe069d1f..7a73710ed 100644 --- a/src/test/java/com/avaje/tests/model/basic/cache/CInhOne.java +++ b/src/test/java/org/tests/model/basic/cache/CInhOne.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic.cache; +package org.tests.model.basic.cache; -import com.avaje.ebean.annotation.Cache; +import io.ebean.annotation.Cache; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/cache/CInhRoot.java b/src/test/java/org/tests/model/basic/cache/CInhRoot.java similarity index 76% rename from src/test/java/com/avaje/tests/model/basic/cache/CInhRoot.java rename to src/test/java/org/tests/model/basic/cache/CInhRoot.java index bd2f5f04d..77e2a16ca 100644 --- a/src/test/java/com/avaje/tests/model/basic/cache/CInhRoot.java +++ b/src/test/java/org/tests/model/basic/cache/CInhRoot.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.basic.cache; +package org.tests.model.basic.cache; -import com.avaje.ebean.annotation.Cache; -import com.avaje.tests.model.basic.BasicDomain; +import io.ebean.annotation.Cache; +import org.tests.model.basic.BasicDomain; import javax.persistence.DiscriminatorColumn; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/cache/CInhTwo.java b/src/test/java/org/tests/model/basic/cache/CInhTwo.java similarity index 81% rename from src/test/java/com/avaje/tests/model/basic/cache/CInhTwo.java rename to src/test/java/org/tests/model/basic/cache/CInhTwo.java index 254c2e932..d0e18c9be 100644 --- a/src/test/java/com/avaje/tests/model/basic/cache/CInhTwo.java +++ b/src/test/java/org/tests/model/basic/cache/CInhTwo.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic.cache; +package org.tests.model.basic.cache; -import com.avaje.ebean.annotation.Cache; +import io.ebean.annotation.Cache; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/event/CustomerPersistAdapter.java b/src/test/java/org/tests/model/basic/event/CustomerPersistAdapter.java similarity index 77% rename from src/test/java/com/avaje/tests/model/basic/event/CustomerPersistAdapter.java rename to src/test/java/org/tests/model/basic/event/CustomerPersistAdapter.java index fce59283f..9ff0b4acf 100644 --- a/src/test/java/com/avaje/tests/model/basic/event/CustomerPersistAdapter.java +++ b/src/test/java/org/tests/model/basic/event/CustomerPersistAdapter.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.basic.event; +package org.tests.model.basic.event; -import com.avaje.ebean.event.BeanPersistAdapter; -import com.avaje.ebean.event.BeanPersistRequest; -import com.avaje.tests.model.basic.Customer; +import io.ebean.event.BeanPersistAdapter; +import io.ebean.event.BeanPersistRequest; +import org.tests.model.basic.Customer; public class CustomerPersistAdapter extends BeanPersistAdapter { diff --git a/src/test/java/com/avaje/tests/model/basic/event/SimpleTOneQueryAdapter.java b/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java similarity index 69% rename from src/test/java/com/avaje/tests/model/basic/event/SimpleTOneQueryAdapter.java rename to src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java index a46fe852d..0fce17a9e 100644 --- a/src/test/java/com/avaje/tests/model/basic/event/SimpleTOneQueryAdapter.java +++ b/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java @@ -1,9 +1,9 @@ -package com.avaje.tests.model.basic.event; +package org.tests.model.basic.event; -import com.avaje.ebean.Query; -import com.avaje.ebean.event.BeanQueryAdapter; -import com.avaje.ebean.event.BeanQueryRequest; -import com.avaje.tests.model.basic.TOne; +import io.ebean.Query; +import io.ebean.event.BeanQueryAdapter; +import io.ebean.event.BeanQueryRequest; +import org.tests.model.basic.TOne; public class SimpleTOneQueryAdapter implements BeanQueryAdapter { diff --git a/src/test/java/com/avaje/tests/model/basic/event/TWithPreInsertPersistAdapter.java b/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java similarity index 81% rename from src/test/java/com/avaje/tests/model/basic/event/TWithPreInsertPersistAdapter.java rename to src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java index 14255cecf..06018dcec 100644 --- a/src/test/java/com/avaje/tests/model/basic/event/TWithPreInsertPersistAdapter.java +++ b/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.basic.event; +package org.tests.model.basic.event; -import com.avaje.ebean.event.BeanPersistAdapter; -import com.avaje.ebean.event.BeanPersistRequest; -import com.avaje.tests.model.basic.TWithPreInsert; +import io.ebean.event.BeanPersistAdapter; +import io.ebean.event.BeanPersistRequest; +import org.tests.model.basic.TWithPreInsert; public class TWithPreInsertPersistAdapter extends BeanPersistAdapter { diff --git a/src/test/java/com/avaje/tests/model/basic/finder/CustomerFinder.java b/src/test/java/org/tests/model/basic/finder/CustomerFinder.java similarity index 85% rename from src/test/java/com/avaje/tests/model/basic/finder/CustomerFinder.java rename to src/test/java/org/tests/model/basic/finder/CustomerFinder.java index 41aeed436..6a326e278 100644 --- a/src/test/java/com/avaje/tests/model/basic/finder/CustomerFinder.java +++ b/src/test/java/org/tests/model/basic/finder/CustomerFinder.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.basic.finder; +package org.tests.model.basic.finder; -import com.avaje.ebean.Finder; -import com.avaje.tests.model.basic.Customer; +import io.ebean.Finder; +import org.tests.model.basic.Customer; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/src/test/java/com/avaje/tests/model/basic/first/First.java b/src/test/java/org/tests/model/basic/first/First.java similarity index 93% rename from src/test/java/com/avaje/tests/model/basic/first/First.java rename to src/test/java/org/tests/model/basic/first/First.java index f31556dc6..8c848ed10 100644 --- a/src/test/java/com/avaje/tests/model/basic/first/First.java +++ b/src/test/java/org/tests/model/basic/first/First.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic.first; +package org.tests.model.basic.first; import javax.persistence.CascadeType; import javax.persistence.Entity; @@ -42,4 +42,4 @@ public class First { this.second = second; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/basic/first/Second.java b/src/test/java/org/tests/model/basic/first/Second.java similarity index 92% rename from src/test/java/com/avaje/tests/model/basic/first/Second.java rename to src/test/java/org/tests/model/basic/first/Second.java index 589da2be4..ca015b149 100644 --- a/src/test/java/com/avaje/tests/model/basic/first/Second.java +++ b/src/test/java/org/tests/model/basic/first/Second.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic.first; +package org.tests.model.basic.first; import javax.persistence.AttributeOverride; import javax.persistence.Column; @@ -32,4 +32,4 @@ public class Second extends SuperSecond { this.title = title; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/basic/first/SuperSecond.java b/src/test/java/org/tests/model/basic/first/SuperSecond.java similarity index 93% rename from src/test/java/com/avaje/tests/model/basic/first/SuperSecond.java rename to src/test/java/org/tests/model/basic/first/SuperSecond.java index 11e6af120..083c30f74 100644 --- a/src/test/java/com/avaje/tests/model/basic/first/SuperSecond.java +++ b/src/test/java/org/tests/model/basic/first/SuperSecond.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic.first; +package org.tests.model.basic.first; import javax.persistence.CascadeType; import javax.persistence.JoinColumn; diff --git a/src/test/java/com/avaje/tests/model/basic/first/TestFirstSecond.java b/src/test/java/org/tests/model/basic/first/TestFirstSecond.java similarity index 79% rename from src/test/java/com/avaje/tests/model/basic/first/TestFirstSecond.java rename to src/test/java/org/tests/model/basic/first/TestFirstSecond.java index 8b6678c0b..9907fa04e 100644 --- a/src/test/java/com/avaje/tests/model/basic/first/TestFirstSecond.java +++ b/src/test/java/org/tests/model/basic/first/TestFirstSecond.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.basic.first; +package org.tests.model.basic.first; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.junit.Test; public class TestFirstSecond extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/model/basic/mapsuper/MapSuperActual.java b/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java similarity index 88% rename from src/test/java/com/avaje/tests/model/basic/mapsuper/MapSuperActual.java rename to src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java index f4c327070..c34292bbe 100644 --- a/src/test/java/com/avaje/tests/model/basic/mapsuper/MapSuperActual.java +++ b/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic.mapsuper; +package org.tests.model.basic.mapsuper; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/basic/mapsuper/MapSuperNoId.java b/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java similarity index 85% rename from src/test/java/com/avaje/tests/model/basic/mapsuper/MapSuperNoId.java rename to src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java index 3d8a95254..22b535c86 100644 --- a/src/test/java/com/avaje/tests/model/basic/mapsuper/MapSuperNoId.java +++ b/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.basic.mapsuper; +package org.tests.model.basic.mapsuper; -import com.avaje.ebean.annotation.CreatedTimestamp; +import io.ebean.annotation.CreatedTimestamp; import javax.persistence.MappedSuperclass; import javax.persistence.Version; diff --git a/src/test/java/com/avaje/tests/model/basic/mapsuper/TestMapSuperEquals.java b/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java similarity index 85% rename from src/test/java/com/avaje/tests/model/basic/mapsuper/TestMapSuperEquals.java rename to src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java index 1f916e034..85f7c06c0 100644 --- a/src/test/java/com/avaje/tests/model/basic/mapsuper/TestMapSuperEquals.java +++ b/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.basic.mapsuper; +package org.tests.model.basic.mapsuper; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.bean.EntityBean; +import io.ebean.BaseTestCase; +import io.ebean.bean.EntityBean; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/model/basic/metaannotation/SizeMedium.java b/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java similarity index 90% rename from src/test/java/com/avaje/tests/model/basic/metaannotation/SizeMedium.java rename to src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java index a07afcc13..ce1d7a68d 100644 --- a/src/test/java/com/avaje/tests/model/basic/metaannotation/SizeMedium.java +++ b/src/test/java/org/tests/model/basic/metaannotation/SizeMedium.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic.metaannotation; +package org.tests.model.basic.metaannotation; import javax.validation.constraints.Size; import java.lang.annotation.Documented; diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/DummyDao.java b/src/test/java/org/tests/model/basic/xtra/DummyDao.java similarity index 87% rename from src/test/java/com/avaje/tests/model/basic/xtra/DummyDao.java rename to src/test/java/org/tests/model/basic/xtra/DummyDao.java index f5311159f..8f00cec6b 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/DummyDao.java +++ b/src/test/java/org/tests/model/basic/xtra/DummyDao.java @@ -1,10 +1,10 @@ -package com.avaje.tests.model.basic.xtra; +package org.tests.model.basic.xtra; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.TxType; -import com.avaje.ebean.annotation.Transactional; -import com.avaje.ebean.config.PersistBatch; +import io.ebean.Ebean; +import io.ebean.Transaction; +import io.ebean.TxType; +import io.ebean.annotation.Transactional; +import io.ebean.PersistBatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/EdChild.java b/src/test/java/org/tests/model/basic/xtra/EdChild.java similarity index 94% rename from src/test/java/com/avaje/tests/model/basic/xtra/EdChild.java rename to src/test/java/org/tests/model/basic/xtra/EdChild.java index b9cfb33cc..ccbb77d38 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/EdChild.java +++ b/src/test/java/org/tests/model/basic/xtra/EdChild.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic.xtra; +package org.tests.model.basic.xtra; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/EdExtendedParent.java b/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java similarity index 89% rename from src/test/java/com/avaje/tests/model/basic/xtra/EdExtendedParent.java rename to src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java index 1f75e811d..bc398b70a 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/EdExtendedParent.java +++ b/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic.xtra; +package org.tests.model.basic.xtra; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; @@ -18,4 +18,4 @@ public class EdExtendedParent extends EdParent { this.extendedName = extendedName; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/EdParent.java b/src/test/java/org/tests/model/basic/xtra/EdParent.java similarity index 96% rename from src/test/java/com/avaje/tests/model/basic/xtra/EdParent.java rename to src/test/java/org/tests/model/basic/xtra/EdParent.java index 5ca36b545..5347430fc 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/EdParent.java +++ b/src/test/java/org/tests/model/basic/xtra/EdParent.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.basic.xtra; +package org.tests.model.basic.xtra; import javax.persistence.CascadeType; diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java b/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java similarity index 76% rename from src/test/java/com/avaje/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java rename to src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java index c5981ed4d..7e37f755a 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java +++ b/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java @@ -1,11 +1,11 @@ -package com.avaje.tests.model.basic.xtra; +package org.tests.model.basic.xtra; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.SqlUpdate; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.annotation.Transactional; -import com.avaje.tests.model.basic.EBasicVer; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.SqlUpdate; +import io.ebean.Transaction; +import io.ebean.annotation.Transactional; +import org.tests.model.basic.EBasicVer; import org.junit.Assert; import javax.persistence.PersistenceException; diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/TestDeleteUnloadedChildren.java b/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java similarity index 93% rename from src/test/java/com/avaje/tests/model/basic/xtra/TestDeleteUnloadedChildren.java rename to src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java index d1d516ae6..e841dab2b 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/TestDeleteUnloadedChildren.java +++ b/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.basic.xtra; +package org.tests.model.basic.xtra; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.SqlUpdate; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.SqlUpdate; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java similarity index 88% rename from src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java rename to src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java index ba2951f55..d91c6113e 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java +++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java @@ -1,9 +1,9 @@ -package com.avaje.tests.model.basic.xtra; +package org.tests.model.basic.xtra; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.config.PersistBatch; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Transaction; +import io.ebean.PersistBatch; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java similarity index 88% rename from src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchThenUpdate.java rename to src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java index ca0912c49..dfbe02e1b 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchThenUpdate.java +++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java @@ -1,9 +1,9 @@ -package com.avaje.tests.model.basic.xtra; +package org.tests.model.basic.xtra; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.config.PersistBatch; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Transaction; +import io.ebean.PersistBatch; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java similarity index 90% rename from src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java rename to src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java index ae6d10a04..67856de3d 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java +++ b/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java @@ -1,9 +1,9 @@ -package com.avaje.tests.model.basic.xtra; +package org.tests.model.basic.xtra; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.config.PersistBatch; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Transaction; +import io.ebean.PersistBatch; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/model/bridge/BAccessLevel.java b/src/test/java/org/tests/model/bridge/BAccessLevel.java similarity index 73% rename from src/test/java/com/avaje/tests/model/bridge/BAccessLevel.java rename to src/test/java/org/tests/model/bridge/BAccessLevel.java index 8b20bce53..b163c29b0 100644 --- a/src/test/java/com/avaje/tests/model/bridge/BAccessLevel.java +++ b/src/test/java/org/tests/model/bridge/BAccessLevel.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.bridge; +package org.tests.model.bridge; /** * Simple enum for our bridge table tests. diff --git a/src/test/java/com/avaje/tests/model/bridge/BSite.java b/src/test/java/org/tests/model/bridge/BSite.java similarity index 84% rename from src/test/java/com/avaje/tests/model/bridge/BSite.java rename to src/test/java/org/tests/model/bridge/BSite.java index ebb034f42..9e61f255b 100644 --- a/src/test/java/com/avaje/tests/model/bridge/BSite.java +++ b/src/test/java/org/tests/model/bridge/BSite.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.bridge; +package org.tests.model.bridge; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/bridge/BSiteUser.java b/src/test/java/org/tests/model/bridge/BSiteUser.java similarity index 97% rename from src/test/java/com/avaje/tests/model/bridge/BSiteUser.java rename to src/test/java/org/tests/model/bridge/BSiteUser.java index 949ec2ae0..b4ff1724e 100644 --- a/src/test/java/com/avaje/tests/model/bridge/BSiteUser.java +++ b/src/test/java/org/tests/model/bridge/BSiteUser.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.bridge; +package org.tests.model.bridge; import javax.persistence.Embeddable; import javax.persistence.EmbeddedId; diff --git a/src/test/java/com/avaje/tests/model/bridge/BSiteUserB.java b/src/test/java/org/tests/model/bridge/BSiteUserB.java similarity index 97% rename from src/test/java/com/avaje/tests/model/bridge/BSiteUserB.java rename to src/test/java/org/tests/model/bridge/BSiteUserB.java index 06b77acae..ef93cc984 100644 --- a/src/test/java/com/avaje/tests/model/bridge/BSiteUserB.java +++ b/src/test/java/org/tests/model/bridge/BSiteUserB.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.bridge; +package org.tests.model.bridge; import javax.persistence.Column; import javax.persistence.Embeddable; diff --git a/src/test/java/com/avaje/tests/model/bridge/BSiteUserC.java b/src/test/java/org/tests/model/bridge/BSiteUserC.java similarity index 97% rename from src/test/java/com/avaje/tests/model/bridge/BSiteUserC.java rename to src/test/java/org/tests/model/bridge/BSiteUserC.java index ae50a78f7..a23eff0d3 100644 --- a/src/test/java/com/avaje/tests/model/bridge/BSiteUserC.java +++ b/src/test/java/org/tests/model/bridge/BSiteUserC.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.bridge; +package org.tests.model.bridge; import javax.persistence.Embeddable; import javax.persistence.EmbeddedId; diff --git a/src/test/java/com/avaje/tests/model/bridge/BUser.java b/src/test/java/org/tests/model/bridge/BUser.java similarity index 84% rename from src/test/java/com/avaje/tests/model/bridge/BUser.java rename to src/test/java/org/tests/model/bridge/BUser.java index 0609046f5..7a87fe864 100644 --- a/src/test/java/com/avaje/tests/model/bridge/BUser.java +++ b/src/test/java/org/tests/model/bridge/BUser.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.bridge; +package org.tests.model.bridge; import javax.persistence.Entity; import javax.persistence.Id; @@ -16,4 +16,4 @@ public class BUser { this.name = name; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/bridge/TestExplicitM2MBridgeTable.java b/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java similarity index 95% rename from src/test/java/com/avaje/tests/model/bridge/TestExplicitM2MBridgeTable.java rename to src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java index 642822b7c..142f9aee5 100644 --- a/src/test/java/com/avaje/tests/model/bridge/TestExplicitM2MBridgeTable.java +++ b/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.bridge; +package org.tests.model.bridge; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/model/cache/EColAB.java b/src/test/java/org/tests/model/cache/EColAB.java similarity index 87% rename from src/test/java/com/avaje/tests/model/cache/EColAB.java rename to src/test/java/org/tests/model/cache/EColAB.java index e6cae1c33..f3a7377b7 100644 --- a/src/test/java/com/avaje/tests/model/cache/EColAB.java +++ b/src/test/java/org/tests/model/cache/EColAB.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.cache; +package org.tests.model.cache; -import com.avaje.ebean.Model; -import com.avaje.ebean.annotation.Cache; +import io.ebean.Model; +import io.ebean.annotation.Cache; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/carwheel/Car.java b/src/test/java/org/tests/model/carwheel/Car.java similarity index 95% rename from src/test/java/com/avaje/tests/model/carwheel/Car.java rename to src/test/java/org/tests/model/carwheel/Car.java index d1f3a5445..2288639bc 100644 --- a/src/test/java/com/avaje/tests/model/carwheel/Car.java +++ b/src/test/java/org/tests/model/carwheel/Car.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.carwheel; +package org.tests.model.carwheel; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/carwheel/Tire.java b/src/test/java/org/tests/model/carwheel/Tire.java similarity index 93% rename from src/test/java/com/avaje/tests/model/carwheel/Tire.java rename to src/test/java/org/tests/model/carwheel/Tire.java index 71e195828..9561cb796 100644 --- a/src/test/java/com/avaje/tests/model/carwheel/Tire.java +++ b/src/test/java/org/tests/model/carwheel/Tire.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.carwheel; +package org.tests.model.carwheel; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/src/test/java/com/avaje/tests/model/carwheel/Wheel.java b/src/test/java/org/tests/model/carwheel/Wheel.java similarity index 96% rename from src/test/java/com/avaje/tests/model/carwheel/Wheel.java rename to src/test/java/org/tests/model/carwheel/Wheel.java index df6613dbe..3390f6dd4 100644 --- a/src/test/java/com/avaje/tests/model/carwheel/Wheel.java +++ b/src/test/java/org/tests/model/carwheel/Wheel.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.carwheel; +package org.tests.model.carwheel; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/carwheeltruck/TCar.java b/src/test/java/org/tests/model/carwheeltruck/TCar.java similarity index 94% rename from src/test/java/com/avaje/tests/model/carwheeltruck/TCar.java rename to src/test/java/org/tests/model/carwheeltruck/TCar.java index 5c3464b80..5274259a2 100644 --- a/src/test/java/com/avaje/tests/model/carwheeltruck/TCar.java +++ b/src/test/java/org/tests/model/carwheeltruck/TCar.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.carwheeltruck; +package org.tests.model.carwheeltruck; import javax.persistence.CascadeType; import javax.persistence.DiscriminatorColumn; diff --git a/src/test/java/com/avaje/tests/model/carwheeltruck/TTruck.java b/src/test/java/org/tests/model/carwheeltruck/TTruck.java similarity index 92% rename from src/test/java/com/avaje/tests/model/carwheeltruck/TTruck.java rename to src/test/java/org/tests/model/carwheeltruck/TTruck.java index b54138581..3c1bd7a83 100644 --- a/src/test/java/com/avaje/tests/model/carwheeltruck/TTruck.java +++ b/src/test/java/org/tests/model/carwheeltruck/TTruck.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.carwheeltruck; +package org.tests.model.carwheeltruck; import javax.persistence.Column; import javax.persistence.DiscriminatorColumn; diff --git a/src/test/java/com/avaje/tests/model/carwheeltruck/TWheel.java b/src/test/java/org/tests/model/carwheeltruck/TWheel.java similarity index 90% rename from src/test/java/com/avaje/tests/model/carwheeltruck/TWheel.java rename to src/test/java/org/tests/model/carwheeltruck/TWheel.java index ec6cb040f..03a6f38da 100644 --- a/src/test/java/com/avaje/tests/model/carwheeltruck/TWheel.java +++ b/src/test/java/org/tests/model/carwheeltruck/TWheel.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.carwheeltruck; +package org.tests.model.carwheeltruck; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java b/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java similarity index 83% rename from src/test/java/com/avaje/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java rename to src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java index df68e66f7..179754200 100644 --- a/src/test/java/com/avaje/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java +++ b/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.carwheeltruck; +package org.tests.model.carwheeltruck; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.junit.Test; import java.util.Random; diff --git a/src/test/java/com/avaje/tests/model/composite/RCustomer.java b/src/test/java/org/tests/model/composite/RCustomer.java similarity index 93% rename from src/test/java/com/avaje/tests/model/composite/RCustomer.java rename to src/test/java/org/tests/model/composite/RCustomer.java index 8e9ecf819..d44cf8052 100644 --- a/src/test/java/com/avaje/tests/model/composite/RCustomer.java +++ b/src/test/java/org/tests/model/composite/RCustomer.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.composite; +package org.tests.model.composite; import javax.persistence.EmbeddedId; diff --git a/src/test/java/com/avaje/tests/model/composite/RCustomerKey.java b/src/test/java/org/tests/model/composite/RCustomerKey.java similarity index 96% rename from src/test/java/com/avaje/tests/model/composite/RCustomerKey.java rename to src/test/java/org/tests/model/composite/RCustomerKey.java index afe0c5c63..881d01674 100644 --- a/src/test/java/com/avaje/tests/model/composite/RCustomerKey.java +++ b/src/test/java/org/tests/model/composite/RCustomerKey.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.composite; +package org.tests.model.composite; import javax.persistence.Embeddable; diff --git a/src/test/java/com/avaje/tests/model/composite/ROrder.java b/src/test/java/org/tests/model/composite/ROrder.java similarity index 98% rename from src/test/java/com/avaje/tests/model/composite/ROrder.java rename to src/test/java/org/tests/model/composite/ROrder.java index 4c38d692a..56b8639df 100644 --- a/src/test/java/com/avaje/tests/model/composite/ROrder.java +++ b/src/test/java/org/tests/model/composite/ROrder.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.composite; +package org.tests.model.composite; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/src/test/java/com/avaje/tests/model/composite/ROrderPK.java b/src/test/java/org/tests/model/composite/ROrderPK.java similarity index 97% rename from src/test/java/com/avaje/tests/model/composite/ROrderPK.java rename to src/test/java/org/tests/model/composite/ROrderPK.java index 6bb1c57c1..c22310a9f 100644 --- a/src/test/java/com/avaje/tests/model/composite/ROrderPK.java +++ b/src/test/java/org/tests/model/composite/ROrderPK.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.composite; +package org.tests.model.composite; import javax.persistence.Embeddable; diff --git a/src/test/java/com/avaje/tests/model/converstation/Conversation.java b/src/test/java/org/tests/model/converstation/Conversation.java similarity index 92% rename from src/test/java/com/avaje/tests/model/converstation/Conversation.java rename to src/test/java/org/tests/model/converstation/Conversation.java index 7bd9023e3..f0caf5181 100644 --- a/src/test/java/com/avaje/tests/model/converstation/Conversation.java +++ b/src/test/java/org/tests/model/converstation/Conversation.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.converstation; +package org.tests.model.converstation; -import com.avaje.tests.model.BaseModel; +import org.tests.model.BaseModel; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/converstation/Group.java b/src/test/java/org/tests/model/converstation/Group.java similarity index 88% rename from src/test/java/com/avaje/tests/model/converstation/Group.java rename to src/test/java/org/tests/model/converstation/Group.java index 2a5d2ff13..eee84f8a7 100644 --- a/src/test/java/com/avaje/tests/model/converstation/Group.java +++ b/src/test/java/org/tests/model/converstation/Group.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.converstation; +package org.tests.model.converstation; -import com.avaje.tests.model.BaseModel; +import org.tests.model.BaseModel; import javax.persistence.Entity; import javax.persistence.OneToMany; diff --git a/src/test/java/com/avaje/tests/model/converstation/Message.java b/src/test/java/org/tests/model/converstation/Message.java similarity index 90% rename from src/test/java/com/avaje/tests/model/converstation/Message.java rename to src/test/java/org/tests/model/converstation/Message.java index 52af3bb58..51379a940 100644 --- a/src/test/java/com/avaje/tests/model/converstation/Message.java +++ b/src/test/java/org/tests/model/converstation/Message.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.converstation; +package org.tests.model.converstation; -import com.avaje.tests.model.BaseModel; +import org.tests.model.BaseModel; import javax.persistence.Entity; import javax.persistence.ManyToOne; diff --git a/src/test/java/com/avaje/tests/model/converstation/Participation.java b/src/test/java/org/tests/model/converstation/Participation.java similarity index 91% rename from src/test/java/com/avaje/tests/model/converstation/Participation.java rename to src/test/java/org/tests/model/converstation/Participation.java index ba96b09ac..dae00e2d5 100644 --- a/src/test/java/com/avaje/tests/model/converstation/Participation.java +++ b/src/test/java/org/tests/model/converstation/Participation.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.converstation; +package org.tests.model.converstation; -import com.avaje.tests.model.BaseModel; +import org.tests.model.BaseModel; import javax.persistence.Entity; import javax.persistence.ManyToOne; diff --git a/src/test/java/com/avaje/tests/model/converstation/User.java b/src/test/java/org/tests/model/converstation/User.java similarity index 84% rename from src/test/java/com/avaje/tests/model/converstation/User.java rename to src/test/java/org/tests/model/converstation/User.java index d0c99f028..f921fd85e 100644 --- a/src/test/java/com/avaje/tests/model/converstation/User.java +++ b/src/test/java/org/tests/model/converstation/User.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.converstation; +package org.tests.model.converstation; -import com.avaje.ebean.annotation.History; -import com.avaje.ebean.annotation.HistoryExclude; -import com.avaje.tests.model.BaseModel; +import io.ebean.annotation.History; +import io.ebean.annotation.HistoryExclude; +import org.tests.model.BaseModel; import javax.persistence.Entity; import javax.persistence.ManyToOne; diff --git a/src/test/java/com/avaje/tests/model/ddd/DExhEntity.java b/src/test/java/org/tests/model/ddd/DExhEntity.java similarity index 90% rename from src/test/java/com/avaje/tests/model/ddd/DExhEntity.java rename to src/test/java/org/tests/model/ddd/DExhEntity.java index 3a2f93c30..73252744c 100644 --- a/src/test/java/com/avaje/tests/model/ddd/DExhEntity.java +++ b/src/test/java/org/tests/model/ddd/DExhEntity.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.ddd; +package org.tests.model.ddd; -import com.avaje.tests.model.ivo.Oid; +import org.tests.model.ivo.Oid; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/ddd/DPerson.java b/src/test/java/org/tests/model/ddd/DPerson.java similarity index 87% rename from src/test/java/com/avaje/tests/model/ddd/DPerson.java rename to src/test/java/org/tests/model/ddd/DPerson.java index 474f104a6..bb18f4252 100644 --- a/src/test/java/com/avaje/tests/model/ddd/DPerson.java +++ b/src/test/java/org/tests/model/ddd/DPerson.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.ddd; +package org.tests.model.ddd; -import com.avaje.tests.model.ivo.Money; -import com.avaje.tests.model.ivo.Oid; +import org.tests.model.ivo.Money; +import org.tests.model.ivo.Oid; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/draftable/BaseDomain.java b/src/test/java/org/tests/model/draftable/BaseDomain.java similarity index 84% rename from src/test/java/com/avaje/tests/model/draftable/BaseDomain.java rename to src/test/java/org/tests/model/draftable/BaseDomain.java index 722b97261..c593f4120 100644 --- a/src/test/java/com/avaje/tests/model/draftable/BaseDomain.java +++ b/src/test/java/org/tests/model/draftable/BaseDomain.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.draftable; +package org.tests.model.draftable; -import com.avaje.ebean.Model; -import com.avaje.ebean.annotation.WhenCreated; -import com.avaje.ebean.annotation.WhenModified; +import io.ebean.Model; +import io.ebean.annotation.WhenCreated; +import io.ebean.annotation.WhenModified; import javax.persistence.Id; import javax.persistence.MappedSuperclass; diff --git a/src/test/java/com/avaje/tests/model/draftable/Doc.java b/src/test/java/org/tests/model/draftable/Doc.java similarity index 86% rename from src/test/java/com/avaje/tests/model/draftable/Doc.java rename to src/test/java/org/tests/model/draftable/Doc.java index 59e80fc94..e2c196644 100644 --- a/src/test/java/com/avaje/tests/model/draftable/Doc.java +++ b/src/test/java/org/tests/model/draftable/Doc.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.draftable; +package org.tests.model.draftable; -import com.avaje.ebean.annotation.Draftable; +import io.ebean.annotation.Draftable; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/draftable/Document.java b/src/test/java/org/tests/model/draftable/Document.java similarity index 90% rename from src/test/java/com/avaje/tests/model/draftable/Document.java rename to src/test/java/org/tests/model/draftable/Document.java index 0647d937b..8daf9c028 100644 --- a/src/test/java/com/avaje/tests/model/draftable/Document.java +++ b/src/test/java/org/tests/model/draftable/Document.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.draftable; +package org.tests.model.draftable; -import com.avaje.ebean.annotation.DraftOnly; -import com.avaje.ebean.annotation.Draftable; +import io.ebean.annotation.DraftOnly; +import io.ebean.annotation.Draftable; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/draftable/DocumentMedia.java b/src/test/java/org/tests/model/draftable/DocumentMedia.java similarity index 87% rename from src/test/java/com/avaje/tests/model/draftable/DocumentMedia.java rename to src/test/java/org/tests/model/draftable/DocumentMedia.java index 19fdcaa34..f5cf0b0dd 100644 --- a/src/test/java/com/avaje/tests/model/draftable/DocumentMedia.java +++ b/src/test/java/org/tests/model/draftable/DocumentMedia.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.draftable; +package org.tests.model.draftable; -import com.avaje.ebean.annotation.DraftableElement; +import io.ebean.annotation.DraftableElement; import javax.persistence.Entity; import javax.persistence.ManyToOne; diff --git a/src/test/java/com/avaje/tests/model/draftable/Link.java b/src/test/java/org/tests/model/draftable/Link.java similarity index 86% rename from src/test/java/com/avaje/tests/model/draftable/Link.java rename to src/test/java/org/tests/model/draftable/Link.java index ae937c7cd..956282059 100644 --- a/src/test/java/com/avaje/tests/model/draftable/Link.java +++ b/src/test/java/org/tests/model/draftable/Link.java @@ -1,11 +1,11 @@ -package com.avaje.tests.model.draftable; +package org.tests.model.draftable; -import com.avaje.ebean.annotation.Draft; -import com.avaje.ebean.annotation.DraftDirty; -import com.avaje.ebean.annotation.DraftReset; -import com.avaje.ebean.annotation.Draftable; -import com.avaje.ebean.annotation.History; -import com.avaje.ebean.annotation.SoftDelete; +import io.ebean.annotation.Draft; +import io.ebean.annotation.DraftDirty; +import io.ebean.annotation.DraftReset; +import io.ebean.annotation.Draftable; +import io.ebean.annotation.History; +import io.ebean.annotation.SoftDelete; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/draftable/Organisation.java b/src/test/java/org/tests/model/draftable/Organisation.java similarity index 87% rename from src/test/java/com/avaje/tests/model/draftable/Organisation.java rename to src/test/java/org/tests/model/draftable/Organisation.java index 2f1d8a979..2c1ca26c2 100644 --- a/src/test/java/com/avaje/tests/model/draftable/Organisation.java +++ b/src/test/java/org/tests/model/draftable/Organisation.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.draftable; +package org.tests.model.draftable; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/embedded/EAddress.java b/src/test/java/org/tests/model/embedded/EAddress.java similarity index 95% rename from src/test/java/com/avaje/tests/model/embedded/EAddress.java rename to src/test/java/org/tests/model/embedded/EAddress.java index a663c5e87..412a8a493 100644 --- a/src/test/java/com/avaje/tests/model/embedded/EAddress.java +++ b/src/test/java/org/tests/model/embedded/EAddress.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.embedded; +package org.tests.model.embedded; import javax.persistence.Embeddable; import javax.persistence.EnumType; diff --git a/src/test/java/com/avaje/tests/model/embedded/EAddressStatus.java b/src/test/java/org/tests/model/embedded/EAddressStatus.java similarity index 52% rename from src/test/java/com/avaje/tests/model/embedded/EAddressStatus.java rename to src/test/java/org/tests/model/embedded/EAddressStatus.java index 8e327ed76..00d18f7c9 100644 --- a/src/test/java/com/avaje/tests/model/embedded/EAddressStatus.java +++ b/src/test/java/org/tests/model/embedded/EAddressStatus.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.embedded; +package org.tests.model.embedded; public enum EAddressStatus { ONE, diff --git a/src/test/java/com/avaje/tests/model/embedded/EEmbDatePeriod.java b/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java similarity index 90% rename from src/test/java/com/avaje/tests/model/embedded/EEmbDatePeriod.java rename to src/test/java/org/tests/model/embedded/EEmbDatePeriod.java index a96b6e9d0..50cb225a3 100644 --- a/src/test/java/com/avaje/tests/model/embedded/EEmbDatePeriod.java +++ b/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.embedded; +package org.tests.model.embedded; import javax.persistence.Embeddable; import java.util.Date; diff --git a/src/test/java/com/avaje/tests/model/embedded/EEmbInner.java b/src/test/java/org/tests/model/embedded/EEmbInner.java similarity index 95% rename from src/test/java/com/avaje/tests/model/embedded/EEmbInner.java rename to src/test/java/org/tests/model/embedded/EEmbInner.java index 6877732d1..f08c5a35b 100644 --- a/src/test/java/com/avaje/tests/model/embedded/EEmbInner.java +++ b/src/test/java/org/tests/model/embedded/EEmbInner.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.embedded; +package org.tests.model.embedded; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/embedded/EEmbOuter.java b/src/test/java/org/tests/model/embedded/EEmbOuter.java similarity index 93% rename from src/test/java/com/avaje/tests/model/embedded/EEmbOuter.java rename to src/test/java/org/tests/model/embedded/EEmbOuter.java index c247ccf67..d573e22b1 100644 --- a/src/test/java/com/avaje/tests/model/embedded/EEmbOuter.java +++ b/src/test/java/org/tests/model/embedded/EEmbOuter.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.embedded; +package org.tests.model.embedded; -import com.avaje.ebean.annotation.PrivateOwned; +import io.ebean.annotation.PrivateOwned; import javax.persistence.CascadeType; import javax.persistence.Embedded; diff --git a/src/test/java/com/avaje/tests/model/embedded/EInvoice.java b/src/test/java/org/tests/model/embedded/EInvoice.java similarity index 94% rename from src/test/java/com/avaje/tests/model/embedded/EInvoice.java rename to src/test/java/org/tests/model/embedded/EInvoice.java index 638742748..0b833fdd1 100644 --- a/src/test/java/com/avaje/tests/model/embedded/EInvoice.java +++ b/src/test/java/org/tests/model/embedded/EInvoice.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.embedded; +package org.tests.model.embedded; -import com.avaje.ebean.annotation.Cache; +import io.ebean.annotation.Cache; import javax.persistence.Embedded; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/embedded/EMain.java b/src/test/java/org/tests/model/embedded/EMain.java similarity index 95% rename from src/test/java/com/avaje/tests/model/embedded/EMain.java rename to src/test/java/org/tests/model/embedded/EMain.java index a5d6c93c3..2b5776999 100644 --- a/src/test/java/com/avaje/tests/model/embedded/EMain.java +++ b/src/test/java/org/tests/model/embedded/EMain.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.embedded; +package org.tests.model.embedded; import javax.persistence.Embedded; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/embedded/EPerson.java b/src/test/java/org/tests/model/embedded/EPerson.java similarity index 96% rename from src/test/java/com/avaje/tests/model/embedded/EPerson.java rename to src/test/java/org/tests/model/embedded/EPerson.java index 131b2cc11..1e85b1041 100644 --- a/src/test/java/com/avaje/tests/model/embedded/EPerson.java +++ b/src/test/java/org/tests/model/embedded/EPerson.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.embedded; +package org.tests.model.embedded; import javax.persistence.AttributeOverride; import javax.persistence.AttributeOverrides; diff --git a/src/test/java/com/avaje/tests/model/embedded/Eembeddable.java b/src/test/java/org/tests/model/embedded/Eembeddable.java similarity index 86% rename from src/test/java/com/avaje/tests/model/embedded/Eembeddable.java rename to src/test/java/org/tests/model/embedded/Eembeddable.java index 8af424cba..574a557a6 100644 --- a/src/test/java/com/avaje/tests/model/embedded/Eembeddable.java +++ b/src/test/java/org/tests/model/embedded/Eembeddable.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.embedded; +package org.tests.model.embedded; import javax.persistence.Embeddable; diff --git a/src/test/java/com/avaje/tests/model/embedded/PrimaryRevision.java b/src/test/java/org/tests/model/embedded/PrimaryRevision.java similarity index 95% rename from src/test/java/com/avaje/tests/model/embedded/PrimaryRevision.java rename to src/test/java/org/tests/model/embedded/PrimaryRevision.java index 5aef927a2..ac5f5d6b3 100644 --- a/src/test/java/com/avaje/tests/model/embedded/PrimaryRevision.java +++ b/src/test/java/org/tests/model/embedded/PrimaryRevision.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.embedded; +package org.tests.model.embedded; import javax.persistence.AttributeOverride; import javax.persistence.Column; diff --git a/src/test/java/com/avaje/tests/model/embedded/RevisionId.java b/src/test/java/org/tests/model/embedded/RevisionId.java similarity index 96% rename from src/test/java/com/avaje/tests/model/embedded/RevisionId.java rename to src/test/java/org/tests/model/embedded/RevisionId.java index eb56c616f..b3e32e6bc 100644 --- a/src/test/java/com/avaje/tests/model/embedded/RevisionId.java +++ b/src/test/java/org/tests/model/embedded/RevisionId.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.embedded; +package org.tests.model.embedded; import javax.persistence.Column; import javax.persistence.Embeddable; diff --git a/src/test/java/com/avaje/tests/model/embedded/TestEmbeddedAttrOverride.java b/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java similarity index 84% rename from src/test/java/com/avaje/tests/model/embedded/TestEmbeddedAttrOverride.java rename to src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java index 4b1be9a9a..786fbd8aa 100644 --- a/src/test/java/com/avaje/tests/model/embedded/TestEmbeddedAttrOverride.java +++ b/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.embedded; +package org.tests.model.embedded; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/model/family/ChildPerson.java b/src/test/java/org/tests/model/family/ChildPerson.java similarity index 93% rename from src/test/java/com/avaje/tests/model/family/ChildPerson.java rename to src/test/java/org/tests/model/family/ChildPerson.java index 045988fa5..d5ead1109 100644 --- a/src/test/java/com/avaje/tests/model/family/ChildPerson.java +++ b/src/test/java/org/tests/model/family/ChildPerson.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.family; +package org.tests.model.family; -import com.avaje.ebean.annotation.Formula; -import com.avaje.tests.model.basic.EBasic; +import io.ebean.annotation.Formula; +import org.tests.model.basic.EBasic; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/family/GrandParentPerson.java b/src/test/java/org/tests/model/family/GrandParentPerson.java similarity index 93% rename from src/test/java/com/avaje/tests/model/family/GrandParentPerson.java rename to src/test/java/org/tests/model/family/GrandParentPerson.java index 574503d02..2307ee3cb 100644 --- a/src/test/java/com/avaje/tests/model/family/GrandParentPerson.java +++ b/src/test/java/org/tests/model/family/GrandParentPerson.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.family; +package org.tests.model.family; -import com.avaje.ebean.annotation.Formula; -import com.avaje.tests.model.basic.EBasic; +import io.ebean.annotation.Formula; +import org.tests.model.basic.EBasic; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/family/InheritablePerson.java b/src/test/java/org/tests/model/family/InheritablePerson.java similarity index 90% rename from src/test/java/com/avaje/tests/model/family/InheritablePerson.java rename to src/test/java/org/tests/model/family/InheritablePerson.java index 12a2ad027..7fe12c5a0 100644 --- a/src/test/java/com/avaje/tests/model/family/InheritablePerson.java +++ b/src/test/java/org/tests/model/family/InheritablePerson.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.family; +package org.tests.model.family; -import com.avaje.tests.model.basic.EBasic; +import org.tests.model.basic.EBasic; import javax.persistence.Id; import javax.persistence.ManyToOne; diff --git a/src/test/java/com/avaje/tests/model/family/ParentPerson.java b/src/test/java/org/tests/model/family/ParentPerson.java similarity index 95% rename from src/test/java/com/avaje/tests/model/family/ParentPerson.java rename to src/test/java/org/tests/model/family/ParentPerson.java index 3f3deba68..166e3c93a 100644 --- a/src/test/java/com/avaje/tests/model/family/ParentPerson.java +++ b/src/test/java/org/tests/model/family/ParentPerson.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.family; +package org.tests.model.family; -import com.avaje.ebean.annotation.Formula; -import com.avaje.tests.model.basic.EBasic; +import io.ebean.annotation.Formula; +import org.tests.model.basic.EBasic; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/history/HeDoc.java b/src/test/java/org/tests/model/history/HeDoc.java similarity index 85% rename from src/test/java/com/avaje/tests/model/history/HeDoc.java rename to src/test/java/org/tests/model/history/HeDoc.java index 0b6b5cd68..35944a322 100644 --- a/src/test/java/com/avaje/tests/model/history/HeDoc.java +++ b/src/test/java/org/tests/model/history/HeDoc.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.history; +package org.tests.model.history; -import com.avaje.tests.model.draftable.BaseDomain; +import org.tests.model.draftable.BaseDomain; import javax.persistence.Entity; import javax.persistence.ManyToMany; diff --git a/src/test/java/com/avaje/tests/model/history/HeLink.java b/src/test/java/org/tests/model/history/HeLink.java similarity index 83% rename from src/test/java/com/avaje/tests/model/history/HeLink.java rename to src/test/java/org/tests/model/history/HeLink.java index 62a206ebc..251b2385e 100644 --- a/src/test/java/com/avaje/tests/model/history/HeLink.java +++ b/src/test/java/org/tests/model/history/HeLink.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.history; +package org.tests.model.history; -import com.avaje.ebean.annotation.History; -import com.avaje.ebean.annotation.HistoryExclude; -import com.avaje.tests.model.draftable.BaseDomain; +import io.ebean.annotation.History; +import io.ebean.annotation.HistoryExclude; +import org.tests.model.draftable.BaseDomain; import javax.persistence.Entity; import javax.persistence.ManyToMany; diff --git a/src/test/java/com/avaje/tests/model/history/HiDoc.java b/src/test/java/org/tests/model/history/HiDoc.java similarity index 85% rename from src/test/java/com/avaje/tests/model/history/HiDoc.java rename to src/test/java/org/tests/model/history/HiDoc.java index f10b422ac..4d68e02d4 100644 --- a/src/test/java/com/avaje/tests/model/history/HiDoc.java +++ b/src/test/java/org/tests/model/history/HiDoc.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.history; +package org.tests.model.history; -import com.avaje.tests.model.draftable.BaseDomain; +import org.tests.model.draftable.BaseDomain; import javax.persistence.Entity; import javax.persistence.ManyToMany; diff --git a/src/test/java/com/avaje/tests/model/history/HiLink.java b/src/test/java/org/tests/model/history/HiLink.java similarity index 87% rename from src/test/java/com/avaje/tests/model/history/HiLink.java rename to src/test/java/org/tests/model/history/HiLink.java index e9193cef3..9d62ea235 100644 --- a/src/test/java/com/avaje/tests/model/history/HiLink.java +++ b/src/test/java/org/tests/model/history/HiLink.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.history; +package org.tests.model.history; -import com.avaje.ebean.annotation.History; -import com.avaje.tests.model.draftable.BaseDomain; +import io.ebean.annotation.History; +import org.tests.model.draftable.BaseDomain; import javax.persistence.Entity; import javax.persistence.ManyToMany; diff --git a/src/test/java/com/avaje/tests/model/history/TestHistoryExclude.java b/src/test/java/org/tests/model/history/TestHistoryExclude.java similarity index 89% rename from src/test/java/com/avaje/tests/model/history/TestHistoryExclude.java rename to src/test/java/org/tests/model/history/TestHistoryExclude.java index a040cdc43..9031fc272 100644 --- a/src/test/java/com/avaje/tests/model/history/TestHistoryExclude.java +++ b/src/test/java/org/tests/model/history/TestHistoryExclude.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.history; +package org.tests.model.history; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.junit.Test; import java.sql.Timestamp; diff --git a/src/test/java/com/avaje/tests/model/history/TestHistoryInclude.java b/src/test/java/org/tests/model/history/TestHistoryInclude.java similarity index 89% rename from src/test/java/com/avaje/tests/model/history/TestHistoryInclude.java rename to src/test/java/org/tests/model/history/TestHistoryInclude.java index 6b29ff349..eb2255953 100644 --- a/src/test/java/com/avaje/tests/model/history/TestHistoryInclude.java +++ b/src/test/java/org/tests/model/history/TestHistoryInclude.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.history; +package org.tests.model.history; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.junit.Test; import java.sql.Timestamp; diff --git a/src/test/java/com/avaje/tests/model/info/InfoCompany.java b/src/test/java/org/tests/model/info/InfoCompany.java similarity index 88% rename from src/test/java/com/avaje/tests/model/info/InfoCompany.java rename to src/test/java/org/tests/model/info/InfoCompany.java index 97738d628..c2f699723 100644 --- a/src/test/java/com/avaje/tests/model/info/InfoCompany.java +++ b/src/test/java/org/tests/model/info/InfoCompany.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.info; +package org.tests.model.info; -import com.avaje.ebean.Finder; -import com.avaje.ebean.Model; -import com.avaje.ebean.annotation.JsonIgnore; +import io.ebean.Finder; +import io.ebean.Model; +import io.ebean.annotation.JsonIgnore; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/info/InfoContact.java b/src/test/java/org/tests/model/info/InfoContact.java similarity index 92% rename from src/test/java/com/avaje/tests/model/info/InfoContact.java rename to src/test/java/org/tests/model/info/InfoContact.java index a11ea7f4c..bc742aeb6 100644 --- a/src/test/java/com/avaje/tests/model/info/InfoContact.java +++ b/src/test/java/org/tests/model/info/InfoContact.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.info; +package org.tests.model.info; -import com.avaje.ebean.Model; +import io.ebean.Model; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/info/InfoCustomer.java b/src/test/java/org/tests/model/info/InfoCustomer.java similarity index 90% rename from src/test/java/com/avaje/tests/model/info/InfoCustomer.java rename to src/test/java/org/tests/model/info/InfoCustomer.java index 0f9111a1f..086475b59 100644 --- a/src/test/java/com/avaje/tests/model/info/InfoCustomer.java +++ b/src/test/java/org/tests/model/info/InfoCustomer.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.info; +package org.tests.model.info; -import com.avaje.ebean.Finder; -import com.avaje.ebean.Model; +import io.ebean.Finder; +import io.ebean.Model; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/inheritexposedtype/IXPhoto.java b/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java similarity index 76% rename from src/test/java/com/avaje/tests/model/inheritexposedtype/IXPhoto.java rename to src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java index 317e01e0b..b409840cd 100644 --- a/src/test/java/com/avaje/tests/model/inheritexposedtype/IXPhoto.java +++ b/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.inheritexposedtype; +package org.tests.model.inheritexposedtype; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/inheritexposedtype/IXResource.java b/src/test/java/org/tests/model/inheritexposedtype/IXResource.java similarity index 93% rename from src/test/java/com/avaje/tests/model/inheritexposedtype/IXResource.java rename to src/test/java/org/tests/model/inheritexposedtype/IXResource.java index e35017aa6..b7b93cd85 100644 --- a/src/test/java/com/avaje/tests/model/inheritexposedtype/IXResource.java +++ b/src/test/java/org/tests/model/inheritexposedtype/IXResource.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.inheritexposedtype; +package org.tests.model.inheritexposedtype; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java b/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java similarity index 62% rename from src/test/java/com/avaje/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java rename to src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java index 9134bcaef..aea5586cf 100644 --- a/src/test/java/com/avaje/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java +++ b/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.inheritexposedtype.test; +package org.tests.model.inheritexposedtype.test; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.inheritexposedtype.IXPhoto; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.inheritexposedtype.IXPhoto; import org.junit.Test; public class TestInheritExposeDtype extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/model/inheritmany/IMRelated.java b/src/test/java/org/tests/model/inheritmany/IMRelated.java similarity index 92% rename from src/test/java/com/avaje/tests/model/inheritmany/IMRelated.java rename to src/test/java/org/tests/model/inheritmany/IMRelated.java index b72f9b85f..e9734b902 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/IMRelated.java +++ b/src/test/java/org/tests/model/inheritmany/IMRelated.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.inheritmany; +package org.tests.model.inheritmany; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/inheritmany/IMRoot.java b/src/test/java/org/tests/model/inheritmany/IMRoot.java similarity index 93% rename from src/test/java/com/avaje/tests/model/inheritmany/IMRoot.java rename to src/test/java/org/tests/model/inheritmany/IMRoot.java index 8d716af86..553b12fad 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/IMRoot.java +++ b/src/test/java/org/tests/model/inheritmany/IMRoot.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.inheritmany; +package org.tests.model.inheritmany; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/inheritmany/IMRootOne.java b/src/test/java/org/tests/model/inheritmany/IMRootOne.java similarity index 87% rename from src/test/java/com/avaje/tests/model/inheritmany/IMRootOne.java rename to src/test/java/org/tests/model/inheritmany/IMRootOne.java index ecd871ad1..1eb67687e 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/IMRootOne.java +++ b/src/test/java/org/tests/model/inheritmany/IMRootOne.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.inheritmany; +package org.tests.model.inheritmany; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/inheritmany/IMRootTwo.java b/src/test/java/org/tests/model/inheritmany/IMRootTwo.java similarity index 91% rename from src/test/java/com/avaje/tests/model/inheritmany/IMRootTwo.java rename to src/test/java/org/tests/model/inheritmany/IMRootTwo.java index 5c7f4f9a6..e63891f67 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/IMRootTwo.java +++ b/src/test/java/org/tests/model/inheritmany/IMRootTwo.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.inheritmany; +package org.tests.model.inheritmany; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/inheritmany/MBase.java b/src/test/java/org/tests/model/inheritmany/MBase.java similarity index 84% rename from src/test/java/com/avaje/tests/model/inheritmany/MBase.java rename to src/test/java/org/tests/model/inheritmany/MBase.java index a163aaf9f..8bfb682e2 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/MBase.java +++ b/src/test/java/org/tests/model/inheritmany/MBase.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.inheritmany; +package org.tests.model.inheritmany; import javax.persistence.Id; import javax.persistence.MappedSuperclass; diff --git a/src/test/java/com/avaje/tests/model/inheritmany/MMedia.java b/src/test/java/org/tests/model/inheritmany/MMedia.java similarity index 92% rename from src/test/java/com/avaje/tests/model/inheritmany/MMedia.java rename to src/test/java/org/tests/model/inheritmany/MMedia.java index d7c1400d9..d59055c71 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/MMedia.java +++ b/src/test/java/org/tests/model/inheritmany/MMedia.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.inheritmany; +package org.tests.model.inheritmany; import javax.persistence.DiscriminatorColumn; import javax.persistence.DiscriminatorType; diff --git a/src/test/java/com/avaje/tests/model/inheritmany/MPicture.java b/src/test/java/org/tests/model/inheritmany/MPicture.java similarity index 87% rename from src/test/java/com/avaje/tests/model/inheritmany/MPicture.java rename to src/test/java/org/tests/model/inheritmany/MPicture.java index f8ebed946..422e93558 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/MPicture.java +++ b/src/test/java/org/tests/model/inheritmany/MPicture.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.inheritmany; +package org.tests.model.inheritmany; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/inheritmany/MProfile.java b/src/test/java/org/tests/model/inheritmany/MProfile.java similarity index 91% rename from src/test/java/com/avaje/tests/model/inheritmany/MProfile.java rename to src/test/java/org/tests/model/inheritmany/MProfile.java index 4bf29671c..d0c561c65 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/MProfile.java +++ b/src/test/java/org/tests/model/inheritmany/MProfile.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.inheritmany; +package org.tests.model.inheritmany; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java b/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java similarity index 89% rename from src/test/java/com/avaje/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java rename to src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java index dbdbbf460..3a0acf4de 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java +++ b/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.inheritmany; +package org.tests.model.inheritmany; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/model/interfaces/Address.java b/src/test/java/org/tests/model/interfaces/Address.java similarity index 93% rename from src/test/java/com/avaje/tests/model/interfaces/Address.java rename to src/test/java/org/tests/model/interfaces/Address.java index aa5a936ec..a4f9885bb 100644 --- a/src/test/java/com/avaje/tests/model/interfaces/Address.java +++ b/src/test/java/org/tests/model/interfaces/Address.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.interfaces; +package org.tests.model.interfaces; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/interfaces/IAddress.java b/src/test/java/org/tests/model/interfaces/IAddress.java similarity index 66% rename from src/test/java/com/avaje/tests/model/interfaces/IAddress.java rename to src/test/java/org/tests/model/interfaces/IAddress.java index f179552ec..78b6d2005 100644 --- a/src/test/java/com/avaje/tests/model/interfaces/IAddress.java +++ b/src/test/java/org/tests/model/interfaces/IAddress.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.interfaces; +package org.tests.model.interfaces; public interface IAddress { String getStreet(); diff --git a/src/test/java/com/avaje/tests/model/interfaces/IPerson.java b/src/test/java/org/tests/model/interfaces/IPerson.java similarity index 71% rename from src/test/java/com/avaje/tests/model/interfaces/IPerson.java rename to src/test/java/org/tests/model/interfaces/IPerson.java index fed13d9a1..0d07ecc6b 100644 --- a/src/test/java/com/avaje/tests/model/interfaces/IPerson.java +++ b/src/test/java/org/tests/model/interfaces/IPerson.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.interfaces; +package org.tests.model.interfaces; public interface IPerson { IAddress getDefaultAddress(); diff --git a/src/test/java/com/avaje/tests/model/interfaces/Person.java b/src/test/java/org/tests/model/interfaces/Person.java similarity index 94% rename from src/test/java/com/avaje/tests/model/interfaces/Person.java rename to src/test/java/org/tests/model/interfaces/Person.java index f55cb4436..5edbb68c7 100644 --- a/src/test/java/com/avaje/tests/model/interfaces/Person.java +++ b/src/test/java/org/tests/model/interfaces/Person.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.interfaces; +package org.tests.model.interfaces; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/ivo/ESomeConvertType.java b/src/test/java/org/tests/model/ivo/ESomeConvertType.java similarity index 94% rename from src/test/java/com/avaje/tests/model/ivo/ESomeConvertType.java rename to src/test/java/org/tests/model/ivo/ESomeConvertType.java index 6f809cfcf..74ccfedab 100644 --- a/src/test/java/com/avaje/tests/model/ivo/ESomeConvertType.java +++ b/src/test/java/org/tests/model/ivo/ESomeConvertType.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.ivo; +package org.tests.model.ivo; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/ivo/Money.java b/src/test/java/org/tests/model/ivo/Money.java similarity index 98% rename from src/test/java/com/avaje/tests/model/ivo/Money.java rename to src/test/java/org/tests/model/ivo/Money.java index 0bcf3f002..e12502994 100644 --- a/src/test/java/com/avaje/tests/model/ivo/Money.java +++ b/src/test/java/org/tests/model/ivo/Money.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.ivo; +package org.tests.model.ivo; import java.io.Serializable; diff --git a/src/test/java/com/avaje/tests/model/ivo/Oid.java b/src/test/java/org/tests/model/ivo/Oid.java similarity index 95% rename from src/test/java/com/avaje/tests/model/ivo/Oid.java rename to src/test/java/org/tests/model/ivo/Oid.java index 7629c33a3..16f9ccf1b 100644 --- a/src/test/java/com/avaje/tests/model/ivo/Oid.java +++ b/src/test/java/org/tests/model/ivo/Oid.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.ivo; +package org.tests.model.ivo; public class Oid { diff --git a/src/test/java/com/avaje/tests/model/ivo/Segment.java b/src/test/java/org/tests/model/ivo/Segment.java similarity index 88% rename from src/test/java/com/avaje/tests/model/ivo/Segment.java rename to src/test/java/org/tests/model/ivo/Segment.java index 53557ba5d..cda049ce5 100644 --- a/src/test/java/com/avaje/tests/model/ivo/Segment.java +++ b/src/test/java/org/tests/model/ivo/Segment.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.ivo; +package org.tests.model.ivo; /** * Simple example of String based IVO. diff --git a/src/test/java/com/avaje/tests/model/ivo/SysTime.java b/src/test/java/org/tests/model/ivo/SysTime.java similarity index 83% rename from src/test/java/com/avaje/tests/model/ivo/SysTime.java rename to src/test/java/org/tests/model/ivo/SysTime.java index 17ab7aae3..c1cb3001c 100644 --- a/src/test/java/com/avaje/tests/model/ivo/SysTime.java +++ b/src/test/java/org/tests/model/ivo/SysTime.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.ivo; +package org.tests.model.ivo; public class SysTime { diff --git a/src/test/java/com/avaje/tests/model/ivo/converter/MoneyTypeConverter.java b/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java similarity index 83% rename from src/test/java/com/avaje/tests/model/ivo/converter/MoneyTypeConverter.java rename to src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java index 71a753de1..acc66bbd5 100644 --- a/src/test/java/com/avaje/tests/model/ivo/converter/MoneyTypeConverter.java +++ b/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.ivo.converter; +package org.tests.model.ivo.converter; -import com.avaje.tests.model.ivo.Money; +import org.tests.model.ivo.Money; import javax.persistence.AttributeConverter; import java.math.BigDecimal; diff --git a/src/test/java/com/avaje/tests/model/ivo/converter/OidTypeConverter.java b/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java similarity index 75% rename from src/test/java/com/avaje/tests/model/ivo/converter/OidTypeConverter.java rename to src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java index 04a218c5d..d223ec470 100644 --- a/src/test/java/com/avaje/tests/model/ivo/converter/OidTypeConverter.java +++ b/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.ivo.converter; +package org.tests.model.ivo.converter; -import com.avaje.ebean.config.ScalarTypeConverter; -import com.avaje.tests.model.ivo.Oid; +import io.ebean.config.ScalarTypeConverter; +import org.tests.model.ivo.Oid; public class OidTypeConverter implements ScalarTypeConverter,Long> { diff --git a/src/test/java/com/avaje/tests/model/ivo/converter/SysTimeConverter.java b/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java similarity index 73% rename from src/test/java/com/avaje/tests/model/ivo/converter/SysTimeConverter.java rename to src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java index 20762ee03..ad9e7c99d 100644 --- a/src/test/java/com/avaje/tests/model/ivo/converter/SysTimeConverter.java +++ b/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.ivo.converter; +package org.tests.model.ivo.converter; -import com.avaje.ebean.config.ScalarTypeConverter; -import com.avaje.tests.model.ivo.SysTime; +import io.ebean.config.ScalarTypeConverter; +import org.tests.model.ivo.SysTime; import java.sql.Timestamp; diff --git a/src/test/java/com/avaje/tests/model/ivo/test/TestAttributeConverter.java b/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java similarity index 66% rename from src/test/java/com/avaje/tests/model/ivo/test/TestAttributeConverter.java rename to src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java index 31d265ace..3005b97e8 100644 --- a/src/test/java/com/avaje/tests/model/ivo/test/TestAttributeConverter.java +++ b/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java @@ -1,9 +1,9 @@ -package com.avaje.tests.model.ivo.test; +package org.tests.model.ivo.test; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.ivo.ESomeConvertType; -import com.avaje.tests.model.ivo.Money; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.ivo.ESomeConvertType; +import org.tests.model.ivo.Money; import org.junit.Test; public class TestAttributeConverter extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/model/joda/BasicJodaEntity.java b/src/test/java/org/tests/model/joda/BasicJodaEntity.java similarity index 87% rename from src/test/java/com/avaje/tests/model/joda/BasicJodaEntity.java rename to src/test/java/org/tests/model/joda/BasicJodaEntity.java index 55ef3f3d8..acb025fe0 100644 --- a/src/test/java/com/avaje/tests/model/joda/BasicJodaEntity.java +++ b/src/test/java/org/tests/model/joda/BasicJodaEntity.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.joda; +package org.tests.model.joda; -import com.avaje.ebean.annotation.CreatedTimestamp; -import com.avaje.ebean.annotation.UpdatedTimestamp; +import io.ebean.annotation.CreatedTimestamp; +import io.ebean.annotation.UpdatedTimestamp; import org.joda.time.DateTime; import org.joda.time.LocalDateTime; diff --git a/src/test/java/com/avaje/tests/model/joda/TestJodaInsertUpdate.java b/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java similarity index 89% rename from src/test/java/com/avaje/tests/model/joda/TestJodaInsertUpdate.java rename to src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java index 4f5cfbe2f..7240eca43 100644 --- a/src/test/java/com/avaje/tests/model/joda/TestJodaInsertUpdate.java +++ b/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.joda; +package org.tests.model.joda; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.joda.time.DateTime; import org.joda.time.LocalDateTime; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicHstore.java b/src/test/java/org/tests/model/json/EBasicHstore.java similarity index 92% rename from src/test/java/com/avaje/tests/model/json/EBasicHstore.java rename to src/test/java/org/tests/model/json/EBasicHstore.java index bd1359845..0c25a6e5c 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicHstore.java +++ b/src/test/java/org/tests/model/json/EBasicHstore.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.json; +package org.tests.model.json; -import com.avaje.ebean.annotation.DbHstore; +import io.ebean.annotation.DbHstore; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonList.java b/src/test/java/org/tests/model/json/EBasicJsonList.java similarity index 92% rename from src/test/java/com/avaje/tests/model/json/EBasicJsonList.java rename to src/test/java/org/tests/model/json/EBasicJsonList.java index 2b1dbdda4..cf34d5826 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonList.java +++ b/src/test/java/org/tests/model/json/EBasicJsonList.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.json; +package org.tests.model.json; -import com.avaje.ebean.annotation.DbJson; -import com.avaje.ebean.annotation.DbJsonB; -import com.avaje.ebean.annotation.DbJsonType; +import io.ebean.annotation.DbJson; +import io.ebean.annotation.DbJsonB; +import io.ebean.annotation.DbJsonType; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonMap.java b/src/test/java/org/tests/model/json/EBasicJsonMap.java similarity index 90% rename from src/test/java/com/avaje/tests/model/json/EBasicJsonMap.java rename to src/test/java/org/tests/model/json/EBasicJsonMap.java index f0f1b7ca9..f18408154 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonMap.java +++ b/src/test/java/org/tests/model/json/EBasicJsonMap.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.json; +package org.tests.model.json; -import com.avaje.ebean.annotation.DbJson; +import io.ebean.annotation.DbJson; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonMapBlob.java b/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java similarity index 86% rename from src/test/java/com/avaje/tests/model/json/EBasicJsonMapBlob.java rename to src/test/java/org/tests/model/json/EBasicJsonMapBlob.java index 5d5440b25..f4df60888 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonMapBlob.java +++ b/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.json; +package org.tests.model.json; -import com.avaje.ebean.annotation.DbJson; -import com.avaje.ebean.annotation.DbJsonType; +import io.ebean.annotation.DbJson; +import io.ebean.annotation.DbJsonType; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonMapClob.java b/src/test/java/org/tests/model/json/EBasicJsonMapClob.java similarity index 86% rename from src/test/java/com/avaje/tests/model/json/EBasicJsonMapClob.java rename to src/test/java/org/tests/model/json/EBasicJsonMapClob.java index 9fb5e1b0b..6d26bd130 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonMapClob.java +++ b/src/test/java/org/tests/model/json/EBasicJsonMapClob.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.json; +package org.tests.model.json; -import com.avaje.ebean.annotation.DbJson; -import com.avaje.ebean.annotation.DbJsonType; +import io.ebean.annotation.DbJson; +import io.ebean.annotation.DbJsonType; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonMapJsonB.java b/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java similarity index 90% rename from src/test/java/com/avaje/tests/model/json/EBasicJsonMapJsonB.java rename to src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java index e9ac6398f..744ca6af5 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonMapJsonB.java +++ b/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.json; +package org.tests.model.json; -import com.avaje.ebean.annotation.DbJsonB; +import io.ebean.annotation.DbJsonB; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonMapVarchar.java b/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java similarity index 86% rename from src/test/java/com/avaje/tests/model/json/EBasicJsonMapVarchar.java rename to src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java index 399285366..c08c4e9fe 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonMapVarchar.java +++ b/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.json; +package org.tests.model.json; -import com.avaje.ebean.annotation.DbJson; -import com.avaje.ebean.annotation.DbJsonType; +import io.ebean.annotation.DbJson; +import io.ebean.annotation.DbJsonType; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonNode.java b/src/test/java/org/tests/model/json/EBasicJsonNode.java similarity index 90% rename from src/test/java/com/avaje/tests/model/json/EBasicJsonNode.java rename to src/test/java/org/tests/model/json/EBasicJsonNode.java index 807386138..7488ac4f8 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonNode.java +++ b/src/test/java/org/tests/model/json/EBasicJsonNode.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.json; +package org.tests.model.json; -import com.avaje.ebean.annotation.DbJson; +import io.ebean.annotation.DbJson; import com.fasterxml.jackson.databind.JsonNode; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonNodeBlob.java b/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java similarity index 86% rename from src/test/java/com/avaje/tests/model/json/EBasicJsonNodeBlob.java rename to src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java index 0b8e55219..844ab3569 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonNodeBlob.java +++ b/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.json; +package org.tests.model.json; -import com.avaje.ebean.annotation.DbJson; -import com.avaje.ebean.annotation.DbJsonType; +import io.ebean.annotation.DbJson; +import io.ebean.annotation.DbJsonType; import com.fasterxml.jackson.databind.JsonNode; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonNodeJsonB.java b/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java similarity index 91% rename from src/test/java/com/avaje/tests/model/json/EBasicJsonNodeJsonB.java rename to src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java index 0308cdf88..d0f7016a3 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonNodeJsonB.java +++ b/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.json; +package org.tests.model.json; -import com.avaje.ebean.annotation.DbJsonB; +import io.ebean.annotation.DbJsonB; import com.fasterxml.jackson.databind.JsonNode; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonNodeVarchar.java b/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java similarity index 86% rename from src/test/java/com/avaje/tests/model/json/EBasicJsonNodeVarchar.java rename to src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java index 9888356ab..8acd2c016 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonNodeVarchar.java +++ b/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.json; +package org.tests.model.json; -import com.avaje.ebean.annotation.DbJson; -import com.avaje.ebean.annotation.DbJsonType; +import io.ebean.annotation.DbJson; +import io.ebean.annotation.DbJsonType; import com.fasterxml.jackson.databind.JsonNode; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonUnmapped.java b/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java similarity index 90% rename from src/test/java/com/avaje/tests/model/json/EBasicJsonUnmapped.java rename to src/test/java/org/tests/model/json/EBasicJsonUnmapped.java index 7e2f0e411..928f048be 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonUnmapped.java +++ b/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.json; +package org.tests.model.json; -import com.avaje.ebean.annotation.UnmappedJson; +import io.ebean.annotation.UnmappedJson; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/json/PlainBean.java b/src/test/java/org/tests/model/json/PlainBean.java similarity index 95% rename from src/test/java/com/avaje/tests/model/json/PlainBean.java rename to src/test/java/org/tests/model/json/PlainBean.java index 3e8c9d7c5..b9b59108c 100644 --- a/src/test/java/com/avaje/tests/model/json/PlainBean.java +++ b/src/test/java/org/tests/model/json/PlainBean.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.json; +package org.tests.model.json; import java.sql.Timestamp; diff --git a/src/test/java/com/avaje/tests/model/m2m/DCredit.java b/src/test/java/org/tests/model/m2m/DCredit.java similarity index 91% rename from src/test/java/com/avaje/tests/model/m2m/DCredit.java rename to src/test/java/org/tests/model/m2m/DCredit.java index 727f5b90a..fa078515b 100644 --- a/src/test/java/com/avaje/tests/model/m2m/DCredit.java +++ b/src/test/java/org/tests/model/m2m/DCredit.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.m2m; +package org.tests.model.m2m; -import com.avaje.ebean.Model; +import io.ebean.Model; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/m2m/DRol.java b/src/test/java/org/tests/model/m2m/DRol.java similarity index 93% rename from src/test/java/com/avaje/tests/model/m2m/DRol.java rename to src/test/java/org/tests/model/m2m/DRol.java index 739f0e66f..f4abd56a2 100644 --- a/src/test/java/com/avaje/tests/model/m2m/DRol.java +++ b/src/test/java/org/tests/model/m2m/DRol.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.m2m; +package org.tests.model.m2m; -import com.avaje.ebean.Model; +import io.ebean.Model; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/m2m/DRot.java b/src/test/java/org/tests/model/m2m/DRot.java similarity index 90% rename from src/test/java/com/avaje/tests/model/m2m/DRot.java rename to src/test/java/org/tests/model/m2m/DRot.java index bd1dc12ab..bb2629fac 100644 --- a/src/test/java/com/avaje/tests/model/m2m/DRot.java +++ b/src/test/java/org/tests/model/m2m/DRot.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.m2m; +package org.tests.model.m2m; -import com.avaje.ebean.Model; +import io.ebean.Model; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/m2m/MailBox.java b/src/test/java/org/tests/model/m2m/MailBox.java similarity index 93% rename from src/test/java/com/avaje/tests/model/m2m/MailBox.java rename to src/test/java/org/tests/model/m2m/MailBox.java index 5dd830fac..a8cd7d51b 100644 --- a/src/test/java/com/avaje/tests/model/m2m/MailBox.java +++ b/src/test/java/org/tests/model/m2m/MailBox.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.m2m; +package org.tests.model.m2m; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/m2m/MailUser.java b/src/test/java/org/tests/model/m2m/MailUser.java similarity index 97% rename from src/test/java/com/avaje/tests/model/m2m/MailUser.java rename to src/test/java/org/tests/model/m2m/MailUser.java index dfc8ffe43..3dba93d6b 100644 --- a/src/test/java/com/avaje/tests/model/m2m/MailUser.java +++ b/src/test/java/org/tests/model/m2m/MailUser.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.m2m; +package org.tests.model.m2m; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/m2m/MnyA.java b/src/test/java/org/tests/model/m2m/MnyA.java similarity index 86% rename from src/test/java/com/avaje/tests/model/m2m/MnyA.java rename to src/test/java/org/tests/model/m2m/MnyA.java index 25c3af82b..d29c2d1b7 100644 --- a/src/test/java/com/avaje/tests/model/m2m/MnyA.java +++ b/src/test/java/org/tests/model/m2m/MnyA.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.m2m; +package org.tests.model.m2m; -import com.avaje.tests.model.BaseModel; +import org.tests.model.BaseModel; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/m2m/MnyB.java b/src/test/java/org/tests/model/m2m/MnyB.java similarity index 90% rename from src/test/java/com/avaje/tests/model/m2m/MnyB.java rename to src/test/java/org/tests/model/m2m/MnyB.java index 371d2f994..ac9c1f58b 100644 --- a/src/test/java/com/avaje/tests/model/m2m/MnyB.java +++ b/src/test/java/org/tests/model/m2m/MnyB.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.m2m; +package org.tests.model.m2m; -import com.avaje.tests.model.BaseModel; +import org.tests.model.BaseModel; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/m2m/MnyC.java b/src/test/java/org/tests/model/m2m/MnyC.java similarity index 85% rename from src/test/java/com/avaje/tests/model/m2m/MnyC.java rename to src/test/java/org/tests/model/m2m/MnyC.java index 15c07efa4..720baff86 100644 --- a/src/test/java/com/avaje/tests/model/m2m/MnyC.java +++ b/src/test/java/org/tests/model/m2m/MnyC.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.m2m; +package org.tests.model.m2m; -import com.avaje.tests.model.BaseModel; +import org.tests.model.BaseModel; import javax.persistence.Entity; import javax.persistence.ManyToMany; diff --git a/src/test/java/com/avaje/tests/model/m2m/MnyTopic.java b/src/test/java/org/tests/model/m2m/MnyTopic.java similarity index 97% rename from src/test/java/com/avaje/tests/model/m2m/MnyTopic.java rename to src/test/java/org/tests/model/m2m/MnyTopic.java index 36b2452d5..02e751024 100644 --- a/src/test/java/com/avaje/tests/model/m2m/MnyTopic.java +++ b/src/test/java/org/tests/model/m2m/MnyTopic.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.m2m; +package org.tests.model.m2m; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/m2m/Permission.java b/src/test/java/org/tests/model/m2m/Permission.java similarity index 92% rename from src/test/java/com/avaje/tests/model/m2m/Permission.java rename to src/test/java/org/tests/model/m2m/Permission.java index dc549f3ec..517a56882 100644 --- a/src/test/java/com/avaje/tests/model/m2m/Permission.java +++ b/src/test/java/org/tests/model/m2m/Permission.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.m2m; +package org.tests.model.m2m; -import com.avaje.ebean.annotation.Cache; +import io.ebean.annotation.Cache; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/m2m/Role.java b/src/test/java/org/tests/model/m2m/Role.java similarity index 97% rename from src/test/java/com/avaje/tests/model/m2m/Role.java rename to src/test/java/org/tests/model/m2m/Role.java index 240b82592..0a2b13703 100644 --- a/src/test/java/com/avaje/tests/model/m2m/Role.java +++ b/src/test/java/org/tests/model/m2m/Role.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.m2m; +package org.tests.model.m2m; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/src/test/java/com/avaje/tests/model/m2m/Tenant.java b/src/test/java/org/tests/model/m2m/Tenant.java similarity index 97% rename from src/test/java/com/avaje/tests/model/m2m/Tenant.java rename to src/test/java/org/tests/model/m2m/Tenant.java index 577700ebf..9a740f54a 100644 --- a/src/test/java/com/avaje/tests/model/m2m/Tenant.java +++ b/src/test/java/org/tests/model/m2m/Tenant.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.m2m; +package org.tests.model.m2m; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/src/test/java/com/avaje/tests/model/m2m/TestM2MDoubleInsert.java b/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java similarity index 85% rename from src/test/java/com/avaje/tests/model/m2m/TestM2MDoubleInsert.java rename to src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java index 1a4e0adcf..1c59dbf3e 100644 --- a/src/test/java/com/avaje/tests/model/m2m/TestM2MDoubleInsert.java +++ b/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.m2m; +package org.tests.model.m2m; -import com.avaje.ebean.Ebean; +import io.ebean.Ebean; import org.junit.Test; public class TestM2MDoubleInsert { diff --git a/src/test/java/com/avaje/tests/model/m2o/Addr.java b/src/test/java/org/tests/model/m2o/Addr.java similarity index 97% rename from src/test/java/com/avaje/tests/model/m2o/Addr.java rename to src/test/java/org/tests/model/m2o/Addr.java index 83bd2acd9..83e06d26b 100644 --- a/src/test/java/com/avaje/tests/model/m2o/Addr.java +++ b/src/test/java/org/tests/model/m2o/Addr.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.m2o; +package org.tests.model.m2o; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/m2o/Empl.java b/src/test/java/org/tests/model/m2o/Empl.java similarity index 96% rename from src/test/java/com/avaje/tests/model/m2o/Empl.java rename to src/test/java/org/tests/model/m2o/Empl.java index cdceeffc7..6341bd725 100644 --- a/src/test/java/com/avaje/tests/model/m2o/Empl.java +++ b/src/test/java/org/tests/model/m2o/Empl.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.m2o; +package org.tests.model.m2o; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/m2o/TestManyToOneAsOne.java b/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java similarity index 86% rename from src/test/java/com/avaje/tests/model/m2o/TestManyToOneAsOne.java rename to src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java index 14619a3f6..bda33da10 100644 --- a/src/test/java/com/avaje/tests/model/m2o/TestManyToOneAsOne.java +++ b/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.m2o; +package org.tests.model.m2o; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.annotation.Transactional; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.annotation.Transactional; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/tests/model/map/MpRole.java b/src/test/java/org/tests/model/map/MpRole.java similarity index 94% rename from src/test/java/com/avaje/tests/model/map/MpRole.java rename to src/test/java/org/tests/model/map/MpRole.java index 915b65e3c..d30c79a4b 100644 --- a/src/test/java/com/avaje/tests/model/map/MpRole.java +++ b/src/test/java/org/tests/model/map/MpRole.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.map; +package org.tests.model.map; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/map/MpUser.java b/src/test/java/org/tests/model/map/MpUser.java similarity index 95% rename from src/test/java/com/avaje/tests/model/map/MpUser.java rename to src/test/java/org/tests/model/map/MpUser.java index 6801b6486..100e1e6a7 100644 --- a/src/test/java/com/avaje/tests/model/map/MpUser.java +++ b/src/test/java/org/tests/model/map/MpUser.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.map; +package org.tests.model.map; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/mappedsuper/ASimpleBean.java b/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java similarity index 89% rename from src/test/java/com/avaje/tests/model/mappedsuper/ASimpleBean.java rename to src/test/java/org/tests/model/mappedsuper/ASimpleBean.java index 7ef37046c..1c865f073 100644 --- a/src/test/java/com/avaje/tests/model/mappedsuper/ASimpleBean.java +++ b/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.mappedsuper; +package org.tests.model.mappedsuper; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/mappedsuper/NotEnhancedMappedSuper.java b/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java similarity index 91% rename from src/test/java/com/avaje/tests/model/mappedsuper/NotEnhancedMappedSuper.java rename to src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java index 0d3d085fd..d7c9816e3 100644 --- a/src/test/java/com/avaje/tests/model/mappedsuper/NotEnhancedMappedSuper.java +++ b/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.mappedsuper; +package org.tests.model.mappedsuper; import javax.persistence.MappedSuperclass; import javax.persistence.Transient; diff --git a/src/test/java/com/avaje/tests/model/noid/NoIdBean.java b/src/test/java/org/tests/model/noid/NoIdBean.java similarity index 87% rename from src/test/java/com/avaje/tests/model/noid/NoIdBean.java rename to src/test/java/org/tests/model/noid/NoIdBean.java index 628dabfd2..129f33757 100644 --- a/src/test/java/com/avaje/tests/model/noid/NoIdBean.java +++ b/src/test/java/org/tests/model/noid/NoIdBean.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.noid; +package org.tests.model.noid; -import com.avaje.ebean.annotation.CreatedTimestamp; +import io.ebean.annotation.CreatedTimestamp; import javax.persistence.Entity; import javax.persistence.Table; diff --git a/src/test/java/com/avaje/tests/model/noid/TestInsertNoIdBean.java b/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java similarity index 80% rename from src/test/java/com/avaje/tests/model/noid/TestInsertNoIdBean.java rename to src/test/java/org/tests/model/noid/TestInsertNoIdBean.java index 06290fc07..b7257afcf 100644 --- a/src/test/java/com/avaje/tests/model/noid/TestInsertNoIdBean.java +++ b/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.noid; +package org.tests.model.noid; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/com/avaje/tests/model/onetoone/Account.java b/src/test/java/org/tests/model/onetoone/Account.java similarity index 83% rename from src/test/java/com/avaje/tests/model/onetoone/Account.java rename to src/test/java/org/tests/model/onetoone/Account.java index 5ed1025fa..a6173400c 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/Account.java +++ b/src/test/java/org/tests/model/onetoone/Account.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.onetoone; +package org.tests.model.onetoone; -import com.avaje.ebean.Finder; -import com.avaje.tests.model.BaseModel; +import io.ebean.Finder; +import org.tests.model.BaseModel; import javax.persistence.Entity; import javax.persistence.OneToOne; diff --git a/src/test/java/com/avaje/tests/model/onetoone/OCompany.java b/src/test/java/org/tests/model/onetoone/OCompany.java similarity index 78% rename from src/test/java/com/avaje/tests/model/onetoone/OCompany.java rename to src/test/java/org/tests/model/onetoone/OCompany.java index 8237295fc..718f896fa 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/OCompany.java +++ b/src/test/java/org/tests/model/onetoone/OCompany.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.onetoone; +package org.tests.model.onetoone; -import com.avaje.tests.model.basic.BasicDomain; +import org.tests.model.basic.BasicDomain; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/onetoone/ORoadShowMsg.java b/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java similarity index 85% rename from src/test/java/com/avaje/tests/model/onetoone/ORoadShowMsg.java rename to src/test/java/org/tests/model/onetoone/ORoadShowMsg.java index d88402c4b..bc7ab5a9f 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/ORoadShowMsg.java +++ b/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.onetoone; +package org.tests.model.onetoone; -import com.avaje.tests.model.basic.BasicDomain; +import org.tests.model.basic.BasicDomain; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/onetoone/OtoChild.java b/src/test/java/org/tests/model/onetoone/OtoChild.java similarity index 93% rename from src/test/java/com/avaje/tests/model/onetoone/OtoChild.java rename to src/test/java/org/tests/model/onetoone/OtoChild.java index fe1bd0519..5126f3b2b 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/OtoChild.java +++ b/src/test/java/org/tests/model/onetoone/OtoChild.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.onetoone; +package org.tests.model.onetoone; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/onetoone/OtoMaster.java b/src/test/java/org/tests/model/onetoone/OtoMaster.java similarity index 93% rename from src/test/java/com/avaje/tests/model/onetoone/OtoMaster.java rename to src/test/java/org/tests/model/onetoone/OtoMaster.java index 3b9f1a711..516c5f9ab 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/OtoMaster.java +++ b/src/test/java/org/tests/model/onetoone/OtoMaster.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.onetoone; +package org.tests.model.onetoone; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/onetoone/TestOneToOneCascadeSave.java b/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java similarity index 86% rename from src/test/java/com/avaje/tests/model/onetoone/TestOneToOneCascadeSave.java rename to src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java index 2a15ecf7d..eedfaa2fb 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/TestOneToOneCascadeSave.java +++ b/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.onetoone; +package org.tests.model.onetoone; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/model/onetoone/TestOneToOneJoinColumn.java b/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java similarity index 76% rename from src/test/java/com/avaje/tests/model/onetoone/TestOneToOneJoinColumn.java rename to src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java index 652d6cb10..60d7eab3b 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/TestOneToOneJoinColumn.java +++ b/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.onetoone; +package org.tests.model.onetoone; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.junit.Test; public class TestOneToOneJoinColumn extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/model/onetoone/TestOneToOneOptionalRelationship.java b/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java similarity index 97% rename from src/test/java/com/avaje/tests/model/onetoone/TestOneToOneOptionalRelationship.java rename to src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java index bb634acf5..b8567d558 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/TestOneToOneOptionalRelationship.java +++ b/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.onetoone; +package org.tests.model.onetoone; -import com.avaje.ebean.BaseTestCase; +import io.ebean.BaseTestCase; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/model/onetoone/User.java b/src/test/java/org/tests/model/onetoone/User.java similarity index 83% rename from src/test/java/com/avaje/tests/model/onetoone/User.java rename to src/test/java/org/tests/model/onetoone/User.java index f5b115284..f36749285 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/User.java +++ b/src/test/java/org/tests/model/onetoone/User.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.onetoone; +package org.tests.model.onetoone; -import com.avaje.ebean.Finder; -import com.avaje.tests.model.BaseModel; +import io.ebean.Finder; +import org.tests.model.BaseModel; import javax.persistence.Entity; import javax.persistence.OneToOne; diff --git a/src/test/java/com/avaje/tests/model/onetoone/album/Album.java b/src/test/java/org/tests/model/onetoone/album/Album.java similarity index 90% rename from src/test/java/com/avaje/tests/model/onetoone/album/Album.java rename to src/test/java/org/tests/model/onetoone/album/Album.java index 2020ee449..4445f8d3b 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/album/Album.java +++ b/src/test/java/org/tests/model/onetoone/album/Album.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.onetoone.album; +package org.tests.model.onetoone.album; -import com.avaje.ebean.Finder; +import io.ebean.Finder; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/onetoone/album/BaseModel.java b/src/test/java/org/tests/model/onetoone/album/BaseModel.java similarity index 75% rename from src/test/java/com/avaje/tests/model/onetoone/album/BaseModel.java rename to src/test/java/org/tests/model/onetoone/album/BaseModel.java index 613cf7dcc..45b905518 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/album/BaseModel.java +++ b/src/test/java/org/tests/model/onetoone/album/BaseModel.java @@ -1,9 +1,9 @@ -package com.avaje.tests.model.onetoone.album; +package org.tests.model.onetoone.album; -import com.avaje.ebean.Model; -import com.avaje.ebean.annotation.SoftDelete; -import com.avaje.ebean.annotation.WhenCreated; -import com.avaje.ebean.annotation.WhenModified; +import io.ebean.Model; +import io.ebean.annotation.SoftDelete; +import io.ebean.annotation.WhenCreated; +import io.ebean.annotation.WhenModified; import org.joda.time.DateTime; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/onetoone/album/Cover.java b/src/test/java/org/tests/model/onetoone/album/Cover.java similarity index 86% rename from src/test/java/com/avaje/tests/model/onetoone/album/Cover.java rename to src/test/java/org/tests/model/onetoone/album/Cover.java index 6c6244d6f..bfbcfd002 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/album/Cover.java +++ b/src/test/java/org/tests/model/onetoone/album/Cover.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.onetoone.album; +package org.tests.model.onetoone.album; -import com.avaje.ebean.Finder; -import com.avaje.ebean.Model; -import com.avaje.ebean.annotation.SoftDelete; +import io.ebean.Finder; +import io.ebean.Model; +import io.ebean.annotation.SoftDelete; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/com/avaje/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java b/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java similarity index 97% rename from src/test/java/com/avaje/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java rename to src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java index 73153fc4a..c4e2e1358 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java +++ b/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java @@ -1,9 +1,9 @@ -package com.avaje.tests.model.onetoone.album; +package org.tests.model.onetoone.album; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Transaction; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Transaction; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/model/onetoone/album/TestOneToOneHardDelete.java b/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java similarity index 95% rename from src/test/java/com/avaje/tests/model/onetoone/album/TestOneToOneHardDelete.java rename to src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java index ddfbdb966..2f2077ff8 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/album/TestOneToOneHardDelete.java +++ b/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.onetoone.album; +package org.tests.model.onetoone.album; -import com.avaje.ebean.BaseTestCase; +import io.ebean.BaseTestCase; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/model/orderentity/OrderEntity.java b/src/test/java/org/tests/model/orderentity/OrderEntity.java similarity index 95% rename from src/test/java/com/avaje/tests/model/orderentity/OrderEntity.java rename to src/test/java/org/tests/model/orderentity/OrderEntity.java index c402c8883..6b2acd451 100644 --- a/src/test/java/com/avaje/tests/model/orderentity/OrderEntity.java +++ b/src/test/java/org/tests/model/orderentity/OrderEntity.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.orderentity; +package org.tests.model.orderentity; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/src/test/java/com/avaje/tests/model/orderentity/OrderItemEntity.java b/src/test/java/org/tests/model/orderentity/OrderItemEntity.java similarity index 96% rename from src/test/java/com/avaje/tests/model/orderentity/OrderItemEntity.java rename to src/test/java/org/tests/model/orderentity/OrderItemEntity.java index 9d85ac551..024be3cc6 100644 --- a/src/test/java/com/avaje/tests/model/orderentity/OrderItemEntity.java +++ b/src/test/java/org/tests/model/orderentity/OrderItemEntity.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.orderentity; +package org.tests.model.orderentity; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/prnt/MPrinter.java b/src/test/java/org/tests/model/prnt/MPrinter.java similarity index 98% rename from src/test/java/com/avaje/tests/model/prnt/MPrinter.java rename to src/test/java/org/tests/model/prnt/MPrinter.java index 6117ea3c6..76c229d92 100644 --- a/src/test/java/com/avaje/tests/model/prnt/MPrinter.java +++ b/src/test/java/org/tests/model/prnt/MPrinter.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.prnt; +package org.tests.model.prnt; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/prnt/MPrinterListener.java b/src/test/java/org/tests/model/prnt/MPrinterListener.java similarity index 80% rename from src/test/java/com/avaje/tests/model/prnt/MPrinterListener.java rename to src/test/java/org/tests/model/prnt/MPrinterListener.java index 4d1e8ef31..a658f7cf1 100644 --- a/src/test/java/com/avaje/tests/model/prnt/MPrinterListener.java +++ b/src/test/java/org/tests/model/prnt/MPrinterListener.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.prnt; +package org.tests.model.prnt; -import com.avaje.ebean.event.BeanPersistAdapter; -import com.avaje.ebean.event.BeanPersistRequest; +import io.ebean.event.BeanPersistAdapter; +import io.ebean.event.BeanPersistRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/com/avaje/tests/model/prnt/MPrinterState.java b/src/test/java/org/tests/model/prnt/MPrinterState.java similarity index 96% rename from src/test/java/com/avaje/tests/model/prnt/MPrinterState.java rename to src/test/java/org/tests/model/prnt/MPrinterState.java index 88594cfd2..9d6657043 100644 --- a/src/test/java/com/avaje/tests/model/prnt/MPrinterState.java +++ b/src/test/java/org/tests/model/prnt/MPrinterState.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.prnt; +package org.tests.model.prnt; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/prnt/MSomeOther.java b/src/test/java/org/tests/model/prnt/MSomeOther.java similarity index 90% rename from src/test/java/com/avaje/tests/model/prnt/MSomeOther.java rename to src/test/java/org/tests/model/prnt/MSomeOther.java index a2a96b631..5efcd7340 100644 --- a/src/test/java/com/avaje/tests/model/prnt/MSomeOther.java +++ b/src/test/java/org/tests/model/prnt/MSomeOther.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.prnt; +package org.tests.model.prnt; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/prnt/TestPrinterStateIssue.java b/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java similarity index 93% rename from src/test/java/com/avaje/tests/model/prnt/TestPrinterStateIssue.java rename to src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java index 1b48c67b7..afdcfb78a 100644 --- a/src/test/java/com/avaje/tests/model/prnt/TestPrinterStateIssue.java +++ b/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.prnt; +package org.tests.model.prnt; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.junit.Test; public class TestPrinterStateIssue extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/model/pview/Paggview.java b/src/test/java/org/tests/model/pview/Paggview.java similarity index 93% rename from src/test/java/com/avaje/tests/model/pview/Paggview.java rename to src/test/java/org/tests/model/pview/Paggview.java index 963392f6d..cc317f718 100644 --- a/src/test/java/com/avaje/tests/model/pview/Paggview.java +++ b/src/test/java/org/tests/model/pview/Paggview.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.pview; +package org.tests.model.pview; import javax.persistence.Basic; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/pview/Pview.java b/src/test/java/org/tests/model/pview/Pview.java similarity index 97% rename from src/test/java/com/avaje/tests/model/pview/Pview.java rename to src/test/java/org/tests/model/pview/Pview.java index e7a073f9d..e3445c396 100644 --- a/src/test/java/com/avaje/tests/model/pview/Pview.java +++ b/src/test/java/org/tests/model/pview/Pview.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.pview; +package org.tests.model.pview; import javax.persistence.Basic; import javax.persistence.CascadeType; diff --git a/src/test/java/com/avaje/tests/model/pview/TestPview.java b/src/test/java/org/tests/model/pview/TestPview.java similarity index 84% rename from src/test/java/com/avaje/tests/model/pview/TestPview.java rename to src/test/java/org/tests/model/pview/TestPview.java index 380afd96d..2ef00487b 100644 --- a/src/test/java/com/avaje/tests/model/pview/TestPview.java +++ b/src/test/java/org/tests/model/pview/TestPview.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.pview; +package org.tests.model.pview; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/model/pview/Wview.java b/src/test/java/org/tests/model/pview/Wview.java similarity index 93% rename from src/test/java/com/avaje/tests/model/pview/Wview.java rename to src/test/java/org/tests/model/pview/Wview.java index 74d4956cf..f88c65d19 100644 --- a/src/test/java/com/avaje/tests/model/pview/Wview.java +++ b/src/test/java/org/tests/model/pview/Wview.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.pview; +package org.tests.model.pview; import javax.persistence.Basic; import javax.persistence.Column; diff --git a/src/test/java/com/avaje/tests/model/rawsql/ERawSqlAggBean.java b/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java similarity index 89% rename from src/test/java/com/avaje/tests/model/rawsql/ERawSqlAggBean.java rename to src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java index 70e5f1749..35a444996 100644 --- a/src/test/java/com/avaje/tests/model/rawsql/ERawSqlAggBean.java +++ b/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.rawsql; +package org.tests.model.rawsql; -import com.avaje.ebean.annotation.Sql; +import io.ebean.annotation.Sql; import javax.persistence.Entity; import java.time.LocalDate; diff --git a/src/test/java/com/avaje/tests/model/selfref/BaseResourceFile.java b/src/test/java/org/tests/model/selfref/BaseResourceFile.java similarity index 93% rename from src/test/java/com/avaje/tests/model/selfref/BaseResourceFile.java rename to src/test/java/org/tests/model/selfref/BaseResourceFile.java index 27f31354c..3b55ff90c 100644 --- a/src/test/java/com/avaje/tests/model/selfref/BaseResourceFile.java +++ b/src/test/java/org/tests/model/selfref/BaseResourceFile.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.selfref; +package org.tests.model.selfref; import javax.persistence.Column; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/selfref/ResourceFile.java b/src/test/java/org/tests/model/selfref/ResourceFile.java similarity index 93% rename from src/test/java/com/avaje/tests/model/selfref/ResourceFile.java rename to src/test/java/org/tests/model/selfref/ResourceFile.java index 20e87c0ab..b7696eeaf 100644 --- a/src/test/java/com/avaje/tests/model/selfref/ResourceFile.java +++ b/src/test/java/org/tests/model/selfref/ResourceFile.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.selfref; +package org.tests.model.selfref; -import com.avaje.ebean.annotation.PrivateOwned; +import io.ebean.annotation.PrivateOwned; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/src/test/java/com/avaje/tests/model/selfref/SelfParent.java b/src/test/java/org/tests/model/selfref/SelfParent.java similarity index 96% rename from src/test/java/com/avaje/tests/model/selfref/SelfParent.java rename to src/test/java/org/tests/model/selfref/SelfParent.java index c3ef61b7d..0e94da293 100644 --- a/src/test/java/com/avaje/tests/model/selfref/SelfParent.java +++ b/src/test/java/org/tests/model/selfref/SelfParent.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.selfref; +package org.tests.model.selfref; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/selfref/SelfRefCustomer.java b/src/test/java/org/tests/model/selfref/SelfRefCustomer.java similarity index 94% rename from src/test/java/com/avaje/tests/model/selfref/SelfRefCustomer.java rename to src/test/java/org/tests/model/selfref/SelfRefCustomer.java index f949669b6..73e7aab1c 100644 --- a/src/test/java/com/avaje/tests/model/selfref/SelfRefCustomer.java +++ b/src/test/java/org/tests/model/selfref/SelfRefCustomer.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.selfref; +package org.tests.model.selfref; import javax.persistence.Entity; import javax.persistence.Id; @@ -43,4 +43,4 @@ public class SelfRefCustomer { this.referredBy = referredBy; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/selfref/SelfRefExample.java b/src/test/java/org/tests/model/selfref/SelfRefExample.java similarity index 97% rename from src/test/java/com/avaje/tests/model/selfref/SelfRefExample.java rename to src/test/java/org/tests/model/selfref/SelfRefExample.java index 0495fa9ce..09a6ab1dc 100644 --- a/src/test/java/com/avaje/tests/model/selfref/SelfRefExample.java +++ b/src/test/java/org/tests/model/selfref/SelfRefExample.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.selfref; +package org.tests.model.selfref; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/selfref/TestResourceFileSelfRef.java b/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java similarity index 86% rename from src/test/java/com/avaje/tests/model/selfref/TestResourceFileSelfRef.java rename to src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java index 995de0ef4..fbb2ee7ae 100644 --- a/src/test/java/com/avaje/tests/model/selfref/TestResourceFileSelfRef.java +++ b/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.selfref; +package org.tests.model.selfref; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; import org.junit.Test; public class TestResourceFileSelfRef extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/model/selfref/TestSelfRefExample.java b/src/test/java/org/tests/model/selfref/TestSelfRefExample.java similarity index 95% rename from src/test/java/com/avaje/tests/model/selfref/TestSelfRefExample.java rename to src/test/java/org/tests/model/selfref/TestSelfRefExample.java index 145bad703..a1806f4da 100644 --- a/src/test/java/com/avaje/tests/model/selfref/TestSelfRefExample.java +++ b/src/test/java/org/tests/model/selfref/TestSelfRefExample.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.selfref; +package org.tests.model.selfref; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; import org.junit.Test; import javax.persistence.PersistenceException; diff --git a/src/test/java/com/avaje/tests/model/selfref/TestTextJsonSelfRef.java b/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java similarity index 91% rename from src/test/java/com/avaje/tests/model/selfref/TestTextJsonSelfRef.java rename to src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java index 18842464e..27b824a41 100644 --- a/src/test/java/com/avaje/tests/model/selfref/TestTextJsonSelfRef.java +++ b/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.selfref; +package org.tests.model.selfref; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.BeanState; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.Ebean; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/model/softdelete/BaseSoftDelete.java b/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java similarity index 87% rename from src/test/java/com/avaje/tests/model/softdelete/BaseSoftDelete.java rename to src/test/java/org/tests/model/softdelete/BaseSoftDelete.java index 829dc171c..0ca927b7b 100644 --- a/src/test/java/com/avaje/tests/model/softdelete/BaseSoftDelete.java +++ b/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.softdelete; +package org.tests.model.softdelete; -import com.avaje.ebean.annotation.SoftDelete; +import io.ebean.annotation.SoftDelete; import javax.persistence.Id; import javax.persistence.MappedSuperclass; diff --git a/src/test/java/com/avaje/tests/model/softdelete/EBasicNoSDChild.java b/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java similarity index 96% rename from src/test/java/com/avaje/tests/model/softdelete/EBasicNoSDChild.java rename to src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java index 5b5c51f6a..6c1670f1d 100644 --- a/src/test/java/com/avaje/tests/model/softdelete/EBasicNoSDChild.java +++ b/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.softdelete; +package org.tests.model.softdelete; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/softdelete/EBasicSDChild.java b/src/test/java/org/tests/model/softdelete/EBasicSDChild.java similarity index 95% rename from src/test/java/com/avaje/tests/model/softdelete/EBasicSDChild.java rename to src/test/java/org/tests/model/softdelete/EBasicSDChild.java index ceee82f97..f70f9c491 100644 --- a/src/test/java/com/avaje/tests/model/softdelete/EBasicSDChild.java +++ b/src/test/java/org/tests/model/softdelete/EBasicSDChild.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.softdelete; +package org.tests.model.softdelete; import javax.persistence.Entity; import javax.persistence.ManyToOne; diff --git a/src/test/java/com/avaje/tests/model/softdelete/EBasicSoftDelete.java b/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java similarity index 96% rename from src/test/java/com/avaje/tests/model/softdelete/EBasicSoftDelete.java rename to src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java index 640d4296a..78d9ae6ee 100644 --- a/src/test/java/com/avaje/tests/model/softdelete/EBasicSoftDelete.java +++ b/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.softdelete; +package org.tests.model.softdelete; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/softdelete/ESoftDelBook.java b/src/test/java/org/tests/model/softdelete/ESoftDelBook.java similarity index 96% rename from src/test/java/com/avaje/tests/model/softdelete/ESoftDelBook.java rename to src/test/java/org/tests/model/softdelete/ESoftDelBook.java index 02a372099..249f6dfea 100644 --- a/src/test/java/com/avaje/tests/model/softdelete/ESoftDelBook.java +++ b/src/test/java/org/tests/model/softdelete/ESoftDelBook.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.softdelete; +package org.tests.model.softdelete; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/softdelete/ESoftDelDown.java b/src/test/java/org/tests/model/softdelete/ESoftDelDown.java similarity index 87% rename from src/test/java/com/avaje/tests/model/softdelete/ESoftDelDown.java rename to src/test/java/org/tests/model/softdelete/ESoftDelDown.java index ac36bd71e..568d0bdd4 100644 --- a/src/test/java/com/avaje/tests/model/softdelete/ESoftDelDown.java +++ b/src/test/java/org/tests/model/softdelete/ESoftDelDown.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.softdelete; +package org.tests.model.softdelete; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/softdelete/ESoftDelMid.java b/src/test/java/org/tests/model/softdelete/ESoftDelMid.java similarity index 96% rename from src/test/java/com/avaje/tests/model/softdelete/ESoftDelMid.java rename to src/test/java/org/tests/model/softdelete/ESoftDelMid.java index 2596583a0..af19536f4 100644 --- a/src/test/java/com/avaje/tests/model/softdelete/ESoftDelMid.java +++ b/src/test/java/org/tests/model/softdelete/ESoftDelMid.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.softdelete; +package org.tests.model.softdelete; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/softdelete/ESoftDelRole.java b/src/test/java/org/tests/model/softdelete/ESoftDelRole.java similarity index 93% rename from src/test/java/com/avaje/tests/model/softdelete/ESoftDelRole.java rename to src/test/java/org/tests/model/softdelete/ESoftDelRole.java index 44f29ca4f..3b90c4240 100644 --- a/src/test/java/com/avaje/tests/model/softdelete/ESoftDelRole.java +++ b/src/test/java/org/tests/model/softdelete/ESoftDelRole.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.softdelete; +package org.tests.model.softdelete; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/softdelete/ESoftDelTop.java b/src/test/java/org/tests/model/softdelete/ESoftDelTop.java similarity index 94% rename from src/test/java/com/avaje/tests/model/softdelete/ESoftDelTop.java rename to src/test/java/org/tests/model/softdelete/ESoftDelTop.java index c315f21b3..00c05d172 100644 --- a/src/test/java/com/avaje/tests/model/softdelete/ESoftDelTop.java +++ b/src/test/java/org/tests/model/softdelete/ESoftDelTop.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.softdelete; +package org.tests.model.softdelete; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/softdelete/ESoftDelUp.java b/src/test/java/org/tests/model/softdelete/ESoftDelUp.java similarity index 86% rename from src/test/java/com/avaje/tests/model/softdelete/ESoftDelUp.java rename to src/test/java/org/tests/model/softdelete/ESoftDelUp.java index f53a2215b..c7b14cc46 100644 --- a/src/test/java/com/avaje/tests/model/softdelete/ESoftDelUp.java +++ b/src/test/java/org/tests/model/softdelete/ESoftDelUp.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.softdelete; +package org.tests.model.softdelete; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/softdelete/ESoftDelUser.java b/src/test/java/org/tests/model/softdelete/ESoftDelUser.java similarity index 94% rename from src/test/java/com/avaje/tests/model/softdelete/ESoftDelUser.java rename to src/test/java/org/tests/model/softdelete/ESoftDelUser.java index e1b41101d..bcac7764a 100644 --- a/src/test/java/com/avaje/tests/model/softdelete/ESoftDelUser.java +++ b/src/test/java/org/tests/model/softdelete/ESoftDelUser.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.softdelete; +package org.tests.model.softdelete; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/survey/Category.java b/src/test/java/org/tests/model/survey/Category.java similarity index 95% rename from src/test/java/com/avaje/tests/model/survey/Category.java rename to src/test/java/org/tests/model/survey/Category.java index 9aebb47cc..baeae2f96 100644 --- a/src/test/java/com/avaje/tests/model/survey/Category.java +++ b/src/test/java/org/tests/model/survey/Category.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.survey; +package org.tests.model.survey; import javax.persistence.CascadeType; import javax.persistence.Entity; @@ -41,4 +41,4 @@ public class Category { public void setSequenceNumber(int number) { this.sequenceNumber = number; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/survey/Group.java b/src/test/java/org/tests/model/survey/Group.java similarity index 96% rename from src/test/java/com/avaje/tests/model/survey/Group.java rename to src/test/java/org/tests/model/survey/Group.java index d9a92394e..278864a4c 100644 --- a/src/test/java/com/avaje/tests/model/survey/Group.java +++ b/src/test/java/org/tests/model/survey/Group.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.survey; +package org.tests.model.survey; import javax.persistence.CascadeType; import javax.persistence.Entity; @@ -44,4 +44,4 @@ public class Group { public void setSequenceNumber(int number) { this.sequenceNumber = number; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/survey/Question.java b/src/test/java/org/tests/model/survey/Question.java similarity index 92% rename from src/test/java/com/avaje/tests/model/survey/Question.java rename to src/test/java/org/tests/model/survey/Question.java index 7dfe7fd62..f133a9988 100644 --- a/src/test/java/com/avaje/tests/model/survey/Question.java +++ b/src/test/java/org/tests/model/survey/Question.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.survey; +package org.tests.model.survey; import javax.persistence.Entity; import javax.persistence.Id; @@ -26,4 +26,4 @@ public class Question { this.sequenceNumber = number; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/survey/Survey.java b/src/test/java/org/tests/model/survey/Survey.java similarity index 94% rename from src/test/java/com/avaje/tests/model/survey/Survey.java rename to src/test/java/org/tests/model/survey/Survey.java index 42bb41fd4..645ca9a50 100644 --- a/src/test/java/com/avaje/tests/model/survey/Survey.java +++ b/src/test/java/org/tests/model/survey/Survey.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.survey; +package org.tests.model.survey; import javax.persistence.CascadeType; import javax.persistence.Entity; @@ -29,4 +29,4 @@ public class Survey { public void setCategories(List categories) { this.categories = categories; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/survey/TestOrderByFetch.java b/src/test/java/org/tests/model/survey/TestOrderByFetch.java similarity index 94% rename from src/test/java/com/avaje/tests/model/survey/TestOrderByFetch.java rename to src/test/java/org/tests/model/survey/TestOrderByFetch.java index 8fa8ff87b..cc6286d0f 100644 --- a/src/test/java/com/avaje/tests/model/survey/TestOrderByFetch.java +++ b/src/test/java/org/tests/model/survey/TestOrderByFetch.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.survey; +package org.tests.model.survey; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.jetbrains.annotations.NotNull; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/model/tevent/TEvent.java b/src/test/java/org/tests/model/tevent/TEvent.java similarity index 95% rename from src/test/java/com/avaje/tests/model/tevent/TEvent.java rename to src/test/java/org/tests/model/tevent/TEvent.java index b0b54346a..04721196e 100644 --- a/src/test/java/com/avaje/tests/model/tevent/TEvent.java +++ b/src/test/java/org/tests/model/tevent/TEvent.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.tevent; +package org.tests.model.tevent; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/tevent/TEventMany.java b/src/test/java/org/tests/model/tevent/TEventMany.java similarity index 96% rename from src/test/java/com/avaje/tests/model/tevent/TEventMany.java rename to src/test/java/org/tests/model/tevent/TEventMany.java index 88679715d..e7ef1020e 100644 --- a/src/test/java/com/avaje/tests/model/tevent/TEventMany.java +++ b/src/test/java/org/tests/model/tevent/TEventMany.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.tevent; +package org.tests.model.tevent; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/tevent/TEventOne.java b/src/test/java/org/tests/model/tevent/TEventOne.java similarity index 94% rename from src/test/java/com/avaje/tests/model/tevent/TEventOne.java rename to src/test/java/org/tests/model/tevent/TEventOne.java index 569f8e12e..c5b1dbb01 100644 --- a/src/test/java/com/avaje/tests/model/tevent/TEventOne.java +++ b/src/test/java/org/tests/model/tevent/TEventOne.java @@ -1,6 +1,6 @@ -package com.avaje.tests.model.tevent; +package org.tests.model.tevent; -import com.avaje.ebean.annotation.Aggregation; +import io.ebean.annotation.Aggregation; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/tevent/TestAssocOneNullTraverse.java b/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java similarity index 84% rename from src/test/java/com/avaje/tests/model/tevent/TestAssocOneNullTraverse.java rename to src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java index 171b113bc..377087985 100644 --- a/src/test/java/com/avaje/tests/model/tevent/TestAssocOneNullTraverse.java +++ b/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.tevent; +package org.tests.model.tevent; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.junit.Test; public class TestAssocOneNullTraverse extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/model/types/SomeFileBean.java b/src/test/java/org/tests/model/types/SomeFileBean.java similarity index 95% rename from src/test/java/com/avaje/tests/model/types/SomeFileBean.java rename to src/test/java/org/tests/model/types/SomeFileBean.java index 2a4d3512c..4b2cc1f5b 100644 --- a/src/test/java/com/avaje/tests/model/types/SomeFileBean.java +++ b/src/test/java/org/tests/model/types/SomeFileBean.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.types; +package org.tests.model.types; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java b/src/test/java/org/tests/model/types/SomeNewTypesBean.java similarity index 98% rename from src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java rename to src/test/java/org/tests/model/types/SomeNewTypesBean.java index ad7c49ebd..3374615b2 100644 --- a/src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java +++ b/src/test/java/org/tests/model/types/SomeNewTypesBean.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.types; +package org.tests.model.types; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/types/SomePeriodBean.java b/src/test/java/org/tests/model/types/SomePeriodBean.java similarity index 94% rename from src/test/java/com/avaje/tests/model/types/SomePeriodBean.java rename to src/test/java/org/tests/model/types/SomePeriodBean.java index 5e05f7cc5..678e0321c 100644 --- a/src/test/java/com/avaje/tests/model/types/SomePeriodBean.java +++ b/src/test/java/org/tests/model/types/SomePeriodBean.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.types; +package org.tests.model.types; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/com/avaje/tests/model/view/EOrderAgg.java b/src/test/java/org/tests/model/view/EOrderAgg.java similarity index 85% rename from src/test/java/com/avaje/tests/model/view/EOrderAgg.java rename to src/test/java/org/tests/model/view/EOrderAgg.java index c4fd3cf03..8a38ef15c 100644 --- a/src/test/java/com/avaje/tests/model/view/EOrderAgg.java +++ b/src/test/java/org/tests/model/view/EOrderAgg.java @@ -1,8 +1,8 @@ -package com.avaje.tests.model.view; +package org.tests.model.view; -import com.avaje.ebean.annotation.Cache; -import com.avaje.ebean.annotation.View; -import com.avaje.tests.model.basic.Order; +import io.ebean.annotation.Cache; +import io.ebean.annotation.View; +import org.tests.model.basic.Order; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/view/TestViewBaseEntity.java b/src/test/java/org/tests/model/view/TestViewBaseEntity.java similarity index 86% rename from src/test/java/com/avaje/tests/model/view/TestViewBaseEntity.java rename to src/test/java/org/tests/model/view/TestViewBaseEntity.java index 9f1809a93..e6da2b525 100644 --- a/src/test/java/com/avaje/tests/model/view/TestViewBaseEntity.java +++ b/src/test/java/org/tests/model/view/TestViewBaseEntity.java @@ -1,11 +1,11 @@ -package com.avaje.tests.model.view; +package org.tests.model.view; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.OrderDetail; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +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; diff --git a/src/test/java/com/avaje/tests/model/zero/TestWithZero.java b/src/test/java/org/tests/model/zero/TestWithZero.java similarity index 85% rename from src/test/java/com/avaje/tests/model/zero/TestWithZero.java rename to src/test/java/org/tests/model/zero/TestWithZero.java index 3d9efa2fa..ce7b68719 100644 --- a/src/test/java/com/avaje/tests/model/zero/TestWithZero.java +++ b/src/test/java/org/tests/model/zero/TestWithZero.java @@ -1,7 +1,7 @@ -package com.avaje.tests.model.zero; +package org.tests.model.zero; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/avaje/tests/model/zero/WithZero.java b/src/test/java/org/tests/model/zero/WithZero.java similarity index 96% rename from src/test/java/com/avaje/tests/model/zero/WithZero.java rename to src/test/java/org/tests/model/zero/WithZero.java index 9c93f31e2..460478d16 100644 --- a/src/test/java/com/avaje/tests/model/zero/WithZero.java +++ b/src/test/java/org/tests/model/zero/WithZero.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.zero; +package org.tests.model.zero; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/model/zero/WithZeroParent.java b/src/test/java/org/tests/model/zero/WithZeroParent.java similarity index 95% rename from src/test/java/com/avaje/tests/model/zero/WithZeroParent.java rename to src/test/java/org/tests/model/zero/WithZeroParent.java index f8f78687a..610e747c8 100644 --- a/src/test/java/com/avaje/tests/model/zero/WithZeroParent.java +++ b/src/test/java/org/tests/model/zero/WithZeroParent.java @@ -1,4 +1,4 @@ -package com.avaje.tests.model.zero; +package org.tests.model.zero; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java b/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java similarity index 81% rename from src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java rename to src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java index c3305ddbb..93adb4e01 100644 --- a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java +++ b/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java @@ -1,9 +1,9 @@ -package com.avaje.tests.persistencecontext; +package org.tests.persistencecontext; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.tests.model.basic.EBasic; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import org.tests.model.basic.EBasic; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextQueryScope.java b/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java similarity index 86% rename from src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextQueryScope.java rename to src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java index 5c37cf90a..3d2d50dc2 100644 --- a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextQueryScope.java +++ b/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java @@ -1,13 +1,13 @@ -package com.avaje.tests.persistencecontext; +package org.tests.persistencecontext; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.SqlUpdate; -import com.avaje.tests.model.basic.EBasicVer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.SqlUpdate; +import org.tests.model.basic.EBasicVer; import org.junit.Test; -import static com.avaje.ebean.PersistenceContextScope.QUERY; -import static com.avaje.ebean.PersistenceContextScope.TRANSACTION; +import static io.ebean.PersistenceContextScope.QUERY; +import static io.ebean.PersistenceContextScope.TRANSACTION; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; diff --git a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java b/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java similarity index 79% rename from src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java rename to src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java index 40c7e361a..f39dbff87 100644 --- a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java +++ b/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java @@ -1,10 +1,10 @@ -package com.avaje.tests.persistencecontext; +package org.tests.persistencecontext; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -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.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.ArrayList; @@ -12,7 +12,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import static com.avaje.ebean.PersistenceContextScope.QUERY; +import static io.ebean.PersistenceContextScope.QUERY; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextServerConfig.java b/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java similarity index 77% rename from src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextServerConfig.java rename to src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java index d7768576b..c235a430a 100644 --- a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextServerConfig.java +++ b/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java @@ -1,15 +1,15 @@ -package com.avaje.tests.persistencecontext; +package org.tests.persistencecontext; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.EbeanServerFactory; -import com.avaje.ebean.PersistenceContextScope; -import com.avaje.ebean.Query; -import com.avaje.ebean.config.ContainerConfig; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.tests.model.basic.EBasicVer; +import io.ebean.BaseTestCase; +import io.ebean.EbeanServer; +import io.ebean.EbeanServerFactory; +import io.ebean.PersistenceContextScope; +import io.ebean.Query; +import io.ebean.config.ContainerConfig; +import io.ebean.config.ServerConfig; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiQuery; +import org.tests.model.basic.EBasicVer; import org.junit.Test; import java.util.Properties; diff --git a/src/test/java/com/avaje/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java similarity index 94% rename from src/test/java/com/avaje/tests/query/TestAddOrderByWithFirstRowsMaxRows.java rename to src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java index 7a28eeab5..7c1517be5 100644 --- a/src/test/java/com/avaje/tests/query/TestAddOrderByWithFirstRowsMaxRows.java +++ b/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.PagedList; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +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.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestAutofetchTuneWithJoin.java b/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java similarity index 78% rename from src/test/java/com/avaje/tests/query/TestAutofetchTuneWithJoin.java rename to src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java index bfa0e0468..dbffd38dd 100644 --- a/src/test/java/com/avaje/tests/query/TestAutofetchTuneWithJoin.java +++ b/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java @@ -1,15 +1,15 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.bean.ObjectGraphNode; -import com.avaje.ebean.bean.ObjectGraphOrigin; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.tests.model.basic.Address; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.bean.ObjectGraphNode; +import io.ebean.bean.ObjectGraphOrigin; +import io.ebeaninternal.api.SpiQuery; +import org.tests.model.basic.Address; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/query/TestConnectionCloseOnSqlerr.java b/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java similarity index 90% rename from src/test/java/com/avaje/tests/query/TestConnectionCloseOnSqlerr.java rename to src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java index 1182b6976..7c5a6bde0 100644 --- a/src/test/java/com/avaje/tests/query/TestConnectionCloseOnSqlerr.java +++ b/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java @@ -1,9 +1,9 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Customer; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestDefaultFetchLazy.java b/src/test/java/org/tests/query/TestDefaultFetchLazy.java similarity index 85% rename from src/test/java/com/avaje/tests/query/TestDefaultFetchLazy.java rename to src/test/java/org/tests/query/TestDefaultFetchLazy.java index 2bf7da6c3..dffdadb96 100644 --- a/src/test/java/com/avaje/tests/query/TestDefaultFetchLazy.java +++ b/src/test/java/org/tests/query/TestDefaultFetchLazy.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.BeanState; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.MyLobSize; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.MyLobSize; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestExprNestedDisjunction.java b/src/test/java/org/tests/query/TestExprNestedDisjunction.java similarity index 92% rename from src/test/java/com/avaje/tests/query/TestExprNestedDisjunction.java rename to src/test/java/org/tests/query/TestExprNestedDisjunction.java index 74adeff5a..c6df4fd0d 100644 --- a/src/test/java/com/avaje/tests/query/TestExprNestedDisjunction.java +++ b/src/test/java/org/tests/query/TestExprNestedDisjunction.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/tests/query/TestIContains.java b/src/test/java/org/tests/query/TestIContains.java similarity index 79% rename from src/test/java/com/avaje/tests/query/TestIContains.java rename to src/test/java/org/tests/query/TestIContains.java index 372b932dc..236e7895a 100644 --- a/src/test/java/com/avaje/tests/query/TestIContains.java +++ b/src/test/java/org/tests/query/TestIContains.java @@ -1,13 +1,13 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.RawSql; +import io.ebean.RawSqlBuilder; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/tests/query/TestImplicitJoinOnParentRelationship.java b/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java similarity index 90% rename from src/test/java/com/avaje/tests/query/TestImplicitJoinOnParentRelationship.java rename to src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java index eaf2dc026..5b100d92e 100644 --- a/src/test/java/com/avaje/tests/query/TestImplicitJoinOnParentRelationship.java +++ b/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestInvalidFetchPath.java b/src/test/java/org/tests/query/TestInvalidFetchPath.java similarity index 83% rename from src/test/java/com/avaje/tests/query/TestInvalidFetchPath.java rename to src/test/java/org/tests/query/TestInvalidFetchPath.java index eeef34fa1..987dc058d 100644 --- a/src/test/java/com/avaje/tests/query/TestInvalidFetchPath.java +++ b/src/test/java/org/tests/query/TestInvalidFetchPath.java @@ -1,8 +1,8 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Customer; import org.junit.Test; import javax.persistence.PersistenceException; diff --git a/src/test/java/com/avaje/tests/query/TestJoinOptOneCascade.java b/src/test/java/org/tests/query/TestJoinOptOneCascade.java similarity index 72% rename from src/test/java/com/avaje/tests/query/TestJoinOptOneCascade.java rename to src/test/java/org/tests/query/TestJoinOptOneCascade.java index f45ac9500..c6debf27a 100644 --- a/src/test/java/com/avaje/tests/query/TestJoinOptOneCascade.java +++ b/src/test/java/org/tests/query/TestJoinOptOneCascade.java @@ -1,9 +1,9 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.EOptOneA; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.EOptOneA; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestLimitAlterFetchMany.java b/src/test/java/org/tests/query/TestLimitAlterFetchMany.java similarity index 73% rename from src/test/java/com/avaje/tests/query/TestLimitAlterFetchMany.java rename to src/test/java/org/tests/query/TestLimitAlterFetchMany.java index c90925420..e0b5d4d2d 100644 --- a/src/test/java/com/avaje/tests/query/TestLimitAlterFetchMany.java +++ b/src/test/java/org/tests/query/TestLimitAlterFetchMany.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/query/TestLimitQuery.java b/src/test/java/org/tests/query/TestLimitQuery.java similarity index 71% rename from src/test/java/com/avaje/tests/query/TestLimitQuery.java rename to src/test/java/org/tests/query/TestLimitQuery.java index 8bb4998d0..4c9f9f3e5 100644 --- a/src/test/java/com/avaje/tests/query/TestLimitQuery.java +++ b/src/test/java/org/tests/query/TestLimitQuery.java @@ -1,9 +1,9 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; -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.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestManyWhereJoin.java b/src/test/java/org/tests/query/TestManyWhereJoin.java similarity index 94% rename from src/test/java/com/avaje/tests/query/TestManyWhereJoin.java rename to src/test/java/org/tests/query/TestManyWhereJoin.java index edbca4f22..4ee1fc62d 100644 --- a/src/test/java/com/avaje/tests/query/TestManyWhereJoin.java +++ b/src/test/java/org/tests/query/TestManyWhereJoin.java @@ -1,12 +1,12 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.Product; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.Product; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java b/src/test/java/org/tests/query/TestManyWhereJoinM2M.java similarity index 91% rename from src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java rename to src/test/java/org/tests/query/TestManyWhereJoinM2M.java index af8c90171..567a189e4 100644 --- a/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java +++ b/src/test/java/org/tests/query/TestManyWhereJoinM2M.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.MRole; -import com.avaje.tests.model.basic.MUser; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.MRole; +import org.tests.model.basic.MUser; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestMyAdHocSqlSelect.java b/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java similarity index 82% rename from src/test/java/com/avaje/tests/query/TestMyAdHocSqlSelect.java rename to src/test/java/org/tests/query/TestMyAdHocSqlSelect.java index 981439d96..0fee55a66 100644 --- a/src/test/java/com/avaje/tests/query/TestMyAdHocSqlSelect.java +++ b/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java @@ -1,12 +1,12 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.tests.model.basic.MyAdHoc; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.RawSql; +import io.ebean.RawSqlBuilder; +import org.tests.model.basic.MyAdHoc; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/tests/query/TestOneToManyCorrectGrouping.java b/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java similarity index 72% rename from src/test/java/com/avaje/tests/query/TestOneToManyCorrectGrouping.java rename to src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java index 8331d5b15..69cb9383e 100644 --- a/src/test/java/com/avaje/tests/query/TestOneToManyCorrectGrouping.java +++ b/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java @@ -1,11 +1,11 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/test/java/com/avaje/tests/query/TestQueryAlias.java b/src/test/java/org/tests/query/TestQueryAlias.java similarity index 90% rename from src/test/java/com/avaje/tests/query/TestQueryAlias.java rename to src/test/java/org/tests/query/TestQueryAlias.java index 8635537b8..fba7cba1f 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryAlias.java +++ b/src/test/java/org/tests/query/TestQueryAlias.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.CKeyParent; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.CKeyParent; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestQueryExists.java b/src/test/java/org/tests/query/TestQueryExists.java similarity index 90% rename from src/test/java/com/avaje/tests/query/TestQueryExists.java rename to src/test/java/org/tests/query/TestQueryExists.java index 09e46b7fa..ea0b19298 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryExists.java +++ b/src/test/java/org/tests/query/TestQueryExists.java @@ -1,11 +1,11 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestQueryFetchJoinWithOrder.java b/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java similarity index 76% rename from src/test/java/com/avaje/tests/query/TestQueryFetchJoinWithOrder.java rename to src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java index 12d091703..69be542f4 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFetchJoinWithOrder.java +++ b/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java @@ -1,11 +1,11 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestQueryFetchManyTwoDeep.java b/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java similarity index 93% rename from src/test/java/com/avaje/tests/query/TestQueryFetchManyTwoDeep.java rename to src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java index 9cf3dde30..bf667c46e 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFetchManyTwoDeep.java +++ b/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java @@ -1,13 +1,13 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.OrderShipment; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebeaninternal.api.SpiQuery; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; +import org.tests.model.basic.OrderShipment; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestQueryFetchSkipPath.java b/src/test/java/org/tests/query/TestQueryFetchSkipPath.java similarity index 70% rename from src/test/java/com/avaje/tests/query/TestQueryFetchSkipPath.java rename to src/test/java/org/tests/query/TestQueryFetchSkipPath.java index cd6ff0b78..196b56fa4 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFetchSkipPath.java +++ b/src/test/java/org/tests/query/TestQueryFetchSkipPath.java @@ -1,12 +1,12 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.ContactNote; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Contact; +import org.tests.model.basic.ContactNote; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/query/TestQueryFilterMany.java b/src/test/java/org/tests/query/TestQueryFilterMany.java similarity index 86% rename from src/test/java/com/avaje/tests/query/TestQueryFilterMany.java rename to src/test/java/org/tests/query/TestQueryFilterMany.java index 9995229dc..20c2b93af 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFilterMany.java +++ b/src/test/java/org/tests/query/TestQueryFilterMany.java @@ -1,11 +1,11 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestQueryFilterManyOnM2M.java b/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java similarity index 61% rename from src/test/java/com/avaje/tests/query/TestQueryFilterManyOnM2M.java rename to src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java index 3fe6548ab..02cc7c9e2 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFilterManyOnM2M.java +++ b/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java @@ -1,8 +1,8 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.MUser; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.MUser; import org.junit.Test; public class TestQueryFilterManyOnM2M extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/query/TestQueryFilterManyOnSecondary.java b/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java similarity index 77% rename from src/test/java/com/avaje/tests/query/TestQueryFilterManyOnSecondary.java rename to src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java index 0838c7ca8..94353484a 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFilterManyOnSecondary.java +++ b/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java @@ -1,14 +1,14 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.Query; -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.Product; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import io.ebean.Query; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderDetail; +import org.tests.model.basic.Product; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestQueryFilterManySimple.java b/src/test/java/org/tests/query/TestQueryFilterManySimple.java similarity index 73% rename from src/test/java/com/avaje/tests/query/TestQueryFilterManySimple.java rename to src/test/java/org/tests/query/TestQueryFilterManySimple.java index ca80c8ebb..5feaefeb2 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFilterManySimple.java +++ b/src/test/java/org/tests/query/TestQueryFilterManySimple.java @@ -1,11 +1,11 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.sql.Date; diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindEach.java b/src/test/java/org/tests/query/TestQueryFindEach.java similarity index 82% rename from src/test/java/com/avaje/tests/query/TestQueryFindEach.java rename to src/test/java/org/tests/query/TestQueryFindEach.java index 2f58399e7..ed700f2b8 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindEach.java +++ b/src/test/java/org/tests/query/TestQueryFindEach.java @@ -1,12 +1,12 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.FetchConfig; +import io.ebean.Query; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindEachWhile.java b/src/test/java/org/tests/query/TestQueryFindEachWhile.java similarity index 83% rename from src/test/java/com/avaje/tests/query/TestQueryFindEachWhile.java rename to src/test/java/org/tests/query/TestQueryFindEachWhile.java index 8d8f4ef18..418c30d8c 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindEachWhile.java +++ b/src/test/java/org/tests/query/TestQueryFindEachWhile.java @@ -1,12 +1,12 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.FetchConfig; +import io.ebean.Query; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindFutureList.java b/src/test/java/org/tests/query/TestQueryFindFutureList.java similarity index 85% rename from src/test/java/com/avaje/tests/query/TestQueryFindFutureList.java rename to src/test/java/org/tests/query/TestQueryFindFutureList.java index b540a731b..6fb623e06 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindFutureList.java +++ b/src/test/java/org/tests/query/TestQueryFindFutureList.java @@ -1,11 +1,11 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FutureList; -import com.avaje.ebean.Transaction; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FutureList; +import io.ebean.Transaction; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java b/src/test/java/org/tests/query/TestQueryFindIterate.java similarity index 93% rename from src/test/java/com/avaje/tests/query/TestQueryFindIterate.java rename to src/test/java/org/tests/query/TestQueryFindIterate.java index 96e8aba5a..76bc92316 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java +++ b/src/test/java/org/tests/query/TestQueryFindIterate.java @@ -1,14 +1,14 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Query; -import com.avaje.ebean.QueryIterator; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.OrderShipment; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Query; +import io.ebean.QueryIterator; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderShipment; +import org.tests.model.basic.ResetBasicData; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindMapTypedKey.java b/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java similarity index 73% rename from src/test/java/com/avaje/tests/query/TestQueryFindMapTypedKey.java rename to src/test/java/org/tests/query/TestQueryFindMapTypedKey.java index 9dfa3b575..5269baf12 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindMapTypedKey.java +++ b/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Product; -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.Product; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.Map; diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java b/src/test/java/org/tests/query/TestQueryFindPagedList.java similarity index 97% rename from src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java rename to src/test/java/org/tests/query/TestQueryFindPagedList.java index 8f8729a32..c0b55fa20 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java +++ b/src/test/java/org/tests/query/TestQueryFindPagedList.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.PagedList; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +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.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindReadOnly.java b/src/test/java/org/tests/query/TestQueryFindReadOnly.java similarity index 85% rename from src/test/java/com/avaje/tests/query/TestQueryFindReadOnly.java rename to src/test/java/org/tests/query/TestQueryFindReadOnly.java index 224d8ae7d..d3d29bb3d 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindReadOnly.java +++ b/src/test/java/org/tests/query/TestQueryFindReadOnly.java @@ -1,9 +1,9 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Article; -import com.avaje.tests.model.basic.Section; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Article; +import org.tests.model.basic.Section; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindVisit.java b/src/test/java/org/tests/query/TestQueryFindVisit.java similarity index 82% rename from src/test/java/com/avaje/tests/query/TestQueryFindVisit.java rename to src/test/java/org/tests/query/TestQueryFindVisit.java index b7bf1372c..6cfe54146 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindVisit.java +++ b/src/test/java/org/tests/query/TestQueryFindVisit.java @@ -1,12 +1,12 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.FetchConfig; +import io.ebean.Query; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestQueryInAssocOne.java b/src/test/java/org/tests/query/TestQueryInAssocOne.java similarity index 69% rename from src/test/java/com/avaje/tests/query/TestQueryInAssocOne.java rename to src/test/java/org/tests/query/TestQueryInAssocOne.java index 318c81b1b..2d00767a3 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryInAssocOne.java +++ b/src/test/java/org/tests/query/TestQueryInAssocOne.java @@ -1,11 +1,11 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestQueryInIdTypeConversion.java b/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java similarity index 63% rename from src/test/java/com/avaje/tests/query/TestQueryInIdTypeConversion.java rename to src/test/java/org/tests/query/TestQueryInIdTypeConversion.java index f8c6e529c..4c900b30f 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryInIdTypeConversion.java +++ b/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java @@ -1,9 +1,9 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; -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.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/query/TestQueryIsNull.java b/src/test/java/org/tests/query/TestQueryIsNull.java similarity index 92% rename from src/test/java/com/avaje/tests/query/TestQueryIsNull.java rename to src/test/java/org/tests/query/TestQueryIsNull.java index 9585dd67e..24390207a 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryIsNull.java +++ b/src/test/java/org/tests/query/TestQueryIsNull.java @@ -1,11 +1,11 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; -import com.avaje.tests.model.m2m.Role; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; +import org.tests.model.m2m.Role; import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/com/avaje/tests/query/TestQueryJoinBatchSize.java b/src/test/java/org/tests/query/TestQueryJoinBatchSize.java similarity index 76% rename from src/test/java/com/avaje/tests/query/TestQueryJoinBatchSize.java rename to src/test/java/org/tests/query/TestQueryJoinBatchSize.java index 1eeefff5c..77dd68977 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryJoinBatchSize.java +++ b/src/test/java/org/tests/query/TestQueryJoinBatchSize.java @@ -1,11 +1,11 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/query/TestQueryJoinMulipleMany.java b/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java similarity index 67% rename from src/test/java/com/avaje/tests/query/TestQueryJoinMulipleMany.java rename to src/test/java/org/tests/query/TestQueryJoinMulipleMany.java index 1df94308c..b4cf4e8ac 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryJoinMulipleMany.java +++ b/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestQueryMultiManyOrder.java b/src/test/java/org/tests/query/TestQueryMultiManyOrder.java similarity index 76% rename from src/test/java/com/avaje/tests/query/TestQueryMultiManyOrder.java rename to src/test/java/org/tests/query/TestQueryMultiManyOrder.java index f5c60cca2..674cf07e9 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryMultiManyOrder.java +++ b/src/test/java/org/tests/query/TestQueryMultiManyOrder.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestQueryNullAssocOne.java b/src/test/java/org/tests/query/TestQueryNullAssocOne.java similarity index 84% rename from src/test/java/com/avaje/tests/query/TestQueryNullAssocOne.java rename to src/test/java/org/tests/query/TestQueryNullAssocOne.java index e8167628b..d47143442 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryNullAssocOne.java +++ b/src/test/java/org/tests/query/TestQueryNullAssocOne.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestQueryPathJoinAndOrder.java b/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java similarity index 72% rename from src/test/java/com/avaje/tests/query/TestQueryPathJoinAndOrder.java rename to src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java index 95a93d41c..74ea5496b 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryPathJoinAndOrder.java +++ b/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java @@ -1,9 +1,9 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; -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.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestQueryPlanCacheRowCount.java b/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java similarity index 86% rename from src/test/java/com/avaje/tests/query/TestQueryPlanCacheRowCount.java rename to src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java index 248d32f21..0abc2b414 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryPlanCacheRowCount.java +++ b/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestRefToLazyLoadMany.java b/src/test/java/org/tests/query/TestRefToLazyLoadMany.java similarity index 78% rename from src/test/java/com/avaje/tests/query/TestRefToLazyLoadMany.java rename to src/test/java/org/tests/query/TestRefToLazyLoadMany.java index eb611305a..340b6c275 100644 --- a/src/test/java/com/avaje/tests/query/TestRefToLazyLoadMany.java +++ b/src/test/java/org/tests/query/TestRefToLazyLoadMany.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +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; diff --git a/src/test/java/com/avaje/tests/query/TestRowCount.java b/src/test/java/org/tests/query/TestRowCount.java similarity index 75% rename from src/test/java/com/avaje/tests/query/TestRowCount.java rename to src/test/java/org/tests/query/TestRowCount.java index da4f110e2..f75e5dc6b 100644 --- a/src/test/java/com/avaje/tests/query/TestRowCount.java +++ b/src/test/java/org/tests/query/TestRowCount.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/TestSubQuery.java b/src/test/java/org/tests/query/TestSubQuery.java similarity index 91% rename from src/test/java/com/avaje/tests/query/TestSubQuery.java rename to src/test/java/org/tests/query/TestSubQuery.java index 0dcb2d382..3563b4333 100644 --- a/src/test/java/com/avaje/tests/query/TestSubQuery.java +++ b/src/test/java/org/tests/query/TestSubQuery.java @@ -1,13 +1,13 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.CKeyParent; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; -import com.avaje.tests.model.basic.Vehicle; -import com.avaje.tests.model.basic.VehicleDriver; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.CKeyParent; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.Vehicle; +import org.tests.model.basic.VehicleDriver; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/com/avaje/tests/query/TestThreeLevelQueryJoin.java b/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java similarity index 67% rename from src/test/java/com/avaje/tests/query/TestThreeLevelQueryJoin.java rename to src/test/java/org/tests/query/TestThreeLevelQueryJoin.java index 4d1e28dba..ae461101c 100644 --- a/src/test/java/com/avaje/tests/query/TestThreeLevelQueryJoin.java +++ b/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; public class TestThreeLevelQueryJoin extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/query/TestWhereRawClause.java b/src/test/java/org/tests/query/TestWhereRawClause.java similarity index 79% rename from src/test/java/com/avaje/tests/query/TestWhereRawClause.java rename to src/test/java/org/tests/query/TestWhereRawClause.java index b9abda112..89bfefcf4 100644 --- a/src/test/java/com/avaje/tests/query/TestWhereRawClause.java +++ b/src/test/java/org/tests/query/TestWhereRawClause.java @@ -1,12 +1,12 @@ -package com.avaje.tests.query; +package org.tests.query; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Expr; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.OrderDetail; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Expr; +import io.ebean.Query; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderDetail; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.sql.Timestamp; diff --git a/src/test/java/com/avaje/tests/query/aggregation/TestAggregationCount.java b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java similarity index 94% rename from src/test/java/com/avaje/tests/query/aggregation/TestAggregationCount.java rename to src/test/java/org/tests/query/aggregation/TestAggregationCount.java index 43071396a..ebac5cb23 100644 --- a/src/test/java/com/avaje/tests/query/aggregation/TestAggregationCount.java +++ b/src/test/java/org/tests/query/aggregation/TestAggregationCount.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query.aggregation; +package org.tests.query.aggregation; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.tevent.TEventMany; -import com.avaje.tests.model.tevent.TEventOne; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.tevent.TEventMany; +import org.tests.model.tevent.TEventOne; import org.junit.BeforeClass; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/autotune/TestAutoTuneProfiling.java b/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java similarity index 86% rename from src/test/java/com/avaje/tests/query/autotune/TestAutoTuneProfiling.java rename to src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java index 17c7ccdb3..903089a97 100644 --- a/src/test/java/com/avaje/tests/query/autotune/TestAutoTuneProfiling.java +++ b/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java @@ -1,12 +1,12 @@ -package com.avaje.tests.query.autotune; +package org.tests.query.autotune; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Address; -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.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Address; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderDetail; +import org.tests.model.basic.ResetBasicData; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/embedded/TestMultipleEmbeddedLoading.java b/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java similarity index 87% rename from src/test/java/com/avaje/tests/query/embedded/TestMultipleEmbeddedLoading.java rename to src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java index 7ed43bf02..82801c939 100644 --- a/src/test/java/com/avaje/tests/query/embedded/TestMultipleEmbeddedLoading.java +++ b/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java @@ -1,14 +1,14 @@ -package com.avaje.tests.query.embedded; +package org.tests.query.embedded; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebean.cache.ServerCacheManager; -import com.avaje.ebean.cache.ServerCacheStatistics; -import com.avaje.tests.model.embedded.EAddress; -import com.avaje.tests.model.embedded.EInvoice; -import com.avaje.tests.model.embedded.EInvoice.State; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.cache.ServerCache; +import io.ebean.cache.ServerCacheManager; +import io.ebean.cache.ServerCacheStatistics; +import org.tests.model.embedded.EAddress; +import org.tests.model.embedded.EInvoice; +import org.tests.model.embedded.EInvoice.State; import org.junit.Test; import java.util.Date; diff --git a/src/test/java/com/avaje/tests/query/finder/TestCustomerFinder.java b/src/test/java/org/tests/query/finder/TestCustomerFinder.java similarity index 89% rename from src/test/java/com/avaje/tests/query/finder/TestCustomerFinder.java rename to src/test/java/org/tests/query/finder/TestCustomerFinder.java index 7170dc250..38d0e4b41 100644 --- a/src/test/java/com/avaje/tests/query/finder/TestCustomerFinder.java +++ b/src/test/java/org/tests/query/finder/TestCustomerFinder.java @@ -1,9 +1,9 @@ -package com.avaje.tests.query.finder; +package org.tests.query.finder; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; -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.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterJoin.java b/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java similarity index 86% rename from src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterJoin.java rename to src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java index 8355bbd62..1c6fdc9a5 100644 --- a/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterJoin.java +++ b/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query.joins; +package org.tests.query.joins; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.MRole; -import com.avaje.tests.model.basic.MUser; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.MRole; +import org.tests.model.basic.MUser; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterOnMany.java b/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java similarity index 87% rename from src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterOnMany.java rename to src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java index c5ddb5801..84368a490 100644 --- a/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterOnMany.java +++ b/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query.joins; +package org.tests.query.joins; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.UUOne; -import com.avaje.tests.model.basic.UUTwo; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.UUOne; +import org.tests.model.basic.UUTwo; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/joins/TestQueryJoinManyNonRoot.java b/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java similarity index 92% rename from src/test/java/com/avaje/tests/query/joins/TestQueryJoinManyNonRoot.java rename to src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java index c86203174..c5c86c3f1 100644 --- a/src/test/java/com/avaje/tests/query/joins/TestQueryJoinManyNonRoot.java +++ b/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java @@ -1,11 +1,11 @@ -package com.avaje.tests.query.joins; +package org.tests.query.joins; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import io.ebean.Query; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/joins/TestQueryJoinQueryNonRoot.java b/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java similarity index 73% rename from src/test/java/com/avaje/tests/query/joins/TestQueryJoinQueryNonRoot.java rename to src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java index 1309684c7..fcbe77f6e 100644 --- a/src/test/java/com/avaje/tests/query/joins/TestQueryJoinQueryNonRoot.java +++ b/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java @@ -1,14 +1,14 @@ -package com.avaje.tests.query.joins; +package org.tests.query.joins; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.el.ElPropertyValue; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.el.ElPropertyValue; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java b/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java similarity index 93% rename from src/test/java/com/avaje/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java rename to src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java index 8cb8b9a6c..4516d2dbe 100644 --- a/src/test/java/com/avaje/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java +++ b/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query.joins; +package org.tests.query.joins; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java b/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java similarity index 84% rename from src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java rename to src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java index c8ac80101..a8685f985 100644 --- a/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java +++ b/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java @@ -1,12 +1,12 @@ -package com.avaje.tests.query.lazy; +package org.tests.query.lazy; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -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.Product; -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.Order; +import org.tests.model.basic.OrderDetail; +import org.tests.model.basic.Product; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/query/orderby/TestOrderByClear.java b/src/test/java/org/tests/query/orderby/TestOrderByClear.java similarity index 72% rename from src/test/java/com/avaje/tests/query/orderby/TestOrderByClear.java rename to src/test/java/org/tests/query/orderby/TestOrderByClear.java index 49a38515e..dd7e35170 100644 --- a/src/test/java/com/avaje/tests/query/orderby/TestOrderByClear.java +++ b/src/test/java/org/tests/query/orderby/TestOrderByClear.java @@ -1,11 +1,11 @@ -package com.avaje.tests.query.orderby; +package org.tests.query.orderby; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.OrderBy; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.OrderBy; +import io.ebean.Query; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/orderby/TestOrderByOnComplex.java b/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java similarity index 62% rename from src/test/java/com/avaje/tests/query/orderby/TestOrderByOnComplex.java rename to src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java index e78f01b86..ab983c7d4 100644 --- a/src/test/java/com/avaje/tests/query/orderby/TestOrderByOnComplex.java +++ b/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query.orderby; +package org.tests.query.orderby; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinct.java b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java similarity index 91% rename from src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinct.java rename to src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java index a2bc000a1..f0e0f0062 100644 --- a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinct.java +++ b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java @@ -1,13 +1,13 @@ -package com.avaje.tests.query.orderby; +package org.tests.query.orderby; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.MRole; -import com.avaje.tests.model.basic.MUser; -import com.avaje.tests.model.basic.MUserType; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +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; diff --git a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinctTake2.java b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java similarity index 91% rename from src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinctTake2.java rename to src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java index 244ef7369..5f3cd9266 100644 --- a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinctTake2.java +++ b/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java @@ -1,9 +1,9 @@ -package com.avaje.tests.query.orderby; +package org.tests.query.orderby; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Customer; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithFunction.java b/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java similarity index 65% rename from src/test/java/com/avaje/tests/query/orderby/TestOrderByWithFunction.java rename to src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java index a937dff13..be7eda0c4 100644 --- a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithFunction.java +++ b/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query.orderby; +package org.tests.query.orderby; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithMany.java b/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java similarity index 93% rename from src/test/java/com/avaje/tests/query/orderby/TestOrderByWithMany.java rename to src/test/java/org/tests/query/orderby/TestOrderByWithMany.java index 8bfd502d5..de2a6ebc2 100644 --- a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithMany.java +++ b/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java @@ -1,11 +1,11 @@ -package com.avaje.tests.query.orderby; +package org.tests.query.orderby; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.OrderDetail; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderDetail; +import org.tests.model.basic.ResetBasicData; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/other/TestFindIdsWithInheritance.java b/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java similarity index 67% rename from src/test/java/com/avaje/tests/query/other/TestFindIdsWithInheritance.java rename to src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java index f891cf146..35f430b5b 100644 --- a/src/test/java/com/avaje/tests/query/other/TestFindIdsWithInheritance.java +++ b/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java @@ -1,9 +1,9 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Truck; -import com.avaje.tests.model.basic.Vehicle; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.Truck; +import org.tests.model.basic.Vehicle; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/other/TestFindIterateHeapDump.java b/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java similarity index 94% rename from src/test/java/com/avaje/tests/query/other/TestFindIterateHeapDump.java rename to src/test/java/org/tests/query/other/TestFindIterateHeapDump.java index 7e4e10c22..3c395f3d6 100644 --- a/src/test/java/com/avaje/tests/query/other/TestFindIterateHeapDump.java +++ b/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java @@ -1,9 +1,9 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.tests.model.basic.EBasic; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import org.tests.model.basic.EBasic; import com.sun.management.HotSpotDiagnosticMXBean; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/other/TestFindPartialWithConstructorSetFields.java b/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java similarity index 83% rename from src/test/java/com/avaje/tests/query/other/TestFindPartialWithConstructorSetFields.java rename to src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java index 979a01e08..ff9dcb89f 100644 --- a/src/test/java/com/avaje/tests/query/other/TestFindPartialWithConstructorSetFields.java +++ b/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.BeanState; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.Ebean; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/query/other/TestFindWhereUsingEnumerated.java b/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java similarity index 73% rename from src/test/java/com/avaje/tests/query/other/TestFindWhereUsingEnumerated.java rename to src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java index f07f14f66..8ef8a1fab 100644 --- a/src/test/java/com/avaje/tests/query/other/TestFindWhereUsingEnumerated.java +++ b/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java @@ -1,9 +1,9 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.MNonEnum; -import com.avaje.tests.model.basic.MNonUpdPropEntity; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.MNonEnum; +import org.tests.model.basic.MNonUpdPropEntity; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/tests/query/other/TestFormulaWithFindCount.java b/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java similarity index 73% rename from src/test/java/com/avaje/tests/query/other/TestFormulaWithFindCount.java rename to src/test/java/org/tests/query/other/TestFormulaWithFindCount.java index b053a6672..b4d50582c 100644 --- a/src/test/java/com/avaje/tests/query/other/TestFormulaWithFindCount.java +++ b/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java @@ -1,11 +1,11 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.ExpressionList; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.ExpressionList; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/other/TestManyLazyLoadingQuery.java b/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java similarity index 76% rename from src/test/java/com/avaje/tests/query/other/TestManyLazyLoadingQuery.java rename to src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java index f085bc07b..cf20aba40 100644 --- a/src/test/java/com/avaje/tests/query/other/TestManyLazyLoadingQuery.java +++ b/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java @@ -1,14 +1,14 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.api.SpiQuery; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.OrderDetail; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; +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.ArrayList; diff --git a/src/test/java/com/avaje/tests/query/other/TestManyToManyLazyLoading.java b/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java similarity index 75% rename from src/test/java/com/avaje/tests/query/other/TestManyToManyLazyLoading.java rename to src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java index aac6b3cd4..a3e331311 100644 --- a/src/test/java/com/avaje/tests/query/other/TestManyToManyLazyLoading.java +++ b/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java @@ -1,9 +1,9 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.MRole; -import com.avaje.tests.model.basic.MUser; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.MRole; +import org.tests.model.basic.MUser; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/query/other/TestObjectGraphNodeStatsCollection.java b/src/test/java/org/tests/query/other/TestObjectGraphNodeStatsCollection.java similarity index 81% rename from src/test/java/com/avaje/tests/query/other/TestObjectGraphNodeStatsCollection.java rename to src/test/java/org/tests/query/other/TestObjectGraphNodeStatsCollection.java index 5539a1a8c..228568a8e 100644 --- a/src/test/java/com/avaje/tests/query/other/TestObjectGraphNodeStatsCollection.java +++ b/src/test/java/org/tests/query/other/TestObjectGraphNodeStatsCollection.java @@ -1,16 +1,16 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.meta.MetaInfoManager; -import com.avaje.ebean.meta.MetaObjectGraphNodeStats; -import com.avaje.ebean.meta.MetaQueryPlanStatistic; -import com.avaje.tests.model.basic.Address; -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.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.meta.MetaInfoManager; +import io.ebean.meta.MetaObjectGraphNodeStats; +import io.ebean.meta.MetaQueryPlanStatistic; +import org.tests.model.basic.Address; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderDetail; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/other/TestOneToManyAsMap.java b/src/test/java/org/tests/query/other/TestOneToManyAsMap.java similarity index 80% rename from src/test/java/com/avaje/tests/query/other/TestOneToManyAsMap.java rename to src/test/java/org/tests/query/other/TestOneToManyAsMap.java index 5e4a17da8..48fe3400c 100644 --- a/src/test/java/com/avaje/tests/query/other/TestOneToManyAsMap.java +++ b/src/test/java/org/tests/query/other/TestOneToManyAsMap.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.tests.model.map.MpRole; -import com.avaje.tests.model.map.MpUser; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import org.tests.model.map.MpRole; +import org.tests.model.map.MpUser; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/other/TestQueryConversationRowCount.java b/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java similarity index 92% rename from src/test/java/com/avaje/tests/query/other/TestQueryConversationRowCount.java rename to src/test/java/org/tests/query/other/TestQueryConversationRowCount.java index a686bef08..db4d874a7 100644 --- a/src/test/java/com/avaje/tests/query/other/TestQueryConversationRowCount.java +++ b/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java @@ -1,9 +1,9 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.converstation.Conversation; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.converstation.Conversation; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/other/TestQueryDistinct.java b/src/test/java/org/tests/query/other/TestQueryDistinct.java similarity index 88% rename from src/test/java/com/avaje/tests/query/other/TestQueryDistinct.java rename to src/test/java/org/tests/query/other/TestQueryDistinct.java index d9b9ceddc..3a16940b0 100644 --- a/src/test/java/com/avaje/tests/query/other/TestQueryDistinct.java +++ b/src/test/java/org/tests/query/other/TestQueryDistinct.java @@ -1,12 +1,12 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/query/other/TestQueryRawExpressionMany.java b/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java similarity index 76% rename from src/test/java/com/avaje/tests/query/other/TestQueryRawExpressionMany.java rename to src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java index 4ac173387..2624bd450 100644 --- a/src/test/java/com/avaje/tests/query/other/TestQueryRawExpressionMany.java +++ b/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/other/TestQueryRowCountWithMany.java b/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java similarity index 93% rename from src/test/java/com/avaje/tests/query/other/TestQueryRowCountWithMany.java rename to src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java index 239af301f..bc773a79c 100644 --- a/src/test/java/com/avaje/tests/query/other/TestQueryRowCountWithMany.java +++ b/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/other/TestQuerySingleAttribute.java b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java similarity index 93% rename from src/test/java/com/avaje/tests/query/other/TestQuerySingleAttribute.java rename to src/test/java/org/tests/query/other/TestQuerySingleAttribute.java index dff521e02..069b208be 100644 --- a/src/test/java/com/avaje/tests/query/other/TestQuerySingleAttribute.java +++ b/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java @@ -1,10 +1,10 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.sql.Date; diff --git a/src/test/java/com/avaje/tests/query/other/TestSelfParent.java b/src/test/java/org/tests/query/other/TestSelfParent.java similarity index 89% rename from src/test/java/com/avaje/tests/query/other/TestSelfParent.java rename to src/test/java/org/tests/query/other/TestSelfParent.java index 633919629..ce15e7895 100644 --- a/src/test/java/com/avaje/tests/query/other/TestSelfParent.java +++ b/src/test/java/org/tests/query/other/TestSelfParent.java @@ -1,8 +1,8 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.selfref.SelfParent; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.selfref.SelfParent; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/other/TestSubQueryBinding.java b/src/test/java/org/tests/query/other/TestSubQueryBinding.java similarity index 67% rename from src/test/java/com/avaje/tests/query/other/TestSubQueryBinding.java rename to src/test/java/org/tests/query/other/TestSubQueryBinding.java index 91106d2a5..ba51c90b8 100644 --- a/src/test/java/com/avaje/tests/query/other/TestSubQueryBinding.java +++ b/src/test/java/org/tests/query/other/TestSubQueryBinding.java @@ -1,11 +1,11 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Expression; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Expression; +import io.ebean.Query; +import org.tests.model.basic.Customer; import org.junit.Test; public class TestSubQueryBinding extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/query/other/TestWhereAnnotation.java b/src/test/java/org/tests/query/other/TestWhereAnnotation.java similarity index 58% rename from src/test/java/com/avaje/tests/query/other/TestWhereAnnotation.java rename to src/test/java/org/tests/query/other/TestWhereAnnotation.java index e9d9fa721..3837246bf 100644 --- a/src/test/java/com/avaje/tests/query/other/TestWhereAnnotation.java +++ b/src/test/java/org/tests/query/other/TestWhereAnnotation.java @@ -1,16 +1,18 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -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.Order; +import org.tests.model.basic.ResetBasicData; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; + public class TestWhereAnnotation extends BaseTestCase { @Test @@ -37,19 +39,21 @@ public class TestWhereAnnotation extends BaseTestCase { ResetBasicData.reset(); + Ebean.getServerCacheManager().clearAll(); + LoggedSqlCollector.start(); - List customers = Ebean.find(Customer.class).findList(); + List customers = Ebean.find(Customer.class) + .findList(); List orders = customers.get(0).getOrders(); - orders.size(); + assertThat(orders.size()).isGreaterThan(0); + orders.get(0).getStatus(); List loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(2, loggedSql.size()); - - String sql = loggedSql.get(1); - Assert.assertTrue(sql.contains("t0.order_date is not null")); + assertThat(loggedSql).hasSize(2); + assertThat(loggedSql.get(1)).contains("t0.order_date is not null"); } } diff --git a/src/test/java/com/avaje/tests/query/other/TestWhereLikeWithSlash.java b/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java similarity index 74% rename from src/test/java/com/avaje/tests/query/other/TestWhereLikeWithSlash.java rename to src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java index 4090bf56d..a3b3eac29 100644 --- a/src/test/java/com/avaje/tests/query/other/TestWhereLikeWithSlash.java +++ b/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java @@ -1,9 +1,9 @@ -package com.avaje.tests.query.other; +package org.tests.query.other; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.EBasic; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.basic.EBasic; import org.junit.Test; public class TestWhereLikeWithSlash extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/query/softdelete/TestSoftDeletePagingList.java b/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java similarity index 88% rename from src/test/java/com/avaje/tests/query/softdelete/TestSoftDeletePagingList.java rename to src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java index 6db1ac359..79d6c38d8 100644 --- a/src/test/java/com/avaje/tests/query/softdelete/TestSoftDeletePagingList.java +++ b/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java @@ -1,9 +1,9 @@ -package com.avaje.tests.query.softdelete; +package org.tests.query.softdelete; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.PagedList; -import com.avaje.tests.model.onetoone.album.Cover; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.PagedList; +import org.tests.model.onetoone.album.Cover; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/sqlquery/SqlQueryTests.java b/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java similarity index 92% rename from src/test/java/com/avaje/tests/query/sqlquery/SqlQueryTests.java rename to src/test/java/org/tests/query/sqlquery/SqlQueryTests.java index 09d234d62..938baacb3 100644 --- a/src/test/java/com/avaje/tests/query/sqlquery/SqlQueryTests.java +++ b/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java @@ -1,11 +1,11 @@ -package com.avaje.tests.query.sqlquery; +package org.tests.query.sqlquery; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.SqlQuery; -import com.avaje.ebean.SqlRow; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.SqlQuery; +import io.ebean.SqlRow; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/query/sqlquery/TestNativeILikeExpression.java b/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java similarity index 74% rename from src/test/java/com/avaje/tests/query/sqlquery/TestNativeILikeExpression.java rename to src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java index a759fde72..b1cd5fc0d 100644 --- a/src/test/java/com/avaje/tests/query/sqlquery/TestNativeILikeExpression.java +++ b/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java @@ -1,12 +1,12 @@ -package com.avaje.tests.query.sqlquery; +package org.tests.query.sqlquery; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.config.Platform; -import com.avaje.ebean.plugin.SpiServer; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.Platform; +import io.ebean.plugin.SpiServer; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/rawsql/TestInsertSqlLogging.java b/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java similarity index 73% rename from src/test/java/com/avaje/tests/rawsql/TestInsertSqlLogging.java rename to src/test/java/org/tests/rawsql/TestInsertSqlLogging.java index d2f4b39ad..6e5977a70 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestInsertSqlLogging.java +++ b/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java @@ -1,9 +1,9 @@ -package com.avaje.tests.rawsql; +package org.tests.rawsql; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.SqlUpdate; -import com.avaje.tests.idkeys.db.AuditLog; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.SqlUpdate; +import org.tests.idkeys.db.AuditLog; import org.junit.Test; public class TestInsertSqlLogging extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/rawsql/TestOrderReportTotal.java b/src/test/java/org/tests/rawsql/TestOrderReportTotal.java similarity index 78% rename from src/test/java/com/avaje/tests/rawsql/TestOrderReportTotal.java rename to src/test/java/org/tests/rawsql/TestOrderReportTotal.java index 04bf37a23..684970db3 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestOrderReportTotal.java +++ b/src/test/java/org/tests/rawsql/TestOrderReportTotal.java @@ -1,13 +1,13 @@ -package com.avaje.tests.rawsql; +package org.tests.rawsql; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.tests.model.basic.OrderAggregate; -import com.avaje.tests.model.basic.OrderDetail; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.RawSql; +import io.ebean.RawSqlBuilder; +import org.tests.model.basic.OrderAggregate; +import org.tests.model.basic.OrderDetail; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlAsKeyword.java b/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java similarity index 85% rename from src/test/java/com/avaje/tests/rawsql/TestRawSqlAsKeyword.java rename to src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java index 652283f59..4e0fe97a1 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlAsKeyword.java +++ b/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java @@ -1,12 +1,12 @@ -package com.avaje.tests.rawsql; +package org.tests.rawsql; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.RawSql; +import io.ebean.RawSqlBuilder; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlCustomerAggregate.java b/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java similarity index 68% rename from src/test/java/com/avaje/tests/rawsql/TestRawSqlCustomerAggregate.java rename to src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java index 98074dfa9..1de360045 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlCustomerAggregate.java +++ b/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java @@ -1,12 +1,12 @@ -package com.avaje.tests.rawsql; +package org.tests.rawsql; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.tests.model.basic.CustomerAggregate; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.RawSql; +import io.ebean.RawSqlBuilder; +import org.tests.model.basic.CustomerAggregate; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlMasterDetail.java b/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java similarity index 94% rename from src/test/java/com/avaje/tests/rawsql/TestRawSqlMasterDetail.java rename to src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java index 561f91294..359bf2ebe 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlMasterDetail.java +++ b/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java @@ -1,14 +1,14 @@ -package com.avaje.tests.rawsql; +package org.tests.rawsql; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.EBasic; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.OrderDetail; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.RawSql; +import io.ebean.RawSqlBuilder; +import org.tests.model.basic.Customer; +import org.tests.model.basic.EBasic; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderDetail; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlNamedParams.java b/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java similarity index 69% rename from src/test/java/com/avaje/tests/rawsql/TestRawSqlNamedParams.java rename to src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java index d0add8794..d8bb7f41c 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlNamedParams.java +++ b/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java @@ -1,12 +1,12 @@ -package com.avaje.tests.rawsql; +package org.tests.rawsql; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.RawSql; +import io.ebean.RawSqlBuilder; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQuery.java b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java similarity index 92% rename from src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQuery.java rename to src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java index 158d76c74..b8ad938b0 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQuery.java +++ b/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java @@ -1,16 +1,16 @@ -package com.avaje.tests.rawsql; +package org.tests.rawsql; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.FutureRowCount; -import com.avaje.ebean.PagedList; -import com.avaje.ebean.Query; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import io.ebean.FutureRowCount; +import io.ebean.PagedList; +import io.ebean.Query; +import io.ebean.RawSql; +import io.ebean.RawSqlBuilder; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQueryDistinct.java b/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java similarity index 73% rename from src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQueryDistinct.java rename to src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java index 6c580f529..8a150a944 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQueryDistinct.java +++ b/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java @@ -1,13 +1,13 @@ -package com.avaje.tests.rawsql; +package org.tests.rawsql; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.Query; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import io.ebean.Query; +import io.ebean.RawSql; +import io.ebean.RawSqlBuilder; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper.java b/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java similarity index 82% rename from src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper.java rename to src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java index 21da0059f..a012e5e5e 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper.java +++ b/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java @@ -1,14 +1,14 @@ -package com.avaje.tests.rawsql; +package org.tests.rawsql; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.OrderAggregate; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.RawSql; +import io.ebean.RawSqlBuilder; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderAggregate; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper2.java b/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java similarity index 74% rename from src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper2.java rename to src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java index 845421677..00f41f683 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper2.java +++ b/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java @@ -1,14 +1,14 @@ -package com.avaje.tests.rawsql; +package org.tests.rawsql; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.Query; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.OrderAggregate; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import io.ebean.Query; +import io.ebean.RawSql; +import io.ebean.RawSqlBuilder; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderAggregate; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper3.java b/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java similarity index 79% rename from src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper3.java rename to src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java index 89b42312d..7a73fbabe 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper3.java +++ b/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java @@ -1,14 +1,14 @@ -package com.avaje.tests.rawsql; +package org.tests.rawsql; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.OrderAggregate; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import io.ebean.RawSql; +import io.ebean.RawSqlBuilder; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.OrderAggregate; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlPositionedParams.java b/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java similarity index 79% rename from src/test/java/com/avaje/tests/rawsql/TestRawSqlPositionedParams.java rename to src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java index aa4269f62..f1c3ef4fd 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlPositionedParams.java +++ b/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java @@ -1,12 +1,12 @@ -package com.avaje.tests.rawsql; +package org.tests.rawsql; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.RawSql; +import io.ebean.RawSqlBuilder; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlUnparsedQuery.java b/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java similarity index 73% rename from src/test/java/com/avaje/tests/rawsql/TestRawSqlUnparsedQuery.java rename to src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java index c16a74401..8d900b15f 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlUnparsedQuery.java +++ b/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java @@ -1,12 +1,12 @@ -package com.avaje.tests.rawsql; +package org.tests.rawsql; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.RawSql; +import io.ebean.RawSqlBuilder; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlWithResultSet.java b/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java similarity index 81% rename from src/test/java/com/avaje/tests/rawsql/TestRawSqlWithResultSet.java rename to src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java index 122501d8d..eea1eb313 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlWithResultSet.java +++ b/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java @@ -1,12 +1,12 @@ -package com.avaje.tests.rawsql; +package org.tests.rawsql; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.Transaction; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import io.ebean.RawSql; +import io.ebean.Transaction; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.sql.PreparedStatement; diff --git a/src/test/java/com/avaje/tests/rawsql/inherit/ParentQueryTest.java b/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java similarity index 91% rename from src/test/java/com/avaje/tests/rawsql/inherit/ParentQueryTest.java rename to src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java index e6b7d057b..dd7d870ac 100644 --- a/src/test/java/com/avaje/tests/rawsql/inherit/ParentQueryTest.java +++ b/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java @@ -1,7 +1,7 @@ -package com.avaje.tests.rawsql.inherit; +package org.tests.rawsql.inherit; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; import org.avaje.test.model.rawsql.inherit.ChildA; import org.avaje.test.model.rawsql.inherit.ChildB; import org.avaje.test.model.rawsql.inherit.Data; diff --git a/src/test/java/com/avaje/tests/rawsql/inherit/ParentRawSqlTest.java b/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java similarity index 97% rename from src/test/java/com/avaje/tests/rawsql/inherit/ParentRawSqlTest.java rename to src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java index d7747f24d..f9cf23de5 100644 --- a/src/test/java/com/avaje/tests/rawsql/inherit/ParentRawSqlTest.java +++ b/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java @@ -1,10 +1,10 @@ -package com.avaje.tests.rawsql.inherit; +package org.tests.rawsql.inherit; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.FetchConfig; +import io.ebean.RawSql; +import io.ebean.RawSqlBuilder; import org.avaje.test.model.rawsql.inherit.ChildA; import org.avaje.test.model.rawsql.inherit.ChildB; import org.avaje.test.model.rawsql.inherit.Data; diff --git a/src/test/java/com/avaje/tests/rawsql/nativesql/TestNativeSqlBasic.java b/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java similarity index 91% rename from src/test/java/com/avaje/tests/rawsql/nativesql/TestNativeSqlBasic.java rename to src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java index 9e2f23ac8..82c295321 100644 --- a/src/test/java/com/avaje/tests/rawsql/nativesql/TestNativeSqlBasic.java +++ b/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java @@ -1,13 +1,13 @@ -package com.avaje.tests.rawsql.nativesql; +package org.tests.rawsql.nativesql; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.BeanState; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Query; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java b/src/test/java/org/tests/readaudit/TestReadAudit.java similarity index 94% rename from src/test/java/com/avaje/tests/readaudit/TestReadAudit.java rename to src/test/java/org/tests/readaudit/TestReadAudit.java index df741e4b4..4f61f2bdc 100644 --- a/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java +++ b/src/test/java/org/tests/readaudit/TestReadAudit.java @@ -1,18 +1,18 @@ -package com.avaje.tests.readaudit; +package org.tests.readaudit; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.EbeanServerFactory; -import com.avaje.ebean.FutureList; -import com.avaje.ebean.cache.ServerCache; -import com.avaje.ebean.cache.ServerCacheStatistics; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.event.readaudit.ReadAuditLogger; -import com.avaje.ebean.event.readaudit.ReadAuditPrepare; -import com.avaje.ebean.event.readaudit.ReadAuditQueryPlan; -import com.avaje.ebean.event.readaudit.ReadEvent; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.tests.model.basic.Country; -import com.avaje.tests.model.basic.EBasicChangeLog; +import io.ebean.BaseTestCase; +import io.ebean.EbeanServerFactory; +import io.ebean.FutureList; +import io.ebean.cache.ServerCache; +import io.ebean.cache.ServerCacheStatistics; +import io.ebean.config.ServerConfig; +import io.ebean.event.readaudit.ReadAuditLogger; +import io.ebean.event.readaudit.ReadAuditPrepare; +import io.ebean.event.readaudit.ReadAuditQueryPlan; +import io.ebean.event.readaudit.ReadEvent; +import io.ebeaninternal.api.SpiEbeanServer; +import org.tests.model.basic.Country; +import org.tests.model.basic.EBasicChangeLog; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.After; import org.junit.Before; diff --git a/src/test/java/com/avaje/tests/refresh/TestRefreshWithMany.java b/src/test/java/org/tests/refresh/TestRefreshWithMany.java similarity index 89% rename from src/test/java/com/avaje/tests/refresh/TestRefreshWithMany.java rename to src/test/java/org/tests/refresh/TestRefreshWithMany.java index a177a6de9..b77790fa9 100644 --- a/src/test/java/com/avaje/tests/refresh/TestRefreshWithMany.java +++ b/src/test/java/org/tests/refresh/TestRefreshWithMany.java @@ -1,11 +1,11 @@ -package com.avaje.tests.refresh; +package org.tests.refresh; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.SqlRow; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.SqlRow; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/avaje/tests/saveassociation/TestSaveAssociation.java b/src/test/java/org/tests/saveassociation/TestSaveAssociation.java similarity index 72% rename from src/test/java/com/avaje/tests/saveassociation/TestSaveAssociation.java rename to src/test/java/org/tests/saveassociation/TestSaveAssociation.java index 815718237..a9ba92bd3 100644 --- a/src/test/java/com/avaje/tests/saveassociation/TestSaveAssociation.java +++ b/src/test/java/org/tests/saveassociation/TestSaveAssociation.java @@ -1,9 +1,9 @@ -package com.avaje.tests.saveassociation; +package org.tests.saveassociation; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.TSDetail; -import com.avaje.tests.model.basic.TSMaster; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.TSDetail; +import org.tests.model.basic.TSMaster; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/saveassociation/TestSaveSamePK.java b/src/test/java/org/tests/saveassociation/TestSaveSamePK.java similarity index 77% rename from src/test/java/com/avaje/tests/saveassociation/TestSaveSamePK.java rename to src/test/java/org/tests/saveassociation/TestSaveSamePK.java index 31d18f69f..1fd29f0ae 100644 --- a/src/test/java/com/avaje/tests/saveassociation/TestSaveSamePK.java +++ b/src/test/java/org/tests/saveassociation/TestSaveSamePK.java @@ -1,9 +1,9 @@ -package com.avaje.tests.saveassociation; +package org.tests.saveassociation; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.TSDetail; -import com.avaje.tests.model.basic.TSMaster; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.TSDetail; +import org.tests.model.basic.TSMaster; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/singleTableInheritance/TestInheritQuery.java b/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java similarity index 92% rename from src/test/java/com/avaje/tests/singleTableInheritance/TestInheritQuery.java rename to src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java index d8e07ca86..8e60191dd 100644 --- a/src/test/java/com/avaje/tests/singleTableInheritance/TestInheritQuery.java +++ b/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java @@ -1,13 +1,13 @@ -package com.avaje.tests.singleTableInheritance; +package org.tests.singleTableInheritance; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.singleTableInheritance.model.PalletLocation; -import com.avaje.tests.singleTableInheritance.model.PalletLocationExternal; -import com.avaje.tests.singleTableInheritance.model.Warehouse; -import com.avaje.tests.singleTableInheritance.model.Zone; -import com.avaje.tests.singleTableInheritance.model.ZoneExternal; -import com.avaje.tests.singleTableInheritance.model.ZoneInternal; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.singleTableInheritance.model.PalletLocation; +import org.tests.singleTableInheritance.model.PalletLocationExternal; +import org.tests.singleTableInheritance.model.Warehouse; +import org.tests.singleTableInheritance.model.Zone; +import org.tests.singleTableInheritance.model.ZoneExternal; +import org.tests.singleTableInheritance.model.ZoneInternal; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/singleTableInheritance/model/PalletLocation.java b/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java similarity index 94% rename from src/test/java/com/avaje/tests/singleTableInheritance/model/PalletLocation.java rename to src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java index 6b8f1efe1..394180d2b 100644 --- a/src/test/java/com/avaje/tests/singleTableInheritance/model/PalletLocation.java +++ b/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java @@ -1,4 +1,4 @@ -package com.avaje.tests.singleTableInheritance.model; +package org.tests.singleTableInheritance.model; import javax.persistence.Column; import javax.persistence.DiscriminatorColumn; diff --git a/src/test/java/com/avaje/tests/singleTableInheritance/model/PalletLocationExternal.java b/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java similarity index 86% rename from src/test/java/com/avaje/tests/singleTableInheritance/model/PalletLocationExternal.java rename to src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java index e9bc37f50..553a77852 100644 --- a/src/test/java/com/avaje/tests/singleTableInheritance/model/PalletLocationExternal.java +++ b/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java @@ -1,4 +1,4 @@ -package com.avaje.tests.singleTableInheritance.model; +package org.tests.singleTableInheritance.model; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/singleTableInheritance/model/Warehouse.java b/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java similarity index 96% rename from src/test/java/com/avaje/tests/singleTableInheritance/model/Warehouse.java rename to src/test/java/org/tests/singleTableInheritance/model/Warehouse.java index 18d8b0800..6116615d4 100644 --- a/src/test/java/com/avaje/tests/singleTableInheritance/model/Warehouse.java +++ b/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java @@ -1,4 +1,4 @@ -package com.avaje.tests.singleTableInheritance.model; +package org.tests.singleTableInheritance.model; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/src/test/java/com/avaje/tests/singleTableInheritance/model/Zone.java b/src/test/java/org/tests/singleTableInheritance/model/Zone.java similarity index 94% rename from src/test/java/com/avaje/tests/singleTableInheritance/model/Zone.java rename to src/test/java/org/tests/singleTableInheritance/model/Zone.java index 2032d958d..7d64a1ab3 100644 --- a/src/test/java/com/avaje/tests/singleTableInheritance/model/Zone.java +++ b/src/test/java/org/tests/singleTableInheritance/model/Zone.java @@ -1,4 +1,4 @@ -package com.avaje.tests.singleTableInheritance.model; +package org.tests.singleTableInheritance.model; import javax.persistence.Column; import javax.persistence.DiscriminatorColumn; diff --git a/src/test/java/com/avaje/tests/singleTableInheritance/model/ZoneExternal.java b/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java similarity index 89% rename from src/test/java/com/avaje/tests/singleTableInheritance/model/ZoneExternal.java rename to src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java index 1713dee77..26599cf73 100644 --- a/src/test/java/com/avaje/tests/singleTableInheritance/model/ZoneExternal.java +++ b/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java @@ -1,4 +1,4 @@ -package com.avaje.tests.singleTableInheritance.model; +package org.tests.singleTableInheritance.model; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/singleTableInheritance/model/ZoneInternal.java b/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java similarity index 89% rename from src/test/java/com/avaje/tests/singleTableInheritance/model/ZoneInternal.java rename to src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java index bfb602f99..eb558952b 100644 --- a/src/test/java/com/avaje/tests/singleTableInheritance/model/ZoneInternal.java +++ b/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java @@ -1,4 +1,4 @@ -package com.avaje.tests.singleTableInheritance.model; +package org.tests.singleTableInheritance.model; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java similarity index 96% rename from src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java rename to src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java index 0f83b0ab7..c52b4aa19 100644 --- a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java +++ b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java @@ -1,12 +1,12 @@ -package com.avaje.tests.softdelete; +package org.tests.softdelete; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.ebean.SqlQuery; -import com.avaje.ebean.SqlRow; -import com.avaje.tests.model.softdelete.EBasicSDChild; -import com.avaje.tests.model.softdelete.EBasicSoftDelete; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import io.ebean.SqlQuery; +import io.ebean.SqlRow; +import org.tests.model.softdelete.EBasicSDChild; +import org.tests.model.softdelete.EBasicSoftDelete; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBook.java b/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java similarity index 93% rename from src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBook.java rename to src/test/java/org/tests/softdelete/TestSoftDeleteBook.java index 60610d998..6bb58f2c2 100644 --- a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBook.java +++ b/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java @@ -1,10 +1,10 @@ -package com.avaje.tests.softdelete; +package org.tests.softdelete; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; -import com.avaje.tests.model.softdelete.ESoftDelBook; -import com.avaje.tests.model.softdelete.ESoftDelUser; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Query; +import org.tests.model.softdelete.ESoftDelBook; +import org.tests.model.softdelete.ESoftDelUser; import org.junit.Test; import java.util.Arrays; diff --git a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteManyToMany.java b/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java similarity index 80% rename from src/test/java/com/avaje/tests/softdelete/TestSoftDeleteManyToMany.java rename to src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java index b6852d5ce..0286e9e32 100644 --- a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteManyToMany.java +++ b/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java @@ -1,9 +1,9 @@ -package com.avaje.tests.softdelete; +package org.tests.softdelete; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.softdelete.ESoftDelRole; -import com.avaje.tests.model.softdelete.ESoftDelUser; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.softdelete.ESoftDelRole; +import org.tests.model.softdelete.ESoftDelUser; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java similarity index 76% rename from src/test/java/com/avaje/tests/softdelete/TestSoftDeleteOptionalRelationship.java rename to src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java index f90e063e1..39701b182 100644 --- a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteOptionalRelationship.java +++ b/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java @@ -1,8 +1,8 @@ -package com.avaje.tests.softdelete; +package org.tests.softdelete; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.softdelete.ESoftDelMid; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.softdelete.ESoftDelMid; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; diff --git a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteTop.java b/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java similarity index 83% rename from src/test/java/com/avaje/tests/softdelete/TestSoftDeleteTop.java rename to src/test/java/org/tests/softdelete/TestSoftDeleteTop.java index 89feea799..7898909f4 100644 --- a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteTop.java +++ b/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java @@ -1,12 +1,12 @@ -package com.avaje.tests.softdelete; +package org.tests.softdelete; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.config.PersistBatch; -import com.avaje.tests.model.softdelete.ESoftDelMid; -import com.avaje.tests.model.softdelete.ESoftDelTop; -import com.avaje.tests.model.softdelete.ESoftDelUp; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Transaction; +import io.ebean.PersistBatch; +import org.tests.model.softdelete.ESoftDelMid; +import org.tests.model.softdelete.ESoftDelTop; +import org.tests.model.softdelete.ESoftDelUp; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/com/avaje/tests/sp/TestManyToManySaveTwice.java b/src/test/java/org/tests/sp/TestManyToManySaveTwice.java similarity index 85% rename from src/test/java/com/avaje/tests/sp/TestManyToManySaveTwice.java rename to src/test/java/org/tests/sp/TestManyToManySaveTwice.java index e83bb9917..7c7654e1d 100644 --- a/src/test/java/com/avaje/tests/sp/TestManyToManySaveTwice.java +++ b/src/test/java/org/tests/sp/TestManyToManySaveTwice.java @@ -1,9 +1,9 @@ -package com.avaje.tests.sp; +package org.tests.sp; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.sp.model.car.Car; -import com.avaje.tests.sp.model.car.Wheel; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.sp.model.car.Car; +import org.tests.sp.model.car.Wheel; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/sp/model/IdEntity.java b/src/test/java/org/tests/sp/model/IdEntity.java similarity index 96% rename from src/test/java/com/avaje/tests/sp/model/IdEntity.java rename to src/test/java/org/tests/sp/model/IdEntity.java index 563ecafa6..c1493d21f 100644 --- a/src/test/java/com/avaje/tests/sp/model/IdEntity.java +++ b/src/test/java/org/tests/sp/model/IdEntity.java @@ -1,4 +1,4 @@ -package com.avaje.tests.sp.model; +package org.tests.sp.model; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; diff --git a/src/test/java/com/avaje/tests/sp/model/car/Car.java b/src/test/java/org/tests/sp/model/car/Car.java similarity index 90% rename from src/test/java/com/avaje/tests/sp/model/car/Car.java rename to src/test/java/org/tests/sp/model/car/Car.java index 15f488936..8058bd7a4 100644 --- a/src/test/java/com/avaje/tests/sp/model/car/Car.java +++ b/src/test/java/org/tests/sp/model/car/Car.java @@ -1,6 +1,6 @@ -package com.avaje.tests.sp.model.car; +package org.tests.sp.model.car; -import com.avaje.tests.sp.model.IdEntity; +import org.tests.sp.model.IdEntity; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/sp/model/car/Wheel.java b/src/test/java/org/tests/sp/model/car/Wheel.java similarity index 73% rename from src/test/java/com/avaje/tests/sp/model/car/Wheel.java rename to src/test/java/org/tests/sp/model/car/Wheel.java index c2ac2ba49..44bf861b0 100644 --- a/src/test/java/com/avaje/tests/sp/model/car/Wheel.java +++ b/src/test/java/org/tests/sp/model/car/Wheel.java @@ -1,6 +1,6 @@ -package com.avaje.tests.sp.model.car; +package org.tests.sp.model.car; -import com.avaje.tests.sp.model.IdEntity; +import org.tests.sp.model.IdEntity; import javax.persistence.Entity; import javax.persistence.Table; diff --git a/src/test/java/com/avaje/tests/text/csv/TestCsvReader.java b/src/test/java/org/tests/text/csv/TestCsvReader.java similarity index 81% rename from src/test/java/com/avaje/tests/text/csv/TestCsvReader.java rename to src/test/java/org/tests/text/csv/TestCsvReader.java index cdd619f06..624d42128 100644 --- a/src/test/java/com/avaje/tests/text/csv/TestCsvReader.java +++ b/src/test/java/org/tests/text/csv/TestCsvReader.java @@ -1,10 +1,10 @@ -package com.avaje.tests.text.csv; +package org.tests.text.csv; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.csv.CsvReader; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.csv.CsvReader; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.io.File; diff --git a/src/test/java/com/avaje/tests/text/csv/TestCsvReaderWithCallback.java b/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java similarity index 80% rename from src/test/java/com/avaje/tests/text/csv/TestCsvReaderWithCallback.java rename to src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java index 81068380a..15cb47d67 100644 --- a/src/test/java/com/avaje/tests/text/csv/TestCsvReaderWithCallback.java +++ b/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java @@ -1,12 +1,12 @@ -package com.avaje.tests.text.csv; +package org.tests.text.csv; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.text.csv.CsvReader; -import com.avaje.ebean.text.csv.DefaultCsvCallback; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.text.csv.CsvReader; +import io.ebean.text.csv.DefaultCsvCallback; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.io.File; diff --git a/src/test/java/com/avaje/tests/text/csv/TestTimeStringParser.java b/src/test/java/org/tests/text/csv/TestTimeStringParser.java similarity index 85% rename from src/test/java/com/avaje/tests/text/csv/TestTimeStringParser.java rename to src/test/java/org/tests/text/csv/TestTimeStringParser.java index 6e52a969e..fac5e5095 100644 --- a/src/test/java/com/avaje/tests/text/csv/TestTimeStringParser.java +++ b/src/test/java/org/tests/text/csv/TestTimeStringParser.java @@ -1,7 +1,7 @@ -package com.avaje.tests.text.csv; +package org.tests.text.csv; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.text.TimeStringParser; +import io.ebean.BaseTestCase; +import io.ebean.text.TimeStringParser; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/text/json/TestJsonBeanDescriptorParse.java b/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java similarity index 76% rename from src/test/java/com/avaje/tests/text/json/TestJsonBeanDescriptorParse.java rename to src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java index 2a55721e1..ebce7d3a2 100644 --- a/src/test/java/com/avaje/tests/text/json/TestJsonBeanDescriptorParse.java +++ b/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java @@ -1,12 +1,12 @@ -package com.avaje.tests.text.json; +package org.tests.text.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.BeanState; -import com.avaje.ebean.Ebean; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.ebeaninternal.server.text.json.ReadJson; -import com.avaje.tests.model.basic.Customer; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.Ebean; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.text.json.ReadJson; +import org.tests.model.basic.Customer; import com.fasterxml.jackson.core.JsonParser; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/text/json/TestJsonBeanWithTimeZone.java b/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java similarity index 83% rename from src/test/java/com/avaje/tests/text/json/TestJsonBeanWithTimeZone.java rename to src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java index 19d8f5167..63630140f 100644 --- a/src/test/java/com/avaje/tests/text/json/TestJsonBeanWithTimeZone.java +++ b/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java @@ -1,9 +1,9 @@ -package com.avaje.tests.text.json; +package org.tests.text.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.tests.model.basic.BeanWithTimeZone; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.json.JsonContext; +import org.tests.model.basic.BeanWithTimeZone; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/text/json/TestJsonInheritanceDiscriminator.java b/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java similarity index 85% rename from src/test/java/com/avaje/tests/text/json/TestJsonInheritanceDiscriminator.java rename to src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java index 8aeb3ff60..e49daffa9 100644 --- a/src/test/java/com/avaje/tests/text/json/TestJsonInheritanceDiscriminator.java +++ b/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java @@ -1,11 +1,11 @@ -package com.avaje.tests.text.json; +package org.tests.text.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.tests.model.basic.Animal; -import com.avaje.tests.model.basic.Cat; -import com.avaje.tests.model.basic.Dog; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.json.JsonContext; +import org.tests.model.basic.Animal; +import org.tests.model.basic.Cat; +import org.tests.model.basic.Dog; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/text/json/TestJsonMap.java b/src/test/java/org/tests/text/json/TestJsonMap.java similarity index 86% rename from src/test/java/com/avaje/tests/text/json/TestJsonMap.java rename to src/test/java/org/tests/text/json/TestJsonMap.java index 68cd8ecdb..4237d5fd6 100644 --- a/src/test/java/com/avaje/tests/text/json/TestJsonMap.java +++ b/src/test/java/org/tests/text/json/TestJsonMap.java @@ -1,12 +1,12 @@ -package com.avaje.tests.text.json; +package org.tests.text.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.PathProperties; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.ebean.text.json.JsonWriteOptions; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.PathProperties; +import io.ebean.text.json.JsonContext; +import io.ebean.text.json.JsonWriteOptions; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/com/avaje/tests/text/json/TestJsonSimple.java b/src/test/java/org/tests/text/json/TestJsonSimple.java similarity index 89% rename from src/test/java/com/avaje/tests/text/json/TestJsonSimple.java rename to src/test/java/org/tests/text/json/TestJsonSimple.java index ad763caec..8954a126f 100644 --- a/src/test/java/com/avaje/tests/text/json/TestJsonSimple.java +++ b/src/test/java/org/tests/text/json/TestJsonSimple.java @@ -1,9 +1,9 @@ -package com.avaje.tests.text.json; +package org.tests.text.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.EJson; -import com.avaje.ebean.text.json.JsonContext; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.json.EJson; +import io.ebean.text.json.JsonContext; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/text/json/TestJsonSomeEnumWithToString.java b/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java similarity index 73% rename from src/test/java/com/avaje/tests/text/json/TestJsonSomeEnumWithToString.java rename to src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java index 6e4aa450d..be569ac77 100644 --- a/src/test/java/com/avaje/tests/text/json/TestJsonSomeEnumWithToString.java +++ b/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java @@ -1,10 +1,10 @@ -package com.avaje.tests.text.json; +package org.tests.text.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.tests.model.basic.SomeEnum; -import com.avaje.tests.model.basic.SomeEnumBean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.json.JsonContext; +import org.tests.model.basic.SomeEnum; +import org.tests.model.basic.SomeEnumBean; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitor.java b/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java similarity index 77% rename from src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitor.java rename to src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java index fbe560d02..8ecef61fc 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitor.java +++ b/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java @@ -1,10 +1,10 @@ -package com.avaje.tests.text.json; +package org.tests.text.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.json.JsonContext; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonCompoundType.java b/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java similarity index 95% rename from src/test/java/com/avaje/tests/text/json/TestTextJsonCompoundType.java rename to src/test/java/org/tests/text/json/TestTextJsonCompoundType.java index 938d58337..8c39075a5 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonCompoundType.java +++ b/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java @@ -1,10 +1,10 @@ -package com.avaje.tests.text.json; +package org.tests.text.json; //import java.util.Currency; // //import org.junit.Assert; -import com.avaje.ebean.BaseTestCase; +import io.ebean.BaseTestCase; import org.junit.Test; // diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java b/src/test/java/org/tests/text/json/TestTextJsonInheritance.java similarity index 72% rename from src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java rename to src/test/java/org/tests/text/json/TestTextJsonInheritance.java index 402f05a73..570dd527b 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java +++ b/src/test/java/org/tests/text/json/TestTextJsonInheritance.java @@ -1,15 +1,15 @@ -package com.avaje.tests.text.json; +package org.tests.text.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.tests.model.basic.Car; -import com.avaje.tests.model.basic.CarAccessory; -import com.avaje.tests.model.basic.CarFuse; -import com.avaje.tests.model.basic.Trip; -import com.avaje.tests.model.basic.Truck; -import com.avaje.tests.model.basic.Vehicle; -import com.avaje.tests.model.basic.VehicleDriver; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.json.JsonContext; +import org.tests.model.basic.Car; +import org.tests.model.basic.CarAccessory; +import org.tests.model.basic.CarFuse; +import org.tests.model.basic.Trip; +import org.tests.model.basic.Truck; +import org.tests.model.basic.Vehicle; +import org.tests.model.basic.VehicleDriver; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonInsertUpdate.java b/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java similarity index 74% rename from src/test/java/com/avaje/tests/text/json/TestTextJsonInsertUpdate.java rename to src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java index d8e9f8d95..86ac5fca8 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonInsertUpdate.java +++ b/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java @@ -1,11 +1,11 @@ -package com.avaje.tests.text.json; +package org.tests.text.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.ebeaninternal.server.lib.util.StringHelper; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.json.JsonContext; +import io.ebeaninternal.server.lib.util.StringHelper; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonInvokeLazy.java b/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java similarity index 60% rename from src/test/java/com/avaje/tests/text/json/TestTextJsonInvokeLazy.java rename to src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java index 95c4e329d..cecc08a46 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonInvokeLazy.java +++ b/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java @@ -1,11 +1,11 @@ -package com.avaje.tests.text.json; +package org.tests.text.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.ebean.text.json.JsonWriteOptions; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.json.JsonContext; +import io.ebean.text.json.JsonWriteOptions; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonReadManyLazyLoad.java b/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java similarity index 85% rename from src/test/java/com/avaje/tests/text/json/TestTextJsonReadManyLazyLoad.java rename to src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java index 8ce9fc560..d7b7bf4e6 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonReadManyLazyLoad.java +++ b/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java @@ -1,12 +1,12 @@ -package com.avaje.tests.text.json; +package org.tests.text.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.PathProperties; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.ebean.text.json.JsonWriteOptions; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.PathProperties; +import io.ebean.text.json.JsonContext; +import io.ebean.text.json.JsonWriteOptions; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonReferenceBean.java b/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java similarity index 77% rename from src/test/java/com/avaje/tests/text/json/TestTextJsonReferenceBean.java rename to src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java index aaae27598..d73f561ed 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonReferenceBean.java +++ b/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java @@ -1,17 +1,17 @@ -package com.avaje.tests.text.json; +package org.tests.text.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.BeanState; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.ebean.text.json.JsonWriteOptions; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.Product; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.Ebean; +import io.ebean.bean.EntityBean; +import io.ebean.text.json.JsonContext; +import io.ebean.text.json.JsonWriteOptions; +import io.ebeaninternal.api.SpiEbeanServer; +import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.Product; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonSimple.java b/src/test/java/org/tests/text/json/TestTextJsonSimple.java similarity index 88% rename from src/test/java/com/avaje/tests/text/json/TestTextJsonSimple.java rename to src/test/java/org/tests/text/json/TestTextJsonSimple.java index ed935b760..f77ff3fd8 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonSimple.java +++ b/src/test/java/org/tests/text/json/TestTextJsonSimple.java @@ -1,16 +1,16 @@ -package com.avaje.tests.text.json; +package org.tests.text.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.text.PathProperties; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.ebean.text.json.JsonReadBeanVisitor; -import com.avaje.ebean.text.json.JsonReadOptions; -import com.avaje.tests.model.basic.Address; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.text.PathProperties; +import io.ebean.text.json.JsonContext; +import io.ebean.text.json.JsonReadBeanVisitor; +import io.ebean.text.json.JsonReadOptions; +import org.tests.model.basic.Address; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonSuperSimple.java b/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java similarity index 69% rename from src/test/java/com/avaje/tests/text/json/TestTextJsonSuperSimple.java rename to src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java index 40b74e65f..59040b598 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonSuperSimple.java +++ b/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java @@ -1,11 +1,11 @@ -package com.avaje.tests.text.json; +package org.tests.text.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.text.json.JsonContext; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonUpdateCascade.java b/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java similarity index 79% rename from src/test/java/com/avaje/tests/text/json/TestTextJsonUpdateCascade.java rename to src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java index 21c92a433..ca1b5b9b4 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonUpdateCascade.java +++ b/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java @@ -1,17 +1,17 @@ -package com.avaje.tests.text.json; +package org.tests.text.json; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.MRole; -import com.avaje.tests.model.basic.MUser; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.Order.Status; -import com.avaje.tests.model.basic.OrderDetail; -import com.avaje.tests.model.basic.Product; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.text.json.JsonContext; +import org.tests.model.basic.Customer; +import org.tests.model.basic.MRole; +import org.tests.model.basic.MUser; +import org.tests.model.basic.Order; +import org.tests.model.basic.Order.Status; +import org.tests.model.basic.OrderDetail; +import org.tests.model.basic.Product; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/timezone/TimezoneTests.java b/src/test/java/org/tests/timezone/TimezoneTests.java similarity index 96% rename from src/test/java/com/avaje/tests/timezone/TimezoneTests.java rename to src/test/java/org/tests/timezone/TimezoneTests.java index 4860b513f..98110f807 100644 --- a/src/test/java/com/avaje/tests/timezone/TimezoneTests.java +++ b/src/test/java/org/tests/timezone/TimezoneTests.java @@ -1,7 +1,7 @@ -package com.avaje.tests.timezone; +package org.tests.timezone; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Transaction; +import io.ebean.Ebean; +import io.ebean.Transaction; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/timezone/TzBean.java b/src/test/java/org/tests/timezone/TzBean.java similarity index 95% rename from src/test/java/com/avaje/tests/timezone/TzBean.java rename to src/test/java/org/tests/timezone/TzBean.java index 86a3092ed..e760b5789 100644 --- a/src/test/java/com/avaje/tests/timezone/TzBean.java +++ b/src/test/java/org/tests/timezone/TzBean.java @@ -1,4 +1,4 @@ -package com.avaje.tests.timezone; +package org.tests.timezone; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/com/avaje/tests/timezone/TzBeanTests.java b/src/test/java/org/tests/timezone/TzBeanTests.java similarity index 97% rename from src/test/java/com/avaje/tests/timezone/TzBeanTests.java rename to src/test/java/org/tests/timezone/TzBeanTests.java index b7e519e4d..ff50ee5a5 100644 --- a/src/test/java/com/avaje/tests/timezone/TzBeanTests.java +++ b/src/test/java/org/tests/timezone/TzBeanTests.java @@ -1,6 +1,6 @@ -package com.avaje.tests.timezone; +package org.tests.timezone; -import com.avaje.ebean.Ebean; +import io.ebean.Ebean; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/transaction/TestAutoCommitDataSource.java b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java similarity index 86% rename from src/test/java/com/avaje/tests/transaction/TestAutoCommitDataSource.java rename to src/test/java/org/tests/transaction/TestAutoCommitDataSource.java index f03d17d49..a7a82c943 100644 --- a/src/test/java/com/avaje/tests/transaction/TestAutoCommitDataSource.java +++ b/src/test/java/org/tests/transaction/TestAutoCommitDataSource.java @@ -1,14 +1,14 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.EbeanServerFactory; -import com.avaje.ebean.Query; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.config.PropertyMap; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.tests.model.basic.UTDetail; -import com.avaje.tests.model.basic.UTMaster; +import io.ebean.BaseTestCase; +import io.ebean.EbeanServer; +import io.ebean.EbeanServerFactory; +import io.ebean.Query; +import io.ebean.Transaction; +import io.ebean.config.PropertyMap; +import io.ebean.config.ServerConfig; +import org.tests.model.basic.UTDetail; +import org.tests.model.basic.UTMaster; import org.avaje.datasource.DataSourceConfig; import org.avaje.datasource.DataSourcePool; import org.avaje.datasource.pool.ConnectionPool; diff --git a/src/test/java/com/avaje/tests/transaction/TestBatchPersistCascade.java b/src/test/java/org/tests/transaction/TestBatchPersistCascade.java similarity index 90% rename from src/test/java/com/avaje/tests/transaction/TestBatchPersistCascade.java rename to src/test/java/org/tests/transaction/TestBatchPersistCascade.java index fd9dfb7ea..7b05b6bac 100644 --- a/src/test/java/com/avaje/tests/transaction/TestBatchPersistCascade.java +++ b/src/test/java/org/tests/transaction/TestBatchPersistCascade.java @@ -1,12 +1,12 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.config.PersistBatch; -import com.avaje.tests.model.basic.UTDetail; -import com.avaje.tests.model.basic.UTMaster; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Transaction; +import io.ebean.PersistBatch; +import org.tests.model.basic.UTDetail; +import org.tests.model.basic.UTMaster; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/com/avaje/tests/transaction/TestBeanStateReset.java b/src/test/java/org/tests/transaction/TestBeanStateReset.java similarity index 92% rename from src/test/java/com/avaje/tests/transaction/TestBeanStateReset.java rename to src/test/java/org/tests/transaction/TestBeanStateReset.java index faeb64a13..1c5470752 100644 --- a/src/test/java/com/avaje/tests/transaction/TestBeanStateReset.java +++ b/src/test/java/org/tests/transaction/TestBeanStateReset.java @@ -1,10 +1,10 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Transaction; -import com.avaje.tests.model.m2m.MnyB; -import com.avaje.tests.model.m2m.MnyC; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Transaction; +import org.tests.model.m2m.MnyB; +import org.tests.model.m2m.MnyC; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/com/avaje/tests/transaction/TestBeginTransactionWithExisting.java b/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java similarity index 84% rename from src/test/java/com/avaje/tests/transaction/TestBeginTransactionWithExisting.java rename to src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java index a0abc175a..bc9b5a176 100644 --- a/src/test/java/com/avaje/tests/transaction/TestBeginTransactionWithExisting.java +++ b/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java @@ -1,9 +1,9 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.TxIsolation; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Transaction; +import io.ebean.TxIsolation; import org.junit.Test; import javax.persistence.PersistenceException; diff --git a/src/test/java/com/avaje/tests/transaction/TestCommitAndContinue.java b/src/test/java/org/tests/transaction/TestCommitAndContinue.java similarity index 94% rename from src/test/java/com/avaje/tests/transaction/TestCommitAndContinue.java rename to src/test/java/org/tests/transaction/TestCommitAndContinue.java index 74f7e5b94..f95035092 100644 --- a/src/test/java/com/avaje/tests/transaction/TestCommitAndContinue.java +++ b/src/test/java/org/tests/transaction/TestCommitAndContinue.java @@ -1,11 +1,11 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.annotation.Transactional; -import com.avaje.tests.model.m2m.MnyB; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Transaction; +import io.ebean.annotation.Transactional; +import org.tests.model.m2m.MnyB; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/com/avaje/tests/transaction/TestCreateTransactionWithIsolation.java b/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java similarity index 79% rename from src/test/java/com/avaje/tests/transaction/TestCreateTransactionWithIsolation.java rename to src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java index 4b372e6ee..cc42c1c3a 100644 --- a/src/test/java/com/avaje/tests/transaction/TestCreateTransactionWithIsolation.java +++ b/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java @@ -1,6 +1,6 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.BaseTestCase; +import io.ebean.BaseTestCase; import org.junit.Test; public class TestCreateTransactionWithIsolation extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/transaction/TestDeleteFromPersistenceContext.java b/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java similarity index 85% rename from src/test/java/com/avaje/tests/transaction/TestDeleteFromPersistenceContext.java rename to src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java index 6571f37ed..446463d35 100644 --- a/src/test/java/com/avaje/tests/transaction/TestDeleteFromPersistenceContext.java +++ b/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java @@ -1,10 +1,10 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.tests.model.basic.EBasicVer; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebeaninternal.api.SpiTransaction; +import org.tests.model.basic.EBasicVer; +import org.tests.model.basic.ResetBasicData; import org.junit.Test; import static junit.framework.TestCase.assertNull; diff --git a/src/test/java/com/avaje/tests/transaction/TestExplicitTransactionMode.java b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java similarity index 87% rename from src/test/java/com/avaje/tests/transaction/TestExplicitTransactionMode.java rename to src/test/java/org/tests/transaction/TestExplicitTransactionMode.java index f1edf9e53..2fc6308c0 100644 --- a/src/test/java/com/avaje/tests/transaction/TestExplicitTransactionMode.java +++ b/src/test/java/org/tests/transaction/TestExplicitTransactionMode.java @@ -1,14 +1,14 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.EbeanServerFactory; -import com.avaje.ebean.Query; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.config.PropertyMap; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.tests.model.basic.UTDetail; -import com.avaje.tests.model.basic.UTMaster; +import io.ebean.BaseTestCase; +import io.ebean.EbeanServer; +import io.ebean.EbeanServerFactory; +import io.ebean.Query; +import io.ebean.Transaction; +import io.ebean.config.PropertyMap; +import io.ebean.config.ServerConfig; +import org.tests.model.basic.UTDetail; +import org.tests.model.basic.UTMaster; import org.avaje.datasource.DataSourceConfig; import org.avaje.datasource.DataSourcePool; import org.avaje.datasource.pool.ConnectionPool; diff --git a/src/test/java/com/avaje/tests/transaction/TestInsertManyAndRef.java b/src/test/java/org/tests/transaction/TestInsertManyAndRef.java similarity index 85% rename from src/test/java/com/avaje/tests/transaction/TestInsertManyAndRef.java rename to src/test/java/org/tests/transaction/TestInsertManyAndRef.java index ed8f1d652..029595eb7 100644 --- a/src/test/java/com/avaje/tests/transaction/TestInsertManyAndRef.java +++ b/src/test/java/org/tests/transaction/TestInsertManyAndRef.java @@ -1,9 +1,9 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.BBookmark; -import com.avaje.tests.model.basic.BBookmarkUser; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.BBookmark; +import org.tests.model.basic.BBookmarkUser; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/com/avaje/tests/transaction/TestNested.java b/src/test/java/org/tests/transaction/TestNested.java similarity index 77% rename from src/test/java/com/avaje/tests/transaction/TestNested.java rename to src/test/java/org/tests/transaction/TestNested.java index 74fb4e870..c3531dec4 100644 --- a/src/test/java/com/avaje/tests/transaction/TestNested.java +++ b/src/test/java/org/tests/transaction/TestNested.java @@ -1,8 +1,8 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.TxRunnable; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.TxRunnable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequired.java b/src/test/java/org/tests/transaction/TestNestedBeginRequired.java similarity index 73% rename from src/test/java/com/avaje/tests/transaction/TestNestedBeginRequired.java rename to src/test/java/org/tests/transaction/TestNestedBeginRequired.java index 685103f9e..ba8c3ecae 100644 --- a/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequired.java +++ b/src/test/java/org/tests/transaction/TestNestedBeginRequired.java @@ -1,13 +1,13 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.TxScope; -import com.avaje.tests.model.basic.Country; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Product; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Transaction; +import io.ebean.TxScope; +import org.tests.model.basic.Country; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Product; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiredWithFailure.java b/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java similarity index 79% rename from src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiredWithFailure.java rename to src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java index af6d811c5..55aa39bc0 100644 --- a/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiredWithFailure.java +++ b/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java @@ -1,14 +1,14 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.TxScope; -import com.avaje.tests.model.basic.Country; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.EBasic; -import com.avaje.tests.model.basic.Product; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Transaction; +import io.ebean.TxScope; +import org.tests.model.basic.Country; +import org.tests.model.basic.Customer; +import org.tests.model.basic.EBasic; +import org.tests.model.basic.Product; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiresNew.java b/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java similarity index 73% rename from src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiresNew.java rename to src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java index 54ea5c366..8666fcffd 100644 --- a/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiresNew.java +++ b/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java @@ -1,13 +1,13 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.TxScope; -import com.avaje.tests.model.basic.Country; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Product; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Transaction; +import io.ebean.TxScope; +import org.tests.model.basic.Country; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Product; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiresNewWithFailure.java b/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java similarity index 77% rename from src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiresNewWithFailure.java rename to src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java index 10cbba35b..f597ec347 100644 --- a/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiresNewWithFailure.java +++ b/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java @@ -1,13 +1,13 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.TxScope; -import com.avaje.tests.model.basic.Country; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Product; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Transaction; +import io.ebean.TxScope; +import org.tests.model.basic.Country; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Product; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/com/avaje/tests/transaction/TestPersistContextClear.java b/src/test/java/org/tests/transaction/TestPersistContextClear.java similarity index 81% rename from src/test/java/com/avaje/tests/transaction/TestPersistContextClear.java rename to src/test/java/org/tests/transaction/TestPersistContextClear.java index f3b8c6db1..d80caa0a9 100644 --- a/src/test/java/com/avaje/tests/transaction/TestPersistContextClear.java +++ b/src/test/java/org/tests/transaction/TestPersistContextClear.java @@ -1,14 +1,14 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.bean.PersistenceContext; -import com.avaje.ebeaninternal.api.SpiTransaction; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Transaction; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.api.SpiTransaction; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; +import org.tests.model.basic.ResetBasicData; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/transaction/TestStatelessUpdateClearPC.java b/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java similarity index 86% rename from src/test/java/com/avaje/tests/transaction/TestStatelessUpdateClearPC.java rename to src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java index c2bded3bc..8e1b59924 100644 --- a/src/test/java/com/avaje/tests/transaction/TestStatelessUpdateClearPC.java +++ b/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java @@ -1,8 +1,8 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.EBasic; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.EBasic; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/avaje/tests/transaction/TestTransactionCallback.java b/src/test/java/org/tests/transaction/TestTransactionCallback.java similarity index 87% rename from src/test/java/com/avaje/tests/transaction/TestTransactionCallback.java rename to src/test/java/org/tests/transaction/TestTransactionCallback.java index f4e7f3370..1c6b5ccbe 100644 --- a/src/test/java/com/avaje/tests/transaction/TestTransactionCallback.java +++ b/src/test/java/org/tests/transaction/TestTransactionCallback.java @@ -1,10 +1,10 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.TransactionCallbackAdapter; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import io.ebean.Transaction; +import io.ebean.TransactionCallbackAdapter; import org.junit.Test; import javax.persistence.PersistenceException; diff --git a/src/test/java/com/avaje/tests/transaction/TestTransactionRollbackOnly.java b/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java similarity index 85% rename from src/test/java/com/avaje/tests/transaction/TestTransactionRollbackOnly.java rename to src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java index 5cfd3806d..247b68761 100644 --- a/src/test/java/com/avaje/tests/transaction/TestTransactionRollbackOnly.java +++ b/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java @@ -1,9 +1,9 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Transaction; -import com.avaje.ebean.annotation.Transactional; -import com.avaje.tests.model.basic.EBasic; +import io.ebean.Ebean; +import io.ebean.Transaction; +import io.ebean.annotation.Transactional; +import org.tests.model.basic.EBasic; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; diff --git a/src/test/java/com/avaje/tests/transaction/TransactionNotTerminatedAfterRollback.java b/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java similarity index 94% rename from src/test/java/com/avaje/tests/transaction/TransactionNotTerminatedAfterRollback.java rename to src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java index 6dec3f255..1645b0259 100644 --- a/src/test/java/com/avaje/tests/transaction/TransactionNotTerminatedAfterRollback.java +++ b/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java @@ -1,7 +1,7 @@ -package com.avaje.tests.transaction; +package org.tests.transaction; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.annotation.Transactional; +import io.ebean.Ebean; +import io.ebean.annotation.Transactional; import org.avaje.agentloader.AgentLoader; import org.junit.BeforeClass; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/types/TestFileType.java b/src/test/java/org/tests/types/TestFileType.java similarity index 93% rename from src/test/java/com/avaje/tests/types/TestFileType.java rename to src/test/java/org/tests/types/TestFileType.java index 657b7327c..1919c7038 100644 --- a/src/test/java/com/avaje/tests/types/TestFileType.java +++ b/src/test/java/org/tests/types/TestFileType.java @@ -1,8 +1,8 @@ -package com.avaje.tests.types; +package org.tests.types; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.types.SomeFileBean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.types.SomeFileBean; import org.junit.Test; import java.io.File; diff --git a/src/test/java/com/avaje/tests/types/TestFileTypeFetching.java b/src/test/java/org/tests/types/TestFileTypeFetching.java similarity index 89% rename from src/test/java/com/avaje/tests/types/TestFileTypeFetching.java rename to src/test/java/org/tests/types/TestFileTypeFetching.java index 250a4c536..00c63d90d 100644 --- a/src/test/java/com/avaje/tests/types/TestFileTypeFetching.java +++ b/src/test/java/org/tests/types/TestFileTypeFetching.java @@ -1,9 +1,9 @@ -package com.avaje.tests.types; +package org.tests.types; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.BeanState; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.types.SomeFileBean; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.Ebean; +import org.tests.model.types.SomeFileBean; import org.junit.Test; import java.io.File; diff --git a/src/test/java/com/avaje/tests/types/TestHstore.java b/src/test/java/org/tests/types/TestHstore.java similarity index 93% rename from src/test/java/com/avaje/tests/types/TestHstore.java rename to src/test/java/org/tests/types/TestHstore.java index 684963efe..50d605f06 100644 --- a/src/test/java/com/avaje/tests/types/TestHstore.java +++ b/src/test/java/org/tests/types/TestHstore.java @@ -1,8 +1,8 @@ -package com.avaje.tests.types; +package org.tests.types; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.json.EBasicHstore; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.json.EBasicHstore; import org.assertj.core.api.Assertions; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/types/TestNewTypes.java b/src/test/java/org/tests/types/TestNewTypes.java similarity index 97% rename from src/test/java/com/avaje/tests/types/TestNewTypes.java rename to src/test/java/org/tests/types/TestNewTypes.java index 02ef14732..a08c03b93 100644 --- a/src/test/java/com/avaje/tests/types/TestNewTypes.java +++ b/src/test/java/org/tests/types/TestNewTypes.java @@ -1,8 +1,8 @@ -package com.avaje.tests.types; +package org.tests.types; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.types.SomeNewTypesBean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.types.SomeNewTypesBean; import org.junit.Test; import java.io.File; diff --git a/src/test/java/com/avaje/tests/types/TestPeriodType.java b/src/test/java/org/tests/types/TestPeriodType.java similarity index 91% rename from src/test/java/com/avaje/tests/types/TestPeriodType.java rename to src/test/java/org/tests/types/TestPeriodType.java index 2e4b033a7..510d40963 100644 --- a/src/test/java/com/avaje/tests/types/TestPeriodType.java +++ b/src/test/java/org/tests/types/TestPeriodType.java @@ -1,8 +1,8 @@ -package com.avaje.tests.types; +package org.tests.types; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.types.SomePeriodBean; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.types.SomePeriodBean; import org.junit.Test; import java.sql.Date; diff --git a/src/test/java/com/avaje/tests/unidirectional/TestUniDirectional.java b/src/test/java/org/tests/unidirectional/TestUniDirectional.java similarity index 84% rename from src/test/java/com/avaje/tests/unidirectional/TestUniDirectional.java rename to src/test/java/org/tests/unidirectional/TestUniDirectional.java index f967aae1e..244678cfd 100644 --- a/src/test/java/com/avaje/tests/unidirectional/TestUniDirectional.java +++ b/src/test/java/org/tests/unidirectional/TestUniDirectional.java @@ -1,9 +1,9 @@ -package com.avaje.tests.unidirectional; +package org.tests.unidirectional; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.UTDetail; -import com.avaje.tests.model.basic.UTMaster; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.UTDetail; +import org.tests.model.basic.UTMaster; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/unitinternal/HelloMain.java b/src/test/java/org/tests/unitinternal/HelloMain.java similarity index 89% rename from src/test/java/com/avaje/tests/unitinternal/HelloMain.java rename to src/test/java/org/tests/unitinternal/HelloMain.java index 421ff81ae..1d80fcdbe 100644 --- a/src/test/java/com/avaje/tests/unitinternal/HelloMain.java +++ b/src/test/java/org/tests/unitinternal/HelloMain.java @@ -1,9 +1,9 @@ -package com.avaje.tests.unitinternal; +package org.tests.unitinternal; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.EbeanServerFactory; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.tests.model.basic.TOne; +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 org.avaje.datasource.DataSourceConfig; import org.slf4j.Logger; diff --git a/src/test/java/com/avaje/tests/unitinternal/TestBasics.java b/src/test/java/org/tests/unitinternal/TestBasics.java similarity index 93% rename from src/test/java/com/avaje/tests/unitinternal/TestBasics.java rename to src/test/java/org/tests/unitinternal/TestBasics.java index 8d6d5a0d0..ae0c42370 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestBasics.java +++ b/src/test/java/org/tests/unitinternal/TestBasics.java @@ -1,4 +1,4 @@ -package com.avaje.tests.unitinternal; +package org.tests.unitinternal; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/unitinternal/TestEqualsOnEnhanced.java b/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java similarity index 79% rename from src/test/java/com/avaje/tests/unitinternal/TestEqualsOnEnhanced.java rename to src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java index d88af051c..b11b2626b 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestEqualsOnEnhanced.java +++ b/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java @@ -1,9 +1,9 @@ -package com.avaje.tests.unitinternal; +package org.tests.unitinternal; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.bean.EntityBean; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.Order; +import io.ebean.BaseTestCase; +import io.ebean.bean.EntityBean; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Order; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/unitinternal/TestLocaleParse.java b/src/test/java/org/tests/unitinternal/TestLocaleParse.java similarity index 92% rename from src/test/java/com/avaje/tests/unitinternal/TestLocaleParse.java rename to src/test/java/org/tests/unitinternal/TestLocaleParse.java index 33eed175e..33f4ef818 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestLocaleParse.java +++ b/src/test/java/org/tests/unitinternal/TestLocaleParse.java @@ -1,6 +1,6 @@ -package com.avaje.tests.unitinternal; +package org.tests.unitinternal; -import com.avaje.ebeaninternal.server.type.ScalarTypeLocale; +import io.ebeaninternal.server.type.ScalarTypeLocale; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/unitinternal/TestNamingConvention.java b/src/test/java/org/tests/unitinternal/TestNamingConvention.java similarity index 97% rename from src/test/java/com/avaje/tests/unitinternal/TestNamingConvention.java rename to src/test/java/org/tests/unitinternal/TestNamingConvention.java index 2f251362a..4db75771e 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestNamingConvention.java +++ b/src/test/java/org/tests/unitinternal/TestNamingConvention.java @@ -1,4 +1,4 @@ -package com.avaje.tests.unitinternal; +package org.tests.unitinternal; import junit.framework.TestCase; diff --git a/src/test/java/com/avaje/tests/unitinternal/TestNullCollectionSet.java b/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java similarity index 73% rename from src/test/java/com/avaje/tests/unitinternal/TestNullCollectionSet.java rename to src/test/java/org/tests/unitinternal/TestNullCollectionSet.java index f428afc12..7e00c5978 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestNullCollectionSet.java +++ b/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java @@ -1,10 +1,10 @@ -package com.avaje.tests.unitinternal; +package org.tests.unitinternal; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.tests.model.basic.ENullCollection; -import com.avaje.tests.model.basic.ENullCollectionDetail; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.bean.BeanCollection; +import org.tests.model.basic.ENullCollection; +import org.tests.model.basic.ENullCollectionDetail; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/unitinternal/TestOrderByParse.java b/src/test/java/org/tests/unitinternal/TestOrderByParse.java similarity index 98% rename from src/test/java/com/avaje/tests/unitinternal/TestOrderByParse.java rename to src/test/java/org/tests/unitinternal/TestOrderByParse.java index ff7507bf4..5fc876353 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestOrderByParse.java +++ b/src/test/java/org/tests/unitinternal/TestOrderByParse.java @@ -1,7 +1,7 @@ -package com.avaje.tests.unitinternal; +package org.tests.unitinternal; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.OrderBy; +import io.ebean.BaseTestCase; +import io.ebean.OrderBy; import org.junit.Test; import static org.junit.Assert.*; diff --git a/src/test/java/com/avaje/tests/unitinternal/TestOriginIntEncoding.java b/src/test/java/org/tests/unitinternal/TestOriginIntEncoding.java similarity index 88% rename from src/test/java/com/avaje/tests/unitinternal/TestOriginIntEncoding.java rename to src/test/java/org/tests/unitinternal/TestOriginIntEncoding.java index 627285b93..78a6267be 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestOriginIntEncoding.java +++ b/src/test/java/org/tests/unitinternal/TestOriginIntEncoding.java @@ -1,7 +1,7 @@ -package com.avaje.tests.unitinternal; +package org.tests.unitinternal; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.bean.CallStack; +import io.ebean.BaseTestCase; +import io.ebean.bean.CallStack; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/unitinternal/TestSimpleEncryptor.java b/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java similarity index 74% rename from src/test/java/com/avaje/tests/unitinternal/TestSimpleEncryptor.java rename to src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java index 34e75efe4..3a9745922 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestSimpleEncryptor.java +++ b/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java @@ -1,9 +1,9 @@ -package com.avaje.tests.unitinternal; +package org.tests.unitinternal; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.config.EncryptKey; -import com.avaje.ebeaninternal.server.type.SimpleAesEncryptor; -import com.avaje.tests.basic.encrypt.BasicEncryptKey; +import io.ebean.BaseTestCase; +import io.ebean.config.EncryptKey; +import io.ebeaninternal.server.type.SimpleAesEncryptor; +import org.tests.basic.encrypt.BasicEncryptKey; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/unitinternal/TestTxTypeOnTransactional.java b/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java similarity index 81% rename from src/test/java/com/avaje/tests/unitinternal/TestTxTypeOnTransactional.java rename to src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java index 7fdd5400f..7be4ccc01 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestTxTypeOnTransactional.java +++ b/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java @@ -1,11 +1,11 @@ -package com.avaje.tests.unitinternal; +package org.tests.unitinternal; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.Transaction; -import com.avaje.tests.model.basic.EBasicVer; -import com.avaje.tests.model.basic.xtra.DummyDao; -import com.avaje.tests.model.basic.xtra.OptimisticLockExceptionThrowingDao; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Transaction; +import org.tests.model.basic.EBasicVer; +import org.tests.model.basic.xtra.DummyDao; +import org.tests.model.basic.xtra.OptimisticLockExceptionThrowingDao; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/com/avaje/tests/unitinternal/TestVanillaCollectionSet.java b/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java similarity index 73% rename from src/test/java/com/avaje/tests/unitinternal/TestVanillaCollectionSet.java rename to src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java index 3b21938df..e445ef954 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestVanillaCollectionSet.java +++ b/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java @@ -1,10 +1,10 @@ -package com.avaje.tests.unitinternal; +package org.tests.unitinternal; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.bean.BeanCollection; -import com.avaje.tests.model.basic.EVanillaCollection; -import com.avaje.tests.model.basic.EVanillaCollectionDetail; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.bean.BeanCollection; +import org.tests.model.basic.EVanillaCollection; +import org.tests.model.basic.EVanillaCollectionDetail; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/update/TestEmbeddedRefreshUpdate.java b/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java similarity index 83% rename from src/test/java/com/avaje/tests/update/TestEmbeddedRefreshUpdate.java rename to src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java index 75f2ebe51..3a2ae5e48 100644 --- a/src/test/java/com/avaje/tests/update/TestEmbeddedRefreshUpdate.java +++ b/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java @@ -1,10 +1,10 @@ -package com.avaje.tests.update; +package org.tests.update; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.embedded.EEmbDatePeriod; -import com.avaje.tests.model.embedded.EEmbInner; -import com.avaje.tests.model.embedded.EEmbOuter; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.embedded.EEmbDatePeriod; +import org.tests.model.embedded.EEmbInner; +import org.tests.model.embedded.EEmbOuter; import org.junit.Test; import java.util.Date; diff --git a/src/test/java/com/avaje/tests/update/TestJsonStatelessUpdate.java b/src/test/java/org/tests/update/TestJsonStatelessUpdate.java similarity index 84% rename from src/test/java/com/avaje/tests/update/TestJsonStatelessUpdate.java rename to src/test/java/org/tests/update/TestJsonStatelessUpdate.java index a3e8779f7..f05b74f6d 100644 --- a/src/test/java/com/avaje/tests/update/TestJsonStatelessUpdate.java +++ b/src/test/java/org/tests/update/TestJsonStatelessUpdate.java @@ -1,11 +1,11 @@ -package com.avaje.tests.update; +package org.tests.update; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.JsonContext; -import com.avaje.ebean.text.json.JsonWriteOptions; -import com.avaje.tests.model.basic.UUOne; -import com.avaje.tests.model.basic.UUTwo; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.text.json.JsonContext; +import io.ebean.text.json.JsonWriteOptions; +import org.tests.model.basic.UUOne; +import org.tests.model.basic.UUTwo; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/update/TestMarkAsDirty.java b/src/test/java/org/tests/update/TestMarkAsDirty.java similarity index 81% rename from src/test/java/com/avaje/tests/update/TestMarkAsDirty.java rename to src/test/java/org/tests/update/TestMarkAsDirty.java index 55dcad9ff..f3da6422f 100644 --- a/src/test/java/com/avaje/tests/update/TestMarkAsDirty.java +++ b/src/test/java/org/tests/update/TestMarkAsDirty.java @@ -1,8 +1,8 @@ -package com.avaje.tests.update; +package org.tests.update; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.EBasicVer; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.EBasicVer; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/update/TestPostgresTruncate.java b/src/test/java/org/tests/update/TestPostgresTruncate.java similarity index 93% rename from src/test/java/com/avaje/tests/update/TestPostgresTruncate.java rename to src/test/java/org/tests/update/TestPostgresTruncate.java index dfec7829f..243734d5e 100644 --- a/src/test/java/com/avaje/tests/update/TestPostgresTruncate.java +++ b/src/test/java/org/tests/update/TestPostgresTruncate.java @@ -1,6 +1,6 @@ -package com.avaje.tests.update; +package org.tests.update; -import com.avaje.ebean.BaseTestCase; +import io.ebean.BaseTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/update/TestSqlUpdateBindMultipleLists.java b/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java similarity index 94% rename from src/test/java/com/avaje/tests/update/TestSqlUpdateBindMultipleLists.java rename to src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java index fae9d4382..acef06709 100644 --- a/src/test/java/com/avaje/tests/update/TestSqlUpdateBindMultipleLists.java +++ b/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java @@ -1,8 +1,8 @@ -package com.avaje.tests.update; +package org.tests.update; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.SqlUpdate; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.SqlUpdate; import org.junit.Test; import static java.util.Arrays.asList; diff --git a/src/test/java/com/avaje/tests/update/TestSqlUpdateInTxn.java b/src/test/java/org/tests/update/TestSqlUpdateInTxn.java similarity index 92% rename from src/test/java/com/avaje/tests/update/TestSqlUpdateInTxn.java rename to src/test/java/org/tests/update/TestSqlUpdateInTxn.java index 6e80edd5f..879517e3c 100644 --- a/src/test/java/com/avaje/tests/update/TestSqlUpdateInTxn.java +++ b/src/test/java/org/tests/update/TestSqlUpdateInTxn.java @@ -1,9 +1,9 @@ -package com.avaje.tests.update; +package org.tests.update; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.SqlUpdate; -import com.avaje.tests.idkeys.db.AuditLog; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.SqlUpdate; +import org.tests.idkeys.db.AuditLog; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/update/TestStatelessUpdate.java b/src/test/java/org/tests/update/TestStatelessUpdate.java similarity index 96% rename from src/test/java/com/avaje/tests/update/TestStatelessUpdate.java rename to src/test/java/org/tests/update/TestStatelessUpdate.java index 45e9d5e53..72eb8b8a3 100644 --- a/src/test/java/com/avaje/tests/update/TestStatelessUpdate.java +++ b/src/test/java/org/tests/update/TestStatelessUpdate.java @@ -1,12 +1,12 @@ -package com.avaje.tests.update; +package org.tests.update; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.tests.model.basic.Contact; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.EBasic; -import com.avaje.tests.model.basic.EBasic.Status; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.EbeanServer; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; +import org.tests.model.basic.EBasic; +import org.tests.model.basic.EBasic.Status; import org.junit.Assert; import org.junit.Test; @@ -101,7 +101,7 @@ public class TestStatelessUpdate extends BaseTestCase { *
    * This feature already works for normal Updates! *
    - * see: {@link com.avaje.tests.update.TestUpdatePartial#testWithoutChangesAndVersionColumn()} + * see: {@link org.tests.update.TestUpdatePartial#testWithoutChangesAndVersionColumn()} */ @Test public void testWithoutChangesAndVersionColumnAndIgnoreNullValues() { diff --git a/src/test/java/com/avaje/tests/update/TestUpdateAllLoadedProperties.java b/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java similarity index 92% rename from src/test/java/com/avaje/tests/update/TestUpdateAllLoadedProperties.java rename to src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java index b892f6ebd..165135f09 100644 --- a/src/test/java/com/avaje/tests/update/TestUpdateAllLoadedProperties.java +++ b/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java @@ -1,10 +1,10 @@ -package com.avaje.tests.update; +package org.tests.update; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Transaction; -import com.avaje.tests.model.basic.EBasicVer; +import io.ebean.BaseTestCase; +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; diff --git a/src/test/java/com/avaje/tests/update/TestUpdatePartial.java b/src/test/java/org/tests/update/TestUpdatePartial.java similarity index 89% rename from src/test/java/com/avaje/tests/update/TestUpdatePartial.java rename to src/test/java/org/tests/update/TestUpdatePartial.java index f4a5e4283..93deea3c1 100644 --- a/src/test/java/com/avaje/tests/update/TestUpdatePartial.java +++ b/src/test/java/org/tests/update/TestUpdatePartial.java @@ -1,10 +1,10 @@ -package com.avaje.tests.update; +package org.tests.update; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.SqlQuery; -import com.avaje.ebean.SqlRow; -import com.avaje.tests.model.basic.Customer; +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 static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/avaje/tests/update/TestUpdatePartialNoVer.java b/src/test/java/org/tests/update/TestUpdatePartialNoVer.java similarity index 68% rename from src/test/java/com/avaje/tests/update/TestUpdatePartialNoVer.java rename to src/test/java/org/tests/update/TestUpdatePartialNoVer.java index f72c6815e..19f7d7697 100644 --- a/src/test/java/com/avaje/tests/update/TestUpdatePartialNoVer.java +++ b/src/test/java/org/tests/update/TestUpdatePartialNoVer.java @@ -1,9 +1,9 @@ -package com.avaje.tests.update; +package org.tests.update; -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.EBasic; -import com.avaje.tests.model.basic.EBasic.Status; +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import org.tests.model.basic.EBasic; +import org.tests.model.basic.EBasic.Status; import org.junit.Test; public class TestUpdatePartialNoVer extends BaseTestCase { diff --git a/src/test/resources/autotune/test-autotune.xml b/src/test/resources/autotune/test-autotune.xml index aabed5e4b..78b795cd4 100644 --- a/src/test/resources/autotune/test-autotune.xml +++ b/src/test/resources/autotune/test-autotune.xml @@ -1,35 +1,35 @@ - - com.avaje.tests.query.autotune.TestAutoTuneProfiling.findById(TestAutoTuneProfiling.java:62) -com.avaje.tests.query.autotune.TestAutoTuneProfiling.useOrderDate(TestAutoTuneProfiling.java:66) -com.avaje.tests.query.autotune.TestAutoTuneProfiling.execute(TestAutoTuneProfiling.java:52) -com.avaje.tests.query.autotune.TestAutoTuneProfiling.test(TestAutoTuneProfiling.java:25) -sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - + + org.tests.query.autotune.TestAutoTuneProfiling.findById(TestAutoTuneProfiling.java:62) + org.tests.query.autotune.TestAutoTuneProfiling.useOrderDate(TestAutoTuneProfiling.java:66) + org.tests.query.autotune.TestAutoTuneProfiling.execute(TestAutoTuneProfiling.java:52) + org.tests.query.autotune.TestAutoTuneProfiling.test(TestAutoTuneProfiling.java:25) + sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + - - com.avaje.tests.query.autotune.TestAutoTuneProfiling.useLotUntuned(TestAutoTuneProfiling.java:95) -com.avaje.tests.query.autotune.TestAutoTuneProfiling.execute(TestAutoTuneProfiling.java:55) -com.avaje.tests.query.autotune.TestAutoTuneProfiling.test(TestAutoTuneProfiling.java:25) -sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) -sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - + + org.tests.query.autotune.TestAutoTuneProfiling.useLotUntuned(TestAutoTuneProfiling.java:95) + org.tests.query.autotune.TestAutoTuneProfiling.execute(TestAutoTuneProfiling.java:55) + org.tests.query.autotune.TestAutoTuneProfiling.test(TestAutoTuneProfiling.java:25) + sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + - - com.avaje.tests.model.basic.Order._ebean_get_customer(Order.java:6) -com.avaje.tests.model.basic.Order.getCustomer(Order.java:228) -com.avaje.tests.query.autotune.TestAutoTuneProfiling.useOrderDateCustomerName(TestAutoTuneProfiling.java:74) -com.avaje.tests.query.autotune.TestAutoTuneProfiling.execute(TestAutoTuneProfiling.java:53) -com.avaje.tests.query.autotune.TestAutoTuneProfiling.test(TestAutoTuneProfiling.java:25) - + + org.tests.model.basic.Order._ebean_get_customer(Order.java:6) + org.tests.model.basic.Order.getCustomer(Order.java:228) + org.tests.query.autotune.TestAutoTuneProfiling.useOrderDateCustomerName(TestAutoTuneProfiling.java:74) + org.tests.query.autotune.TestAutoTuneProfiling.execute(TestAutoTuneProfiling.java:53) + org.tests.query.autotune.TestAutoTuneProfiling.test(TestAutoTuneProfiling.java:25) + - - com.avaje.tests.model.basic.OrderDetail._ebean_get_product(OrderDetail.java:6) -com.avaje.tests.model.basic.OrderDetail.getProduct(OrderDetail.java:150) -com.avaje.tests.query.autotune.TestAutoTuneProfiling.useLotUntuned(TestAutoTuneProfiling.java:96) -com.avaje.tests.query.autotune.TestAutoTuneProfiling.execute(TestAutoTuneProfiling.java:55) -com.avaje.tests.query.autotune.TestAutoTuneProfiling.test(TestAutoTuneProfiling.java:32) - + + org.tests.model.basic.OrderDetail._ebean_get_product(OrderDetail.java:6) + org.tests.model.basic.OrderDetail.getProduct(OrderDetail.java:150) + org.tests.query.autotune.TestAutoTuneProfiling.useLotUntuned(TestAutoTuneProfiling.java:96) + org.tests.query.autotune.TestAutoTuneProfiling.execute(TestAutoTuneProfiling.java:55) + org.tests.query.autotune.TestAutoTuneProfiling.test(TestAutoTuneProfiling.java:32) + diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties index 8329f170a..d31a62e7b 100644 --- a/src/test/resources/ebean.properties +++ b/src/test/resources/ebean.properties @@ -9,7 +9,7 @@ #load.properties=${HOME}/config/myapp.ebean.properties -ebean.encryptKeyManager=com.avaje.tests.basic.encrypt.BasicEncyptKeyManager +ebean.encryptKeyManager=org.tests.basic.encrypt.BasicEncyptKeyManager #ebean.autotune.querytuning=true #ebean.autotune.profiling=true @@ -23,7 +23,7 @@ datasource.default=h2 #ebean.h2.idType=SEQUENCE -ebean.currentUserProvider=com.avaje.ebean.MyCurrentUserProvider +ebean.currentUserProvider=io.ebean.MyCurrentUserProvider #ebean.expressionNativeIlike=true #ebean.jsonInclude=NON_NULL @@ -61,7 +61,7 @@ datasource.h2.maxConnections=25 #datasource.h2.isolationlevel=read_committed #datasource.h2.capturestacktrace=true #datasource.h2.maxStackTraceSize=20 -datasource.h2.poolListener=com.avaje.tests.basic.MyTestDataSourcePoolListener +datasource.h2.poolListener=org.tests.basic.MyTestDataSourcePoolListener #datasource.h2.customProperties=IGNORECASE=TRUE;MODE=Oracle; datasource.h2autocommit.autoCommit=true diff --git a/src/test/resources/ebean.xml b/src/test/resources/ebean.xml index 7232b943b..10cdbf265 100644 --- a/src/test/resources/ebean.xml +++ b/src/test/resources/ebean.xml @@ -1,7 +1,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -46,7 +46,7 @@ - + select (name, version) diff --git a/src/test/resources/com/avaje/ebean/dbmigration/model/1.0.model.xml b/src/test/resources/io/ebean/dbmigration/model/1.0.model.xml similarity index 100% rename from src/test/resources/com/avaje/ebean/dbmigration/model/1.0.model.xml rename to src/test/resources/io/ebean/dbmigration/model/1.0.model.xml diff --git a/src/test/resources/com/avaje/ebean/dbmigration/model/1.1.model.xml b/src/test/resources/io/ebean/dbmigration/model/1.1.model.xml similarity index 100% rename from src/test/resources/com/avaje/ebean/dbmigration/model/1.1.model.xml rename to src/test/resources/io/ebean/dbmigration/model/1.1.model.xml diff --git a/src/test/resources/com/avaje/ebean/dbmigration/model/1.1_2__drops.model.xml b/src/test/resources/io/ebean/dbmigration/model/1.1_2__drops.model.xml similarity index 100% rename from src/test/resources/com/avaje/ebean/dbmigration/model/1.1_2__drops.model.xml rename to src/test/resources/io/ebean/dbmigration/model/1.1_2__drops.model.xml diff --git a/src/test/resources/com/avaje/ebean/dbmigration/model/2.0.model.xml b/src/test/resources/io/ebean/dbmigration/model/2.0.model.xml similarity index 100% rename from src/test/resources/com/avaje/ebean/dbmigration/model/2.0.model.xml rename to src/test/resources/io/ebean/dbmigration/model/2.0.model.xml diff --git a/src/test/resources/com/avaje/ebean/dbmigration/model/2.1.model.xml b/src/test/resources/io/ebean/dbmigration/model/2.1.model.xml similarity index 100% rename from src/test/resources/com/avaje/ebean/dbmigration/model/2.1.model.xml rename to src/test/resources/io/ebean/dbmigration/model/2.1.model.xml diff --git a/src/test/resources/com/avaje/ebean/dbmigration/model/2.2__drops.model.xml b/src/test/resources/io/ebean/dbmigration/model/2.2__drops.model.xml similarity index 100% rename from src/test/resources/com/avaje/ebean/dbmigration/model/2.2__drops.model.xml rename to src/test/resources/io/ebean/dbmigration/model/2.2__drops.model.xml diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index d56df31bc..461365004 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -73,10 +73,10 @@ - + - + diff --git a/src/test/resources/test-ebean.xml b/src/test/resources/test-ebean.xml index d28c6ab52..242907663 100644 --- a/src/test/resources/test-ebean.xml +++ b/src/test/resources/test-ebean.xml @@ -1,7 +1,7 @@ - +