This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new e8eef1d4d CAY-2826 Rename `ServerModule` to `CoreModule`
e8eef1d4d is described below
commit e8eef1d4dd0e4fcf7b54fea0aa85ab2fdc79a1b2
Author: stariy95 <[email protected]>
AuthorDate: Thu Nov 23 17:36:49 2023 +0400
CAY-2826 Rename `ServerModule` to `CoreModule`
---
RELEASE-NOTES.txt | 1 +
UPGRADE.txt | 2 +
.../invalidation/CacheInvalidationModule.java | 4 +-
.../CacheInvalidationModuleProvider.java | 4 +-
.../org/apache/cayenne/gen/PropertyUtilsTest.java | 4 +-
.../cayenne/commitlog/CommitLogModuleExtender.java | 4 +-
.../commitlog/CommitLogServerModuleProvider.java | 4 +-
.../cayenne/crypto/CryptoServerModuleProvider.java | 4 +-
.../configuration/ToolsServerModuleExtender.java | 6 +--
.../cayenne/jcache/JCacheModuleExtender.java | 4 +-
.../cayenne/jcache/JCacheServerModuleProvider.java | 4 +-
.../ProjectCompatibilityModuleProvider.java | 4 +-
.../velocity/VelocityServerModuleProvider.java | 4 +-
.../org/apache/cayenne/DataChannelQueryFilter.java | 2 +-
.../org/apache/cayenne/DataChannelSyncFilter.java | 2 +-
.../apache/cayenne/configuration/Constants.java | 12 ++---
.../server/{ServerModule.java => CoreModule.java} | 17 +++---
...ModuleExtender.java => CoreModuleExtender.java} | 60 +++++++++++-----------
...ModuleProvider.java => CoreModuleProvider.java} | 12 ++---
.../org/apache/cayenne/runtime/CayenneRuntime.java | 6 +--
.../cayenne/runtime/CayenneRuntimeBuilder.java | 12 ++---
...onfiguration.server.CayenneServerModuleProvider | 2 +-
.../access/DefaultDataRowStoreFactoryIT.java | 10 ++--
.../cayenne/access/util/ServerCaseSyncModule.java | 4 +-
...oviderTest.java => CoreModuleProviderTest.java} | 4 +-
.../server/DataDomainProviderTest.java | 2 +-
.../server/DefaultDbAdapterFactoryTest.java | 8 +--
.../cayenne/runtime/CayenneRuntimeBuilderTest.java | 10 ++--
.../unit/di/server/CayenneRuntimeProvider.java | 6 +--
.../server/CayenneRuntimeProviderContextsSync.java | 4 +-
.../unit/di/server/ServerCaseContextsSync.java | 4 +-
.../cayenne/unit/di/server/ServerCaseModule.java | 10 ++--
...eakReferenceStrategyCayenneRuntimeProvider.java | 4 +-
.../org/apache/cayenne/unit/jira/CAY_743Test.java | 6 +--
.../asciidoc/_cayenne-guide/part2/customize.adoc | 8 +--
.../asciidoc/_cayenne-guide/part2/lifecycle.adoc | 4 +-
.../asciidoc/_cayenne-guide/part2/starting.adoc | 2 +-
.../docs/asciidoc/_cayenne-guide/part2/tuning.adoc | 2 +-
.../main/java/org/apache/cayenne/modeler/Main.java | 6 +--
39 files changed, 136 insertions(+), 132 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 199027d77..ac6abdb8c 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -46,6 +46,7 @@ CAY-2819 DataContext.performIteratedQuery() method should be
unified with iterat
CAY-2821 Change development versioning schema
CAY-2822 Rename `cayenne-server` module to `cayenne`
CAY-2823 Merge `ServerRuntime` back to `CayenneRuntime` and deprecate it
+CAY-2826 Rename `ServerModule` to `CoreModule`
Bug Fixes:
diff --git a/UPGRADE.txt b/UPGRADE.txt
index 92691d864..fb9f2a966 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -46,6 +46,8 @@ that accordingly in your build scripts
* Per CAY-2823 `ServerRuntime` is deprecated. You should change your code to
use `org.apache.cayenne.runtime.CayenneRuntime` instead.
+* Per CAY-2826 `ServerModule` renamed to `CoreModule`
+
UPGRADING TO 4.2.M2
* Per CAY-2659 All batch translators (`InsertBatchTranslator`,
`UpdateBatchTranslator`, etc.) are updated to the new SQLBuilder utility.
diff --git
a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModule.java
b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModule.java
index 338cc56ff..7495a7568 100644
---
a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModule.java
+++
b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModule.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.cache.invalidation;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.ListBuilder;
import org.apache.cayenne.di.Module;
@@ -59,6 +59,6 @@ public class CacheInvalidationModule implements Module {
.addHandler(CacheGroupsHandler.class);
// want the filter to be INSIDE transactions by default
-
ServerModule.extend(binder).addSyncFilter(CacheInvalidationFilter.class, true);
+ CoreModule.extend(binder).addSyncFilter(CacheInvalidationFilter.class,
true);
}
}
diff --git
a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModuleProvider.java
b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModuleProvider.java
index 9b8448685..4470b99da 100644
---
a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModuleProvider.java
+++
b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModuleProvider.java
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.Collections;
import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Module;
/**
@@ -43,6 +43,6 @@ public class CacheInvalidationModuleProvider implements
CayenneServerModuleProvi
@Override
public Collection<Class<? extends Module>> overrides() {
- return Collections.singletonList(ServerModule.class);
+ return Collections.singletonList(CoreModule.class);
}
}
diff --git
a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java
b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java
index 9f79ae607..162460557 100644
--- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java
+++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java
@@ -20,7 +20,7 @@
package org.apache.cayenne.gen;
import org.apache.cayenne.access.types.TimestampType;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.spi.DefaultScope;
import org.apache.cayenne.exp.property.DateProperty;
@@ -70,7 +70,7 @@ public class PropertyUtilsTest {
propertyUtils = DIBootstrap.createInjector(
new CgenCaseModule(testScope),
new CgenModule(),
- binder ->
ServerModule.extend(binder).addUserExtendedType(new TimestampType()))
+ binder ->
CoreModule.extend(binder).addUserExtendedType(new TimestampType()))
.getInstance(ToolsUtilsFactory.class)
.createPropertyUtils(logger, importUtils);
}
diff --git
a/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogModuleExtender.java
b/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogModuleExtender.java
index 74f0d4102..c815f7b80 100644
---
a/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogModuleExtender.java
+++
b/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogModuleExtender.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.commitlog;
import org.apache.cayenne.commitlog.meta.AnnotationCommitLogEntityFactory;
import org.apache.cayenne.commitlog.meta.CommitLogEntity;
import org.apache.cayenne.commitlog.meta.CommitLogEntityFactory;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.ListBuilder;
@@ -71,7 +71,7 @@ public class CommitLogModuleExtender {
}
protected CommitLogModuleExtender registerFilter(boolean inTx) {
- ServerModule.extend(binder).addSyncFilter(CommitLogFilter.class, inTx);
+ CoreModule.extend(binder).addSyncFilter(CommitLogFilter.class, inTx);
return this;
}
diff --git
a/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogServerModuleProvider.java
b/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogServerModuleProvider.java
index 123bafc1d..cf84b3879 100644
---
a/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogServerModuleProvider.java
+++
b/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogServerModuleProvider.java
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.Collections;
import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Module;
/**
@@ -43,6 +43,6 @@ public class CommitLogServerModuleProvider implements
CayenneServerModuleProvide
@Override
public Collection<Class<? extends Module>> overrides() {
- return Collections.singletonList(ServerModule.class);
+ return Collections.singletonList(CoreModule.class);
}
}
diff --git
a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoServerModuleProvider.java
b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoServerModuleProvider.java
index 621135cf4..829513f77 100644
---
a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoServerModuleProvider.java
+++
b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoServerModuleProvider.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.Collections;
import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Module;
/**
@@ -42,6 +42,6 @@ public class CryptoServerModuleProvider implements
CayenneServerModuleProvider {
@Override
public Collection<Class<? extends Module>> overrides() {
- return Collections.singletonList(ServerModule.class);
+ return Collections.singletonList(CoreModule.class);
}
}
diff --git
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsServerModuleExtender.java
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsServerModuleExtender.java
index 20c4faf04..0080e5369 100644
---
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsServerModuleExtender.java
+++
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsServerModuleExtender.java
@@ -19,18 +19,18 @@
package org.apache.cayenne.dbsync.reverse.configuration;
-import org.apache.cayenne.configuration.server.ServerModuleExtender;
+import org.apache.cayenne.configuration.server.CoreModuleExtender;
import org.apache.cayenne.di.Binder;
// this class exists so that ToolsModule can call "initAllExtensions()" that
is protected in ServerModuleExtender.
-class ToolsServerModuleExtender extends ServerModuleExtender {
+class ToolsServerModuleExtender extends CoreModuleExtender {
public ToolsServerModuleExtender(Binder binder) {
super(binder);
}
@Override
- protected ServerModuleExtender initAllExtensions() {
+ protected CoreModuleExtender initAllExtensions() {
return super.initAllExtensions();
}
}
diff --git
a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleExtender.java
b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleExtender.java
index f8d0516ba..194a6ba54 100644
---
a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleExtender.java
+++
b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleExtender.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.jcache;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Binder;
/**
@@ -33,7 +33,7 @@ public class JCacheModuleExtender {
}
public JCacheModuleExtender setJCacheProviderConfig(String
providerConfigURI) {
-
ServerModule.extend(binder).setProperty(JCacheConstants.JCACHE_PROVIDER_CONFIG,
providerConfigURI);
+
CoreModule.extend(binder).setProperty(JCacheConstants.JCACHE_PROVIDER_CONFIG,
providerConfigURI);
return this;
}
}
diff --git
a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheServerModuleProvider.java
b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheServerModuleProvider.java
index 57ce6e615..a9370caa3 100644
---
a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheServerModuleProvider.java
+++
b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheServerModuleProvider.java
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.Collections;
import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Module;
/**
@@ -43,6 +43,6 @@ public class JCacheServerModuleProvider implements
CayenneServerModuleProvider {
@Override
public Collection<Class<? extends Module>> overrides() {
- return Collections.singletonList(ServerModule.class);
+ return Collections.singletonList(CoreModule.class);
}
}
diff --git
a/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProvider.java
b/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProvider.java
index 36b435218..7cc7a580f 100644
---
a/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProvider.java
+++
b/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProvider.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
import java.util.Collection;
import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.project.ProjectModule;
@@ -46,6 +46,6 @@ public class ProjectCompatibilityModuleProvider implements
CayenneServerModulePr
public Collection<Class<? extends Module>> overrides() {
// compatibility module overrides XML loaders defined in ServerModule
and
// upgrade services from ProjectModule
- return Arrays.asList(ServerModule.class, ProjectModule.class);
+ return Arrays.asList(CoreModule.class, ProjectModule.class);
}
}
diff --git
a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityServerModuleProvider.java
b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityServerModuleProvider.java
index e926994a5..da3f95456 100644
---
a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityServerModuleProvider.java
+++
b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityServerModuleProvider.java
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.Collections;
import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Module;
/**
@@ -43,6 +43,6 @@ public class VelocityServerModuleProvider implements
CayenneServerModuleProvider
@Override
public Collection<Class<? extends Module>> overrides() {
- return Collections.singletonList(ServerModule.class);
+ return Collections.singletonList(CoreModule.class);
}
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/DataChannelQueryFilter.java
b/cayenne/src/main/java/org/apache/cayenne/DataChannelQueryFilter.java
index 5bf6e2e4b..bcb888aec 100644
--- a/cayenne/src/main/java/org/apache/cayenne/DataChannelQueryFilter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/DataChannelQueryFilter.java
@@ -38,7 +38,7 @@ import org.apache.cayenne.query.Query;
* }}</pre>
*
* @see DataChannelSyncFilter
- * @see
org.apache.cayenne.configuration.server.ServerModuleExtender#addQueryFilter(DataChannelQueryFilter)
+ * @see
org.apache.cayenne.configuration.server.CoreModuleExtender#addQueryFilter(DataChannelQueryFilter)
*
* @since 4.1
*/
diff --git
a/cayenne/src/main/java/org/apache/cayenne/DataChannelSyncFilter.java
b/cayenne/src/main/java/org/apache/cayenne/DataChannelSyncFilter.java
index 646c28ee5..d8e0c1b98 100644
--- a/cayenne/src/main/java/org/apache/cayenne/DataChannelSyncFilter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/DataChannelSyncFilter.java
@@ -40,7 +40,7 @@ import org.apache.cayenne.graph.GraphDiff;
* }}</pre>
*
* @see DataChannelQueryFilter
- * @see
org.apache.cayenne.configuration.server.ServerModuleExtender#addSyncFilter(Class,
boolean)
+ * @see
org.apache.cayenne.configuration.server.CoreModuleExtender#addSyncFilter(Class,
boolean)
*
* @since 4.1
*/
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/Constants.java
b/cayenne/src/main/java/org/apache/cayenne/configuration/Constants.java
index 9bddfa082..ddef26ff0 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/Constants.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/Constants.java
@@ -33,7 +33,7 @@ public interface Constants {
* A DI container key for the Map<String, String> storing properties
* used by built-in Cayenne service.
*
- * @see
org.apache.cayenne.configuration.server.ServerModuleExtender#setProperty(String,
Object)
+ * @see
org.apache.cayenne.configuration.server.CoreModuleExtender#setProperty(String,
Object)
*/
String PROPERTIES_MAP = "cayenne.properties";
@@ -47,7 +47,7 @@ public interface Constants {
/**
* A DI container key for the List<Object> storing lifecycle events
listeners.
*
- * @see
org.apache.cayenne.configuration.server.ServerModuleExtender#addListener(Object)
+ * @see
org.apache.cayenne.configuration.server.CoreModuleExtender#addListener(Object)
*/
String SERVER_DOMAIN_LISTENERS_LIST = "cayenne.server.domain_listeners";
@@ -61,7 +61,7 @@ public interface Constants {
* A DI container key for the List<ExtendedType> storing default
* adapter-agnostic ExtendedTypes.
*
- * @see
org.apache.cayenne.configuration.server.ServerModuleExtender#addDefaultExtendedType(ExtendedType)
+ * @see
org.apache.cayenne.configuration.server.CoreModuleExtender#addDefaultExtendedType(ExtendedType)
*/
String SERVER_DEFAULT_TYPES_LIST = "cayenne.server.default_types";
@@ -69,7 +69,7 @@ public interface Constants {
* A DI container key for the List<ExtendedType> storing a
* user-provided ExtendedTypes.
*
- * @see
org.apache.cayenne.configuration.server.ServerModuleExtender#addUserExtendedType(ExtendedType)
+ * @see
org.apache.cayenne.configuration.server.CoreModuleExtender#addUserExtendedType(ExtendedType)
*/
String SERVER_USER_TYPES_LIST = "cayenne.server.user_types";
@@ -77,7 +77,7 @@ public interface Constants {
* A DI container key for the List<ExtendedTypeFactory> storing
* default and user-provided ExtendedTypeFactories.
*
- * @see
org.apache.cayenne.configuration.server.ServerModuleExtender#addExtendedTypeFactory(Class)
+ * @see
org.apache.cayenne.configuration.server.CoreModuleExtender#addExtendedTypeFactory(Class)
*/
String SERVER_TYPE_FACTORIES_LIST = "cayenne.server.type_factories";
@@ -177,7 +177,7 @@ public interface Constants {
/**
* Snapshot cache max size
*
- * @see
org.apache.cayenne.configuration.server.ServerModuleExtender#snapshotCacheSize(int)
+ * @see
org.apache.cayenne.configuration.server.CoreModuleExtender#snapshotCacheSize(int)
* @since 4.0
*/
String SNAPSHOT_CACHE_SIZE_PROPERTY = "cayenne.DataRowStore.snapshot.size";
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java
b/cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModule.java
similarity index 98%
rename from
cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java
rename to
cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModule.java
index 5c3962acb..e44faa181 100644
---
a/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java
+++
b/cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModule.java
@@ -132,21 +132,22 @@ import java.util.Calendar;
import java.util.GregorianCalendar;
/**
- * A DI module containing all Cayenne server runtime configuration.
+ * A DI module containing all Cayenne runtime configuration.
*
- * @since 3.1
+ * @since 3.1 introduced
+ * @since 5.0 renamed from ServerModule
*/
-public class ServerModule implements Module {
+public class CoreModule implements Module {
private static final int DEFAULT_MAX_ID_QUALIFIER_SIZE = 10000;
/**
- * Returns an extender object that allows the app to customize the
ServerModule services.
+ * Returns an extender object that allows the app to customize the
CoreModule services.
*
* @since 5.0
*/
- public static ServerModuleExtender extend(Binder b) {
- return new ServerModuleExtender(b);
+ public static CoreModuleExtender extend(Binder b) {
+ return new CoreModuleExtender(b);
}
/**
@@ -327,11 +328,11 @@ public class ServerModule implements Module {
}
/**
- * Creates a new {@link ServerModule}.
+ * Creates a new {@link CoreModule}.
*
* @since 4.0
*/
- public ServerModule() {
+ public CoreModule() {
}
public void configure(Binder binder) {
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerModuleExtender.java
b/cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModuleExtender.java
similarity index 81%
rename from
cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerModuleExtender.java
rename to
cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModuleExtender.java
index 540edc6d1..846c0de5f 100644
---
a/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerModuleExtender.java
+++
b/cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModuleExtender.java
@@ -33,12 +33,12 @@ import org.apache.cayenne.di.MapBuilder;
import org.apache.cayenne.tx.TransactionFilter;
/**
- * A builder of extensions for {@link ServerModule}.
+ * A builder of extensions for {@link CoreModule}.
*
- * @see ServerModule#extend(Binder)
+ * @see CoreModule#extend(Binder)
* @since 5.0
*/
-public class ServerModuleExtender {
+public class CoreModuleExtender {
private final Binder binder;
@@ -54,11 +54,11 @@ public class ServerModuleExtender {
private ListBuilder<ExtendedTypeFactory> extendedTypeFactories;
private ListBuilder<ValueObjectType> valueObjectTypes;
- protected ServerModuleExtender(Binder binder) {
+ protected CoreModuleExtender(Binder binder) {
this.binder = binder;
}
- protected ServerModuleExtender initAllExtensions() {
+ protected CoreModuleExtender initAllExtensions() {
contributeProperties();
contributeProjectLocations();
contributeAdapterDetectors();
@@ -76,7 +76,7 @@ public class ServerModuleExtender {
/**
* Sets Cayenne runtime property. Property names known to Cayenne are
defined in the {@link Constants} interface.
*/
- public ServerModuleExtender setProperty(String key, Object value) {
+ public CoreModuleExtender setProperty(String key, Object value) {
contributeProperties().put(key, value != null ? value.toString() :
null);
return this;
}
@@ -84,7 +84,7 @@ public class ServerModuleExtender {
/**
* Configures the stack to synchronize data between ObjectContexts. This
is false by default.
*/
- public ServerModuleExtender syncContexts() {
+ public CoreModuleExtender syncContexts() {
contributeProperties().put(Constants.SERVER_CONTEXTS_SYNC_PROPERTY,
"true");
return this;
}
@@ -92,7 +92,7 @@ public class ServerModuleExtender {
/**
* Sets transaction management to either external. By default,
transactions are internally managed by Cayenne.
*/
- public ServerModuleExtender externalTransactions() {
+ public CoreModuleExtender externalTransactions() {
contributeProperties().put(Constants.SERVER_EXTERNAL_TX_PROPERTY,
"true");
return this;
}
@@ -102,7 +102,7 @@ public class ServerModuleExtender {
*
* @param size max size of snapshot cache
*/
- public ServerModuleExtender snapshotCacheSize(int size) {
+ public CoreModuleExtender snapshotCacheSize(int size) {
contributeProperties().put(Constants.SNAPSHOT_CACHE_SIZE_PROPERTY,
Integer.toString(size));
return this;
}
@@ -110,7 +110,7 @@ public class ServerModuleExtender {
/**
* Adds a custom project location.
*/
- public ServerModuleExtender addProjectLocation(String location) {
+ public CoreModuleExtender addProjectLocation(String location) {
contributeProjectLocations().add(location);
return this;
}
@@ -118,7 +118,7 @@ public class ServerModuleExtender {
/**
* Adds a custom PK generator per DbAdapter
*/
- public ServerModuleExtender addPkGenerator(Class<? extends DbAdapter>
adapter, PkGenerator pkGenerator) {
+ public CoreModuleExtender addPkGenerator(Class<? extends DbAdapter>
adapter, PkGenerator pkGenerator) {
contributePkGenerators().put(adapter.getName(), pkGenerator);
return this;
}
@@ -126,7 +126,7 @@ public class ServerModuleExtender {
/**
* Adds a custom PK generator per DbAdapter
*/
- public ServerModuleExtender addPkGenerator(Class<? extends DbAdapter>
adapter, Class<? extends PkGenerator> pkGeneratorType) {
+ public CoreModuleExtender addPkGenerator(Class<? extends DbAdapter>
adapter, Class<? extends PkGenerator> pkGeneratorType) {
contributePkGenerators().put(adapter.getName(), pkGeneratorType);
return this;
}
@@ -134,7 +134,7 @@ public class ServerModuleExtender {
/**
* Adds a custom query filter to the end of the existing filter list
*/
- public ServerModuleExtender addQueryFilter(DataChannelQueryFilter
queryFilter) {
+ public CoreModuleExtender addQueryFilter(DataChannelQueryFilter
queryFilter) {
contributeQueryFilters().add(queryFilter);
return this;
}
@@ -142,7 +142,7 @@ public class ServerModuleExtender {
/**
* Adds a custom query filter to the end of the existing filter list
*/
- public ServerModuleExtender addQueryFilter(Class<? extends
DataChannelQueryFilter> queryFilterType) {
+ public CoreModuleExtender addQueryFilter(Class<? extends
DataChannelQueryFilter> queryFilterType) {
contributeQueryFilters().add(queryFilterType);
return this;
}
@@ -150,7 +150,7 @@ public class ServerModuleExtender {
/**
* Adds a custom sync filter.
*/
- public ServerModuleExtender addSyncFilter(DataChannelSyncFilter
syncFilter) {
+ public CoreModuleExtender addSyncFilter(DataChannelSyncFilter syncFilter) {
contributeSyncFilters().add(syncFilter);
return this;
}
@@ -158,7 +158,7 @@ public class ServerModuleExtender {
/**
* Adds a custom sync filter.
*/
- public ServerModuleExtender addSyncFilter(Class<? extends
DataChannelSyncFilter> syncFilterType) {
+ public CoreModuleExtender addSyncFilter(Class<? extends
DataChannelSyncFilter> syncFilterType) {
contributeSyncFilters().add(syncFilterType);
return this;
}
@@ -167,7 +167,7 @@ public class ServerModuleExtender {
* Adds a custom sync filter. Depending on the "includeInTransaction"
parameter value it is added either
* before or after the {@link TransactionFilter}.
*/
- public ServerModuleExtender addSyncFilter(DataChannelSyncFilter
syncFilter, boolean includeInTransaction) {
+ public CoreModuleExtender addSyncFilter(DataChannelSyncFilter syncFilter,
boolean includeInTransaction) {
if (includeInTransaction) {
contributeSyncFilters().insertBefore(syncFilter,
TransactionFilter.class);
} else {
@@ -181,7 +181,7 @@ public class ServerModuleExtender {
* Adds a custom sync filter. Depending on the "includeInTransaction"
parameter value it is added either
* before or after the {@link TransactionFilter}.
*/
- public ServerModuleExtender addSyncFilter(Class<? extends
DataChannelSyncFilter> syncFilterType, boolean includeInTransaction) {
+ public CoreModuleExtender addSyncFilter(Class<? extends
DataChannelSyncFilter> syncFilterType, boolean includeInTransaction) {
if (includeInTransaction) {
contributeSyncFilters().insertBefore(syncFilterType,
TransactionFilter.class);
} else {
@@ -194,7 +194,7 @@ public class ServerModuleExtender {
/**
* Registers an annotated event listener.
*/
- public ServerModuleExtender addListener(Object listener) {
+ public CoreModuleExtender addListener(Object listener) {
contributeListeners().add(listener);
return this;
}
@@ -202,7 +202,7 @@ public class ServerModuleExtender {
/**
* Registers an annotated event listener of a given type
*/
- public ServerModuleExtender addListenerType(Class<?> listenerType) {
+ public CoreModuleExtender addListenerType(Class<?> listenerType) {
contributeListeners().add(listenerType);
return this;
}
@@ -210,7 +210,7 @@ public class ServerModuleExtender {
/**
* Adds a custom DbAdapterDetector
*/
- public ServerModuleExtender addAdapterDetector(DbAdapterDetector
adapterDetector) {
+ public CoreModuleExtender addAdapterDetector(DbAdapterDetector
adapterDetector) {
contributeAdapterDetectors().add(adapterDetector);
return this;
}
@@ -218,7 +218,7 @@ public class ServerModuleExtender {
/**
* Adds a custom DbAdapterDetector
*/
- public ServerModuleExtender addAdapterDetector(Class<? extends
DbAdapterDetector> adapterDetectorType) {
+ public CoreModuleExtender addAdapterDetector(Class<? extends
DbAdapterDetector> adapterDetectorType) {
contributeAdapterDetectors().add(adapterDetectorType);
return this;
}
@@ -227,7 +227,7 @@ public class ServerModuleExtender {
* Adds a default adapter-agnostic ExtendedType. "Default" types are
loaded before adapter-provided or "user"
* types, so they may be overridden by those.
*/
- public ServerModuleExtender addDefaultExtendedType(ExtendedType<?> type) {
+ public CoreModuleExtender addDefaultExtendedType(ExtendedType<?> type) {
contributeDefaultExtendedTypes().add(type);
return this;
}
@@ -236,7 +236,7 @@ public class ServerModuleExtender {
* Adds a default adapter-agnostic ExtendedType. "Default" types are
loaded before adapter-provided or "user"
* types, so they may be overridden by those.
*/
- public ServerModuleExtender addDefaultExtendedType(Class<? extends
ExtendedType<?>> type) {
+ public CoreModuleExtender addDefaultExtendedType(Class<? extends
ExtendedType<?>> type) {
contributeDefaultExtendedTypes().add(type);
return this;
}
@@ -245,7 +245,7 @@ public class ServerModuleExtender {
* Adds an adapter-agnostic ExtendedType. "User" types are loaded after
default and adapter-provided types and
* can override those.
*/
- public ServerModuleExtender addUserExtendedType(ExtendedType<?> type) {
+ public CoreModuleExtender addUserExtendedType(ExtendedType<?> type) {
contributeUserExtendedTypes().add(type);
return this;
}
@@ -254,7 +254,7 @@ public class ServerModuleExtender {
* Adds an adapter-agnostic ExtendedType. "User" types are loaded after
default and adapter-provided types and
* can override those.
*/
- public ServerModuleExtender addUserExtendedType(Class<? extends
ExtendedType<?>> type) {
+ public CoreModuleExtender addUserExtendedType(Class<? extends
ExtendedType<?>> type) {
contributeUserExtendedTypes().add(type);
return this;
}
@@ -262,7 +262,7 @@ public class ServerModuleExtender {
/**
* Adds an ExtendedTypeFactory used for dynamic extended type creation.
*/
- public ServerModuleExtender addExtendedTypeFactory(ExtendedTypeFactory
factory) {
+ public CoreModuleExtender addExtendedTypeFactory(ExtendedTypeFactory
factory) {
contributeExtendedTypeFactories().add(factory);
return this;
}
@@ -270,7 +270,7 @@ public class ServerModuleExtender {
/**
* Adds an ExtendedTypeFactory used for dynamic extended type creation.
*/
- public ServerModuleExtender addExtendedTypeFactory(Class<? extends
ExtendedTypeFactory> factoryType) {
+ public CoreModuleExtender addExtendedTypeFactory(Class<? extends
ExtendedTypeFactory> factoryType) {
contributeExtendedTypeFactories().add(factoryType);
return this;
}
@@ -278,7 +278,7 @@ public class ServerModuleExtender {
/**
* Adds a custom {@link ValueObjectType}.
*/
- public ServerModuleExtender addValueObjectType(ValueObjectType<?, ?> type)
{
+ public CoreModuleExtender addValueObjectType(ValueObjectType<?, ?> type) {
contributeValueObjectTypes().add(type);
return this;
}
@@ -286,7 +286,7 @@ public class ServerModuleExtender {
/**
* Adds a custom {@link ValueObjectType}.
*/
- public ServerModuleExtender addValueObjectType(Class<? extends
ValueObjectType<?, ?>> type) {
+ public CoreModuleExtender addValueObjectType(Class<? extends
ValueObjectType<?, ?>> type) {
contributeValueObjectTypes().add(type);
return this;
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/server/MainCayenneServerModuleProvider.java
b/cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModuleProvider.java
similarity index 82%
rename from
cayenne/src/main/java/org/apache/cayenne/configuration/server/MainCayenneServerModuleProvider.java
rename to
cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModuleProvider.java
index 6bedc8d33..bbc8ef489 100644
---
a/cayenne/src/main/java/org/apache/cayenne/configuration/server/MainCayenneServerModuleProvider.java
+++
b/cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModuleProvider.java
@@ -19,26 +19,26 @@
package org.apache.cayenne.configuration.server;
import org.apache.cayenne.di.Module;
-import org.apache.cayenne.di.spi.ModuleProvider;
import java.util.Collection;
import java.util.Collections;
/**
- * ServerModule auto-loading facility.
+ * CoreModule auto-loading facility.
*
- * @since 4.0
+ * @since 4.0 introduced
+ * @since 5.0 renamed from MainCayenneServerModuleProvider
*/
-public class MainCayenneServerModuleProvider implements
CayenneServerModuleProvider {
+public class CoreModuleProvider implements CayenneServerModuleProvider {
@Override
public Module module() {
- return new ServerModule();
+ return new CoreModule();
}
@Override
public Class<? extends Module> moduleType() {
- return ServerModule.class;
+ return CoreModule.class;
}
@Override
diff --git
a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
index 6c484fdaa..a528f8daa 100644
--- a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
+++ b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.configuration.ObjectContextFactory;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.BeforeScopeEnd;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
@@ -121,8 +121,8 @@ public class CayenneRuntime {
}
/**
- * Creates a server runtime configuring it with a standard set of services
- * contained in {@link ServerModule}. CayenneServerModule is created with
+ * Creates a runtime configuring it with a standard set of services
+ * contained in {@link CoreModule}. CoreModule is created with
* one or more 'configurationLocations'. An optional array of extra modules
* may contain service overrides and/or user services.
*/
diff --git
a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java
b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java
index bc535514c..c877bfaa3 100644
---
a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java
+++
b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java
@@ -21,9 +21,9 @@ package org.apache.cayenne.runtime;
import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.configuration.server.DataSourceFactory;
-import org.apache.cayenne.configuration.server.ServerModule;
-import org.apache.cayenne.configuration.server.ServerModuleExtender;
+import org.apache.cayenne.configuration.server.CoreModuleExtender;
import org.apache.cayenne.datasource.DataSourceBuilder;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.di.spi.ModuleLoader;
@@ -203,7 +203,7 @@ public class CayenneRuntimeBuilder {
}
private Collection<? extends Module> defaultModules() {
- return Collections.singleton(new ServerModule());
+ return Collections.singleton(new CoreModule());
}
private Collection<? extends Module> builderModules() {
@@ -212,7 +212,7 @@ public class CayenneRuntimeBuilder {
if (!configs.isEmpty()) {
modules.add(binder -> {
- ServerModuleExtender extender = ServerModule.extend(binder);
+ CoreModuleExtender extender = CoreModule.extend(binder);
configs.forEach(extender::addProjectLocation);
});
}
@@ -228,7 +228,7 @@ public class CayenneRuntimeBuilder {
if (nameOverride != null) {
final String finalNameOverride = nameOverride;
- modules.add(binder ->
ServerModule.extend(binder).setProperty(Constants.SERVER_DOMAIN_NAME_PROPERTY,
finalNameOverride));
+ modules.add(binder ->
CoreModule.extend(binder).setProperty(Constants.SERVER_DOMAIN_NAME_PROPERTY,
finalNameOverride));
}
if (dataSourceFactory != null) {
@@ -243,7 +243,7 @@ public class CayenneRuntimeBuilder {
else if (jdbcUrl != null && jdbcDriver != null) {
modules.add(binder -> {
binder.bind(DataDomain.class).toProvider(SyntheticNodeDataDomainProvider.class);
- ServerModuleExtender extender = ServerModule.extend(binder)
+ CoreModuleExtender extender = CoreModule.extend(binder)
.setProperty(Constants.JDBC_DRIVER_PROPERTY,
jdbcDriver)
.setProperty(Constants.JDBC_URL_PROPERTY, jdbcUrl);
diff --git
a/cayenne/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
b/cayenne/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
index 367c0575f..ac8e3f098 100644
---
a/cayenne/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
+++
b/cayenne/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
@@ -17,4 +17,4 @@
# under the License.
##################################################################
-org.apache.cayenne.configuration.server.MainCayenneServerModuleProvider
\ No newline at end of file
+org.apache.cayenne.configuration.server.CoreModuleProvider
\ No newline at end of file
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
index c9b5433c8..8846bb5c6 100644
---
a/cayenne/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
@@ -25,8 +25,8 @@ import
org.apache.cayenne.access.flush.DefaultDataDomainFlushActionFactory;
import org.apache.cayenne.access.flush.operation.DefaultDbRowOpSorter;
import org.apache.cayenne.configuration.DefaultRuntimeProperties;
import org.apache.cayenne.configuration.RuntimeProperties;
-import org.apache.cayenne.configuration.server.ServerModule;
-import org.apache.cayenne.configuration.server.ServerModuleExtender;
+import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.server.CoreModuleExtender;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.ClassLoaderManager;
@@ -84,7 +84,7 @@ public class DefaultDataRowStoreFactoryIT extends ServerCase {
binder.bind(RuntimeProperties.class).to(DefaultRuntimeProperties.class);
binder.bind(EventBridge.class).toProvider(NoopEventBridgeProvider.class);
binder.bind(DataRowStoreFactory.class).to(DefaultDataRowStoreFactory.class);
- ServerModule.extend(binder).snapshotCacheSize(CACHE_SIZE);
+ CoreModule.extend(binder).snapshotCacheSize(CACHE_SIZE);
};
Injector injector = DIBootstrap.createInjector(testModule);
@@ -124,13 +124,13 @@ public class DefaultDataRowStoreFactoryIT extends
ServerCase {
assertEquals(dataStore.getEventBridge().getClass(),
MockEventBridge.class);
}
- static class TestExtender extends ServerModuleExtender {
+ static class TestExtender extends CoreModuleExtender {
public TestExtender(Binder binder) {
super(binder);
}
@Override
- protected ServerModuleExtender initAllExtensions() {
+ protected CoreModuleExtender initAllExtensions() {
return super.initAllExtensions();
}
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/util/ServerCaseSyncModule.java
b/cayenne/src/test/java/org/apache/cayenne/access/util/ServerCaseSyncModule.java
index efafcb958..44a39d9f6 100644
---
a/cayenne/src/test/java/org/apache/cayenne/access/util/ServerCaseSyncModule.java
+++
b/cayenne/src/test/java/org/apache/cayenne/access/util/ServerCaseSyncModule.java
@@ -18,13 +18,13 @@
****************************************************************/
package org.apache.cayenne.access.util;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.Module;
public class ServerCaseSyncModule implements Module {
@Override
public void configure(Binder binder) {
- ServerModule.extend(binder).syncContexts();
+ CoreModule.extend(binder).syncContexts();
}
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/configuration/server/ServerModuleProviderTest.java
b/cayenne/src/test/java/org/apache/cayenne/configuration/server/CoreModuleProviderTest.java
similarity index 86%
rename from
cayenne/src/test/java/org/apache/cayenne/configuration/server/ServerModuleProviderTest.java
rename to
cayenne/src/test/java/org/apache/cayenne/configuration/server/CoreModuleProviderTest.java
index 646edceac..31e1c62d5 100644
---
a/cayenne/src/test/java/org/apache/cayenne/configuration/server/ServerModuleProviderTest.java
+++
b/cayenne/src/test/java/org/apache/cayenne/configuration/server/CoreModuleProviderTest.java
@@ -21,10 +21,10 @@ package org.apache.cayenne.configuration.server;
import org.apache.cayenne.unit.util.ModuleProviderChecker;
import org.junit.Test;
-public class ServerModuleProviderTest {
+public class CoreModuleProviderTest {
@Test
public void testProviderPresent() {
-
ModuleProviderChecker.testProviderPresent(MainCayenneServerModuleProvider.class,
CayenneServerModuleProvider.class);
+ ModuleProviderChecker.testProviderPresent(CoreModuleProvider.class,
CayenneServerModuleProvider.class);
}
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
b/cayenne/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
index a73ae478e..564bce31d 100644
---
a/cayenne/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
+++
b/cayenne/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
@@ -172,7 +172,7 @@ public class DataDomainProviderTest {
b.bind(PkGenerator.class).to(JdbcPkGenerator.class);
b.bind(PkGeneratorFactoryProvider.class).to(PkGeneratorFactoryProvider.class);
- ServerModule.extend(b)
+ CoreModule.extend(b)
.initAllExtensions()
.addAdapterDetector(FirebirdSniffer.class)
diff --git
a/cayenne/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
b/cayenne/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
index 1952d1556..3b3bc7da6 100644
---
a/cayenne/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
+++
b/cayenne/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
@@ -76,7 +76,7 @@ public class DefaultDbAdapterFactoryTest {
dataSource.setupConnection(connection);
Module testModule = binder -> {
- ServerModule.extend(binder).initAllExtensions();
+ CoreModule.extend(binder).initAllExtensions();
binder.bind(PkGenerator.class).to(JdbcPkGenerator.class);
binder.bind(PkGeneratorFactoryProvider.class).to(PkGeneratorFactoryProvider.class);
@@ -104,7 +104,7 @@ public class DefaultDbAdapterFactoryTest {
Module testModule = b -> {
- ServerModule.extend(b).initAllExtensions();
+ CoreModule.extend(b).initAllExtensions();
b.bind(PkGenerator.class).to(JdbcPkGenerator.class);
b.bind(PkGeneratorFactoryProvider.class).to(PkGeneratorFactoryProvider.class);
@@ -139,7 +139,7 @@ public class DefaultDbAdapterFactoryTest {
List<DbAdapterDetector> detectors = new ArrayList<>();
Module testModule = b -> {
- ServerModule.extend(b).initAllExtensions();
+ CoreModule.extend(b).initAllExtensions();
b.bind(PkGenerator.class).to(JdbcPkGenerator.class);
b.bind(PkGeneratorFactoryProvider.class).to(PkGeneratorFactoryProvider.class);
@@ -181,7 +181,7 @@ public class DefaultDbAdapterFactoryTest {
dataSource.setupConnection(connection);
Module testModule = binder -> {
- ServerModule.extend(binder).initAllExtensions();
+ CoreModule.extend(binder).initAllExtensions();
binder.bind(PkGenerator.class).to(JdbcPkGenerator.class);
binder.bind(PkGeneratorFactoryProvider.class).to(PkGeneratorFactoryProvider.class);
diff --git
a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderTest.java
b/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderTest.java
index 526652b54..f90fb4287 100644
---
a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderTest.java
+++
b/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderTest.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.runtime;
import org.apache.cayenne.configuration.Constants;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Key;
import org.apache.cayenne.di.Module;
import org.junit.After;
@@ -62,7 +62,7 @@ public class CayenneRuntimeBuilderTest {
Collection<Module> modules = runtime.getModules();
assertEquals(2, modules.size());
- assertThat(modules.iterator().next(),
instanceOf(ServerModule.class));
+ assertThat(modules.iterator().next(),
instanceOf(CoreModule.class));
}
@Test
@@ -77,7 +77,7 @@ public class CayenneRuntimeBuilderTest {
Collection<Module> modules = runtime.getModules();
assertEquals(2, modules.size());
- assertThat(modules.iterator().next(),
instanceOf(ServerModule.class));
+ assertThat(modules.iterator().next(),
instanceOf(CoreModule.class));
}
@@ -93,7 +93,7 @@ public class CayenneRuntimeBuilderTest {
Collection<Module> modules = runtime.getModules();
assertEquals(3, modules.size());
- assertThat(modules.iterator().next(),
instanceOf(ServerModule.class));
+ assertThat(modules.iterator().next(),
instanceOf(CoreModule.class));
}
@Test
@@ -106,7 +106,7 @@ public class CayenneRuntimeBuilderTest {
Collection<Module> modules = runtime.getModules();
assertEquals(3, modules.size());
Module[] array = modules.toArray(new Module[3]);
- assertThat(array[0], instanceOf(ServerModule.class));
+ assertThat(array[0], instanceOf(CoreModule.class));
assertSame(m, array[1]);
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/CayenneRuntimeProvider.java
b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/CayenneRuntimeProvider.java
index e0f3a7b07..6455f174e 100644
---
a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/CayenneRuntimeProvider.java
+++
b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/CayenneRuntimeProvider.java
@@ -21,8 +21,8 @@ package org.apache.cayenne.unit.di.server;
import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.configuration.Constants;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.configuration.server.DataNodeFactory;
-import org.apache.cayenne.configuration.server.ServerModule;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.Inject;
@@ -83,7 +83,7 @@ public class CayenneRuntimeProvider implements
Provider<CayenneRuntime> {
@Override
public void configure(Binder binder) {
- // these are the objects overriding standard ServerModule
definitions or
+ // these are the objects overriding standard CoreModule
definitions or
// dependencies needed by such overrides
binder.bind(DbAdapter.class).toProviderInstance(dbAdapterProvider);
@@ -91,7 +91,7 @@ public class CayenneRuntimeProvider implements
Provider<CayenneRuntime> {
binder.bind(DataNodeFactory.class).to(ServerCaseDataNodeFactory.class);
binder.bind(UnitDbAdapter.class).toInstance(unitDbAdapter);
- ServerModule.extend(binder)
+ CoreModule.extend(binder)
// Use soft references instead of default weak.
// Should remove problems with random-failing tests (those
that are GC-sensitive).
.setProperty(Constants.SERVER_OBJECT_RETAIN_STRATEGY_PROPERTY, "soft");
diff --git
a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/CayenneRuntimeProviderContextsSync.java
b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/CayenneRuntimeProviderContextsSync.java
index 21041915a..1fb41c417 100644
---
a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/CayenneRuntimeProviderContextsSync.java
+++
b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/CayenneRuntimeProviderContextsSync.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.unit.di.server;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Module;
@@ -44,7 +44,7 @@ public class CayenneRuntimeProviderContextsSync extends
CayenneRuntimeProvider {
@Override
protected Collection<? extends Module> getExtraModules() {
Collection<Module> modules = new ArrayList<>(super.getExtraModules());
- modules.add(binder -> ServerModule.extend(binder).syncContexts());
+ modules.add(binder -> CoreModule.extend(binder).syncContexts());
return modules;
}
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseContextsSync.java
b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseContextsSync.java
index 2cf3e097a..7de50f681 100644
---
a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseContextsSync.java
+++
b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseContextsSync.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.unit.di.server;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Injector;
@@ -42,7 +42,7 @@ public class ServerCaseContextsSync extends DICase {
new ServerCaseModule(testScope),
binder -> {
binder.bind(CayenneRuntime.class).toProvider(CayenneRuntimeProviderContextsSync.class).in(testScope);
- ServerModule.extend(binder).syncContexts();
+ CoreModule.extend(binder).syncContexts();
});
injector.getInstance(SchemaBuilder.class).rebuildSchema();
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
index d27f1dc0a..034671144 100644
---
a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
+++
b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
@@ -34,9 +34,9 @@ import
org.apache.cayenne.configuration.DefaultObjectStoreFactory;
import org.apache.cayenne.configuration.DefaultRuntimeProperties;
import org.apache.cayenne.configuration.ObjectStoreFactory;
import org.apache.cayenne.configuration.RuntimeProperties;
+import org.apache.cayenne.configuration.server.CoreModuleExtender;
import org.apache.cayenne.configuration.server.DataSourceFactory;
import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
-import org.apache.cayenne.configuration.server.ServerModuleExtender;
import org.apache.cayenne.configuration.xml.DataChannelMetaData;
import org.apache.cayenne.configuration.xml.DefaultHandlerFactory;
import org.apache.cayenne.configuration.xml.HandlerFactory;
@@ -241,7 +241,7 @@ public class ServerCaseModule implements Module {
// this factory is a hack that allows to inject to DbAdapters loaded
outside of
// server runtime... BatchQueryBuilderFactory is hardcoded and
whatever is placed
- // in the ServerModule is ignored
+ // in the CoreModule is ignored
binder.bind(BatchTranslatorFactory.class).toProvider(ServerCaseBatchQueryBuilderFactoryProvider.class);
binder.bind(DataChannelInterceptor.class).to(ServerCaseDataChannelInterceptor.class);
binder.bind(SQLTemplateCustomizer.class).toProvider(SQLTemplateCustomizerProvider.class);
@@ -270,14 +270,14 @@ public class ServerCaseModule implements Module {
binder.bind(DBCleaner.class).toProvider(DBCleanerProvider.class).in(testScope);
}
- // this class exists so that ToolsModule can call "initAllExtensions()"
that is protected in ServerModuleExtender.
- static class ServerCaseModuleExtender extends ServerModuleExtender {
+ // this class exists so that ToolsModule can call "initAllExtensions()"
that is protected in CoreModuleExtender.
+ static class ServerCaseModuleExtender extends CoreModuleExtender {
public ServerCaseModuleExtender(Binder binder) {
super(binder);
}
@Override
- protected ServerModuleExtender initAllExtensions() {
+ protected CoreModuleExtender initAllExtensions() {
return super.initAllExtensions();
}
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/WeakReferenceStrategyCayenneRuntimeProvider.java
b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/WeakReferenceStrategyCayenneRuntimeProvider.java
index 172835530..f0e0ed307 100644
---
a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/WeakReferenceStrategyCayenneRuntimeProvider.java
+++
b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/WeakReferenceStrategyCayenneRuntimeProvider.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.unit.di.server;
import org.apache.cayenne.configuration.Constants;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Module;
@@ -42,7 +42,7 @@ public class WeakReferenceStrategyCayenneRuntimeProvider
extends CayenneRuntimeP
@Override
protected Collection<? extends Module> getExtraModules() {
Collection<Module> modules = new ArrayList<>(super.getExtraModules());
- modules.add(b ->
ServerModule.extend(b).setProperty(Constants.SERVER_OBJECT_RETAIN_STRATEGY_PROPERTY,
"weak"));
+ modules.add(b ->
CoreModule.extend(b).setProperty(Constants.SERVER_OBJECT_RETAIN_STRATEGY_PROPERTY,
"weak"));
return modules;
}
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java
b/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java
index a2b2b82dc..188090742 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.unit.jira;
import org.apache.cayenne.access.DataDomain;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
@@ -35,12 +35,12 @@ public class CAY_743Test {
@Test
public void testLoad2MapsWithCrossMapInheritance() throws Exception {
- Injector injector = DIBootstrap.createInjector(new ServerModule(
+ Injector injector = DIBootstrap.createInjector(new CoreModule(
){
@Override
public void configure(Binder binder) {
super.configure(binder);
-
ServerModule.extend(binder).addProjectLocation("cay743/cayenne-domain.xml");
+
CoreModule.extend(binder).addProjectLocation("cay743/cayenne-domain.xml");
}
});
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc
index 7835cfb93..c7141ed8a 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc
@@ -250,7 +250,7 @@ public class MyDbAdapterDetector implements
DbAdapterDetector {
[source, Java]
----
-ServerModule.contributeAdapterDetectors(binder)
+CoreModule.contributeAdapterDetectors(binder)
.add(MyDbAdapterDetector.class);
----
@@ -263,7 +263,7 @@ So it is easy to redefine a built-in service in Cayenne by
rebinding desired imp
To do that, first we need to know what those services to redefine are.
While we describe some of them in the following sections, the best way to get
a full list
is to check the source code of the Cayenne version you are using and
-namely look in `org.apache.cayenne.configuration.server.ServerModule` - the
main built-in module in Cayenne.
+namely look in `org.apache.cayenne.configuration.server.CoreModule` - the main
built-in module in Cayenne.
Now an example of overriding `JdbcEventLogger` service. The default
implementation of this service
is provided by `Slf4jJdbcEventLogger`. But if we want to use
`FormattedSlf4jJdbcEventLogger`
@@ -340,7 +340,7 @@ Last step is to register this new type in `CayenneRuntime`:
CayenneRuntime runtime = CayenneRuntime.builder()
.addConfig("cayenne-project.xml")
.addModule(binder ->
- ServerModule.contributeValueObjectTypes(binder)
+ CoreModule.contributeValueObjectTypes(binder)
.add(MoneyValueObjectType.class))
.build();
----
@@ -432,7 +432,7 @@ public class DoubleArrayType implements ExtendedType {
CayenneRuntime runtime = CayenneRuntime.builder()
.addConfig("cayenne-project.xml")
.addModule(binder ->
- ServerModule.contributeUserTypes(binder)
+ CoreModule.contributeUserTypes(binder)
.add(new DoubleArrayType()))
.build();
----
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/lifecycle.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/lifecycle.adoc
index 1673f699d..92ddae280 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/lifecycle.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/lifecycle.adoc
@@ -133,7 +133,7 @@ Ignore the annotations for a minute. The important point
here is that the listen
CayenneRuntime runtime = CayenneRuntime.builder()
// ..
.addModule(binder ->
- ServerModule.contributeDomainListeners()
+ CoreModule.contributeDomainListeners()
.add(Listener1.class)
.add(new Listener2())
)
@@ -257,7 +257,7 @@ Now since this is both a filter and a listener, it needs to
be registered as suc
CayenneRuntime runtime = CayenneRuntime.builder()
// ..
.addModule(b ->
- ServerModule.contributeDomainSyncFilters(b)
+ CoreModule.contributeDomainSyncFilters(b)
.add(CommittedObjectCounter.class)
)
// ..
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/starting.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/starting.adoc
index aa5cd238f..e7c3a786c 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/starting.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/starting.adoc
@@ -32,7 +32,7 @@ CayenneRuntime encapsulates a single Cayenne stack. Most
applications will just
[source, java]
----
Module extensions = binder ->
- ServerModule.contributeProperties(binder)
+ CoreModule.contributeProperties(binder)
.put(Constants.SERVER_EXTERNAL_TX_PROPERTY, "true");
CayenneRuntime runtime = CayenneRuntime.builder()
.addConfig("com/example/cayenne-project.xml")
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/tuning.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/tuning.adoc
index 888e82205..639ecfda9 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/tuning.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/tuning.adoc
@@ -356,7 +356,7 @@ public class MyModule implements Module {
@Override
public void configure(Binder binder) {
- ServerModule.contributeProperties(binder)
+ CoreModule.contributeProperties(binder)
.put(Constants.SERVER_CONTEXTS_SYNC_PROPERTY, "false");
}
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
index 0afa051f9..fa1d166db 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.modeler;
-import org.apache.cayenne.configuration.server.ServerModule;
+import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.dbsync.DbSyncModule;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
@@ -102,9 +102,9 @@ public class Main {
}
protected Collection<Module> appendModules(Collection<Module> modules) {
- // TODO: this is dirty... ServerModule is out of place inside the
Modeler...
+ // TODO: this is dirty... CoreModule is out of place inside the
Modeler...
// If we need CayenneRuntime for certain operations, those should
start their own stack...
- modules.add(new ServerModule());
+ modules.add(new CoreModule());
modules.add(new ProjectModule());
modules.add(new DbSyncModule());
