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 64835b483 CAY-2828 Rename values in
`org.apache.cayenne.configuration.Constants`
64835b483 is described below
commit 64835b483c0333d366c9fd789385d6cc71de122d
Author: stariy95 <[email protected]>
AuthorDate: Fri Nov 24 13:25:31 2023 +0400
CAY-2828 Rename values in `org.apache.cayenne.configuration.Constants`
---
RELEASE-NOTES.txt | 1 +
.../dbsync/reverse/configuration/ToolsModule.java | 2 +-
.../java/org/apache/cayenne/access/DataDomain.java | 2 +-
.../access/DefaultObjectMapRetainStrategy.java | 2 +-
.../apache/cayenne/configuration/Constants.java | 97 +++++++++++++++++++---
.../configuration/DefaultObjectStoreFactory.java | 2 +-
.../cayenne/configuration/runtime/CoreModule.java | 20 ++---
.../configuration/runtime/CoreModuleExtender.java | 16 ++--
.../configuration/runtime/DataDomainProvider.java | 8 +-
.../runtime/DefaultDbAdapterFactory.java | 2 +-
.../java/org/apache/cayenne/dba/JdbcAdapter.java | 8 +-
.../org/apache/cayenne/dba/db2/DB2Adapter.java | 8 +-
.../org/apache/cayenne/dba/derby/DerbyAdapter.java | 8 +-
.../cayenne/dba/firebird/FirebirdAdapter.java | 8 +-
.../cayenne/dba/frontbase/FrontBaseAdapter.java | 8 +-
.../java/org/apache/cayenne/dba/h2/H2Adapter.java | 8 +-
.../apache/cayenne/dba/hsqldb/HSQLDBAdapter.java | 8 +-
.../cayenne/dba/hsqldb/HSQLDBNoSchemaAdapter.java | 8 +-
.../apache/cayenne/dba/ingres/IngresAdapter.java | 8 +-
.../org/apache/cayenne/dba/mysql/MySQLAdapter.java | 8 +-
.../apache/cayenne/dba/oracle/Oracle8Adapter.java | 8 +-
.../apache/cayenne/dba/oracle/OracleAdapter.java | 8 +-
.../cayenne/dba/postgres/PostgresAdapter.java | 8 +-
.../apache/cayenne/dba/sqlite/SQLiteAdapter.java | 8 +-
.../cayenne/dba/sqlserver/SQLServerAdapter.java | 8 +-
.../apache/cayenne/dba/sybase/SybaseAdapter.java | 8 +-
.../apache/cayenne/event/EventManagerProvider.java | 2 +-
.../cayenne/runtime/CayenneRuntimeBuilder.java | 2 +-
.../cayenne/tx/DefaultTransactionFactory.java | 2 +-
.../runtime/DataDomainProviderTest.java | 2 +-
.../DefaultDataSourceFactoryLoaderTest.java | 6 +-
.../runtime/DefaultDbAdapterFactoryTest.java | 4 +-
.../cayenne/runtime/CayenneRuntimeBuilderTest.java | 6 +-
.../unit/di/server/CayenneRuntimeProvider.java | 2 +-
.../cayenne/unit/di/server/ServerCaseModule.java | 4 +-
...eakReferenceStrategyCayenneRuntimeProvider.java | 2 +-
36 files changed, 192 insertions(+), 120 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 4835f910f..c4c13a70c 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -49,6 +49,7 @@ CAY-2823 Merge `ServerRuntime` back to `CayenneRuntime` and
deprecate it
CAY-2824 Rename CayenneServerModuleProvider to CayenneRuntimeModuleProvider
CAY-2825 Rename package `o.a.c.configuration.server` to
`o.a.c.configuration.runtime`
CAY-2826 Rename `ServerModule` to `CoreModule`
+CAY-2828 Rename values in `org.apache.cayenne.configuration.Constants`
Bug Fixes:
diff --git
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
index a13fca301..8269745d2 100644
---
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
+++
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
@@ -152,7 +152,7 @@ public class ToolsModule implements Module {
binder.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
binder.bind(ResourceLocator.class).to(ClassLoaderResourceLocator.class);
- binder.bind(Key.get(ResourceLocator.class,
Constants.SERVER_RESOURCE_LOCATOR)).to(ClassLoaderResourceLocator.class);
+ binder.bind(Key.get(ResourceLocator.class,
Constants.RESOURCE_LOCATOR)).to(ClassLoaderResourceLocator.class);
binder.bind(RuntimeProperties.class).to(DefaultRuntimeProperties.class);
binder.bind(BatchTranslatorFactory.class).to(DefaultBatchTranslatorFactory.class);
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DataDomain.java
b/cayenne/src/main/java/org/apache/cayenne/access/DataDomain.java
index 6ab496f2d..9b2811bf5 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/DataDomain.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/DataDomain.java
@@ -815,7 +815,7 @@ public class DataDomain implements QueryEngine, DataChannel
{
* Cayenne when generating such queries. The default is 10000. It can be
* changed either by calling {@link #setMaxIdQualifierSize(int)} or
changing
* the value for property
- * {@link Constants#SERVER_MAX_ID_QUALIFIER_SIZE_PROPERTY}.
+ * {@link Constants#MAX_ID_QUALIFIER_SIZE_PROPERTY}.
*
* @since 3.1
*/
diff --git
a/cayenne/src/main/java/org/apache/cayenne/access/DefaultObjectMapRetainStrategy.java
b/cayenne/src/main/java/org/apache/cayenne/access/DefaultObjectMapRetainStrategy.java
index efc4ac557..05f248ed8 100644
---
a/cayenne/src/main/java/org/apache/cayenne/access/DefaultObjectMapRetainStrategy.java
+++
b/cayenne/src/main/java/org/apache/cayenne/access/DefaultObjectMapRetainStrategy.java
@@ -47,7 +47,7 @@ public class DefaultObjectMapRetainStrategy implements
ObjectMapRetainStrategy {
}
public Map<Object, Persistent> createObjectMap() {
- String strategy =
runtimeProperties.get(Constants.SERVER_OBJECT_RETAIN_STRATEGY_PROPERTY);
+ String strategy =
runtimeProperties.get(Constants.OBJECT_RETAIN_STRATEGY_PROPERTY);
if (strategy == null || WEAK_RETAIN_STRATEGY.equals(strategy)) {
return new WeakValueMap<>();
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 b2d6f99d6..67958de6e 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/Constants.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/Constants.java
@@ -42,20 +42,38 @@ public interface Constants {
* objects that can discover the type of current database and install the
* correct DbAdapter in runtime.
*/
- String SERVER_ADAPTER_DETECTORS_LIST = "cayenne.server.adapter_detectors";
+ String ADAPTER_DETECTORS_LIST = "cayenne.server.adapter_detectors";
+
+ /**
+ * @deprecated since 5.0, use {@link #ADAPTER_DETECTORS_LIST}
+ */
+ @Deprecated(since = "5.0", forRemoval = true)
+ String SERVER_ADAPTER_DETECTORS_LIST = ADAPTER_DETECTORS_LIST;
/**
* A DI container key for the List<Object> storing lifecycle events
listeners.
*
* @see
org.apache.cayenne.configuration.runtime.CoreModuleExtender#addListener(Object)
*/
- String SERVER_DOMAIN_LISTENERS_LIST = "cayenne.server.domain_listeners";
+ String DOMAIN_LISTENERS_LIST = "cayenne.server.domain_listeners";
+
+ /**
+ * @deprecated since 5.0, use {@link #DOMAIN_LISTENERS_LIST}
+ */
+ @Deprecated(since = "5.0", forRemoval = true)
+ String SERVER_DOMAIN_LISTENERS_LIST = DOMAIN_LISTENERS_LIST;
/**
* A DI container key for the List<String> storing locations of the
* one of more project configuration files.
*/
- String SERVER_PROJECT_LOCATIONS_LIST = "cayenne.server.project_locations";
+ String PROJECT_LOCATIONS_LIST = "cayenne.server.project_locations";
+
+ /**
+ * @deprecated since 5.0, use {@link #PROJECT_LOCATIONS_LIST}
+ */
+ @Deprecated(since = "5.0", forRemoval = true)
+ String SERVER_PROJECT_LOCATIONS_LIST = PROJECT_LOCATIONS_LIST;
/**
* A DI container key for the List<ExtendedType> storing default
@@ -63,7 +81,13 @@ public interface Constants {
*
* @see
org.apache.cayenne.configuration.runtime.CoreModuleExtender#addDefaultExtendedType(ExtendedType)
*/
- String SERVER_DEFAULT_TYPES_LIST = "cayenne.server.default_types";
+ String DEFAULT_TYPES_LIST = "cayenne.server.default_types";
+
+ /**
+ * @deprecated since 5.0, use {@link #DEFAULT_TYPES_LIST}
+ */
+ @Deprecated(since = "5.0", forRemoval = true)
+ String SERVER_DEFAULT_TYPES_LIST = DEFAULT_TYPES_LIST;
/**
* A DI container key for the List<ExtendedType> storing a
@@ -71,7 +95,13 @@ public interface Constants {
*
* @see
org.apache.cayenne.configuration.runtime.CoreModuleExtender#addUserExtendedType(ExtendedType)
*/
- String SERVER_USER_TYPES_LIST = "cayenne.server.user_types";
+ String USER_TYPES_LIST = "cayenne.server.user_types";
+
+ /**
+ * @deprecated since 5.0, use {@link #USER_TYPES_LIST}
+ */
+ @Deprecated(since = "5.0", forRemoval = true)
+ String SERVER_USER_TYPES_LIST = USER_TYPES_LIST;
/**
* A DI container key for the List<ExtendedTypeFactory> storing
@@ -79,12 +109,24 @@ public interface Constants {
*
* @see
org.apache.cayenne.configuration.runtime.CoreModuleExtender#addExtendedTypeFactory(Class)
*/
- String SERVER_TYPE_FACTORIES_LIST = "cayenne.server.type_factories";
+ String TYPE_FACTORIES_LIST = "cayenne.server.type_factories";
+
+ /**
+ * @deprecated since 5.0, use {@link #TYPE_FACTORIES_LIST}
+ */
+ @Deprecated(since = "5.0", forRemoval = true)
+ String SERVER_TYPE_FACTORIES_LIST = TYPE_FACTORIES_LIST;
/**
- * A server-side DI container key for binding {@link
org.apache.cayenne.resource.ResourceLocator}
+ * A DI container key for binding {@link
org.apache.cayenne.resource.ResourceLocator}
*/
- String SERVER_RESOURCE_LOCATOR = "cayenne.server.resource_locator";
+ String RESOURCE_LOCATOR = "cayenne.server.resource_locator";
+
+ /**
+ * @deprecated since 5.0, use {@link #RESOURCE_LOCATOR}
+ */
+ @Deprecated(since = "5.0", forRemoval = true)
+ String SERVER_RESOURCE_LOCATOR = RESOURCE_LOCATOR;
// Runtime properties
@@ -130,25 +172,49 @@ public interface Constants {
*
* @since 4.0
*/
- String SERVER_DOMAIN_NAME_PROPERTY = "cayenne.server.domain.name";
+ String DOMAIN_NAME_PROPERTY = "cayenne.server.domain.name";
+
+ /**
+ * @deprecated since 5.0, use {@link #DOMAIN_NAME_PROPERTY}
+ */
+ @Deprecated(since = "5.0", forRemoval = true)
+ String SERVER_DOMAIN_NAME_PROPERTY = DOMAIN_NAME_PROPERTY;
/**
* A boolean property defining whether cross-contexts synchronization is
* enabled. Possible values are "true" or "false".
*/
- String SERVER_CONTEXTS_SYNC_PROPERTY =
"cayenne.server.contexts_sync_strategy";
+ String CONTEXTS_SYNC_PROPERTY = "cayenne.server.contexts_sync_strategy";
+
+ /**
+ * @deprecated since 5.0, use {@link #CONTEXTS_SYNC_PROPERTY}
+ */
+ @Deprecated(since = "5.0", forRemoval = true)
+ String SERVER_CONTEXTS_SYNC_PROPERTY = CONTEXTS_SYNC_PROPERTY;
/**
* A String property that defines how ObjectContexts should retain cached
* committed objects. Possible values are "weak", "soft", "hard".
*/
- String SERVER_OBJECT_RETAIN_STRATEGY_PROPERTY =
"cayenne.server.object_retain_strategy";
+ String OBJECT_RETAIN_STRATEGY_PROPERTY =
"cayenne.server.object_retain_strategy";
+
+ /**
+ * @deprecated since 5.0, use {@link #CONTEXTS_SYNC_PROPERTY}
+ */
+ @Deprecated(since = "5.0", forRemoval = true)
+ String SERVER_OBJECT_RETAIN_STRATEGY_PROPERTY =
OBJECT_RETAIN_STRATEGY_PROPERTY;
/**
* A boolean property that defines whether runtime should use external
* transactions. Possible values are "true" or "false".
*/
- String SERVER_EXTERNAL_TX_PROPERTY = "cayenne.server.external_tx";
+ String EXTERNAL_TX_PROPERTY = "cayenne.server.external_tx";
+
+ /**
+ * @deprecated since 5.0, use {@link #EXTERNAL_TX_PROPERTY}
+ */
+ @Deprecated(since = "5.0", forRemoval = true)
+ String SERVER_EXTERNAL_TX_PROPERTY = EXTERNAL_TX_PROPERTY;
/**
* A property that defines a maximum number of ID qualifiers in where
clause
@@ -157,7 +223,12 @@ public interface Constants {
* DISJOINT_BY_ID prefetch processing. This is needed to avoid where clause
* size limitations and memory usage efficiency.
*/
- String SERVER_MAX_ID_QUALIFIER_SIZE_PROPERTY =
"cayenne.server.max_id_qualifier_size";
+ String MAX_ID_QUALIFIER_SIZE_PROPERTY =
"cayenne.server.max_id_qualifier_size";
+
+ /**
+ * @deprecated since 5.0, use {@link #MAX_ID_QUALIFIER_SIZE_PROPERTY}
+ */
+ String SERVER_MAX_ID_QUALIFIER_SIZE_PROPERTY =
MAX_ID_QUALIFIER_SIZE_PROPERTY;
/**
* Defines if database uses case-insensitive collation
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/DefaultObjectStoreFactory.java
b/cayenne/src/main/java/org/apache/cayenne/configuration/DefaultObjectStoreFactory.java
index 3fffac70c..988f2245f 100644
---
a/cayenne/src/main/java/org/apache/cayenne/configuration/DefaultObjectStoreFactory.java
+++
b/cayenne/src/main/java/org/apache/cayenne/configuration/DefaultObjectStoreFactory.java
@@ -40,7 +40,7 @@ public class DefaultObjectStoreFactory implements
ObjectStoreFactory {
protected ObjectMapRetainStrategy retainStrategy;
public ObjectStore createObjectStore(DataRowStore dataRowCache) {
- boolean sync =
runtimeProperties.getBoolean(Constants.SERVER_CONTEXTS_SYNC_PROPERTY, false);
+ boolean sync =
runtimeProperties.getBoolean(Constants.CONTEXTS_SYNC_PROPERTY, false);
return sync ? new ObjectStore(dataRowCache,
retainStrategy.createObjectMap())
: new NoSyncObjectStore(dataRowCache,
retainStrategy.createObjectMap());
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java
b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java
index dd1a47816..b7ba5ee1b 100644
---
a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java
+++
b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java
@@ -160,7 +160,7 @@ public class CoreModule implements Module {
*/
@Deprecated(since = "5.0")
public static void useExternalTransactions(Binder binder, boolean
useExternal) {
- extend(binder).setProperty(Constants.SERVER_EXTERNAL_TX_PROPERTY,
String.valueOf(useExternal));
+ extend(binder).setProperty(Constants.EXTERNAL_TX_PROPERTY,
String.valueOf(useExternal));
}
/**
@@ -186,7 +186,7 @@ public class CoreModule implements Module {
*/
@Deprecated(since = "5.0")
public static ListBuilder<String> contributeProjectLocations(Binder
binder) {
- return binder.bindList(String.class,
Constants.SERVER_PROJECT_LOCATIONS_LIST);
+ return binder.bindList(String.class, Constants.PROJECT_LOCATIONS_LIST);
}
/**
@@ -227,7 +227,7 @@ public class CoreModule implements Module {
*/
@Deprecated(since = "5.0")
public static ListBuilder<Object> contributeDomainListeners(Binder binder)
{
- return binder.bindList(Object.class,
Constants.SERVER_DOMAIN_LISTENERS_LIST);
+ return binder.bindList(Object.class, Constants.DOMAIN_LISTENERS_LIST);
}
/**
@@ -241,7 +241,7 @@ public class CoreModule implements Module {
*/
@Deprecated(since = "5.0")
public static ListBuilder<DbAdapterDetector>
contributeAdapterDetectors(Binder binder) {
- return binder.bindList(DbAdapterDetector.class,
Constants.SERVER_ADAPTER_DETECTORS_LIST);
+ return binder.bindList(DbAdapterDetector.class,
Constants.ADAPTER_DETECTORS_LIST);
}
/**
@@ -283,7 +283,7 @@ public class CoreModule implements Module {
*/
@Deprecated(since = "5.0")
public static ListBuilder<ExtendedTypeFactory>
contributeTypeFactories(Binder binder) {
- return binder.bindList(ExtendedTypeFactory.class,
Constants.SERVER_TYPE_FACTORIES_LIST);
+ return binder.bindList(ExtendedTypeFactory.class,
Constants.TYPE_FACTORIES_LIST);
}
/**
@@ -298,7 +298,7 @@ public class CoreModule implements Module {
*/
@Deprecated(since = "5.0")
public static ListBuilder<ExtendedType> contributeDefaultTypes(Binder
binder) {
- return binder.bindList(ExtendedType.class,
Constants.SERVER_DEFAULT_TYPES_LIST);
+ return binder.bindList(ExtendedType.class,
Constants.DEFAULT_TYPES_LIST);
}
/**
@@ -313,7 +313,7 @@ public class CoreModule implements Module {
*/
@Deprecated(since = "5.0")
public static ListBuilder<ExtendedType> contributeUserTypes(Binder binder)
{
- return binder.bindList(ExtendedType.class,
Constants.SERVER_USER_TYPES_LIST);
+ return binder.bindList(ExtendedType.class, Constants.USER_TYPES_LIST);
}
/**
@@ -340,8 +340,8 @@ public class CoreModule implements Module {
extend(binder).initAllExtensions()
// global stack properties
- .setProperty(Constants.SERVER_MAX_ID_QUALIFIER_SIZE_PROPERTY,
DEFAULT_MAX_ID_QUALIFIER_SIZE)
- .setProperty(Constants.SERVER_CONTEXTS_SYNC_PROPERTY, "false")
+ .setProperty(Constants.MAX_ID_QUALIFIER_SIZE_PROPERTY,
DEFAULT_MAX_ID_QUALIFIER_SIZE)
+ .setProperty(Constants.CONTEXTS_SYNC_PROPERTY, "false")
// known DbAdapter detectors in reverse order of popularity.
.addAdapterDetector(FirebirdSniffer.class)
@@ -441,7 +441,7 @@ public class CoreModule implements Module {
// a locator of resources, such as XML descriptors
binder.bind(ResourceLocator.class).to(ClassLoaderResourceLocator.class);
- binder.bind(Key.get(ResourceLocator.class,
Constants.SERVER_RESOURCE_LOCATOR)).to(ClassLoaderResourceLocator.class);
+ binder.bind(Key.get(ResourceLocator.class,
Constants.RESOURCE_LOCATOR)).to(ClassLoaderResourceLocator.class);
// a global properties object
binder.bind(RuntimeProperties.class).to(DefaultRuntimeProperties.class);
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModuleExtender.java
b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModuleExtender.java
index 6b9dc85d6..cf768d29c 100644
---
a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModuleExtender.java
+++
b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModuleExtender.java
@@ -85,7 +85,7 @@ public class CoreModuleExtender {
* Configures the stack to synchronize data between ObjectContexts. This
is false by default.
*/
public CoreModuleExtender syncContexts() {
- contributeProperties().put(Constants.SERVER_CONTEXTS_SYNC_PROPERTY,
"true");
+ contributeProperties().put(Constants.CONTEXTS_SYNC_PROPERTY, "true");
return this;
}
@@ -93,7 +93,7 @@ public class CoreModuleExtender {
* Sets transaction management to either external. By default,
transactions are internally managed by Cayenne.
*/
public CoreModuleExtender externalTransactions() {
- contributeProperties().put(Constants.SERVER_EXTERNAL_TX_PROPERTY,
"true");
+ contributeProperties().put(Constants.EXTERNAL_TX_PROPERTY, "true");
return this;
}
@@ -293,7 +293,7 @@ public class CoreModuleExtender {
private ListBuilder<String> contributeProjectLocations() {
if (projectLocations == null) {
- projectLocations = binder.bindList(String.class,
Constants.SERVER_PROJECT_LOCATIONS_LIST);
+ projectLocations = binder.bindList(String.class,
Constants.PROJECT_LOCATIONS_LIST);
}
return projectLocations;
}
@@ -321,7 +321,7 @@ public class CoreModuleExtender {
private ListBuilder<Object> contributeListeners() {
if (listeners == null) {
- listeners = binder.bindList(Object.class,
Constants.SERVER_DOMAIN_LISTENERS_LIST);
+ listeners = binder.bindList(Object.class,
Constants.DOMAIN_LISTENERS_LIST);
}
return listeners;
}
@@ -329,7 +329,7 @@ public class CoreModuleExtender {
private ListBuilder<DbAdapterDetector> contributeAdapterDetectors() {
if (adapterDetectors == null) {
adapterDetectors = binder.bindList(DbAdapterDetector.class,
-
Constants.SERVER_ADAPTER_DETECTORS_LIST);
+
Constants.ADAPTER_DETECTORS_LIST);
}
return adapterDetectors;
}
@@ -337,7 +337,7 @@ public class CoreModuleExtender {
private ListBuilder<ExtendedType> contributeDefaultExtendedTypes() {
if (defaultExtendedTypes == null) {
defaultExtendedTypes = binder.bindList(ExtendedType.class,
-
Constants.SERVER_DEFAULT_TYPES_LIST);
+
Constants.DEFAULT_TYPES_LIST);
}
return defaultExtendedTypes;
}
@@ -345,7 +345,7 @@ public class CoreModuleExtender {
private ListBuilder<ExtendedType> contributeUserExtendedTypes() {
if (userExtendedTypes == null) {
userExtendedTypes = binder.bindList(ExtendedType.class,
-
Constants.SERVER_USER_TYPES_LIST);
+ Constants.USER_TYPES_LIST);
}
return userExtendedTypes;
}
@@ -353,7 +353,7 @@ public class CoreModuleExtender {
private ListBuilder<ExtendedTypeFactory> contributeExtendedTypeFactories()
{
if (extendedTypeFactories == null) {
extendedTypeFactories = binder.bindList(ExtendedTypeFactory.class,
-
Constants.SERVER_TYPE_FACTORIES_LIST);
+
Constants.TYPE_FACTORIES_LIST);
}
return extendedTypeFactories;
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataDomainProvider.java
b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataDomainProvider.java
index 09cb50018..690474792 100644
---
a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataDomainProvider.java
+++
b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataDomainProvider.java
@@ -83,10 +83,10 @@ public class DataDomainProvider implements
Provider<DataDomain> {
@Inject
protected List<DataChannelSyncFilter> syncFilters;
- @Inject(Constants.SERVER_DOMAIN_LISTENERS_LIST)
+ @Inject(Constants.DOMAIN_LISTENERS_LIST)
protected List<Object> listeners;
- @Inject(Constants.SERVER_PROJECT_LOCATIONS_LIST)
+ @Inject(Constants.PROJECT_LOCATIONS_LIST)
protected List<String> locations;
@Inject
@@ -126,7 +126,7 @@ public class DataDomainProvider implements
Provider<DataDomain> {
DataDomain dataDomain = createDataDomain(descriptor.getName());
-
dataDomain.setMaxIdQualifierSize(runtimeProperties.getInt(Constants.SERVER_MAX_ID_QUALIFIER_SIZE_PROPERTY,
-1));
+
dataDomain.setMaxIdQualifierSize(runtimeProperties.getInt(Constants.MAX_ID_QUALIFIER_SIZE_PROPERTY,
-1));
dataDomain.setQueryCache(new NestedQueryCache(queryCache));
dataDomain.setEntitySorter(injector.getInstance(EntitySorter.class));
@@ -189,7 +189,7 @@ public class DataDomainProvider implements
Provider<DataDomain> {
protected DataChannelDescriptor loadDescriptor() {
DataChannelDescriptor descriptor = locations.isEmpty() ? new
DataChannelDescriptor() : loadDescriptorFromConfigs();
- String nameOverride =
runtimeProperties.get(Constants.SERVER_DOMAIN_NAME_PROPERTY);
+ String nameOverride =
runtimeProperties.get(Constants.DOMAIN_NAME_PROPERTY);
if (nameOverride != null) {
descriptor.setName(nameOverride);
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactory.java
b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactory.java
index be076eced..56a1bfada 100644
---
a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactory.java
+++
b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactory.java
@@ -60,7 +60,7 @@ public class DefaultDbAdapterFactory implements
DbAdapterFactory {
protected List<DbAdapterDetector> detectors;
- public
DefaultDbAdapterFactory(@Inject(Constants.SERVER_ADAPTER_DETECTORS_LIST)
List<DbAdapterDetector> detectors) {
+ public
DefaultDbAdapterFactory(@Inject(Constants.ADAPTER_DETECTORS_LIST)
List<DbAdapterDetector> detectors) {
if (detectors == null) {
throw new NullPointerException("Null detectors list");
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
index 06451fd6f..d778a325a 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
@@ -84,10 +84,10 @@ public class JdbcAdapter implements DbAdapter {
* Creates new JdbcAdapter with a set of default parameters.
*/
public JdbcAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(Constants.SERVER_DEFAULT_TYPES_LIST)
List<ExtendedType> defaultExtendedTypes,
- @Inject(Constants.SERVER_USER_TYPES_LIST)
List<ExtendedType> userExtendedTypes,
- @Inject(Constants.SERVER_TYPE_FACTORIES_LIST)
List<ExtendedTypeFactory> extendedTypeFactories,
- @Inject(Constants.SERVER_RESOURCE_LOCATOR)
ResourceLocator resourceLocator,
+ @Inject(Constants.DEFAULT_TYPES_LIST)
List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.USER_TYPES_LIST) List<ExtendedType>
userExtendedTypes,
+ @Inject(Constants.TYPE_FACTORIES_LIST)
List<ExtendedTypeFactory> extendedTypeFactories,
+ @Inject(Constants.RESOURCE_LOCATOR) ResourceLocator
resourceLocator,
@Inject ValueObjectTypeRegistry
valueObjectTypeRegistry) {
// init defaults
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java
index eae298b25..0d6fa50d0 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java
@@ -65,10 +65,10 @@ public class DB2Adapter extends JdbcAdapter {
private static final String TRIM_FUNCTION = "RTRIM";
public DB2Adapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType>
defaultExtendedTypes,
- @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType>
userExtendedTypes,
- @Inject(Constants.SERVER_TYPE_FACTORIES_LIST)
List<ExtendedTypeFactory> extendedTypeFactories,
- @Inject(Constants.SERVER_RESOURCE_LOCATOR) ResourceLocator
resourceLocator,
+ @Inject(Constants.DEFAULT_TYPES_LIST) List<ExtendedType>
defaultExtendedTypes,
+ @Inject(Constants.USER_TYPES_LIST) List<ExtendedType>
userExtendedTypes,
+ @Inject(Constants.TYPE_FACTORIES_LIST) List<ExtendedTypeFactory>
extendedTypeFactories,
+ @Inject(Constants.RESOURCE_LOCATOR) ResourceLocator
resourceLocator,
@Inject ValueObjectTypeRegistry valueObjectTypeRegistry) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes,
extendedTypeFactories, resourceLocator, valueObjectTypeRegistry);
setSupportsGeneratedKeys(true);
diff --git
a/cayenne/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java
index 437b0e394..7ddf5b0c2 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java
@@ -72,10 +72,10 @@ public class DerbyAdapter extends JdbcAdapter {
public DerbyAdapter(
@Inject RuntimeProperties runtimeProperties,
- @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType>
defaultExtendedTypes,
- @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType>
userExtendedTypes,
- @Inject(Constants.SERVER_TYPE_FACTORIES_LIST)
List<ExtendedTypeFactory> extendedTypeFactories,
- @Inject(Constants.SERVER_RESOURCE_LOCATOR) ResourceLocator
resourceLocator,
+ @Inject(Constants.DEFAULT_TYPES_LIST) List<ExtendedType>
defaultExtendedTypes,
+ @Inject(Constants.USER_TYPES_LIST) List<ExtendedType>
userExtendedTypes,
+ @Inject(Constants.TYPE_FACTORIES_LIST) List<ExtendedTypeFactory>
extendedTypeFactories,
+ @Inject(Constants.RESOURCE_LOCATOR) ResourceLocator
resourceLocator,
@Inject ValueObjectTypeRegistry valueObjectTypeRegistry) {
super(
runtimeProperties,
diff --git
a/cayenne/src/main/java/org/apache/cayenne/dba/firebird/FirebirdAdapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/firebird/FirebirdAdapter.java
index 8a7bed5ba..065a03a62 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/firebird/FirebirdAdapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/firebird/FirebirdAdapter.java
@@ -58,10 +58,10 @@ public class FirebirdAdapter extends JdbcAdapter {
private static final String NCHAR_SUFFIX = " CHARACTER SET UNICODE_FSS";
public FirebirdAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType>
defaultExtendedTypes,
- @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType>
userExtendedTypes,
- @Inject(Constants.SERVER_TYPE_FACTORIES_LIST)
List<ExtendedTypeFactory> extendedTypeFactories,
- @Inject(Constants.SERVER_RESOURCE_LOCATOR) ResourceLocator
resourceLocator,
+ @Inject(Constants.DEFAULT_TYPES_LIST) List<ExtendedType>
defaultExtendedTypes,
+ @Inject(Constants.USER_TYPES_LIST) List<ExtendedType>
userExtendedTypes,
+ @Inject(Constants.TYPE_FACTORIES_LIST) List<ExtendedTypeFactory>
extendedTypeFactories,
+ @Inject(Constants.RESOURCE_LOCATOR) ResourceLocator
resourceLocator,
@Inject ValueObjectTypeRegistry valueObjectTypeRegistry) {
super(
runtimeProperties,
diff --git
a/cayenne/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java
index cdc56a0f9..6d87a64b5 100644
---
a/cayenne/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java
+++
b/cayenne/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java
@@ -69,10 +69,10 @@ import org.apache.cayenne.resource.ResourceLocator;
public class FrontBaseAdapter extends JdbcAdapter {
public FrontBaseAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(Constants.SERVER_DEFAULT_TYPES_LIST)
List<ExtendedType> defaultExtendedTypes,
- @Inject(Constants.SERVER_USER_TYPES_LIST)
List<ExtendedType> userExtendedTypes,
- @Inject(Constants.SERVER_TYPE_FACTORIES_LIST)
List<ExtendedTypeFactory> extendedTypeFactories,
- @Inject(Constants.SERVER_RESOURCE_LOCATOR)
ResourceLocator resourceLocator,
+ @Inject(Constants.DEFAULT_TYPES_LIST)
List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.USER_TYPES_LIST) List<ExtendedType>
userExtendedTypes,
+ @Inject(Constants.TYPE_FACTORIES_LIST)
List<ExtendedTypeFactory> extendedTypeFactories,
+ @Inject(Constants.RESOURCE_LOCATOR) ResourceLocator
resourceLocator,
@Inject ValueObjectTypeRegistry
valueObjectTypeRegistry) {
super(runtimeProperties, defaultExtendedTypes,
userExtendedTypes, extendedTypeFactories, resourceLocator,
valueObjectTypeRegistry);
setSupportsBatchUpdates(true);
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java
index e5982029c..013a52dd5 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/h2/H2Adapter.java
@@ -56,10 +56,10 @@ import java.util.List;
*/
public class H2Adapter extends JdbcAdapter {
public H2Adapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType>
defaultExtendedTypes,
- @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType>
userExtendedTypes,
- @Inject(Constants.SERVER_TYPE_FACTORIES_LIST)
List<ExtendedTypeFactory> extendedTypeFactories,
- @Inject(Constants.SERVER_RESOURCE_LOCATOR) ResourceLocator
resourceLocator,
+ @Inject(Constants.DEFAULT_TYPES_LIST) List<ExtendedType>
defaultExtendedTypes,
+ @Inject(Constants.USER_TYPES_LIST) List<ExtendedType>
userExtendedTypes,
+ @Inject(Constants.TYPE_FACTORIES_LIST) List<ExtendedTypeFactory>
extendedTypeFactories,
+ @Inject(Constants.RESOURCE_LOCATOR) ResourceLocator
resourceLocator,
@Inject ValueObjectTypeRegistry valueObjectTypeRegistry) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes,
extendedTypeFactories, resourceLocator, valueObjectTypeRegistry);
setSupportsGeneratedKeys(true);
diff --git
a/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java
index b19c6858e..ad92da895 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBAdapter.java
@@ -64,10 +64,10 @@ public class HSQLDBAdapter extends JdbcAdapter {
public static final String TRIM_FUNCTION = "RTRIM";
public HSQLDBAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(Constants.SERVER_DEFAULT_TYPES_LIST)
List<ExtendedType> defaultExtendedTypes,
- @Inject(Constants.SERVER_USER_TYPES_LIST)
List<ExtendedType> userExtendedTypes,
- @Inject(Constants.SERVER_TYPE_FACTORIES_LIST)
List<ExtendedTypeFactory> extendedTypeFactories,
- @Inject(Constants.SERVER_RESOURCE_LOCATOR)
ResourceLocator resourceLocator,
+ @Inject(Constants.DEFAULT_TYPES_LIST)
List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.USER_TYPES_LIST) List<ExtendedType>
userExtendedTypes,
+ @Inject(Constants.TYPE_FACTORIES_LIST)
List<ExtendedTypeFactory> extendedTypeFactories,
+ @Inject(Constants.RESOURCE_LOCATOR) ResourceLocator
resourceLocator,
@Inject ValueObjectTypeRegistry valueObjectTypeRegistry) {
super(runtimeProperties, defaultExtendedTypes,
userExtendedTypes, extendedTypeFactories, resourceLocator,
valueObjectTypeRegistry);
setSupportsGeneratedKeys(true);
diff --git
a/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBNoSchemaAdapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBNoSchemaAdapter.java
index d86eb3bc0..f24540feb 100644
---
a/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBNoSchemaAdapter.java
+++
b/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBNoSchemaAdapter.java
@@ -40,10 +40,10 @@ import java.util.List;
public class HSQLDBNoSchemaAdapter extends HSQLDBAdapter {
public HSQLDBNoSchemaAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType>
defaultExtendedTypes,
- @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType>
userExtendedTypes,
- @Inject(Constants.SERVER_TYPE_FACTORIES_LIST)
List<ExtendedTypeFactory> extendedTypeFactories,
- @Inject(Constants.SERVER_RESOURCE_LOCATOR) ResourceLocator
resourceLocator,
+ @Inject(Constants.DEFAULT_TYPES_LIST) List<ExtendedType>
defaultExtendedTypes,
+ @Inject(Constants.USER_TYPES_LIST) List<ExtendedType>
userExtendedTypes,
+ @Inject(Constants.TYPE_FACTORIES_LIST) List<ExtendedTypeFactory>
extendedTypeFactories,
+ @Inject(Constants.RESOURCE_LOCATOR) ResourceLocator
resourceLocator,
@Inject ValueObjectTypeRegistry valueObjectTypeRegistry) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes,
extendedTypeFactories, resourceLocator, valueObjectTypeRegistry);
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java
index a04e3a4ab..b97549e70 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java
@@ -60,10 +60,10 @@ public class IngresAdapter extends JdbcAdapter {
public static final String TRIM_FUNCTION = "TRIM";
public IngresAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(Constants.SERVER_DEFAULT_TYPES_LIST)
List<ExtendedType> defaultExtendedTypes,
- @Inject(Constants.SERVER_USER_TYPES_LIST)
List<ExtendedType> userExtendedTypes,
- @Inject(Constants.SERVER_TYPE_FACTORIES_LIST)
List<ExtendedTypeFactory> extendedTypeFactories,
- @Inject(Constants.SERVER_RESOURCE_LOCATOR)
ResourceLocator resourceLocator,
+ @Inject(Constants.DEFAULT_TYPES_LIST)
List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.USER_TYPES_LIST)
List<ExtendedType> userExtendedTypes,
+ @Inject(Constants.TYPE_FACTORIES_LIST)
List<ExtendedTypeFactory> extendedTypeFactories,
+ @Inject(Constants.RESOURCE_LOCATOR)
ResourceLocator resourceLocator,
@Inject
ValueObjectTypeRegistry valueObjectTypeRegistry) {
super(runtimeProperties, defaultExtendedTypes,
userExtendedTypes, extendedTypeFactories, resourceLocator,
valueObjectTypeRegistry);
setSupportsUniqueConstraints(true);
diff --git
a/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java
index ac3682986..4301ee40a 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java
@@ -87,10 +87,10 @@ public class MySQLAdapter extends JdbcAdapter {
protected String storageEngine;
public MySQLAdapter(@Inject RuntimeProperties runtimeProperties,
-
@Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType>
defaultExtendedTypes,
-
@Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
-
@Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory>
extendedTypeFactories,
-
@Inject(Constants.SERVER_RESOURCE_LOCATOR) ResourceLocator resourceLocator,
+
@Inject(Constants.DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+
@Inject(Constants.USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+
@Inject(Constants.TYPE_FACTORIES_LIST) List<ExtendedTypeFactory>
extendedTypeFactories,
+
@Inject(Constants.RESOURCE_LOCATOR) ResourceLocator resourceLocator,
@Inject ValueObjectTypeRegistry
valueObjectTypeRegistry) {
super(runtimeProperties, defaultExtendedTypes,
userExtendedTypes, extendedTypeFactories, resourceLocator,
valueObjectTypeRegistry);
diff --git
a/cayenne/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java
index 6e3d15441..c609af680 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java
@@ -50,10 +50,10 @@ public class Oracle8Adapter extends OracleAdapter {
}
public Oracle8Adapter(@Inject RuntimeProperties runtimeProperties,
-
@Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType>
defaultExtendedTypes,
-
@Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
-
@Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory>
extendedTypeFactories,
-
@Inject(Constants.SERVER_RESOURCE_LOCATOR) ResourceLocator resourceLocator,
+
@Inject(Constants.DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+
@Inject(Constants.USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+
@Inject(Constants.TYPE_FACTORIES_LIST) List<ExtendedTypeFactory>
extendedTypeFactories,
+
@Inject(Constants.RESOURCE_LOCATOR) ResourceLocator resourceLocator,
@Inject
ValueObjectTypeRegistry valueObjectTypeRegistry) {
super(runtimeProperties, defaultExtendedTypes,
userExtendedTypes, extendedTypeFactories, resourceLocator,
valueObjectTypeRegistry);
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
index 276fbe84e..ad077d47f 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
@@ -166,10 +166,10 @@ public class OracleAdapter extends JdbcAdapter {
}
public OracleAdapter(@Inject RuntimeProperties runtimeProperties,
-
@Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType>
defaultExtendedTypes,
-
@Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
-
@Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory>
extendedTypeFactories,
-
@Inject(Constants.SERVER_RESOURCE_LOCATOR) ResourceLocator resourceLocator,
+
@Inject(Constants.DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+
@Inject(Constants.USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+
@Inject(Constants.TYPE_FACTORIES_LIST) List<ExtendedTypeFactory>
extendedTypeFactories,
+
@Inject(Constants.RESOURCE_LOCATOR) ResourceLocator resourceLocator,
@Inject
ValueObjectTypeRegistry valueObjectTypeRegistry) {
super(runtimeProperties, defaultExtendedTypes,
userExtendedTypes, extendedTypeFactories, resourceLocator,
valueObjectTypeRegistry);
diff --git
a/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java
index 465433b28..df67c1d45 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java
@@ -70,10 +70,10 @@ public class PostgresAdapter extends JdbcAdapter {
private List<String> SYSTEM_SCHEMAS =
Arrays.asList("information_schema", "pg_catalog");
public PostgresAdapter(@Inject RuntimeProperties runtimeProperties,
-
@Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType>
defaultExtendedTypes,
-
@Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
-
@Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory>
extendedTypeFactories,
-
@Inject(Constants.SERVER_RESOURCE_LOCATOR) ResourceLocator resourceLocator,
+
@Inject(Constants.DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+
@Inject(Constants.USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+
@Inject(Constants.TYPE_FACTORIES_LIST) List<ExtendedTypeFactory>
extendedTypeFactories,
+
@Inject(Constants.RESOURCE_LOCATOR) ResourceLocator resourceLocator,
@Inject
ValueObjectTypeRegistry valueObjectTypeRegistry) {
super(runtimeProperties, defaultExtendedTypes,
userExtendedTypes, extendedTypeFactories, resourceLocator,
valueObjectTypeRegistry);
setSupportsBatchUpdates(true);
diff --git
a/cayenne/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java
index d86f7d394..68e3f8905 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java
@@ -57,10 +57,10 @@ public class SQLiteAdapter extends JdbcAdapter {
public SQLiteAdapter(
@Inject RuntimeProperties runtimeProperties,
- @Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType>
defaultExtendedTypes,
- @Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType>
userExtendedTypes,
- @Inject(Constants.SERVER_TYPE_FACTORIES_LIST)
List<ExtendedTypeFactory> extendedTypeFactories,
- @Inject(Constants.SERVER_RESOURCE_LOCATOR) ResourceLocator
resourceLocator,
+ @Inject(Constants.DEFAULT_TYPES_LIST) List<ExtendedType>
defaultExtendedTypes,
+ @Inject(Constants.USER_TYPES_LIST) List<ExtendedType>
userExtendedTypes,
+ @Inject(Constants.TYPE_FACTORIES_LIST) List<ExtendedTypeFactory>
extendedTypeFactories,
+ @Inject(Constants.RESOURCE_LOCATOR) ResourceLocator
resourceLocator,
@Inject ValueObjectTypeRegistry valueObjectTypeRegistry) {
super(
runtimeProperties,
diff --git
a/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
index b3b448445..e8378ad55 100644
---
a/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
+++
b/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
@@ -94,10 +94,10 @@ public class SQLServerAdapter extends SybaseAdapter {
private final List<String> SYSTEM_CATALOGS = Arrays.asList("model",
"msdb", "tempdb");
public SQLServerAdapter(@Inject RuntimeProperties runtimeProperties,
-
@Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType>
defaultExtendedTypes,
-
@Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
-
@Inject(Constants.SERVER_TYPE_FACTORIES_LIST) List<ExtendedTypeFactory>
extendedTypeFactories,
-
@Inject(Constants.SERVER_RESOURCE_LOCATOR) ResourceLocator resourceLocator,
+
@Inject(Constants.DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
+
@Inject(Constants.USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
+
@Inject(Constants.TYPE_FACTORIES_LIST) List<ExtendedTypeFactory>
extendedTypeFactories,
+
@Inject(Constants.RESOURCE_LOCATOR) ResourceLocator resourceLocator,
@Inject
ValueObjectTypeRegistry valueObjectTypeRegistry) {
super(runtimeProperties, defaultExtendedTypes,
userExtendedTypes, extendedTypeFactories, resourceLocator,
valueObjectTypeRegistry);
diff --git
a/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java
b/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java
index f4013fd66..459f5e0ad 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java
@@ -50,10 +50,10 @@ import org.apache.cayenne.resource.ResourceLocator;
public class SybaseAdapter extends JdbcAdapter {
public SybaseAdapter(@Inject RuntimeProperties runtimeProperties,
- @Inject(Constants.SERVER_DEFAULT_TYPES_LIST)
List<ExtendedType> defaultExtendedTypes,
- @Inject(Constants.SERVER_USER_TYPES_LIST)
List<ExtendedType> userExtendedTypes,
- @Inject(Constants.SERVER_TYPE_FACTORIES_LIST)
List<ExtendedTypeFactory> extendedTypeFactories,
- @Inject(Constants.SERVER_RESOURCE_LOCATOR)
ResourceLocator resourceLocator,
+ @Inject(Constants.DEFAULT_TYPES_LIST)
List<ExtendedType> defaultExtendedTypes,
+ @Inject(Constants.USER_TYPES_LIST) List<ExtendedType>
userExtendedTypes,
+ @Inject(Constants.TYPE_FACTORIES_LIST)
List<ExtendedTypeFactory> extendedTypeFactories,
+ @Inject(Constants.RESOURCE_LOCATOR) ResourceLocator
resourceLocator,
@Inject ValueObjectTypeRegistry
valueObjectTypeRegistry) {
super(runtimeProperties, defaultExtendedTypes, userExtendedTypes,
extendedTypeFactories, resourceLocator, valueObjectTypeRegistry);
diff --git
a/cayenne/src/main/java/org/apache/cayenne/event/EventManagerProvider.java
b/cayenne/src/main/java/org/apache/cayenne/event/EventManagerProvider.java
index 4b59e274c..a3ffc6080 100644
--- a/cayenne/src/main/java/org/apache/cayenne/event/EventManagerProvider.java
+++ b/cayenne/src/main/java/org/apache/cayenne/event/EventManagerProvider.java
@@ -37,7 +37,7 @@ public class EventManagerProvider implements
Provider<EventManager> {
@Override
public EventManager get() throws ConfigurationException {
- boolean sync =
properties.getBoolean(Constants.SERVER_CONTEXTS_SYNC_PROPERTY, false);
+ boolean sync = properties.getBoolean(Constants.CONTEXTS_SYNC_PROPERTY,
false);
return sync ? new DefaultEventManager() : new NoopEventManager();
}
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 285ab9006..b807b216e 100644
---
a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java
+++
b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java
@@ -227,7 +227,7 @@ public class CayenneRuntimeBuilder {
if (nameOverride != null) {
final String finalNameOverride = nameOverride;
- modules.add(binder ->
CoreModule.extend(binder).setProperty(Constants.SERVER_DOMAIN_NAME_PROPERTY,
finalNameOverride));
+ modules.add(binder ->
CoreModule.extend(binder).setProperty(Constants.DOMAIN_NAME_PROPERTY,
finalNameOverride));
}
if (dataSourceFactory != null) {
diff --git
a/cayenne/src/main/java/org/apache/cayenne/tx/DefaultTransactionFactory.java
b/cayenne/src/main/java/org/apache/cayenne/tx/DefaultTransactionFactory.java
index 737fcfe06..9f9052f82 100644
--- a/cayenne/src/main/java/org/apache/cayenne/tx/DefaultTransactionFactory.java
+++ b/cayenne/src/main/java/org/apache/cayenne/tx/DefaultTransactionFactory.java
@@ -33,7 +33,7 @@ public class DefaultTransactionFactory implements
TransactionFactory {
protected JdbcEventLogger jdbcEventLogger;
public DefaultTransactionFactory(@Inject RuntimeProperties properties,
@Inject JdbcEventLogger jdbcEventLogger) {
- this.externalTransactions =
properties.getBoolean(Constants.SERVER_EXTERNAL_TX_PROPERTY, false);
+ this.externalTransactions =
properties.getBoolean(Constants.EXTERNAL_TX_PROPERTY, false);
this.jdbcEventLogger = jdbcEventLogger;
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderTest.java
b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderTest.java
index eda7ec38c..c4e223ca7 100644
---
a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderTest.java
+++
b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderTest.java
@@ -218,7 +218,7 @@ public class DataDomainProviderTest {
};
b.bind(ResourceLocator.class).toInstance(locator);
- b.bind(Key.get(ResourceLocator.class,
Constants.SERVER_RESOURCE_LOCATOR)).toInstance(locator);
+ b.bind(Key.get(ResourceLocator.class,
Constants.RESOURCE_LOCATOR)).toInstance(locator);
b.bind(ConfigurationNameMapper.class).to(DefaultConfigurationNameMapper.class);
b.bind(DataChannelDescriptorMerger.class).to(DefaultDataChannelDescriptorMerger.class);
b.bind(DataChannelDescriptorLoader.class).toInstance(testLoader);
diff --git
a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDataSourceFactoryLoaderTest.java
b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDataSourceFactoryLoaderTest.java
index 2cb2d179b..ab62a0b92 100644
---
a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDataSourceFactoryLoaderTest.java
+++
b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDataSourceFactoryLoaderTest.java
@@ -56,7 +56,7 @@ public class DefaultDataSourceFactoryLoaderTest {
binder.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
binder.bind(ResourceLocator.class).to(MockResourceLocator.class);
- binder.bind(Key.get(ResourceLocator.class,
Constants.SERVER_RESOURCE_LOCATOR)).to(MockResourceLocator.class);
+ binder.bind(Key.get(ResourceLocator.class,
Constants.RESOURCE_LOCATOR)).to(MockResourceLocator.class);
binder.bind(RuntimeProperties.class).toInstance(mock(RuntimeProperties.class));
binder.bind(JdbcEventLogger.class).to(Slf4jJdbcEventLogger.class);
};
@@ -115,7 +115,7 @@ public class DefaultDataSourceFactoryLoaderTest {
binder.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
binder.bind(ResourceLocator.class).to(MockResourceLocator.class);
- binder.bind(Key.get(ResourceLocator.class,
Constants.SERVER_RESOURCE_LOCATOR)).to(MockResourceLocator.class);
+ binder.bind(Key.get(ResourceLocator.class,
Constants.RESOURCE_LOCATOR)).to(MockResourceLocator.class);
binder.bind(RuntimeProperties.class).toInstance(properties);
binder.bind(JdbcEventLogger.class).to(Slf4jJdbcEventLogger.class);
};
@@ -160,7 +160,7 @@ public class DefaultDataSourceFactoryLoaderTest {
binder.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
binder.bind(ResourceLocator.class).to(MockResourceLocator.class);
- binder.bind(Key.get(ResourceLocator.class,
Constants.SERVER_RESOURCE_LOCATOR)).to(MockResourceLocator.class);
+ binder.bind(Key.get(ResourceLocator.class,
Constants.RESOURCE_LOCATOR)).to(MockResourceLocator.class);
binder.bind(RuntimeProperties.class).toInstance(properties);
binder.bind(JdbcEventLogger.class).to(Slf4jJdbcEventLogger.class);
};
diff --git
a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactoryTest.java
b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactoryTest.java
index f60f89ffc..8a06f8d38 100644
---
a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactoryTest.java
+++
b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactoryTest.java
@@ -112,7 +112,7 @@ public class DefaultDbAdapterFactoryTest {
b.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
b.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
b.bind(ResourceLocator.class).to(ClassLoaderResourceLocator.class);
- b.bind(Key.get(ResourceLocator.class,
Constants.SERVER_RESOURCE_LOCATOR)).to(ClassLoaderResourceLocator.class);
+ b.bind(Key.get(ResourceLocator.class,
Constants.RESOURCE_LOCATOR)).to(ClassLoaderResourceLocator.class);
b.bind(RuntimeProperties.class).to(DefaultRuntimeProperties.class);
b.bind(BatchTranslatorFactory.class).toInstance(mock(BatchTranslatorFactory.class));
@@ -147,7 +147,7 @@ public class DefaultDbAdapterFactoryTest {
b.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
b.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
b.bind(ResourceLocator.class).to(ClassLoaderResourceLocator.class);
- b.bind(Key.get(ResourceLocator.class,
Constants.SERVER_RESOURCE_LOCATOR)).to(ClassLoaderResourceLocator.class);
+ b.bind(Key.get(ResourceLocator.class,
Constants.RESOURCE_LOCATOR)).to(ClassLoaderResourceLocator.class);
b.bind(RuntimeProperties.class).to(DefaultRuntimeProperties.class);
b.bind(BatchTranslatorFactory.class).toInstance(mock(BatchTranslatorFactory.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 5d760795d..415a8b0a5 100644
---
a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderTest.java
+++
b/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderTest.java
@@ -56,7 +56,7 @@ public class CayenneRuntimeBuilderTest {
runtime = new CayenneRuntimeBuilder(null).build();
List<String> locations = runtime.getInjector().getInstance(
- Key.getListOf(String.class,
Constants.SERVER_PROJECT_LOCATIONS_LIST));
+ Key.getListOf(String.class,
Constants.PROJECT_LOCATIONS_LIST));
assertEquals(List.of(), locations);
@@ -71,7 +71,7 @@ public class CayenneRuntimeBuilderTest {
runtime = new
CayenneRuntimeBuilder(null).addConfig("xxxx").build();
List<String> locations = runtime.getInjector().getInstance(
- Key.getListOf(String.class,
Constants.SERVER_PROJECT_LOCATIONS_LIST));
+ Key.getListOf(String.class,
Constants.PROJECT_LOCATIONS_LIST));
assertEquals(List.of("xxxx"), locations);
@@ -87,7 +87,7 @@ public class CayenneRuntimeBuilderTest {
runtime = new CayenneRuntimeBuilder(null).addConfigs("xxxx",
"yyyy").build();
List<String> locations = runtime.getInjector().getInstance(
- Key.getListOf(String.class,
Constants.SERVER_PROJECT_LOCATIONS_LIST));
+ Key.getListOf(String.class,
Constants.PROJECT_LOCATIONS_LIST));
assertEquals(Arrays.asList("xxxx", "yyyy"), locations);
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 fe40c3962..b59b1a0e4 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
@@ -94,7 +94,7 @@ public class CayenneRuntimeProvider implements
Provider<CayenneRuntime> {
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");
+ .setProperty(Constants.OBJECT_RETAIN_STRATEGY_PROPERTY,
"soft");
// map DataSources for all test DataNode names
binder.bind(ServerCaseDataSourceFactory.class).toInstance(dataSourceFactory);
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 27447fcbb..0bff011c2 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
@@ -160,7 +160,7 @@ public class ServerCaseModule implements Module {
// 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")
+ .setProperty(Constants.OBJECT_RETAIN_STRATEGY_PROPERTY, "soft")
.addPkGenerator(DB2Adapter.class, DB2PkGenerator.class)
.addPkGenerator(DerbyAdapter.class, DerbyPkGenerator.class)
@@ -249,7 +249,7 @@ public class ServerCaseModule implements Module {
binder.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
binder.bind(ResourceLocator.class).to(ClassLoaderResourceLocator.class);
- binder.bind(Key.get(ResourceLocator.class,
Constants.SERVER_RESOURCE_LOCATOR)).to(ClassLoaderResourceLocator.class);
+ binder.bind(Key.get(ResourceLocator.class,
Constants.RESOURCE_LOCATOR)).to(ClassLoaderResourceLocator.class);
binder.bind(ObjectStoreFactory.class).to(DefaultObjectStoreFactory.class);
binder.bind(DataMapLoader.class).to(XMLDataMapLoader.class);
binder.bind(ConfigurationNameMapper.class).to(DefaultConfigurationNameMapper.class);
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 ad89afc9e..e128e914a 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
@@ -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 ->
CoreModule.extend(b).setProperty(Constants.SERVER_OBJECT_RETAIN_STRATEGY_PROPERTY,
"weak"));
+ modules.add(b ->
CoreModule.extend(b).setProperty(Constants.OBJECT_RETAIN_STRATEGY_PROPERTY,
"weak"));
return modules;
}
}
