From 60becb634678f8195e7501f82ed955be7d2dcc17 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Fri, 9 Oct 2020 17:12:27 +1300 Subject: [PATCH] #2072 - Extract ebean-api module - NB: this includes moving ShutdownManager and small adjustment to DocStore/Elastic SPI --- ebean-api/pom.xml | 135 ++++++++++++++++++ .../java/io/ebean/AcquireLockException.java | 0 .../src/main/java/io/ebean/AutoTune.java | 0 .../java/io/ebean/BackgroundExecutor.java | 0 .../src/main/java/io/ebean/BeanFinder.java | 0 .../main/java/io/ebean/BeanRepository.java | 0 .../src/main/java/io/ebean/BeanState.java | 0 .../src/main/java/io/ebean/CacheMode.java | 0 .../src/main/java/io/ebean/CallableSql.java | 0 .../java/io/ebean/CountDistinctOrder.java | 0 .../src/main/java/io/ebean/CountedValue.java | 0 .../src/main/java/io/ebean/DB.java | 0 .../java/io/ebean/DataIntegrityException.java | 0 .../src/main/java/io/ebean/Database.java | 0 .../main/java/io/ebean/DatabaseFactory.java | 0 .../src/main/java/io/ebean/DbContext.java | 0 .../src/main/java/io/ebean/DbPrimary.java | 0 .../java/io/ebean/DocStoreQueueEntry.java | 0 .../src/main/java/io/ebean/DocumentStore.java | 14 +- .../src/main/java/io/ebean/DtoQuery.java | 0 .../java/io/ebean/DuplicateKeyException.java | 0 .../src/main/java/io/ebean/Ebean.java | 0 .../src/main/java/io/ebean/EbeanServer.java | 0 .../java/io/ebean/EbeanServerFactory.java | 0 .../src/main/java/io/ebean/EbeanVersion.java | 0 .../main/java/io/ebean/EmptyPagedList.java | 0 .../main/java/io/ebean/ExampleExpression.java | 0 .../src/main/java/io/ebean/Expr.java | 0 .../src/main/java/io/ebean/Expression.java | 0 .../main/java/io/ebean/ExpressionFactory.java | 0 .../main/java/io/ebean/ExpressionList.java | 0 .../main/java/io/ebean/ExtendedServer.java | 0 .../src/main/java/io/ebean/FetchConfig.java | 0 .../src/main/java/io/ebean/FetchGroup.java | 0 .../main/java/io/ebean/FetchGroupBuilder.java | 0 .../src/main/java/io/ebean/FetchPath.java | 0 .../src/main/java/io/ebean/Filter.java | 0 .../src/main/java/io/ebean/Finder.java | 0 .../src/main/java/io/ebean/FutureIds.java | 0 .../src/main/java/io/ebean/FutureList.java | 0 .../main/java/io/ebean/FutureRowCount.java | 0 .../src/main/java/io/ebean/Junction.java | 0 .../src/main/java/io/ebean/LikeType.java | 0 .../src/main/java/io/ebean/MergeOptions.java | 0 .../java/io/ebean/MergeOptionsBuilder.java | 0 .../src/main/java/io/ebean/Model.java | 0 .../src/main/java/io/ebean/OrderBy.java | 0 .../src/main/java/io/ebean/PagedList.java | 0 .../src/main/java/io/ebean/Pairs.java | 0 .../io/ebean/PersistenceContextScope.java | 0 .../java/io/ebean/PersistenceIOException.java | 0 .../main/java/io/ebean/ProfileLocation.java | 0 .../src/main/java/io/ebean/Query.java | 0 .../src/main/java/io/ebean/QueryIterator.java | 0 .../src/main/java/io/ebean/QueryType.java | 0 .../src/main/java/io/ebean/RawSql.java | 0 .../src/main/java/io/ebean/RawSqlBuilder.java | 0 .../src/main/java/io/ebean/RowConsumer.java | 0 .../src/main/java/io/ebean/RowMapper.java | 0 .../src/main/java/io/ebean/ScriptRunner.java | 0 .../ebean/SerializableConflictException.java | 0 .../src/main/java/io/ebean/SqlQuery.java | 0 .../src/main/java/io/ebean/SqlRow.java | 0 .../src/main/java/io/ebean/SqlUpdate.java | 0 .../src/main/java/io/ebean/Transaction.java | 0 .../java/io/ebean/TransactionCallback.java | 0 .../io/ebean/TransactionCallbackAdapter.java | 0 .../src/main/java/io/ebean/TxScope.java | 0 .../src/main/java/io/ebean/Update.java | 0 .../src/main/java/io/ebean/UpdateQuery.java | 0 .../src/main/java/io/ebean/ValuePair.java | 0 .../src/main/java/io/ebean/Version.java | 0 .../main/java/io/ebean/XServiceProvider.java | 0 .../java/io/ebean/bean/BeanCollection.java | 0 .../java/io/ebean/bean/BeanCollectionAdd.java | 0 .../io/ebean/bean/BeanCollectionLoader.java | 0 .../java/io/ebean/bean/BeanDiffVisitor.java | 0 .../main/java/io/ebean/bean/BeanLoader.java | 0 .../main/java/io/ebean/bean/CallOrigin.java | 0 .../main/java/io/ebean/bean/CallStack.java | 0 .../io/ebean/bean/EnhancedTransactional.java | 0 .../main/java/io/ebean/bean/EntityBean.java | 0 .../io/ebean/bean/EntityBeanIntercept.java | 0 .../io/ebean/bean/NodeUsageCollector.java | 0 .../java/io/ebean/bean/NodeUsageListener.java | 0 .../io/ebean/bean/NotEnhancedException.java | 0 .../java/io/ebean/bean/ObjectGraphNode.java | 0 .../java/io/ebean/bean/ObjectGraphOrigin.java | 0 .../io/ebean/bean/PersistenceContext.java | 0 .../java/io/ebean/bean/PreGetterCallback.java | 0 .../java/io/ebean/bean/SingleBeanLoader.java | 0 .../src/main/java/io/ebean/bean/package.html | 0 .../java/io/ebean/cache/QueryCacheEntry.java | 0 .../ebean/cache/QueryCacheEntryValidate.java | 0 .../main/java/io/ebean/cache/ServerCache.java | 0 .../io/ebean/cache/ServerCacheConfig.java | 0 .../io/ebean/cache/ServerCacheFactory.java | 0 .../io/ebean/cache/ServerCacheManager.java | 0 .../ebean/cache/ServerCacheNotification.java | 0 .../io/ebean/cache/ServerCacheNotify.java | 0 .../ebean/cache/ServerCacheNotifyPlugin.java | 0 .../io/ebean/cache/ServerCacheOptions.java | 0 .../io/ebean/cache/ServerCachePlugin.java | 0 .../io/ebean/cache/ServerCacheRegion.java | 0 .../io/ebean/cache/ServerCacheStatistics.java | 0 .../java/io/ebean/cache/ServerCacheType.java | 0 .../java/io/ebean/cache/TenantAwareKey.java | 0 .../src/main/java/io/ebean/cache/package.html | 0 .../ebean/common/AbstractBeanCollection.java | 0 .../main/java/io/ebean/common/BeanList.java | 0 .../main/java/io/ebean/common/BeanMap.java | 0 .../main/java/io/ebean/common/BeanSet.java | 0 .../io/ebean/common/CopyOnFirstWriteList.java | 0 .../io/ebean/common/ModifyCollection.java | 0 .../java/io/ebean/common/ModifyHolder.java | 0 .../java/io/ebean/common/ModifyIterator.java | 0 .../main/java/io/ebean/common/ModifyList.java | 0 .../io/ebean/common/ModifyListIterator.java | 0 .../main/java/io/ebean/common/ModifySet.java | 0 .../main/java/io/ebean/common/package.html | 0 .../config/AbstractNamingConvention.java | 0 .../java/io/ebean/config/AutoConfigure.java | 0 .../java/io/ebean/config/AutoTuneConfig.java | 0 .../java/io/ebean/config/AutoTuneMode.java | 0 .../config/BeanNotEnhancedException.java | 0 .../config/BeanNotRegisteredException.java | 0 .../java/io/ebean/config/ClassLoadConfig.java | 0 .../java/io/ebean/config/ContainerConfig.java | 0 .../ebean/config/CurrentTenantProvider.java | 0 .../io/ebean/config/CurrentUserProvider.java | 0 .../io/ebean/config/CustomDbTypeMapping.java | 0 .../java/io/ebean/config/DatabaseConfig.java | 0 .../ebean/config/DatabaseConfigProvider.java | 0 .../io/ebean/config/DbConstraintNaming.java | 0 .../ebean/config/DbConstraintNormalise.java | 0 .../io/ebean/config/DbMigrationConfig.java | 0 .../java/io/ebean/config/DocStoreConfig.java | 0 .../java/io/ebean/config/EncryptDeploy.java | 0 .../io/ebean/config/EncryptDeployManager.java | 0 .../main/java/io/ebean/config/EncryptKey.java | 0 .../io/ebean/config/EncryptKeyManager.java | 0 .../main/java/io/ebean/config/Encryptor.java | 0 .../config/ExternalTransactionManager.java | 0 .../java/io/ebean/config/IdGenerator.java | 0 .../main/java/io/ebean/config/JsonConfig.java | 0 .../config/MatchingNamingConvention.java | 0 .../main/java/io/ebean/config/ModuleInfo.java | 0 .../io/ebean/config/ModuleInfoLoader.java | 0 .../io/ebean/config/NamingConvention.java | 0 .../java/io/ebean/config/PlatformConfig.java | 0 .../java/io/ebean/config/ProfilingConfig.java | 0 .../io/ebean/config/PropertiesWrapper.java | 0 .../io/ebean/config/ScalarTypeConverter.java | 0 .../java/io/ebean/config/ServerConfig.java | 0 .../io/ebean/config/ServerConfigProvider.java | 0 .../java/io/ebean/config/SlowQueryEvent.java | 0 .../io/ebean/config/SlowQueryListener.java | 0 .../main/java/io/ebean/config/TableName.java | 0 .../ebean/config/TenantCatalogProvider.java | 0 .../config/TenantDataSourceProvider.java | 0 .../main/java/io/ebean/config/TenantMode.java | 0 .../io/ebean/config/TenantSchemaProvider.java | 0 .../config/UnderscoreNamingConvention.java | 0 .../config/dbplatform/AbstractDbEncrypt.java | 0 .../dbplatform/BasicSqlAnsiLimiter.java | 0 .../dbplatform/BasicSqlLimitOffset.java | 0 .../config/dbplatform/BasicSqlLimiter.java | 0 .../config/dbplatform/DataErrorType.java | 0 .../config/dbplatform/DatabasePlatform.java | 0 .../config/dbplatform/DbDefaultValue.java | 0 .../io/ebean/config/dbplatform/DbEncrypt.java | 0 .../config/dbplatform/DbEncryptFunction.java | 0 .../config/dbplatform/DbHistorySupport.java | 0 .../ebean/config/dbplatform/DbIdentity.java | 0 .../config/dbplatform/DbPlatformType.java | 0 .../dbplatform/DbPlatformTypeLookup.java | 0 .../dbplatform/DbPlatformTypeMapping.java | 0 .../dbplatform/DbPlatformTypeParser.java | 0 .../dbplatform/DbStandardHistorySupport.java | 0 .../io/ebean/config/dbplatform/DbType.java | 0 .../dbplatform/DbViewHistorySupport.java | 0 .../ebean/config/dbplatform/ExtraDbTypes.java | 0 .../io/ebean/config/dbplatform/IdType.java | 0 .../dbplatform/LimitOffsetSqlLimiter.java | 0 .../dbplatform/PlatformIdGenerator.java | 0 .../dbplatform/SequenceBatchIdGenerator.java | 0 .../dbplatform/SequenceIdGenerator.java | 0 .../dbplatform/SequenceStepIdGenerator.java | 0 .../dbplatform/SimpleSequenceIdGenerator.java | 0 .../config/dbplatform/SqlCodeTranslator.java | 0 .../config/dbplatform/SqlErrorCodes.java | 0 .../dbplatform/SqlExceptionTranslator.java | 0 .../config/dbplatform/SqlLimitRequest.java | 0 .../config/dbplatform/SqlLimitResponse.java | 0 .../ebean/config/dbplatform/SqlLimiter.java | 0 .../clickhouse/ClickHousePlatform.java | 0 .../dbplatform/clickhouse/package-info.java | 0 .../cockroach/CockroachPlatform.java | 0 .../dbplatform/cockroach/package-info.java | 0 .../config/dbplatform/db2/DB2Platform.java | 0 .../db2/DB2SequenceIdGenerator.java | 0 .../config/dbplatform/db2/Db2SqlLimiter.java | 0 .../config/dbplatform/db2/package-info.java | 0 .../config/dbplatform/h2/H2DbEncrypt.java | 0 .../dbplatform/h2/H2HistorySupport.java | 0 .../dbplatform/h2/H2HistoryTrigger.java | 0 .../config/dbplatform/h2/H2Platform.java | 0 .../dbplatform/h2/H2SequenceIdGenerator.java | 0 .../config/dbplatform/h2/package-info.java | 0 .../dbplatform/hana/HanaBasicSqlLimiter.java | 0 .../dbplatform/hana/HanaHistorySupport.java | 0 .../config/dbplatform/hana/HanaPlatform.java | 0 .../dbplatform/hana/HanaSqlLimiter.java | 0 .../config/dbplatform/hana/package-info.java | 0 .../dbplatform/hsqldb/HsqldbPlatform.java | 0 .../dbplatform/hsqldb/package-info.java | 0 .../mariadb/MariaDbHistorySupport.java | 0 .../dbplatform/mariadb/MariaDbPlatform.java | 0 .../dbplatform/mysql/BaseMySqlPlatform.java | 0 .../dbplatform/mysql/MySql55Platform.java | 0 .../config/dbplatform/mysql/MySqlBlob.java | 0 .../config/dbplatform/mysql/MySqlClob.java | 0 .../dbplatform/mysql/MySqlDbEncrypt.java | 0 .../dbplatform/mysql/MySqlHistorySupport.java | 0 .../dbplatform/mysql/MySqlPlatform.java | 0 .../config/dbplatform/mysql/package-info.java | 0 .../dbplatform/nuodb/NuoDbHistorySupport.java | 0 .../dbplatform/nuodb/NuoDbPlatform.java | 0 .../dbplatform/nuodb/NuoDbSequence.java | 0 .../config/dbplatform/nuodb/package-info.java | 0 .../dbplatform/oracle/Oracle11Platform.java | 0 .../oracle/OracleAnsiSqlRowsLimiter.java | 0 .../dbplatform/oracle/OracleDbEncrypt.java | 0 .../oracle/OracleDbHistorySupport.java | 0 .../dbplatform/oracle/OraclePlatform.java | 0 .../oracle/OracleRownumSqlLimiter.java | 0 .../oracle/OracleSequenceIdGenerator.java | 0 .../dbplatform/oracle/package-info.java | 0 .../io/ebean/config/dbplatform/package.html | 0 .../postgres/Postgres9Platform.java | 0 .../postgres/PostgresDbEncrypt.java | 0 .../postgres/PostgresHistorySupport.java | 0 .../dbplatform/postgres/PostgresPlatform.java | 0 .../postgres/PostgresSequenceIdGenerator.java | 0 .../dbplatform/postgres/package-info.java | 0 .../sqlanywhere/SqlAnywhereLimiter.java | 0 .../sqlanywhere/SqlAnywherePlatform.java | 0 .../dbplatform/sqlanywhere/package-info.java | 0 .../dbplatform/sqlite/SQLitePlatform.java | 0 .../dbplatform/sqlite/package-info.java | 0 .../sqlserver/SqlServer16Platform.java | 0 .../sqlserver/SqlServer17Platform.java | 0 .../sqlserver/SqlServerBasePlatform.java | 0 .../sqlserver/SqlServerBasicSqlLimiter.java | 0 .../sqlserver/SqlServerHistorySupport.java | 0 .../sqlserver/SqlServerSqlLimiter.java | 0 .../sqlserver/SqlServerStepSequence.java | 0 .../dbplatform/sqlserver/package-info.java | 0 .../main/java/io/ebean/config/package.html | 0 .../io/ebean/dbmigration/DbMigration.java | 0 .../io/ebean/dbmigration/package-info.java | 0 .../java/io/ebean/docstore/DocMapping.java | 7 + .../io/ebean/docstore/DocQueryContext.java | 7 + .../io/ebean/docstore/DocUpdateContext.java | 7 + .../main/java/io/ebean/docstore}/RawDoc.java | 2 +- .../event/AbstractBeanPersistListener.java | 0 .../io/ebean/event/BeanDeleteIdRequest.java | 0 .../io/ebean/event/BeanFindController.java | 0 .../io/ebean/event/BeanPersistAdapter.java | 0 .../io/ebean/event/BeanPersistController.java | 0 .../io/ebean/event/BeanPersistListener.java | 0 .../io/ebean/event/BeanPersistRequest.java | 0 .../event/BeanPostConstructListener.java | 0 .../java/io/ebean/event/BeanPostLoad.java | 0 .../java/io/ebean/event/BeanQueryAdapter.java | 0 .../java/io/ebean/event/BeanQueryRequest.java | 0 .../java/io/ebean/event/BulkTableEvent.java | 0 .../ebean/event/BulkTableEventListener.java | 0 .../main/java/io/ebean/event/ClassUtil.java | 0 .../io/ebean/event/ServerConfigStartup.java | 0 .../ebean/event/ServletContextListener.java | 0 .../java/io/ebean/event/ShutdownManager.java | 0 .../io/ebean/event/changelog/BeanChange.java | 0 .../event/changelog/ChangeLogFilter.java | 0 .../event/changelog/ChangeLogListener.java | 0 .../event/changelog/ChangeLogPrepare.java | 0 .../event/changelog/ChangeLogRegister.java | 0 .../io/ebean/event/changelog/ChangeSet.java | 0 .../io/ebean/event/changelog/ChangeType.java | 0 .../io/ebean/event/changelog/TxnState.java | 0 .../ebean/event/changelog/package-info.java | 0 .../src/main/java/io/ebean/event/package.html | 0 .../event/readaudit/ReadAuditLogger.java | 0 .../event/readaudit/ReadAuditPrepare.java | 0 .../event/readaudit/ReadAuditQueryPlan.java | 0 .../io/ebean/event/readaudit/ReadEvent.java | 0 .../ebean/event/readaudit/package-info.java | 0 .../io/ebean/meta/AbstractMetricVisitor.java | 0 .../io/ebean/meta/BasicMetricVisitor.java | 0 .../java/io/ebean/meta/MetaCountMetric.java | 0 .../java/io/ebean/meta/MetaInfoManager.java | 0 .../main/java/io/ebean/meta/MetaMetric.java | 0 .../java/io/ebean/meta/MetaQueryMetric.java | 0 .../java/io/ebean/meta/MetaQueryPlan.java | 0 .../java/io/ebean/meta/MetaTimedMetric.java | 0 .../main/java/io/ebean/meta/MetricData.java | 0 .../java/io/ebean/meta/MetricVisitor.java | 0 .../java/io/ebean/meta/QueryPlanInit.java | 0 .../java/io/ebean/meta/QueryPlanRequest.java | 0 .../java/io/ebean/meta/ServerMetrics.java | 0 .../io/ebean/meta/ServerMetricsAsJson.java | 0 .../main/java/io/ebean/meta/SortMetric.java | 0 .../main/java/io/ebean/meta/package-info.java | 0 .../java/io/ebean/metric/CountMetric.java | 0 .../io/ebean/metric/CountMetricStats.java | 0 .../java/io/ebean/metric/MetricFactory.java | 0 .../ebean/metric/MetricServiceProvider.java | 0 .../io/ebean/metric/QueryPlanCollector.java | 0 .../java/io/ebean/metric/QueryPlanMetric.java | 0 .../java/io/ebean/metric/TimedMetric.java | 0 .../java/io/ebean/metric/TimedMetricMap.java | 0 .../io/ebean/metric/TimedMetricStats.java | 0 .../src/main/java/io/ebean/overview.html | 0 .../src/main/java/io/ebean/package.html | 0 .../java/io/ebean/plugin/BeanDocType.java | 8 +- .../main/java/io/ebean/plugin/BeanType.java | 4 +- .../java/io/ebean/plugin/ExpressionPath.java | 0 .../io/ebean/plugin/LoadErrorHandler.java | 0 .../src/main/java/io/ebean/plugin/Plugin.java | 0 .../main/java/io/ebean/plugin/Property.java | 0 .../io/ebean/plugin/PropertyAssocMany.java | 0 .../main/java/io/ebean/plugin/SpiServer.java | 0 .../java/io/ebean/plugin/package-info.java | 0 .../java/io/ebean/search/AbstractMatch.java | 0 .../src/main/java/io/ebean/search/Match.java | 0 .../main/java/io/ebean/search/MultiMatch.java | 0 .../java/io/ebean/search/TextCommonTerms.java | 0 .../java/io/ebean/search/TextQueryString.java | 0 .../main/java/io/ebean/search/TextSimple.java | 0 .../java/io/ebean/search/package-info.java | 0 .../java/io/ebean/service/SpiContainer.java | 0 .../io/ebean/service/SpiContainerFactory.java | 0 .../io/ebean/service/SpiFetchGroupQuery.java | 0 .../ebean/service/SpiFetchGroupService.java | 0 .../java/io/ebean/service/SpiJsonService.java | 0 .../service/SpiProfileLocationFactory.java | 0 .../io/ebean/service/SpiRawSqlService.java | 0 .../src/main/java/io/ebean/stylesheet.css | 0 .../java/io/ebean/text/PathProperties.java | 0 .../io/ebean/text/PathPropertiesParser.java | 0 .../java/io/ebean/text/StringFormatter.java | 0 .../main/java/io/ebean/text/StringParser.java | 0 .../java/io/ebean/text/TextException.java | 0 .../java/io/ebean/text/TimeStringParser.java | 0 .../java/io/ebean/text/csv/CsvCallback.java | 0 .../java/io/ebean/text/csv/CsvReader.java | 0 .../io/ebean/text/csv/DefaultCsvCallback.java | 0 .../java/io/ebean/text/csv/package-info.java | 0 .../main/java/io/ebean/text/json/EJson.java | 0 .../io/ebean/text/json/JsonBeanReader.java | 0 .../java/io/ebean/text/json/JsonContext.java | 0 .../io/ebean/text/json/JsonIOException.java | 0 .../ebean/text/json/JsonReadBeanVisitor.java | 0 .../io/ebean/text/json/JsonReadOptions.java | 0 .../ebean/text/json/JsonWriteBeanVisitor.java | 0 .../io/ebean/text/json/JsonWriteOptions.java | 0 .../java/io/ebean/text/json/JsonWriter.java | 0 .../java/io/ebean/text/json/package-info.java | 0 .../main/java/io/ebean/text/package-info.java | 0 .../java/io/ebean/util/AnnotationUtil.java | 0 .../java/io/ebean/util/CamelCaseHelper.java | 0 .../main/java/io/ebean/util/EncodeB64.java | 0 .../main/java/io/ebean/util/JdbcClose.java | 0 .../main/java/io/ebean/util/SplitName.java | 0 .../main/java/io/ebean/util/StringHelper.java | 0 .../main/java/io/ebean/util/package-info.java | 0 ebean-autotune/pom.xml | 8 +- ebean-core/pom.xml | 103 ++++--------- .../docstore/api/DocQueryRequest.java | 3 +- .../docstore/api/DocStoreBeanAdapter.java | 7 +- .../docstore/api/DocStoreUpdateContext.java | 4 +- .../docstore/api/mapping/DocumentMapping.java | 3 +- .../api/support/DocStoreBeanBaseAdapter.java | 7 +- .../docstore/none/NoneDocStore.java | 14 +- .../none/NoneDocStoreBeanAdapter.java | 7 +- .../support/DocStoreBeanBaseAdapterTest.java | 7 +- ebean-querybean/pom.xml | 7 + ebean-test/pom.xml | 7 + pom.xml | 1 + 389 files changed, 253 insertions(+), 109 deletions(-) create mode 100644 ebean-api/pom.xml rename {ebean-core => ebean-api}/src/main/java/io/ebean/AcquireLockException.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/AutoTune.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/BackgroundExecutor.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/BeanFinder.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/BeanRepository.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/BeanState.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/CacheMode.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/CallableSql.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/CountDistinctOrder.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/CountedValue.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/DB.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/DataIntegrityException.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/Database.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/DatabaseFactory.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/DbContext.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/DbPrimary.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/DocStoreQueueEntry.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/DocumentStore.java (96%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/DtoQuery.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/DuplicateKeyException.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/Ebean.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/EbeanServer.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/EbeanServerFactory.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/EbeanVersion.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/EmptyPagedList.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/ExampleExpression.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/Expr.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/Expression.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/ExpressionFactory.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/ExpressionList.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/ExtendedServer.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/FetchConfig.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/FetchGroup.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/FetchGroupBuilder.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/FetchPath.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/Filter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/Finder.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/FutureIds.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/FutureList.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/FutureRowCount.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/Junction.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/LikeType.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/MergeOptions.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/MergeOptionsBuilder.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/Model.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/OrderBy.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/PagedList.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/Pairs.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/PersistenceContextScope.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/PersistenceIOException.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/ProfileLocation.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/Query.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/QueryIterator.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/QueryType.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/RawSql.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/RawSqlBuilder.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/RowConsumer.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/RowMapper.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/ScriptRunner.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/SerializableConflictException.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/SqlQuery.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/SqlRow.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/SqlUpdate.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/Transaction.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/TransactionCallback.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/TransactionCallbackAdapter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/TxScope.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/Update.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/UpdateQuery.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/ValuePair.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/Version.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/XServiceProvider.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/BeanCollection.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/BeanCollectionAdd.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/BeanCollectionLoader.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/BeanDiffVisitor.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/BeanLoader.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/CallOrigin.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/CallStack.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/EnhancedTransactional.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/EntityBean.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/EntityBeanIntercept.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/NodeUsageCollector.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/NodeUsageListener.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/NotEnhancedException.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/ObjectGraphNode.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/ObjectGraphOrigin.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/PersistenceContext.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/PreGetterCallback.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/SingleBeanLoader.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/bean/package.html (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/cache/QueryCacheEntry.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/cache/QueryCacheEntryValidate.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/cache/ServerCache.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/cache/ServerCacheConfig.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/cache/ServerCacheFactory.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/cache/ServerCacheManager.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/cache/ServerCacheNotification.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/cache/ServerCacheNotify.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/cache/ServerCacheOptions.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/cache/ServerCachePlugin.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/cache/ServerCacheRegion.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/cache/ServerCacheStatistics.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/cache/ServerCacheType.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/cache/TenantAwareKey.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/cache/package.html (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/common/AbstractBeanCollection.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/common/BeanList.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/common/BeanMap.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/common/BeanSet.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/common/CopyOnFirstWriteList.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/common/ModifyCollection.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/common/ModifyHolder.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/common/ModifyIterator.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/common/ModifyList.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/common/ModifyListIterator.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/common/ModifySet.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/common/package.html (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/AbstractNamingConvention.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/AutoConfigure.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/AutoTuneConfig.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/AutoTuneMode.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/BeanNotEnhancedException.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/BeanNotRegisteredException.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/ClassLoadConfig.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/ContainerConfig.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/CurrentTenantProvider.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/CurrentUserProvider.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/CustomDbTypeMapping.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/DatabaseConfig.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/DatabaseConfigProvider.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/DbConstraintNaming.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/DbConstraintNormalise.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/DbMigrationConfig.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/DocStoreConfig.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/EncryptDeploy.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/EncryptDeployManager.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/EncryptKey.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/EncryptKeyManager.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/Encryptor.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/ExternalTransactionManager.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/IdGenerator.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/JsonConfig.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/MatchingNamingConvention.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/ModuleInfo.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/ModuleInfoLoader.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/NamingConvention.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/PlatformConfig.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/ProfilingConfig.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/PropertiesWrapper.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/ScalarTypeConverter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/ServerConfig.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/ServerConfigProvider.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/SlowQueryEvent.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/SlowQueryListener.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/TableName.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/TenantCatalogProvider.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/TenantDataSourceProvider.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/TenantMode.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/TenantSchemaProvider.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/UnderscoreNamingConvention.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/BasicSqlAnsiLimiter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/BasicSqlLimitOffset.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/BasicSqlLimiter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/DataErrorType.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/DbDefaultValue.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/DbEncrypt.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/DbEncryptFunction.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/DbHistorySupport.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/DbIdentity.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/DbPlatformType.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeLookup.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeParser.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/DbStandardHistorySupport.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/DbType.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/DbViewHistorySupport.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/ExtraDbTypes.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/IdType.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/PlatformIdGenerator.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/SqlErrorCodes.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/SqlLimitRequest.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/SqlLimitResponse.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/SqlLimiter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/clickhouse/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/cockroach/CockroachPlatform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/cockroach/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/db2/Db2SqlLimiter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/db2/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/h2/H2DbEncrypt.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/h2/H2HistorySupport.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/h2/H2HistoryTrigger.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/h2/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/hana/HanaBasicSqlLimiter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/hana/HanaHistorySupport.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/hana/HanaSqlLimiter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/hana/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/hsqldb/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbHistorySupport.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbPlatform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/mysql/BaseMySqlPlatform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/mysql/MySql55Platform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/mysql/MySqlBlob.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/mysql/MySqlClob.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/mysql/MySqlHistorySupport.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/mysql/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbHistorySupport.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbSequence.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/nuodb/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/oracle/OracleAnsiSqlRowsLimiter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbEncrypt.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbHistorySupport.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/oracle/OracleRownumSqlLimiter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/oracle/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/package.html (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/postgres/Postgres9Platform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/postgres/PostgresDbEncrypt.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/postgres/PostgresHistorySupport.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/postgres/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywhereLimiter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/sqlanywhere/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/sqlite/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer16Platform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasicSqlLimiter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerHistorySupport.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerSqlLimiter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequence.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/dbplatform/sqlserver/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/config/package.html (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/dbmigration/DbMigration.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/dbmigration/package-info.java (100%) create mode 100644 ebean-api/src/main/java/io/ebean/docstore/DocMapping.java create mode 100644 ebean-api/src/main/java/io/ebean/docstore/DocQueryContext.java create mode 100644 ebean-api/src/main/java/io/ebean/docstore/DocUpdateContext.java rename {ebean-core/src/main/java/io/ebeanservice/docstore/api => ebean-api/src/main/java/io/ebean/docstore}/RawDoc.java (97%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/AbstractBeanPersistListener.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/BeanDeleteIdRequest.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/BeanFindController.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/BeanPersistAdapter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/BeanPersistController.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/BeanPersistListener.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/BeanPersistRequest.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/BeanPostConstructListener.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/BeanPostLoad.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/BeanQueryAdapter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/BeanQueryRequest.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/BulkTableEvent.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/BulkTableEventListener.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/ClassUtil.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/ServerConfigStartup.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/ServletContextListener.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/ShutdownManager.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/changelog/BeanChange.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/changelog/ChangeLogFilter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/changelog/ChangeLogListener.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/changelog/ChangeLogPrepare.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/changelog/ChangeLogRegister.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/changelog/ChangeSet.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/changelog/ChangeType.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/changelog/TxnState.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/changelog/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/package.html (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/readaudit/ReadAuditLogger.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/readaudit/ReadAuditPrepare.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/readaudit/ReadAuditQueryPlan.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/readaudit/ReadEvent.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/event/readaudit/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/meta/AbstractMetricVisitor.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/meta/BasicMetricVisitor.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/meta/MetaCountMetric.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/meta/MetaInfoManager.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/meta/MetaMetric.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/meta/MetaQueryMetric.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/meta/MetaQueryPlan.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/meta/MetaTimedMetric.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/meta/MetricData.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/meta/MetricVisitor.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/meta/QueryPlanInit.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/meta/QueryPlanRequest.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/meta/ServerMetrics.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/meta/ServerMetricsAsJson.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/meta/SortMetric.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/meta/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/metric/CountMetric.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/metric/CountMetricStats.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/metric/MetricFactory.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/metric/MetricServiceProvider.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/metric/QueryPlanCollector.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/metric/QueryPlanMetric.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/metric/TimedMetric.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/metric/TimedMetricMap.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/metric/TimedMetricStats.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/overview.html (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/package.html (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/plugin/BeanDocType.java (85%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/plugin/BeanType.java (97%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/plugin/ExpressionPath.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/plugin/LoadErrorHandler.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/plugin/Plugin.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/plugin/Property.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/plugin/PropertyAssocMany.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/plugin/SpiServer.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/plugin/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/search/AbstractMatch.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/search/Match.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/search/MultiMatch.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/search/TextCommonTerms.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/search/TextQueryString.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/search/TextSimple.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/search/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/service/SpiContainer.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/service/SpiContainerFactory.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/service/SpiFetchGroupQuery.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/service/SpiFetchGroupService.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/service/SpiJsonService.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/service/SpiProfileLocationFactory.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/service/SpiRawSqlService.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/stylesheet.css (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/PathProperties.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/PathPropertiesParser.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/StringFormatter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/StringParser.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/TextException.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/TimeStringParser.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/csv/CsvCallback.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/csv/CsvReader.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/csv/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/json/EJson.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/json/JsonBeanReader.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/json/JsonContext.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/json/JsonIOException.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/json/JsonReadBeanVisitor.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/json/JsonReadOptions.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/json/JsonWriteBeanVisitor.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/json/JsonWriteOptions.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/json/JsonWriter.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/json/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/text/package-info.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/util/AnnotationUtil.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/util/CamelCaseHelper.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/util/EncodeB64.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/util/JdbcClose.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/util/SplitName.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/util/StringHelper.java (100%) rename {ebean-core => ebean-api}/src/main/java/io/ebean/util/package-info.java (100%) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml new file mode 100644 index 000000000..29c2b192b --- /dev/null +++ b/ebean-api/pom.xml @@ -0,0 +1,135 @@ + + + + ebean-parent + io.ebean + 12.4.3-SNAPSHOT + + 4.0.0 + + ebean-api + + + 2.10.0 + 2.10.0 + + + + + + + org.slf4j + slf4j-api + 1.7.25 + provided + + + + io.avaje + avaje-config + 1.0 + + + + + io.avaje + avaje-jsr305 + 1.0 + provided + + + + io.ebean + persistence-api + 2.2.4 + + + + io.ebean + ebean-annotation + 6.13 + + + + io.ebean + ebean-types + 2.1 + + + + io.ebean + ebean-datasource + 5.1 + + + + io.ebean + ebean-migration + 12.1.4 + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson-core.version} + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind.version} + true + + + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + provided + + + + + com.h2database + h2 + 1.4.199 + provided + + + + javax.transaction + jta + 1.1 + true + + + + + javax.validation + validation-api + 1.1.0.Final + true + + + + javax.servlet + javax.servlet-api + 3.1.0 + true + + + + + diff --git a/ebean-core/src/main/java/io/ebean/AcquireLockException.java b/ebean-api/src/main/java/io/ebean/AcquireLockException.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/AcquireLockException.java rename to ebean-api/src/main/java/io/ebean/AcquireLockException.java diff --git a/ebean-core/src/main/java/io/ebean/AutoTune.java b/ebean-api/src/main/java/io/ebean/AutoTune.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/AutoTune.java rename to ebean-api/src/main/java/io/ebean/AutoTune.java diff --git a/ebean-core/src/main/java/io/ebean/BackgroundExecutor.java b/ebean-api/src/main/java/io/ebean/BackgroundExecutor.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/BackgroundExecutor.java rename to ebean-api/src/main/java/io/ebean/BackgroundExecutor.java diff --git a/ebean-core/src/main/java/io/ebean/BeanFinder.java b/ebean-api/src/main/java/io/ebean/BeanFinder.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/BeanFinder.java rename to ebean-api/src/main/java/io/ebean/BeanFinder.java diff --git a/ebean-core/src/main/java/io/ebean/BeanRepository.java b/ebean-api/src/main/java/io/ebean/BeanRepository.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/BeanRepository.java rename to ebean-api/src/main/java/io/ebean/BeanRepository.java diff --git a/ebean-core/src/main/java/io/ebean/BeanState.java b/ebean-api/src/main/java/io/ebean/BeanState.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/BeanState.java rename to ebean-api/src/main/java/io/ebean/BeanState.java diff --git a/ebean-core/src/main/java/io/ebean/CacheMode.java b/ebean-api/src/main/java/io/ebean/CacheMode.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/CacheMode.java rename to ebean-api/src/main/java/io/ebean/CacheMode.java diff --git a/ebean-core/src/main/java/io/ebean/CallableSql.java b/ebean-api/src/main/java/io/ebean/CallableSql.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/CallableSql.java rename to ebean-api/src/main/java/io/ebean/CallableSql.java diff --git a/ebean-core/src/main/java/io/ebean/CountDistinctOrder.java b/ebean-api/src/main/java/io/ebean/CountDistinctOrder.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/CountDistinctOrder.java rename to ebean-api/src/main/java/io/ebean/CountDistinctOrder.java diff --git a/ebean-core/src/main/java/io/ebean/CountedValue.java b/ebean-api/src/main/java/io/ebean/CountedValue.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/CountedValue.java rename to ebean-api/src/main/java/io/ebean/CountedValue.java diff --git a/ebean-core/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/DB.java rename to ebean-api/src/main/java/io/ebean/DB.java diff --git a/ebean-core/src/main/java/io/ebean/DataIntegrityException.java b/ebean-api/src/main/java/io/ebean/DataIntegrityException.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/DataIntegrityException.java rename to ebean-api/src/main/java/io/ebean/DataIntegrityException.java diff --git a/ebean-core/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/Database.java rename to ebean-api/src/main/java/io/ebean/Database.java diff --git a/ebean-core/src/main/java/io/ebean/DatabaseFactory.java b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/DatabaseFactory.java rename to ebean-api/src/main/java/io/ebean/DatabaseFactory.java diff --git a/ebean-core/src/main/java/io/ebean/DbContext.java b/ebean-api/src/main/java/io/ebean/DbContext.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/DbContext.java rename to ebean-api/src/main/java/io/ebean/DbContext.java diff --git a/ebean-core/src/main/java/io/ebean/DbPrimary.java b/ebean-api/src/main/java/io/ebean/DbPrimary.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/DbPrimary.java rename to ebean-api/src/main/java/io/ebean/DbPrimary.java diff --git a/ebean-core/src/main/java/io/ebean/DocStoreQueueEntry.java b/ebean-api/src/main/java/io/ebean/DocStoreQueueEntry.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/DocStoreQueueEntry.java rename to ebean-api/src/main/java/io/ebean/DocStoreQueueEntry.java diff --git a/ebean-core/src/main/java/io/ebean/DocumentStore.java b/ebean-api/src/main/java/io/ebean/DocumentStore.java similarity index 96% rename from ebean-core/src/main/java/io/ebean/DocumentStore.java rename to ebean-api/src/main/java/io/ebean/DocumentStore.java index 2422461c1..6aed9ca87 100644 --- a/ebean-core/src/main/java/io/ebean/DocumentStore.java +++ b/ebean-api/src/main/java/io/ebean/DocumentStore.java @@ -1,7 +1,7 @@ package io.ebean; -import io.ebeanservice.docstore.api.DocQueryRequest; -import io.ebeanservice.docstore.api.RawDoc; +import io.ebean.docstore.DocQueryContext; +import io.ebean.docstore.RawDoc; import javax.annotation.Nullable; import java.io.IOException; @@ -69,7 +69,7 @@ public interface DocumentStore { * } */ @Nullable - T find(DocQueryRequest request); + T find(DocQueryContext request); /** * Execute the find list query. This request is prepared to execute secondary queries. @@ -86,7 +86,7 @@ public interface DocumentStore { * * } */ - List findList(DocQueryRequest request); + List findList(DocQueryContext request); /** * Execute the query against the document store returning the paged list. @@ -107,7 +107,7 @@ public interface DocumentStore { * * } */ - PagedList findPagedList(DocQueryRequest request); + PagedList findPagedList(DocQueryContext request); /** * Execute the query against the document store with the expectation of a large set of results @@ -129,7 +129,7 @@ public interface DocumentStore { * * } */ - void findEach(DocQueryRequest query, Consumer consumer); + void findEach(DocQueryContext query, Consumer consumer); /** * Execute the query against the document store with the expectation of a large set of results @@ -161,7 +161,7 @@ public interface DocumentStore { * * } */ - void findEachWhile(DocQueryRequest query, Predicate consumer); + void findEachWhile(DocQueryContext query, Predicate consumer); /** * Find each processing raw documents. diff --git a/ebean-core/src/main/java/io/ebean/DtoQuery.java b/ebean-api/src/main/java/io/ebean/DtoQuery.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/DtoQuery.java rename to ebean-api/src/main/java/io/ebean/DtoQuery.java diff --git a/ebean-core/src/main/java/io/ebean/DuplicateKeyException.java b/ebean-api/src/main/java/io/ebean/DuplicateKeyException.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/DuplicateKeyException.java rename to ebean-api/src/main/java/io/ebean/DuplicateKeyException.java diff --git a/ebean-core/src/main/java/io/ebean/Ebean.java b/ebean-api/src/main/java/io/ebean/Ebean.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/Ebean.java rename to ebean-api/src/main/java/io/ebean/Ebean.java diff --git a/ebean-core/src/main/java/io/ebean/EbeanServer.java b/ebean-api/src/main/java/io/ebean/EbeanServer.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/EbeanServer.java rename to ebean-api/src/main/java/io/ebean/EbeanServer.java diff --git a/ebean-core/src/main/java/io/ebean/EbeanServerFactory.java b/ebean-api/src/main/java/io/ebean/EbeanServerFactory.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/EbeanServerFactory.java rename to ebean-api/src/main/java/io/ebean/EbeanServerFactory.java diff --git a/ebean-core/src/main/java/io/ebean/EbeanVersion.java b/ebean-api/src/main/java/io/ebean/EbeanVersion.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/EbeanVersion.java rename to ebean-api/src/main/java/io/ebean/EbeanVersion.java diff --git a/ebean-core/src/main/java/io/ebean/EmptyPagedList.java b/ebean-api/src/main/java/io/ebean/EmptyPagedList.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/EmptyPagedList.java rename to ebean-api/src/main/java/io/ebean/EmptyPagedList.java diff --git a/ebean-core/src/main/java/io/ebean/ExampleExpression.java b/ebean-api/src/main/java/io/ebean/ExampleExpression.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/ExampleExpression.java rename to ebean-api/src/main/java/io/ebean/ExampleExpression.java diff --git a/ebean-core/src/main/java/io/ebean/Expr.java b/ebean-api/src/main/java/io/ebean/Expr.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/Expr.java rename to ebean-api/src/main/java/io/ebean/Expr.java diff --git a/ebean-core/src/main/java/io/ebean/Expression.java b/ebean-api/src/main/java/io/ebean/Expression.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/Expression.java rename to ebean-api/src/main/java/io/ebean/Expression.java diff --git a/ebean-core/src/main/java/io/ebean/ExpressionFactory.java b/ebean-api/src/main/java/io/ebean/ExpressionFactory.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/ExpressionFactory.java rename to ebean-api/src/main/java/io/ebean/ExpressionFactory.java diff --git a/ebean-core/src/main/java/io/ebean/ExpressionList.java b/ebean-api/src/main/java/io/ebean/ExpressionList.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/ExpressionList.java rename to ebean-api/src/main/java/io/ebean/ExpressionList.java diff --git a/ebean-core/src/main/java/io/ebean/ExtendedServer.java b/ebean-api/src/main/java/io/ebean/ExtendedServer.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/ExtendedServer.java rename to ebean-api/src/main/java/io/ebean/ExtendedServer.java diff --git a/ebean-core/src/main/java/io/ebean/FetchConfig.java b/ebean-api/src/main/java/io/ebean/FetchConfig.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/FetchConfig.java rename to ebean-api/src/main/java/io/ebean/FetchConfig.java diff --git a/ebean-core/src/main/java/io/ebean/FetchGroup.java b/ebean-api/src/main/java/io/ebean/FetchGroup.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/FetchGroup.java rename to ebean-api/src/main/java/io/ebean/FetchGroup.java diff --git a/ebean-core/src/main/java/io/ebean/FetchGroupBuilder.java b/ebean-api/src/main/java/io/ebean/FetchGroupBuilder.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/FetchGroupBuilder.java rename to ebean-api/src/main/java/io/ebean/FetchGroupBuilder.java diff --git a/ebean-core/src/main/java/io/ebean/FetchPath.java b/ebean-api/src/main/java/io/ebean/FetchPath.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/FetchPath.java rename to ebean-api/src/main/java/io/ebean/FetchPath.java diff --git a/ebean-core/src/main/java/io/ebean/Filter.java b/ebean-api/src/main/java/io/ebean/Filter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/Filter.java rename to ebean-api/src/main/java/io/ebean/Filter.java diff --git a/ebean-core/src/main/java/io/ebean/Finder.java b/ebean-api/src/main/java/io/ebean/Finder.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/Finder.java rename to ebean-api/src/main/java/io/ebean/Finder.java diff --git a/ebean-core/src/main/java/io/ebean/FutureIds.java b/ebean-api/src/main/java/io/ebean/FutureIds.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/FutureIds.java rename to ebean-api/src/main/java/io/ebean/FutureIds.java diff --git a/ebean-core/src/main/java/io/ebean/FutureList.java b/ebean-api/src/main/java/io/ebean/FutureList.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/FutureList.java rename to ebean-api/src/main/java/io/ebean/FutureList.java diff --git a/ebean-core/src/main/java/io/ebean/FutureRowCount.java b/ebean-api/src/main/java/io/ebean/FutureRowCount.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/FutureRowCount.java rename to ebean-api/src/main/java/io/ebean/FutureRowCount.java diff --git a/ebean-core/src/main/java/io/ebean/Junction.java b/ebean-api/src/main/java/io/ebean/Junction.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/Junction.java rename to ebean-api/src/main/java/io/ebean/Junction.java diff --git a/ebean-core/src/main/java/io/ebean/LikeType.java b/ebean-api/src/main/java/io/ebean/LikeType.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/LikeType.java rename to ebean-api/src/main/java/io/ebean/LikeType.java diff --git a/ebean-core/src/main/java/io/ebean/MergeOptions.java b/ebean-api/src/main/java/io/ebean/MergeOptions.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/MergeOptions.java rename to ebean-api/src/main/java/io/ebean/MergeOptions.java diff --git a/ebean-core/src/main/java/io/ebean/MergeOptionsBuilder.java b/ebean-api/src/main/java/io/ebean/MergeOptionsBuilder.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/MergeOptionsBuilder.java rename to ebean-api/src/main/java/io/ebean/MergeOptionsBuilder.java diff --git a/ebean-core/src/main/java/io/ebean/Model.java b/ebean-api/src/main/java/io/ebean/Model.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/Model.java rename to ebean-api/src/main/java/io/ebean/Model.java diff --git a/ebean-core/src/main/java/io/ebean/OrderBy.java b/ebean-api/src/main/java/io/ebean/OrderBy.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/OrderBy.java rename to ebean-api/src/main/java/io/ebean/OrderBy.java diff --git a/ebean-core/src/main/java/io/ebean/PagedList.java b/ebean-api/src/main/java/io/ebean/PagedList.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/PagedList.java rename to ebean-api/src/main/java/io/ebean/PagedList.java diff --git a/ebean-core/src/main/java/io/ebean/Pairs.java b/ebean-api/src/main/java/io/ebean/Pairs.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/Pairs.java rename to ebean-api/src/main/java/io/ebean/Pairs.java diff --git a/ebean-core/src/main/java/io/ebean/PersistenceContextScope.java b/ebean-api/src/main/java/io/ebean/PersistenceContextScope.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/PersistenceContextScope.java rename to ebean-api/src/main/java/io/ebean/PersistenceContextScope.java diff --git a/ebean-core/src/main/java/io/ebean/PersistenceIOException.java b/ebean-api/src/main/java/io/ebean/PersistenceIOException.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/PersistenceIOException.java rename to ebean-api/src/main/java/io/ebean/PersistenceIOException.java diff --git a/ebean-core/src/main/java/io/ebean/ProfileLocation.java b/ebean-api/src/main/java/io/ebean/ProfileLocation.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/ProfileLocation.java rename to ebean-api/src/main/java/io/ebean/ProfileLocation.java diff --git a/ebean-core/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/Query.java rename to ebean-api/src/main/java/io/ebean/Query.java diff --git a/ebean-core/src/main/java/io/ebean/QueryIterator.java b/ebean-api/src/main/java/io/ebean/QueryIterator.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/QueryIterator.java rename to ebean-api/src/main/java/io/ebean/QueryIterator.java diff --git a/ebean-core/src/main/java/io/ebean/QueryType.java b/ebean-api/src/main/java/io/ebean/QueryType.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/QueryType.java rename to ebean-api/src/main/java/io/ebean/QueryType.java diff --git a/ebean-core/src/main/java/io/ebean/RawSql.java b/ebean-api/src/main/java/io/ebean/RawSql.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/RawSql.java rename to ebean-api/src/main/java/io/ebean/RawSql.java diff --git a/ebean-core/src/main/java/io/ebean/RawSqlBuilder.java b/ebean-api/src/main/java/io/ebean/RawSqlBuilder.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/RawSqlBuilder.java rename to ebean-api/src/main/java/io/ebean/RawSqlBuilder.java diff --git a/ebean-core/src/main/java/io/ebean/RowConsumer.java b/ebean-api/src/main/java/io/ebean/RowConsumer.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/RowConsumer.java rename to ebean-api/src/main/java/io/ebean/RowConsumer.java diff --git a/ebean-core/src/main/java/io/ebean/RowMapper.java b/ebean-api/src/main/java/io/ebean/RowMapper.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/RowMapper.java rename to ebean-api/src/main/java/io/ebean/RowMapper.java diff --git a/ebean-core/src/main/java/io/ebean/ScriptRunner.java b/ebean-api/src/main/java/io/ebean/ScriptRunner.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/ScriptRunner.java rename to ebean-api/src/main/java/io/ebean/ScriptRunner.java diff --git a/ebean-core/src/main/java/io/ebean/SerializableConflictException.java b/ebean-api/src/main/java/io/ebean/SerializableConflictException.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/SerializableConflictException.java rename to ebean-api/src/main/java/io/ebean/SerializableConflictException.java diff --git a/ebean-core/src/main/java/io/ebean/SqlQuery.java b/ebean-api/src/main/java/io/ebean/SqlQuery.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/SqlQuery.java rename to ebean-api/src/main/java/io/ebean/SqlQuery.java diff --git a/ebean-core/src/main/java/io/ebean/SqlRow.java b/ebean-api/src/main/java/io/ebean/SqlRow.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/SqlRow.java rename to ebean-api/src/main/java/io/ebean/SqlRow.java diff --git a/ebean-core/src/main/java/io/ebean/SqlUpdate.java b/ebean-api/src/main/java/io/ebean/SqlUpdate.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/SqlUpdate.java rename to ebean-api/src/main/java/io/ebean/SqlUpdate.java diff --git a/ebean-core/src/main/java/io/ebean/Transaction.java b/ebean-api/src/main/java/io/ebean/Transaction.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/Transaction.java rename to ebean-api/src/main/java/io/ebean/Transaction.java diff --git a/ebean-core/src/main/java/io/ebean/TransactionCallback.java b/ebean-api/src/main/java/io/ebean/TransactionCallback.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/TransactionCallback.java rename to ebean-api/src/main/java/io/ebean/TransactionCallback.java diff --git a/ebean-core/src/main/java/io/ebean/TransactionCallbackAdapter.java b/ebean-api/src/main/java/io/ebean/TransactionCallbackAdapter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/TransactionCallbackAdapter.java rename to ebean-api/src/main/java/io/ebean/TransactionCallbackAdapter.java diff --git a/ebean-core/src/main/java/io/ebean/TxScope.java b/ebean-api/src/main/java/io/ebean/TxScope.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/TxScope.java rename to ebean-api/src/main/java/io/ebean/TxScope.java diff --git a/ebean-core/src/main/java/io/ebean/Update.java b/ebean-api/src/main/java/io/ebean/Update.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/Update.java rename to ebean-api/src/main/java/io/ebean/Update.java diff --git a/ebean-core/src/main/java/io/ebean/UpdateQuery.java b/ebean-api/src/main/java/io/ebean/UpdateQuery.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/UpdateQuery.java rename to ebean-api/src/main/java/io/ebean/UpdateQuery.java diff --git a/ebean-core/src/main/java/io/ebean/ValuePair.java b/ebean-api/src/main/java/io/ebean/ValuePair.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/ValuePair.java rename to ebean-api/src/main/java/io/ebean/ValuePair.java diff --git a/ebean-core/src/main/java/io/ebean/Version.java b/ebean-api/src/main/java/io/ebean/Version.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/Version.java rename to ebean-api/src/main/java/io/ebean/Version.java diff --git a/ebean-core/src/main/java/io/ebean/XServiceProvider.java b/ebean-api/src/main/java/io/ebean/XServiceProvider.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/XServiceProvider.java rename to ebean-api/src/main/java/io/ebean/XServiceProvider.java diff --git a/ebean-core/src/main/java/io/ebean/bean/BeanCollection.java b/ebean-api/src/main/java/io/ebean/bean/BeanCollection.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/BeanCollection.java rename to ebean-api/src/main/java/io/ebean/bean/BeanCollection.java diff --git a/ebean-core/src/main/java/io/ebean/bean/BeanCollectionAdd.java b/ebean-api/src/main/java/io/ebean/bean/BeanCollectionAdd.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/BeanCollectionAdd.java rename to ebean-api/src/main/java/io/ebean/bean/BeanCollectionAdd.java diff --git a/ebean-core/src/main/java/io/ebean/bean/BeanCollectionLoader.java b/ebean-api/src/main/java/io/ebean/bean/BeanCollectionLoader.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/BeanCollectionLoader.java rename to ebean-api/src/main/java/io/ebean/bean/BeanCollectionLoader.java diff --git a/ebean-core/src/main/java/io/ebean/bean/BeanDiffVisitor.java b/ebean-api/src/main/java/io/ebean/bean/BeanDiffVisitor.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/BeanDiffVisitor.java rename to ebean-api/src/main/java/io/ebean/bean/BeanDiffVisitor.java diff --git a/ebean-core/src/main/java/io/ebean/bean/BeanLoader.java b/ebean-api/src/main/java/io/ebean/bean/BeanLoader.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/BeanLoader.java rename to ebean-api/src/main/java/io/ebean/bean/BeanLoader.java diff --git a/ebean-core/src/main/java/io/ebean/bean/CallOrigin.java b/ebean-api/src/main/java/io/ebean/bean/CallOrigin.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/CallOrigin.java rename to ebean-api/src/main/java/io/ebean/bean/CallOrigin.java diff --git a/ebean-core/src/main/java/io/ebean/bean/CallStack.java b/ebean-api/src/main/java/io/ebean/bean/CallStack.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/CallStack.java rename to ebean-api/src/main/java/io/ebean/bean/CallStack.java diff --git a/ebean-core/src/main/java/io/ebean/bean/EnhancedTransactional.java b/ebean-api/src/main/java/io/ebean/bean/EnhancedTransactional.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/EnhancedTransactional.java rename to ebean-api/src/main/java/io/ebean/bean/EnhancedTransactional.java diff --git a/ebean-core/src/main/java/io/ebean/bean/EntityBean.java b/ebean-api/src/main/java/io/ebean/bean/EntityBean.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/EntityBean.java rename to ebean-api/src/main/java/io/ebean/bean/EntityBean.java diff --git a/ebean-core/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/EntityBeanIntercept.java rename to ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java diff --git a/ebean-core/src/main/java/io/ebean/bean/NodeUsageCollector.java b/ebean-api/src/main/java/io/ebean/bean/NodeUsageCollector.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/NodeUsageCollector.java rename to ebean-api/src/main/java/io/ebean/bean/NodeUsageCollector.java diff --git a/ebean-core/src/main/java/io/ebean/bean/NodeUsageListener.java b/ebean-api/src/main/java/io/ebean/bean/NodeUsageListener.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/NodeUsageListener.java rename to ebean-api/src/main/java/io/ebean/bean/NodeUsageListener.java diff --git a/ebean-core/src/main/java/io/ebean/bean/NotEnhancedException.java b/ebean-api/src/main/java/io/ebean/bean/NotEnhancedException.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/NotEnhancedException.java rename to ebean-api/src/main/java/io/ebean/bean/NotEnhancedException.java diff --git a/ebean-core/src/main/java/io/ebean/bean/ObjectGraphNode.java b/ebean-api/src/main/java/io/ebean/bean/ObjectGraphNode.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/ObjectGraphNode.java rename to ebean-api/src/main/java/io/ebean/bean/ObjectGraphNode.java diff --git a/ebean-core/src/main/java/io/ebean/bean/ObjectGraphOrigin.java b/ebean-api/src/main/java/io/ebean/bean/ObjectGraphOrigin.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/ObjectGraphOrigin.java rename to ebean-api/src/main/java/io/ebean/bean/ObjectGraphOrigin.java diff --git a/ebean-core/src/main/java/io/ebean/bean/PersistenceContext.java b/ebean-api/src/main/java/io/ebean/bean/PersistenceContext.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/PersistenceContext.java rename to ebean-api/src/main/java/io/ebean/bean/PersistenceContext.java diff --git a/ebean-core/src/main/java/io/ebean/bean/PreGetterCallback.java b/ebean-api/src/main/java/io/ebean/bean/PreGetterCallback.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/PreGetterCallback.java rename to ebean-api/src/main/java/io/ebean/bean/PreGetterCallback.java diff --git a/ebean-core/src/main/java/io/ebean/bean/SingleBeanLoader.java b/ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/SingleBeanLoader.java rename to ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java diff --git a/ebean-core/src/main/java/io/ebean/bean/package.html b/ebean-api/src/main/java/io/ebean/bean/package.html similarity index 100% rename from ebean-core/src/main/java/io/ebean/bean/package.html rename to ebean-api/src/main/java/io/ebean/bean/package.html diff --git a/ebean-core/src/main/java/io/ebean/cache/QueryCacheEntry.java b/ebean-api/src/main/java/io/ebean/cache/QueryCacheEntry.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/cache/QueryCacheEntry.java rename to ebean-api/src/main/java/io/ebean/cache/QueryCacheEntry.java diff --git a/ebean-core/src/main/java/io/ebean/cache/QueryCacheEntryValidate.java b/ebean-api/src/main/java/io/ebean/cache/QueryCacheEntryValidate.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/cache/QueryCacheEntryValidate.java rename to ebean-api/src/main/java/io/ebean/cache/QueryCacheEntryValidate.java diff --git a/ebean-core/src/main/java/io/ebean/cache/ServerCache.java b/ebean-api/src/main/java/io/ebean/cache/ServerCache.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/cache/ServerCache.java rename to ebean-api/src/main/java/io/ebean/cache/ServerCache.java diff --git a/ebean-core/src/main/java/io/ebean/cache/ServerCacheConfig.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheConfig.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/cache/ServerCacheConfig.java rename to ebean-api/src/main/java/io/ebean/cache/ServerCacheConfig.java diff --git a/ebean-core/src/main/java/io/ebean/cache/ServerCacheFactory.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheFactory.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/cache/ServerCacheFactory.java rename to ebean-api/src/main/java/io/ebean/cache/ServerCacheFactory.java diff --git a/ebean-core/src/main/java/io/ebean/cache/ServerCacheManager.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/cache/ServerCacheManager.java rename to ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java diff --git a/ebean-core/src/main/java/io/ebean/cache/ServerCacheNotification.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotification.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/cache/ServerCacheNotification.java rename to ebean-api/src/main/java/io/ebean/cache/ServerCacheNotification.java diff --git a/ebean-core/src/main/java/io/ebean/cache/ServerCacheNotify.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotify.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/cache/ServerCacheNotify.java rename to ebean-api/src/main/java/io/ebean/cache/ServerCacheNotify.java diff --git a/ebean-core/src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java rename to ebean-api/src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java diff --git a/ebean-core/src/main/java/io/ebean/cache/ServerCacheOptions.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheOptions.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/cache/ServerCacheOptions.java rename to ebean-api/src/main/java/io/ebean/cache/ServerCacheOptions.java diff --git a/ebean-core/src/main/java/io/ebean/cache/ServerCachePlugin.java b/ebean-api/src/main/java/io/ebean/cache/ServerCachePlugin.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/cache/ServerCachePlugin.java rename to ebean-api/src/main/java/io/ebean/cache/ServerCachePlugin.java diff --git a/ebean-core/src/main/java/io/ebean/cache/ServerCacheRegion.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/cache/ServerCacheRegion.java rename to ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java diff --git a/ebean-core/src/main/java/io/ebean/cache/ServerCacheStatistics.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheStatistics.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/cache/ServerCacheStatistics.java rename to ebean-api/src/main/java/io/ebean/cache/ServerCacheStatistics.java diff --git a/ebean-core/src/main/java/io/ebean/cache/ServerCacheType.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheType.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/cache/ServerCacheType.java rename to ebean-api/src/main/java/io/ebean/cache/ServerCacheType.java diff --git a/ebean-core/src/main/java/io/ebean/cache/TenantAwareKey.java b/ebean-api/src/main/java/io/ebean/cache/TenantAwareKey.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/cache/TenantAwareKey.java rename to ebean-api/src/main/java/io/ebean/cache/TenantAwareKey.java diff --git a/ebean-core/src/main/java/io/ebean/cache/package.html b/ebean-api/src/main/java/io/ebean/cache/package.html similarity index 100% rename from ebean-core/src/main/java/io/ebean/cache/package.html rename to ebean-api/src/main/java/io/ebean/cache/package.html diff --git a/ebean-core/src/main/java/io/ebean/common/AbstractBeanCollection.java b/ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/common/AbstractBeanCollection.java rename to ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java diff --git a/ebean-core/src/main/java/io/ebean/common/BeanList.java b/ebean-api/src/main/java/io/ebean/common/BeanList.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/common/BeanList.java rename to ebean-api/src/main/java/io/ebean/common/BeanList.java diff --git a/ebean-core/src/main/java/io/ebean/common/BeanMap.java b/ebean-api/src/main/java/io/ebean/common/BeanMap.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/common/BeanMap.java rename to ebean-api/src/main/java/io/ebean/common/BeanMap.java diff --git a/ebean-core/src/main/java/io/ebean/common/BeanSet.java b/ebean-api/src/main/java/io/ebean/common/BeanSet.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/common/BeanSet.java rename to ebean-api/src/main/java/io/ebean/common/BeanSet.java diff --git a/ebean-core/src/main/java/io/ebean/common/CopyOnFirstWriteList.java b/ebean-api/src/main/java/io/ebean/common/CopyOnFirstWriteList.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/common/CopyOnFirstWriteList.java rename to ebean-api/src/main/java/io/ebean/common/CopyOnFirstWriteList.java diff --git a/ebean-core/src/main/java/io/ebean/common/ModifyCollection.java b/ebean-api/src/main/java/io/ebean/common/ModifyCollection.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/common/ModifyCollection.java rename to ebean-api/src/main/java/io/ebean/common/ModifyCollection.java diff --git a/ebean-core/src/main/java/io/ebean/common/ModifyHolder.java b/ebean-api/src/main/java/io/ebean/common/ModifyHolder.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/common/ModifyHolder.java rename to ebean-api/src/main/java/io/ebean/common/ModifyHolder.java diff --git a/ebean-core/src/main/java/io/ebean/common/ModifyIterator.java b/ebean-api/src/main/java/io/ebean/common/ModifyIterator.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/common/ModifyIterator.java rename to ebean-api/src/main/java/io/ebean/common/ModifyIterator.java diff --git a/ebean-core/src/main/java/io/ebean/common/ModifyList.java b/ebean-api/src/main/java/io/ebean/common/ModifyList.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/common/ModifyList.java rename to ebean-api/src/main/java/io/ebean/common/ModifyList.java diff --git a/ebean-core/src/main/java/io/ebean/common/ModifyListIterator.java b/ebean-api/src/main/java/io/ebean/common/ModifyListIterator.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/common/ModifyListIterator.java rename to ebean-api/src/main/java/io/ebean/common/ModifyListIterator.java diff --git a/ebean-core/src/main/java/io/ebean/common/ModifySet.java b/ebean-api/src/main/java/io/ebean/common/ModifySet.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/common/ModifySet.java rename to ebean-api/src/main/java/io/ebean/common/ModifySet.java diff --git a/ebean-core/src/main/java/io/ebean/common/package.html b/ebean-api/src/main/java/io/ebean/common/package.html similarity index 100% rename from ebean-core/src/main/java/io/ebean/common/package.html rename to ebean-api/src/main/java/io/ebean/common/package.html diff --git a/ebean-core/src/main/java/io/ebean/config/AbstractNamingConvention.java b/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/AbstractNamingConvention.java rename to ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java diff --git a/ebean-core/src/main/java/io/ebean/config/AutoConfigure.java b/ebean-api/src/main/java/io/ebean/config/AutoConfigure.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/AutoConfigure.java rename to ebean-api/src/main/java/io/ebean/config/AutoConfigure.java diff --git a/ebean-core/src/main/java/io/ebean/config/AutoTuneConfig.java b/ebean-api/src/main/java/io/ebean/config/AutoTuneConfig.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/AutoTuneConfig.java rename to ebean-api/src/main/java/io/ebean/config/AutoTuneConfig.java diff --git a/ebean-core/src/main/java/io/ebean/config/AutoTuneMode.java b/ebean-api/src/main/java/io/ebean/config/AutoTuneMode.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/AutoTuneMode.java rename to ebean-api/src/main/java/io/ebean/config/AutoTuneMode.java diff --git a/ebean-core/src/main/java/io/ebean/config/BeanNotEnhancedException.java b/ebean-api/src/main/java/io/ebean/config/BeanNotEnhancedException.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/BeanNotEnhancedException.java rename to ebean-api/src/main/java/io/ebean/config/BeanNotEnhancedException.java diff --git a/ebean-core/src/main/java/io/ebean/config/BeanNotRegisteredException.java b/ebean-api/src/main/java/io/ebean/config/BeanNotRegisteredException.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/BeanNotRegisteredException.java rename to ebean-api/src/main/java/io/ebean/config/BeanNotRegisteredException.java diff --git a/ebean-core/src/main/java/io/ebean/config/ClassLoadConfig.java b/ebean-api/src/main/java/io/ebean/config/ClassLoadConfig.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/ClassLoadConfig.java rename to ebean-api/src/main/java/io/ebean/config/ClassLoadConfig.java diff --git a/ebean-core/src/main/java/io/ebean/config/ContainerConfig.java b/ebean-api/src/main/java/io/ebean/config/ContainerConfig.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/ContainerConfig.java rename to ebean-api/src/main/java/io/ebean/config/ContainerConfig.java diff --git a/ebean-core/src/main/java/io/ebean/config/CurrentTenantProvider.java b/ebean-api/src/main/java/io/ebean/config/CurrentTenantProvider.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/CurrentTenantProvider.java rename to ebean-api/src/main/java/io/ebean/config/CurrentTenantProvider.java diff --git a/ebean-core/src/main/java/io/ebean/config/CurrentUserProvider.java b/ebean-api/src/main/java/io/ebean/config/CurrentUserProvider.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/CurrentUserProvider.java rename to ebean-api/src/main/java/io/ebean/config/CurrentUserProvider.java diff --git a/ebean-core/src/main/java/io/ebean/config/CustomDbTypeMapping.java b/ebean-api/src/main/java/io/ebean/config/CustomDbTypeMapping.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/CustomDbTypeMapping.java rename to ebean-api/src/main/java/io/ebean/config/CustomDbTypeMapping.java diff --git a/ebean-core/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/DatabaseConfig.java rename to ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java diff --git a/ebean-core/src/main/java/io/ebean/config/DatabaseConfigProvider.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfigProvider.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/DatabaseConfigProvider.java rename to ebean-api/src/main/java/io/ebean/config/DatabaseConfigProvider.java diff --git a/ebean-core/src/main/java/io/ebean/config/DbConstraintNaming.java b/ebean-api/src/main/java/io/ebean/config/DbConstraintNaming.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/DbConstraintNaming.java rename to ebean-api/src/main/java/io/ebean/config/DbConstraintNaming.java diff --git a/ebean-core/src/main/java/io/ebean/config/DbConstraintNormalise.java b/ebean-api/src/main/java/io/ebean/config/DbConstraintNormalise.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/DbConstraintNormalise.java rename to ebean-api/src/main/java/io/ebean/config/DbConstraintNormalise.java diff --git a/ebean-core/src/main/java/io/ebean/config/DbMigrationConfig.java b/ebean-api/src/main/java/io/ebean/config/DbMigrationConfig.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/DbMigrationConfig.java rename to ebean-api/src/main/java/io/ebean/config/DbMigrationConfig.java diff --git a/ebean-core/src/main/java/io/ebean/config/DocStoreConfig.java b/ebean-api/src/main/java/io/ebean/config/DocStoreConfig.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/DocStoreConfig.java rename to ebean-api/src/main/java/io/ebean/config/DocStoreConfig.java diff --git a/ebean-core/src/main/java/io/ebean/config/EncryptDeploy.java b/ebean-api/src/main/java/io/ebean/config/EncryptDeploy.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/EncryptDeploy.java rename to ebean-api/src/main/java/io/ebean/config/EncryptDeploy.java diff --git a/ebean-core/src/main/java/io/ebean/config/EncryptDeployManager.java b/ebean-api/src/main/java/io/ebean/config/EncryptDeployManager.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/EncryptDeployManager.java rename to ebean-api/src/main/java/io/ebean/config/EncryptDeployManager.java diff --git a/ebean-core/src/main/java/io/ebean/config/EncryptKey.java b/ebean-api/src/main/java/io/ebean/config/EncryptKey.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/EncryptKey.java rename to ebean-api/src/main/java/io/ebean/config/EncryptKey.java diff --git a/ebean-core/src/main/java/io/ebean/config/EncryptKeyManager.java b/ebean-api/src/main/java/io/ebean/config/EncryptKeyManager.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/EncryptKeyManager.java rename to ebean-api/src/main/java/io/ebean/config/EncryptKeyManager.java diff --git a/ebean-core/src/main/java/io/ebean/config/Encryptor.java b/ebean-api/src/main/java/io/ebean/config/Encryptor.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/Encryptor.java rename to ebean-api/src/main/java/io/ebean/config/Encryptor.java diff --git a/ebean-core/src/main/java/io/ebean/config/ExternalTransactionManager.java b/ebean-api/src/main/java/io/ebean/config/ExternalTransactionManager.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/ExternalTransactionManager.java rename to ebean-api/src/main/java/io/ebean/config/ExternalTransactionManager.java diff --git a/ebean-core/src/main/java/io/ebean/config/IdGenerator.java b/ebean-api/src/main/java/io/ebean/config/IdGenerator.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/IdGenerator.java rename to ebean-api/src/main/java/io/ebean/config/IdGenerator.java diff --git a/ebean-core/src/main/java/io/ebean/config/JsonConfig.java b/ebean-api/src/main/java/io/ebean/config/JsonConfig.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/JsonConfig.java rename to ebean-api/src/main/java/io/ebean/config/JsonConfig.java diff --git a/ebean-core/src/main/java/io/ebean/config/MatchingNamingConvention.java b/ebean-api/src/main/java/io/ebean/config/MatchingNamingConvention.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/MatchingNamingConvention.java rename to ebean-api/src/main/java/io/ebean/config/MatchingNamingConvention.java diff --git a/ebean-core/src/main/java/io/ebean/config/ModuleInfo.java b/ebean-api/src/main/java/io/ebean/config/ModuleInfo.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/ModuleInfo.java rename to ebean-api/src/main/java/io/ebean/config/ModuleInfo.java diff --git a/ebean-core/src/main/java/io/ebean/config/ModuleInfoLoader.java b/ebean-api/src/main/java/io/ebean/config/ModuleInfoLoader.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/ModuleInfoLoader.java rename to ebean-api/src/main/java/io/ebean/config/ModuleInfoLoader.java diff --git a/ebean-core/src/main/java/io/ebean/config/NamingConvention.java b/ebean-api/src/main/java/io/ebean/config/NamingConvention.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/NamingConvention.java rename to ebean-api/src/main/java/io/ebean/config/NamingConvention.java diff --git a/ebean-core/src/main/java/io/ebean/config/PlatformConfig.java b/ebean-api/src/main/java/io/ebean/config/PlatformConfig.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/PlatformConfig.java rename to ebean-api/src/main/java/io/ebean/config/PlatformConfig.java diff --git a/ebean-core/src/main/java/io/ebean/config/ProfilingConfig.java b/ebean-api/src/main/java/io/ebean/config/ProfilingConfig.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/ProfilingConfig.java rename to ebean-api/src/main/java/io/ebean/config/ProfilingConfig.java diff --git a/ebean-core/src/main/java/io/ebean/config/PropertiesWrapper.java b/ebean-api/src/main/java/io/ebean/config/PropertiesWrapper.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/PropertiesWrapper.java rename to ebean-api/src/main/java/io/ebean/config/PropertiesWrapper.java diff --git a/ebean-core/src/main/java/io/ebean/config/ScalarTypeConverter.java b/ebean-api/src/main/java/io/ebean/config/ScalarTypeConverter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/ScalarTypeConverter.java rename to ebean-api/src/main/java/io/ebean/config/ScalarTypeConverter.java diff --git a/ebean-core/src/main/java/io/ebean/config/ServerConfig.java b/ebean-api/src/main/java/io/ebean/config/ServerConfig.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/ServerConfig.java rename to ebean-api/src/main/java/io/ebean/config/ServerConfig.java diff --git a/ebean-core/src/main/java/io/ebean/config/ServerConfigProvider.java b/ebean-api/src/main/java/io/ebean/config/ServerConfigProvider.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/ServerConfigProvider.java rename to ebean-api/src/main/java/io/ebean/config/ServerConfigProvider.java diff --git a/ebean-core/src/main/java/io/ebean/config/SlowQueryEvent.java b/ebean-api/src/main/java/io/ebean/config/SlowQueryEvent.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/SlowQueryEvent.java rename to ebean-api/src/main/java/io/ebean/config/SlowQueryEvent.java diff --git a/ebean-core/src/main/java/io/ebean/config/SlowQueryListener.java b/ebean-api/src/main/java/io/ebean/config/SlowQueryListener.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/SlowQueryListener.java rename to ebean-api/src/main/java/io/ebean/config/SlowQueryListener.java diff --git a/ebean-core/src/main/java/io/ebean/config/TableName.java b/ebean-api/src/main/java/io/ebean/config/TableName.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/TableName.java rename to ebean-api/src/main/java/io/ebean/config/TableName.java diff --git a/ebean-core/src/main/java/io/ebean/config/TenantCatalogProvider.java b/ebean-api/src/main/java/io/ebean/config/TenantCatalogProvider.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/TenantCatalogProvider.java rename to ebean-api/src/main/java/io/ebean/config/TenantCatalogProvider.java diff --git a/ebean-core/src/main/java/io/ebean/config/TenantDataSourceProvider.java b/ebean-api/src/main/java/io/ebean/config/TenantDataSourceProvider.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/TenantDataSourceProvider.java rename to ebean-api/src/main/java/io/ebean/config/TenantDataSourceProvider.java diff --git a/ebean-core/src/main/java/io/ebean/config/TenantMode.java b/ebean-api/src/main/java/io/ebean/config/TenantMode.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/TenantMode.java rename to ebean-api/src/main/java/io/ebean/config/TenantMode.java diff --git a/ebean-core/src/main/java/io/ebean/config/TenantSchemaProvider.java b/ebean-api/src/main/java/io/ebean/config/TenantSchemaProvider.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/TenantSchemaProvider.java rename to ebean-api/src/main/java/io/ebean/config/TenantSchemaProvider.java diff --git a/ebean-core/src/main/java/io/ebean/config/UnderscoreNamingConvention.java b/ebean-api/src/main/java/io/ebean/config/UnderscoreNamingConvention.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/UnderscoreNamingConvention.java rename to ebean-api/src/main/java/io/ebean/config/UnderscoreNamingConvention.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/BasicSqlAnsiLimiter.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/BasicSqlAnsiLimiter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/BasicSqlAnsiLimiter.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/BasicSqlAnsiLimiter.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/BasicSqlLimitOffset.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/BasicSqlLimitOffset.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/BasicSqlLimitOffset.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/BasicSqlLimitOffset.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/BasicSqlLimiter.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/BasicSqlLimiter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/BasicSqlLimiter.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/BasicSqlLimiter.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/DataErrorType.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DataErrorType.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/DataErrorType.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/DataErrorType.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/DbDefaultValue.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DbDefaultValue.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/DbDefaultValue.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/DbDefaultValue.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/DbEncrypt.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DbEncrypt.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/DbEncrypt.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/DbEncrypt.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/DbEncryptFunction.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DbEncryptFunction.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/DbEncryptFunction.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/DbEncryptFunction.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/DbHistorySupport.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DbHistorySupport.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/DbHistorySupport.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/DbHistorySupport.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/DbIdentity.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DbIdentity.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/DbIdentity.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/DbIdentity.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/DbPlatformType.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DbPlatformType.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/DbPlatformType.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/DbPlatformType.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeLookup.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeLookup.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeLookup.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeLookup.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeParser.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeParser.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeParser.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeParser.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/DbStandardHistorySupport.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DbStandardHistorySupport.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/DbStandardHistorySupport.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/DbStandardHistorySupport.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/DbType.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DbType.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/DbType.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/DbType.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/DbViewHistorySupport.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DbViewHistorySupport.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/DbViewHistorySupport.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/DbViewHistorySupport.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/ExtraDbTypes.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/ExtraDbTypes.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/ExtraDbTypes.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/ExtraDbTypes.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/IdType.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/IdType.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/IdType.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/IdType.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/PlatformIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/PlatformIdGenerator.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/PlatformIdGenerator.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/PlatformIdGenerator.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/SqlErrorCodes.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlErrorCodes.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/SqlErrorCodes.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/SqlErrorCodes.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/SqlLimitRequest.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlLimitRequest.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/SqlLimitRequest.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/SqlLimitRequest.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/SqlLimitResponse.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlLimitResponse.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/SqlLimitResponse.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/SqlLimitResponse.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/SqlLimiter.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlLimiter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/SqlLimiter.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/SqlLimiter.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/clickhouse/package-info.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/clickhouse/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/clickhouse/package-info.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/clickhouse/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/cockroach/CockroachPlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/cockroach/CockroachPlatform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/cockroach/CockroachPlatform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/cockroach/CockroachPlatform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/cockroach/package-info.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/cockroach/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/cockroach/package-info.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/cockroach/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/db2/Db2SqlLimiter.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/Db2SqlLimiter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/db2/Db2SqlLimiter.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/db2/Db2SqlLimiter.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/db2/package-info.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/db2/package-info.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/db2/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/h2/H2DbEncrypt.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2DbEncrypt.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/h2/H2DbEncrypt.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2DbEncrypt.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/h2/H2HistorySupport.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2HistorySupport.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/h2/H2HistorySupport.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2HistorySupport.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/h2/H2HistoryTrigger.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2HistoryTrigger.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/h2/H2HistoryTrigger.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2HistoryTrigger.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/h2/package-info.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/h2/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/h2/package-info.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/h2/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/hana/HanaBasicSqlLimiter.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/hana/HanaBasicSqlLimiter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/hana/HanaBasicSqlLimiter.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/hana/HanaBasicSqlLimiter.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/hana/HanaHistorySupport.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/hana/HanaHistorySupport.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/hana/HanaHistorySupport.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/hana/HanaHistorySupport.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/hana/HanaSqlLimiter.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/hana/HanaSqlLimiter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/hana/HanaSqlLimiter.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/hana/HanaSqlLimiter.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/hana/package-info.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/hana/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/hana/package-info.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/hana/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/hsqldb/package-info.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/hsqldb/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/hsqldb/package-info.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/hsqldb/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbHistorySupport.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbHistorySupport.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbHistorySupport.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbHistorySupport.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbPlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbPlatform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbPlatform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbPlatform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/mysql/BaseMySqlPlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/BaseMySqlPlatform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/mysql/BaseMySqlPlatform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/BaseMySqlPlatform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/mysql/MySql55Platform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/MySql55Platform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/mysql/MySql55Platform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/MySql55Platform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/mysql/MySqlBlob.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/MySqlBlob.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/mysql/MySqlBlob.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/MySqlBlob.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/mysql/MySqlClob.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/MySqlClob.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/mysql/MySqlClob.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/MySqlClob.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/mysql/MySqlHistorySupport.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/MySqlHistorySupport.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/mysql/MySqlHistorySupport.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/MySqlHistorySupport.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/mysql/package-info.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/mysql/package-info.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbHistorySupport.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbHistorySupport.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbHistorySupport.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbHistorySupport.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbSequence.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbSequence.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbSequence.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbSequence.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/nuodb/package-info.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/nuodb/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/nuodb/package-info.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/nuodb/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/oracle/OracleAnsiSqlRowsLimiter.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleAnsiSqlRowsLimiter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/oracle/OracleAnsiSqlRowsLimiter.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleAnsiSqlRowsLimiter.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbEncrypt.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbEncrypt.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbEncrypt.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbEncrypt.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbHistorySupport.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbHistorySupport.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbHistorySupport.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbHistorySupport.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/oracle/OracleRownumSqlLimiter.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleRownumSqlLimiter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/oracle/OracleRownumSqlLimiter.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleRownumSqlLimiter.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/oracle/package-info.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/oracle/package-info.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/package.html b/ebean-api/src/main/java/io/ebean/config/dbplatform/package.html similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/package.html rename to ebean-api/src/main/java/io/ebean/config/dbplatform/package.html diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/postgres/Postgres9Platform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/postgres/Postgres9Platform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/postgres/Postgres9Platform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/postgres/Postgres9Platform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/postgres/PostgresDbEncrypt.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/postgres/PostgresDbEncrypt.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/postgres/PostgresDbEncrypt.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/postgres/PostgresDbEncrypt.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/postgres/PostgresHistorySupport.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/postgres/PostgresHistorySupport.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/postgres/PostgresHistorySupport.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/postgres/PostgresHistorySupport.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/postgres/package-info.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/postgres/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/postgres/package-info.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/postgres/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywhereLimiter.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywhereLimiter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywhereLimiter.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywhereLimiter.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/sqlanywhere/package-info.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlanywhere/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/sqlanywhere/package-info.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/sqlanywhere/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/sqlite/package-info.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlite/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/sqlite/package-info.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/sqlite/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer16Platform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer16Platform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer16Platform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer16Platform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasicSqlLimiter.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasicSqlLimiter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasicSqlLimiter.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasicSqlLimiter.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerHistorySupport.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerHistorySupport.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerHistorySupport.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerHistorySupport.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerSqlLimiter.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerSqlLimiter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerSqlLimiter.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerSqlLimiter.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequence.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequence.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequence.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequence.java diff --git a/ebean-core/src/main/java/io/ebean/config/dbplatform/sqlserver/package-info.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/dbplatform/sqlserver/package-info.java rename to ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/config/package.html b/ebean-api/src/main/java/io/ebean/config/package.html similarity index 100% rename from ebean-core/src/main/java/io/ebean/config/package.html rename to ebean-api/src/main/java/io/ebean/config/package.html diff --git a/ebean-core/src/main/java/io/ebean/dbmigration/DbMigration.java b/ebean-api/src/main/java/io/ebean/dbmigration/DbMigration.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/dbmigration/DbMigration.java rename to ebean-api/src/main/java/io/ebean/dbmigration/DbMigration.java diff --git a/ebean-core/src/main/java/io/ebean/dbmigration/package-info.java b/ebean-api/src/main/java/io/ebean/dbmigration/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/dbmigration/package-info.java rename to ebean-api/src/main/java/io/ebean/dbmigration/package-info.java diff --git a/ebean-api/src/main/java/io/ebean/docstore/DocMapping.java b/ebean-api/src/main/java/io/ebean/docstore/DocMapping.java new file mode 100644 index 000000000..9d8d4f3e0 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/docstore/DocMapping.java @@ -0,0 +1,7 @@ +package io.ebean.docstore; + +/** + * Document Mapping for a bean marker interface. + */ +public interface DocMapping { +} diff --git a/ebean-api/src/main/java/io/ebean/docstore/DocQueryContext.java b/ebean-api/src/main/java/io/ebean/docstore/DocQueryContext.java new file mode 100644 index 000000000..5e1718992 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/docstore/DocQueryContext.java @@ -0,0 +1,7 @@ +package io.ebean.docstore; + +/** + * Document query request context marker interface. + */ +public interface DocQueryContext { +} diff --git a/ebean-api/src/main/java/io/ebean/docstore/DocUpdateContext.java b/ebean-api/src/main/java/io/ebean/docstore/DocUpdateContext.java new file mode 100644 index 000000000..37fc7bf88 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/docstore/DocUpdateContext.java @@ -0,0 +1,7 @@ +package io.ebean.docstore; + +/** + * Document update context marker interface. + */ +public interface DocUpdateContext { +} diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/RawDoc.java b/ebean-api/src/main/java/io/ebean/docstore/RawDoc.java similarity index 97% rename from ebean-core/src/main/java/io/ebeanservice/docstore/api/RawDoc.java rename to ebean-api/src/main/java/io/ebean/docstore/RawDoc.java index b2f4d4412..282ab6f77 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/RawDoc.java +++ b/ebean-api/src/main/java/io/ebean/docstore/RawDoc.java @@ -1,4 +1,4 @@ -package io.ebeanservice.docstore.api; +package io.ebean.docstore; import java.util.Map; diff --git a/ebean-core/src/main/java/io/ebean/event/AbstractBeanPersistListener.java b/ebean-api/src/main/java/io/ebean/event/AbstractBeanPersistListener.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/AbstractBeanPersistListener.java rename to ebean-api/src/main/java/io/ebean/event/AbstractBeanPersistListener.java diff --git a/ebean-core/src/main/java/io/ebean/event/BeanDeleteIdRequest.java b/ebean-api/src/main/java/io/ebean/event/BeanDeleteIdRequest.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/BeanDeleteIdRequest.java rename to ebean-api/src/main/java/io/ebean/event/BeanDeleteIdRequest.java diff --git a/ebean-core/src/main/java/io/ebean/event/BeanFindController.java b/ebean-api/src/main/java/io/ebean/event/BeanFindController.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/BeanFindController.java rename to ebean-api/src/main/java/io/ebean/event/BeanFindController.java diff --git a/ebean-core/src/main/java/io/ebean/event/BeanPersistAdapter.java b/ebean-api/src/main/java/io/ebean/event/BeanPersistAdapter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/BeanPersistAdapter.java rename to ebean-api/src/main/java/io/ebean/event/BeanPersistAdapter.java diff --git a/ebean-core/src/main/java/io/ebean/event/BeanPersistController.java b/ebean-api/src/main/java/io/ebean/event/BeanPersistController.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/BeanPersistController.java rename to ebean-api/src/main/java/io/ebean/event/BeanPersistController.java diff --git a/ebean-core/src/main/java/io/ebean/event/BeanPersistListener.java b/ebean-api/src/main/java/io/ebean/event/BeanPersistListener.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/BeanPersistListener.java rename to ebean-api/src/main/java/io/ebean/event/BeanPersistListener.java diff --git a/ebean-core/src/main/java/io/ebean/event/BeanPersistRequest.java b/ebean-api/src/main/java/io/ebean/event/BeanPersistRequest.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/BeanPersistRequest.java rename to ebean-api/src/main/java/io/ebean/event/BeanPersistRequest.java diff --git a/ebean-core/src/main/java/io/ebean/event/BeanPostConstructListener.java b/ebean-api/src/main/java/io/ebean/event/BeanPostConstructListener.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/BeanPostConstructListener.java rename to ebean-api/src/main/java/io/ebean/event/BeanPostConstructListener.java diff --git a/ebean-core/src/main/java/io/ebean/event/BeanPostLoad.java b/ebean-api/src/main/java/io/ebean/event/BeanPostLoad.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/BeanPostLoad.java rename to ebean-api/src/main/java/io/ebean/event/BeanPostLoad.java diff --git a/ebean-core/src/main/java/io/ebean/event/BeanQueryAdapter.java b/ebean-api/src/main/java/io/ebean/event/BeanQueryAdapter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/BeanQueryAdapter.java rename to ebean-api/src/main/java/io/ebean/event/BeanQueryAdapter.java diff --git a/ebean-core/src/main/java/io/ebean/event/BeanQueryRequest.java b/ebean-api/src/main/java/io/ebean/event/BeanQueryRequest.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/BeanQueryRequest.java rename to ebean-api/src/main/java/io/ebean/event/BeanQueryRequest.java diff --git a/ebean-core/src/main/java/io/ebean/event/BulkTableEvent.java b/ebean-api/src/main/java/io/ebean/event/BulkTableEvent.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/BulkTableEvent.java rename to ebean-api/src/main/java/io/ebean/event/BulkTableEvent.java diff --git a/ebean-core/src/main/java/io/ebean/event/BulkTableEventListener.java b/ebean-api/src/main/java/io/ebean/event/BulkTableEventListener.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/BulkTableEventListener.java rename to ebean-api/src/main/java/io/ebean/event/BulkTableEventListener.java diff --git a/ebean-core/src/main/java/io/ebean/event/ClassUtil.java b/ebean-api/src/main/java/io/ebean/event/ClassUtil.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/ClassUtil.java rename to ebean-api/src/main/java/io/ebean/event/ClassUtil.java diff --git a/ebean-core/src/main/java/io/ebean/event/ServerConfigStartup.java b/ebean-api/src/main/java/io/ebean/event/ServerConfigStartup.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/ServerConfigStartup.java rename to ebean-api/src/main/java/io/ebean/event/ServerConfigStartup.java diff --git a/ebean-core/src/main/java/io/ebean/event/ServletContextListener.java b/ebean-api/src/main/java/io/ebean/event/ServletContextListener.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/ServletContextListener.java rename to ebean-api/src/main/java/io/ebean/event/ServletContextListener.java diff --git a/ebean-core/src/main/java/io/ebean/event/ShutdownManager.java b/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/ShutdownManager.java rename to ebean-api/src/main/java/io/ebean/event/ShutdownManager.java diff --git a/ebean-core/src/main/java/io/ebean/event/changelog/BeanChange.java b/ebean-api/src/main/java/io/ebean/event/changelog/BeanChange.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/changelog/BeanChange.java rename to ebean-api/src/main/java/io/ebean/event/changelog/BeanChange.java diff --git a/ebean-core/src/main/java/io/ebean/event/changelog/ChangeLogFilter.java b/ebean-api/src/main/java/io/ebean/event/changelog/ChangeLogFilter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/changelog/ChangeLogFilter.java rename to ebean-api/src/main/java/io/ebean/event/changelog/ChangeLogFilter.java diff --git a/ebean-core/src/main/java/io/ebean/event/changelog/ChangeLogListener.java b/ebean-api/src/main/java/io/ebean/event/changelog/ChangeLogListener.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/changelog/ChangeLogListener.java rename to ebean-api/src/main/java/io/ebean/event/changelog/ChangeLogListener.java diff --git a/ebean-core/src/main/java/io/ebean/event/changelog/ChangeLogPrepare.java b/ebean-api/src/main/java/io/ebean/event/changelog/ChangeLogPrepare.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/changelog/ChangeLogPrepare.java rename to ebean-api/src/main/java/io/ebean/event/changelog/ChangeLogPrepare.java diff --git a/ebean-core/src/main/java/io/ebean/event/changelog/ChangeLogRegister.java b/ebean-api/src/main/java/io/ebean/event/changelog/ChangeLogRegister.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/changelog/ChangeLogRegister.java rename to ebean-api/src/main/java/io/ebean/event/changelog/ChangeLogRegister.java diff --git a/ebean-core/src/main/java/io/ebean/event/changelog/ChangeSet.java b/ebean-api/src/main/java/io/ebean/event/changelog/ChangeSet.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/changelog/ChangeSet.java rename to ebean-api/src/main/java/io/ebean/event/changelog/ChangeSet.java diff --git a/ebean-core/src/main/java/io/ebean/event/changelog/ChangeType.java b/ebean-api/src/main/java/io/ebean/event/changelog/ChangeType.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/changelog/ChangeType.java rename to ebean-api/src/main/java/io/ebean/event/changelog/ChangeType.java diff --git a/ebean-core/src/main/java/io/ebean/event/changelog/TxnState.java b/ebean-api/src/main/java/io/ebean/event/changelog/TxnState.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/changelog/TxnState.java rename to ebean-api/src/main/java/io/ebean/event/changelog/TxnState.java diff --git a/ebean-core/src/main/java/io/ebean/event/changelog/package-info.java b/ebean-api/src/main/java/io/ebean/event/changelog/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/changelog/package-info.java rename to ebean-api/src/main/java/io/ebean/event/changelog/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/event/package.html b/ebean-api/src/main/java/io/ebean/event/package.html similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/package.html rename to ebean-api/src/main/java/io/ebean/event/package.html diff --git a/ebean-core/src/main/java/io/ebean/event/readaudit/ReadAuditLogger.java b/ebean-api/src/main/java/io/ebean/event/readaudit/ReadAuditLogger.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/readaudit/ReadAuditLogger.java rename to ebean-api/src/main/java/io/ebean/event/readaudit/ReadAuditLogger.java diff --git a/ebean-core/src/main/java/io/ebean/event/readaudit/ReadAuditPrepare.java b/ebean-api/src/main/java/io/ebean/event/readaudit/ReadAuditPrepare.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/readaudit/ReadAuditPrepare.java rename to ebean-api/src/main/java/io/ebean/event/readaudit/ReadAuditPrepare.java diff --git a/ebean-core/src/main/java/io/ebean/event/readaudit/ReadAuditQueryPlan.java b/ebean-api/src/main/java/io/ebean/event/readaudit/ReadAuditQueryPlan.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/readaudit/ReadAuditQueryPlan.java rename to ebean-api/src/main/java/io/ebean/event/readaudit/ReadAuditQueryPlan.java diff --git a/ebean-core/src/main/java/io/ebean/event/readaudit/ReadEvent.java b/ebean-api/src/main/java/io/ebean/event/readaudit/ReadEvent.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/readaudit/ReadEvent.java rename to ebean-api/src/main/java/io/ebean/event/readaudit/ReadEvent.java diff --git a/ebean-core/src/main/java/io/ebean/event/readaudit/package-info.java b/ebean-api/src/main/java/io/ebean/event/readaudit/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/event/readaudit/package-info.java rename to ebean-api/src/main/java/io/ebean/event/readaudit/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/meta/AbstractMetricVisitor.java b/ebean-api/src/main/java/io/ebean/meta/AbstractMetricVisitor.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/meta/AbstractMetricVisitor.java rename to ebean-api/src/main/java/io/ebean/meta/AbstractMetricVisitor.java diff --git a/ebean-core/src/main/java/io/ebean/meta/BasicMetricVisitor.java b/ebean-api/src/main/java/io/ebean/meta/BasicMetricVisitor.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/meta/BasicMetricVisitor.java rename to ebean-api/src/main/java/io/ebean/meta/BasicMetricVisitor.java diff --git a/ebean-core/src/main/java/io/ebean/meta/MetaCountMetric.java b/ebean-api/src/main/java/io/ebean/meta/MetaCountMetric.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/meta/MetaCountMetric.java rename to ebean-api/src/main/java/io/ebean/meta/MetaCountMetric.java diff --git a/ebean-core/src/main/java/io/ebean/meta/MetaInfoManager.java b/ebean-api/src/main/java/io/ebean/meta/MetaInfoManager.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/meta/MetaInfoManager.java rename to ebean-api/src/main/java/io/ebean/meta/MetaInfoManager.java diff --git a/ebean-core/src/main/java/io/ebean/meta/MetaMetric.java b/ebean-api/src/main/java/io/ebean/meta/MetaMetric.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/meta/MetaMetric.java rename to ebean-api/src/main/java/io/ebean/meta/MetaMetric.java diff --git a/ebean-core/src/main/java/io/ebean/meta/MetaQueryMetric.java b/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/meta/MetaQueryMetric.java rename to ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java diff --git a/ebean-core/src/main/java/io/ebean/meta/MetaQueryPlan.java b/ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/meta/MetaQueryPlan.java rename to ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java diff --git a/ebean-core/src/main/java/io/ebean/meta/MetaTimedMetric.java b/ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/meta/MetaTimedMetric.java rename to ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java diff --git a/ebean-core/src/main/java/io/ebean/meta/MetricData.java b/ebean-api/src/main/java/io/ebean/meta/MetricData.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/meta/MetricData.java rename to ebean-api/src/main/java/io/ebean/meta/MetricData.java diff --git a/ebean-core/src/main/java/io/ebean/meta/MetricVisitor.java b/ebean-api/src/main/java/io/ebean/meta/MetricVisitor.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/meta/MetricVisitor.java rename to ebean-api/src/main/java/io/ebean/meta/MetricVisitor.java diff --git a/ebean-core/src/main/java/io/ebean/meta/QueryPlanInit.java b/ebean-api/src/main/java/io/ebean/meta/QueryPlanInit.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/meta/QueryPlanInit.java rename to ebean-api/src/main/java/io/ebean/meta/QueryPlanInit.java diff --git a/ebean-core/src/main/java/io/ebean/meta/QueryPlanRequest.java b/ebean-api/src/main/java/io/ebean/meta/QueryPlanRequest.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/meta/QueryPlanRequest.java rename to ebean-api/src/main/java/io/ebean/meta/QueryPlanRequest.java diff --git a/ebean-core/src/main/java/io/ebean/meta/ServerMetrics.java b/ebean-api/src/main/java/io/ebean/meta/ServerMetrics.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/meta/ServerMetrics.java rename to ebean-api/src/main/java/io/ebean/meta/ServerMetrics.java diff --git a/ebean-core/src/main/java/io/ebean/meta/ServerMetricsAsJson.java b/ebean-api/src/main/java/io/ebean/meta/ServerMetricsAsJson.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/meta/ServerMetricsAsJson.java rename to ebean-api/src/main/java/io/ebean/meta/ServerMetricsAsJson.java diff --git a/ebean-core/src/main/java/io/ebean/meta/SortMetric.java b/ebean-api/src/main/java/io/ebean/meta/SortMetric.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/meta/SortMetric.java rename to ebean-api/src/main/java/io/ebean/meta/SortMetric.java diff --git a/ebean-core/src/main/java/io/ebean/meta/package-info.java b/ebean-api/src/main/java/io/ebean/meta/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/meta/package-info.java rename to ebean-api/src/main/java/io/ebean/meta/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/metric/CountMetric.java b/ebean-api/src/main/java/io/ebean/metric/CountMetric.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/metric/CountMetric.java rename to ebean-api/src/main/java/io/ebean/metric/CountMetric.java diff --git a/ebean-core/src/main/java/io/ebean/metric/CountMetricStats.java b/ebean-api/src/main/java/io/ebean/metric/CountMetricStats.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/metric/CountMetricStats.java rename to ebean-api/src/main/java/io/ebean/metric/CountMetricStats.java diff --git a/ebean-core/src/main/java/io/ebean/metric/MetricFactory.java b/ebean-api/src/main/java/io/ebean/metric/MetricFactory.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/metric/MetricFactory.java rename to ebean-api/src/main/java/io/ebean/metric/MetricFactory.java diff --git a/ebean-core/src/main/java/io/ebean/metric/MetricServiceProvider.java b/ebean-api/src/main/java/io/ebean/metric/MetricServiceProvider.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/metric/MetricServiceProvider.java rename to ebean-api/src/main/java/io/ebean/metric/MetricServiceProvider.java diff --git a/ebean-core/src/main/java/io/ebean/metric/QueryPlanCollector.java b/ebean-api/src/main/java/io/ebean/metric/QueryPlanCollector.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/metric/QueryPlanCollector.java rename to ebean-api/src/main/java/io/ebean/metric/QueryPlanCollector.java diff --git a/ebean-core/src/main/java/io/ebean/metric/QueryPlanMetric.java b/ebean-api/src/main/java/io/ebean/metric/QueryPlanMetric.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/metric/QueryPlanMetric.java rename to ebean-api/src/main/java/io/ebean/metric/QueryPlanMetric.java diff --git a/ebean-core/src/main/java/io/ebean/metric/TimedMetric.java b/ebean-api/src/main/java/io/ebean/metric/TimedMetric.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/metric/TimedMetric.java rename to ebean-api/src/main/java/io/ebean/metric/TimedMetric.java diff --git a/ebean-core/src/main/java/io/ebean/metric/TimedMetricMap.java b/ebean-api/src/main/java/io/ebean/metric/TimedMetricMap.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/metric/TimedMetricMap.java rename to ebean-api/src/main/java/io/ebean/metric/TimedMetricMap.java diff --git a/ebean-core/src/main/java/io/ebean/metric/TimedMetricStats.java b/ebean-api/src/main/java/io/ebean/metric/TimedMetricStats.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/metric/TimedMetricStats.java rename to ebean-api/src/main/java/io/ebean/metric/TimedMetricStats.java diff --git a/ebean-core/src/main/java/io/ebean/overview.html b/ebean-api/src/main/java/io/ebean/overview.html similarity index 100% rename from ebean-core/src/main/java/io/ebean/overview.html rename to ebean-api/src/main/java/io/ebean/overview.html diff --git a/ebean-core/src/main/java/io/ebean/package.html b/ebean-api/src/main/java/io/ebean/package.html similarity index 100% rename from ebean-core/src/main/java/io/ebean/package.html rename to ebean-api/src/main/java/io/ebean/package.html diff --git a/ebean-core/src/main/java/io/ebean/plugin/BeanDocType.java b/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java similarity index 85% rename from ebean-core/src/main/java/io/ebean/plugin/BeanDocType.java rename to ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java index d82c05c84..92b3d6d19 100644 --- a/ebean-core/src/main/java/io/ebean/plugin/BeanDocType.java +++ b/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java @@ -2,7 +2,7 @@ package io.ebean.plugin; import io.ebean.FetchPath; import io.ebean.Query; -import io.ebeanservice.docstore.api.DocStoreUpdateContext; +import io.ebean.docstore.DocUpdateContext; import java.io.IOException; @@ -52,12 +52,12 @@ public interface BeanDocType { * This somewhat assumes the bean is fetched with appropriate path properties * to match the expected document structure. */ - void index(Object idValue, T bean, DocStoreUpdateContext txn) throws IOException; + void index(Object idValue, T bean, DocUpdateContext txn) throws IOException; /** * Add a delete by Id to the doc store. */ - void deleteById(Object idValue, DocStoreUpdateContext txn) throws IOException; + void deleteById(Object idValue, DocUpdateContext txn) throws IOException; /** * Add a embedded document update to the doc store. @@ -67,6 +67,6 @@ public interface BeanDocType { * @param embeddedRawContent the content of the embedded document in JSON form * @param txn the doc store transaction to add the update to */ - void updateEmbedded(Object idValue, String embeddedProperty, String embeddedRawContent, DocStoreUpdateContext txn) throws IOException; + void updateEmbedded(Object idValue, String embeddedProperty, String embeddedRawContent, DocUpdateContext txn) throws IOException; } diff --git a/ebean-core/src/main/java/io/ebean/plugin/BeanType.java b/ebean-api/src/main/java/io/ebean/plugin/BeanType.java similarity index 97% rename from ebean-core/src/main/java/io/ebean/plugin/BeanType.java rename to ebean-api/src/main/java/io/ebean/plugin/BeanType.java index 81a77ef98..bf6edffaa 100644 --- a/ebean-core/src/main/java/io/ebean/plugin/BeanType.java +++ b/ebean-api/src/main/java/io/ebean/plugin/BeanType.java @@ -6,7 +6,7 @@ import io.ebean.event.BeanFindController; import io.ebean.event.BeanPersistController; import io.ebean.event.BeanPersistListener; import io.ebean.event.BeanQueryAdapter; -import io.ebeanservice.docstore.api.mapping.DocumentMapping; +import io.ebean.docstore.DocMapping; import javax.annotation.Nonnull; import java.util.Collection; @@ -167,7 +167,7 @@ public interface BeanType { * for the document store. *

*/ - DocumentMapping getDocMapping(); + DocMapping getDocMapping(); /** * Return the doc store queueId for this bean type. diff --git a/ebean-core/src/main/java/io/ebean/plugin/ExpressionPath.java b/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/plugin/ExpressionPath.java rename to ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java diff --git a/ebean-core/src/main/java/io/ebean/plugin/LoadErrorHandler.java b/ebean-api/src/main/java/io/ebean/plugin/LoadErrorHandler.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/plugin/LoadErrorHandler.java rename to ebean-api/src/main/java/io/ebean/plugin/LoadErrorHandler.java diff --git a/ebean-core/src/main/java/io/ebean/plugin/Plugin.java b/ebean-api/src/main/java/io/ebean/plugin/Plugin.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/plugin/Plugin.java rename to ebean-api/src/main/java/io/ebean/plugin/Plugin.java diff --git a/ebean-core/src/main/java/io/ebean/plugin/Property.java b/ebean-api/src/main/java/io/ebean/plugin/Property.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/plugin/Property.java rename to ebean-api/src/main/java/io/ebean/plugin/Property.java diff --git a/ebean-core/src/main/java/io/ebean/plugin/PropertyAssocMany.java b/ebean-api/src/main/java/io/ebean/plugin/PropertyAssocMany.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/plugin/PropertyAssocMany.java rename to ebean-api/src/main/java/io/ebean/plugin/PropertyAssocMany.java diff --git a/ebean-core/src/main/java/io/ebean/plugin/SpiServer.java b/ebean-api/src/main/java/io/ebean/plugin/SpiServer.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/plugin/SpiServer.java rename to ebean-api/src/main/java/io/ebean/plugin/SpiServer.java diff --git a/ebean-core/src/main/java/io/ebean/plugin/package-info.java b/ebean-api/src/main/java/io/ebean/plugin/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/plugin/package-info.java rename to ebean-api/src/main/java/io/ebean/plugin/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/search/AbstractMatch.java b/ebean-api/src/main/java/io/ebean/search/AbstractMatch.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/search/AbstractMatch.java rename to ebean-api/src/main/java/io/ebean/search/AbstractMatch.java diff --git a/ebean-core/src/main/java/io/ebean/search/Match.java b/ebean-api/src/main/java/io/ebean/search/Match.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/search/Match.java rename to ebean-api/src/main/java/io/ebean/search/Match.java diff --git a/ebean-core/src/main/java/io/ebean/search/MultiMatch.java b/ebean-api/src/main/java/io/ebean/search/MultiMatch.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/search/MultiMatch.java rename to ebean-api/src/main/java/io/ebean/search/MultiMatch.java diff --git a/ebean-core/src/main/java/io/ebean/search/TextCommonTerms.java b/ebean-api/src/main/java/io/ebean/search/TextCommonTerms.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/search/TextCommonTerms.java rename to ebean-api/src/main/java/io/ebean/search/TextCommonTerms.java diff --git a/ebean-core/src/main/java/io/ebean/search/TextQueryString.java b/ebean-api/src/main/java/io/ebean/search/TextQueryString.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/search/TextQueryString.java rename to ebean-api/src/main/java/io/ebean/search/TextQueryString.java diff --git a/ebean-core/src/main/java/io/ebean/search/TextSimple.java b/ebean-api/src/main/java/io/ebean/search/TextSimple.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/search/TextSimple.java rename to ebean-api/src/main/java/io/ebean/search/TextSimple.java diff --git a/ebean-core/src/main/java/io/ebean/search/package-info.java b/ebean-api/src/main/java/io/ebean/search/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/search/package-info.java rename to ebean-api/src/main/java/io/ebean/search/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/service/SpiContainer.java b/ebean-api/src/main/java/io/ebean/service/SpiContainer.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/service/SpiContainer.java rename to ebean-api/src/main/java/io/ebean/service/SpiContainer.java diff --git a/ebean-core/src/main/java/io/ebean/service/SpiContainerFactory.java b/ebean-api/src/main/java/io/ebean/service/SpiContainerFactory.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/service/SpiContainerFactory.java rename to ebean-api/src/main/java/io/ebean/service/SpiContainerFactory.java diff --git a/ebean-core/src/main/java/io/ebean/service/SpiFetchGroupQuery.java b/ebean-api/src/main/java/io/ebean/service/SpiFetchGroupQuery.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/service/SpiFetchGroupQuery.java rename to ebean-api/src/main/java/io/ebean/service/SpiFetchGroupQuery.java diff --git a/ebean-core/src/main/java/io/ebean/service/SpiFetchGroupService.java b/ebean-api/src/main/java/io/ebean/service/SpiFetchGroupService.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/service/SpiFetchGroupService.java rename to ebean-api/src/main/java/io/ebean/service/SpiFetchGroupService.java diff --git a/ebean-core/src/main/java/io/ebean/service/SpiJsonService.java b/ebean-api/src/main/java/io/ebean/service/SpiJsonService.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/service/SpiJsonService.java rename to ebean-api/src/main/java/io/ebean/service/SpiJsonService.java diff --git a/ebean-core/src/main/java/io/ebean/service/SpiProfileLocationFactory.java b/ebean-api/src/main/java/io/ebean/service/SpiProfileLocationFactory.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/service/SpiProfileLocationFactory.java rename to ebean-api/src/main/java/io/ebean/service/SpiProfileLocationFactory.java diff --git a/ebean-core/src/main/java/io/ebean/service/SpiRawSqlService.java b/ebean-api/src/main/java/io/ebean/service/SpiRawSqlService.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/service/SpiRawSqlService.java rename to ebean-api/src/main/java/io/ebean/service/SpiRawSqlService.java diff --git a/ebean-core/src/main/java/io/ebean/stylesheet.css b/ebean-api/src/main/java/io/ebean/stylesheet.css similarity index 100% rename from ebean-core/src/main/java/io/ebean/stylesheet.css rename to ebean-api/src/main/java/io/ebean/stylesheet.css diff --git a/ebean-core/src/main/java/io/ebean/text/PathProperties.java b/ebean-api/src/main/java/io/ebean/text/PathProperties.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/PathProperties.java rename to ebean-api/src/main/java/io/ebean/text/PathProperties.java diff --git a/ebean-core/src/main/java/io/ebean/text/PathPropertiesParser.java b/ebean-api/src/main/java/io/ebean/text/PathPropertiesParser.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/PathPropertiesParser.java rename to ebean-api/src/main/java/io/ebean/text/PathPropertiesParser.java diff --git a/ebean-core/src/main/java/io/ebean/text/StringFormatter.java b/ebean-api/src/main/java/io/ebean/text/StringFormatter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/StringFormatter.java rename to ebean-api/src/main/java/io/ebean/text/StringFormatter.java diff --git a/ebean-core/src/main/java/io/ebean/text/StringParser.java b/ebean-api/src/main/java/io/ebean/text/StringParser.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/StringParser.java rename to ebean-api/src/main/java/io/ebean/text/StringParser.java diff --git a/ebean-core/src/main/java/io/ebean/text/TextException.java b/ebean-api/src/main/java/io/ebean/text/TextException.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/TextException.java rename to ebean-api/src/main/java/io/ebean/text/TextException.java diff --git a/ebean-core/src/main/java/io/ebean/text/TimeStringParser.java b/ebean-api/src/main/java/io/ebean/text/TimeStringParser.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/TimeStringParser.java rename to ebean-api/src/main/java/io/ebean/text/TimeStringParser.java diff --git a/ebean-core/src/main/java/io/ebean/text/csv/CsvCallback.java b/ebean-api/src/main/java/io/ebean/text/csv/CsvCallback.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/csv/CsvCallback.java rename to ebean-api/src/main/java/io/ebean/text/csv/CsvCallback.java diff --git a/ebean-core/src/main/java/io/ebean/text/csv/CsvReader.java b/ebean-api/src/main/java/io/ebean/text/csv/CsvReader.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/csv/CsvReader.java rename to ebean-api/src/main/java/io/ebean/text/csv/CsvReader.java diff --git a/ebean-core/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java b/ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java rename to ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java diff --git a/ebean-core/src/main/java/io/ebean/text/csv/package-info.java b/ebean-api/src/main/java/io/ebean/text/csv/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/csv/package-info.java rename to ebean-api/src/main/java/io/ebean/text/csv/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/text/json/EJson.java b/ebean-api/src/main/java/io/ebean/text/json/EJson.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/json/EJson.java rename to ebean-api/src/main/java/io/ebean/text/json/EJson.java diff --git a/ebean-core/src/main/java/io/ebean/text/json/JsonBeanReader.java b/ebean-api/src/main/java/io/ebean/text/json/JsonBeanReader.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/json/JsonBeanReader.java rename to ebean-api/src/main/java/io/ebean/text/json/JsonBeanReader.java diff --git a/ebean-core/src/main/java/io/ebean/text/json/JsonContext.java b/ebean-api/src/main/java/io/ebean/text/json/JsonContext.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/json/JsonContext.java rename to ebean-api/src/main/java/io/ebean/text/json/JsonContext.java diff --git a/ebean-core/src/main/java/io/ebean/text/json/JsonIOException.java b/ebean-api/src/main/java/io/ebean/text/json/JsonIOException.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/json/JsonIOException.java rename to ebean-api/src/main/java/io/ebean/text/json/JsonIOException.java diff --git a/ebean-core/src/main/java/io/ebean/text/json/JsonReadBeanVisitor.java b/ebean-api/src/main/java/io/ebean/text/json/JsonReadBeanVisitor.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/json/JsonReadBeanVisitor.java rename to ebean-api/src/main/java/io/ebean/text/json/JsonReadBeanVisitor.java diff --git a/ebean-core/src/main/java/io/ebean/text/json/JsonReadOptions.java b/ebean-api/src/main/java/io/ebean/text/json/JsonReadOptions.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/json/JsonReadOptions.java rename to ebean-api/src/main/java/io/ebean/text/json/JsonReadOptions.java diff --git a/ebean-core/src/main/java/io/ebean/text/json/JsonWriteBeanVisitor.java b/ebean-api/src/main/java/io/ebean/text/json/JsonWriteBeanVisitor.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/json/JsonWriteBeanVisitor.java rename to ebean-api/src/main/java/io/ebean/text/json/JsonWriteBeanVisitor.java diff --git a/ebean-core/src/main/java/io/ebean/text/json/JsonWriteOptions.java b/ebean-api/src/main/java/io/ebean/text/json/JsonWriteOptions.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/json/JsonWriteOptions.java rename to ebean-api/src/main/java/io/ebean/text/json/JsonWriteOptions.java diff --git a/ebean-core/src/main/java/io/ebean/text/json/JsonWriter.java b/ebean-api/src/main/java/io/ebean/text/json/JsonWriter.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/json/JsonWriter.java rename to ebean-api/src/main/java/io/ebean/text/json/JsonWriter.java diff --git a/ebean-core/src/main/java/io/ebean/text/json/package-info.java b/ebean-api/src/main/java/io/ebean/text/json/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/json/package-info.java rename to ebean-api/src/main/java/io/ebean/text/json/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/text/package-info.java b/ebean-api/src/main/java/io/ebean/text/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/text/package-info.java rename to ebean-api/src/main/java/io/ebean/text/package-info.java diff --git a/ebean-core/src/main/java/io/ebean/util/AnnotationUtil.java b/ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/util/AnnotationUtil.java rename to ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java diff --git a/ebean-core/src/main/java/io/ebean/util/CamelCaseHelper.java b/ebean-api/src/main/java/io/ebean/util/CamelCaseHelper.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/util/CamelCaseHelper.java rename to ebean-api/src/main/java/io/ebean/util/CamelCaseHelper.java diff --git a/ebean-core/src/main/java/io/ebean/util/EncodeB64.java b/ebean-api/src/main/java/io/ebean/util/EncodeB64.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/util/EncodeB64.java rename to ebean-api/src/main/java/io/ebean/util/EncodeB64.java diff --git a/ebean-core/src/main/java/io/ebean/util/JdbcClose.java b/ebean-api/src/main/java/io/ebean/util/JdbcClose.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/util/JdbcClose.java rename to ebean-api/src/main/java/io/ebean/util/JdbcClose.java diff --git a/ebean-core/src/main/java/io/ebean/util/SplitName.java b/ebean-api/src/main/java/io/ebean/util/SplitName.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/util/SplitName.java rename to ebean-api/src/main/java/io/ebean/util/SplitName.java diff --git a/ebean-core/src/main/java/io/ebean/util/StringHelper.java b/ebean-api/src/main/java/io/ebean/util/StringHelper.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/util/StringHelper.java rename to ebean-api/src/main/java/io/ebean/util/StringHelper.java diff --git a/ebean-core/src/main/java/io/ebean/util/package-info.java b/ebean-api/src/main/java/io/ebean/util/package-info.java similarity index 100% rename from ebean-core/src/main/java/io/ebean/util/package-info.java rename to ebean-api/src/main/java/io/ebean/util/package-info.java diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index c453546c4..5d0326850 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -13,10 +13,16 @@ + + io.ebean + ebean-api + ${project.version} + + io.ebean ebean-core - 12.4.3-SNAPSHOT + ${project.version} diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index bf3e29a56..e1996073d 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -12,16 +12,16 @@ ebean-core http://ebean-orm.github.io/ - - 2.10.0 - 2.10.0 - - scm:git:git@github.com:ebean-orm/ebean.git HEAD + + 2.10.0 + 2.10.0 + + - org.slf4j - slf4j-api - 1.7.25 + io.ebean + ebean-api + ${project.version} provided - - io.avaje - avaje-config - 1.0 - - - - com.fasterxml.jackson.core - jackson-core - ${jackson-core.version} - - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson-databind.version} - true - + + + + + javax.transaction @@ -142,10 +87,9 @@ - javax.servlet - javax.servlet-api - 3.1.0 - true + org.antlr + antlr4-runtime + 4.8-1 @@ -170,6 +114,21 @@ true + + + com.fasterxml.jackson.core + jackson-core + ${jackson-core.version} + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind.version} + true + + org.postgresql diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocQueryRequest.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocQueryRequest.java index ed13ceb4e..004047976 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocQueryRequest.java @@ -1,5 +1,6 @@ package io.ebeanservice.docstore.api; +import io.ebean.docstore.DocQueryContext; import io.ebean.text.json.JsonReadOptions; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.api.SpiTransaction; @@ -7,7 +8,7 @@ import io.ebeaninternal.api.SpiTransaction; /** * A Query request for the document store. */ -public interface DocQueryRequest { +public interface DocQueryRequest extends DocQueryContext { /** * Return the transaction for this request (can be null for document store only queries). diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java index 687942bac..5c0dd02be 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java @@ -2,6 +2,7 @@ package io.ebeanservice.docstore.api; import io.ebean.Query; import io.ebean.annotation.DocStoreMode; +import io.ebean.docstore.DocUpdateContext; import io.ebean.plugin.BeanDocType; import io.ebeaninternal.server.core.PersistRequest; import io.ebeaninternal.server.core.PersistRequestBean; @@ -66,13 +67,13 @@ public interface DocStoreBeanAdapter extends BeanDocType { * Process a delete by id of a given document. */ @Override - void deleteById(Object idValue, DocStoreUpdateContext txn) throws IOException; + void deleteById(Object idValue, DocUpdateContext txn) throws IOException; /** * Process an index event which is effectively an insert or update (or put). */ @Override - void index(Object idValue, T entityBean, DocStoreUpdateContext txn) throws IOException; + void index(Object idValue, T entityBean, DocUpdateContext txn) throws IOException; /** * Process an insert persist request. @@ -104,7 +105,7 @@ public interface DocStoreBeanAdapter extends BeanDocType { * @param txn the doc store transaction to use to process the update */ @Override - void updateEmbedded(Object idValue, String embeddedProperty, String embeddedRawContent, DocStoreUpdateContext txn) throws IOException; + void updateEmbedded(Object idValue, String embeddedProperty, String embeddedRawContent, DocUpdateContext txn) throws IOException; /** * Create the document mapping. diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreUpdateContext.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreUpdateContext.java index 52066fd01..d04c4fdcd 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreUpdateContext.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreUpdateContext.java @@ -1,11 +1,13 @@ package io.ebeanservice.docstore.api; +import io.ebean.docstore.DocUpdateContext; + /** * The doc store specific context/transaction used to collect updates to send to the document store. *

* Doc store specific implementations gather changes and bulk update the document store. *

*/ -public interface DocStoreUpdateContext { +public interface DocStoreUpdateContext extends DocUpdateContext { } diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java index 0b5787451..0b68545c7 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java @@ -1,11 +1,12 @@ package io.ebeanservice.docstore.api.mapping; import io.ebean.FetchPath; +import io.ebean.docstore.DocMapping; /** * Mapping for a document stored in a doc store (like ElasticSearch). */ -public class DocumentMapping { +public class DocumentMapping implements DocMapping { protected final String queueId; diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java index ff2d5c3b4..7212f74ee 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java @@ -4,6 +4,7 @@ import io.ebean.FetchPath; import io.ebean.Query; import io.ebean.annotation.DocStore; import io.ebean.annotation.DocStoreMode; +import io.ebean.docstore.DocUpdateContext; import io.ebean.plugin.BeanType; import io.ebean.text.PathProperties; import io.ebeaninternal.api.SpiEbeanServer; @@ -326,10 +327,10 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< } @Override - public abstract void deleteById(Object idValue, DocStoreUpdateContext txn) throws IOException; + public abstract void deleteById(Object idValue, DocUpdateContext txn) throws IOException; @Override - public abstract void index(Object idValue, T entityBean, DocStoreUpdateContext txn) throws IOException; + public abstract void index(Object idValue, T entityBean, DocUpdateContext txn) throws IOException; @Override public abstract void insert(Object idValue, PersistRequestBean persistRequest, DocStoreUpdateContext txn) throws IOException; @@ -338,6 +339,6 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< public abstract void update(Object idValue, PersistRequestBean persistRequest, DocStoreUpdateContext txn) throws IOException; @Override - public abstract void updateEmbedded(Object idValue, String embeddedProperty, String embeddedRawContent, DocStoreUpdateContext txn) throws IOException; + public abstract void updateEmbedded(Object idValue, String embeddedProperty, String embeddedRawContent, DocUpdateContext txn) throws IOException; } diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStore.java b/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStore.java index 8331f6ccd..a7dda71d4 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStore.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStore.java @@ -4,8 +4,8 @@ import io.ebean.DocStoreQueueEntry; import io.ebean.DocumentStore; import io.ebean.PagedList; import io.ebean.Query; -import io.ebeanservice.docstore.api.DocQueryRequest; -import io.ebeanservice.docstore.api.RawDoc; +import io.ebean.docstore.DocQueryContext; +import io.ebean.docstore.RawDoc; import java.io.IOException; import java.util.List; @@ -68,27 +68,27 @@ public class NoneDocStore implements DocumentStore { } @Override - public T find(DocQueryRequest request) { + public T find(DocQueryContext request) { throw implementationNotInClassPath(); } @Override - public PagedList findPagedList(DocQueryRequest request) { + public PagedList findPagedList(DocQueryContext request) { throw implementationNotInClassPath(); } @Override - public List findList(DocQueryRequest request) { + public List findList(DocQueryContext request) { throw implementationNotInClassPath(); } @Override - public void findEach(DocQueryRequest query, Consumer consumer) { + public void findEach(DocQueryContext query, Consumer consumer) { throw implementationNotInClassPath(); } @Override - public void findEachWhile(DocQueryRequest query, Predicate consumer) { + public void findEachWhile(DocQueryContext query, Predicate consumer) { throw implementationNotInClassPath(); } diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java index de513f3c6..d187af169 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java @@ -1,5 +1,6 @@ package io.ebeanservice.docstore.none; +import io.ebean.docstore.DocUpdateContext; import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; @@ -23,12 +24,12 @@ public class NoneDocStoreBeanAdapter extends DocStoreBeanBaseAdapter { } @Override - public void deleteById(Object idValue, DocStoreUpdateContext txn) throws IOException { + public void deleteById(Object idValue, DocUpdateContext txn) throws IOException { throw NoneDocStore.implementationNotInClassPath(); } @Override - public void index(Object idValue, T entityBean, DocStoreUpdateContext txn) throws IOException { + public void index(Object idValue, T entityBean, DocUpdateContext txn) throws IOException { throw NoneDocStore.implementationNotInClassPath(); } @@ -43,7 +44,7 @@ public class NoneDocStoreBeanAdapter extends DocStoreBeanBaseAdapter { } @Override - public void updateEmbedded(Object idValue, String embeddedProperty, String embeddedRawContent, DocStoreUpdateContext txn) throws IOException { + public void updateEmbedded(Object idValue, String embeddedProperty, String embeddedRawContent, DocUpdateContext txn) throws IOException { throw NoneDocStore.implementationNotInClassPath(); } } diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java index 57c31da2b..bbc8c5752 100644 --- a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java +++ b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java @@ -3,6 +3,7 @@ package io.ebeanservice.docstore.api.support; import io.ebean.BaseTestCase; import io.ebean.Query; +import io.ebean.docstore.DocUpdateContext; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.deploy.BeanDescriptor; @@ -46,11 +47,11 @@ public class DocStoreBeanBaseAdapterTest extends BaseTestCase { } @Override - public void deleteById(Object idValue, DocStoreUpdateContext txn) throws IOException { + public void deleteById(Object idValue, DocUpdateContext txn) throws IOException { } @Override - public void index(Object idValue, Object entityBean, DocStoreUpdateContext txn) throws IOException { + public void index(Object idValue, Object entityBean, DocUpdateContext txn) throws IOException { } @Override @@ -62,7 +63,7 @@ public class DocStoreBeanBaseAdapterTest extends BaseTestCase { } @Override - public void updateEmbedded(Object idValue, String embeddedProperty, String embeddedRawContent, DocStoreUpdateContext txn) throws IOException { + public void updateEmbedded(Object idValue, String embeddedProperty, String embeddedRawContent, DocUpdateContext txn) throws IOException { } } } diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 3bcf51309..cf4562efb 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -15,6 +15,13 @@ + + io.ebean + ebean-api + ${project.version} + provided + + io.ebean ebean-core diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index d141108c6..df6cf1b4b 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -20,6 +20,13 @@ provided + + io.ebean + ebean-api + ${project.version} + provided + + io.ebean ebean-core diff --git a/pom.xml b/pom.xml index a3dcd073c..90b68a70b 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,7 @@ ebean + ebean-api ebean-bom ebean-core ebean-autotune