You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2022/11/16 14:50:50 UTC
[cayenne] 03/06: refactor list/map builders providers
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
commit e6b17d78951dbb404734cbe2038b5a9c89fafcfe
Author: Mikhail Dzianishchyts <mi...@gmail.com>
AuthorDate: Wed Nov 16 13:16:18 2022 +0300
refactor list/map builders providers
---
.../CacheInvalidationModuleExtender.java | 5 +-
.../cayenne/commitlog/CommitLogModuleExtender.java | 5 +-
.../cayenne/project/ProjectModuleExtender.java | 10 +++-
.../configuration/server/ServerModuleExtender.java | 59 ++++++++++++++++++----
4 files changed, 64 insertions(+), 15 deletions(-)
diff --git a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModuleExtender.java b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModuleExtender.java
index 606b0e6a6..72f303e0d 100644
--- a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModuleExtender.java
+++ b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModuleExtender.java
@@ -71,7 +71,10 @@ public class CacheInvalidationModuleExtender {
}
private ListBuilder<InvalidationHandler> contributeInvalidationHandlers() {
- return invalidationHandlers != null ? invalidationHandlers : (invalidationHandlers = binder.bindList(InvalidationHandler.class));
+ if (invalidationHandlers == null) {
+ invalidationHandlers = binder.bindList(InvalidationHandler.class);
+ }
+ return invalidationHandlers;
}
}
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 a75aee0f4..74f0d4102 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
@@ -95,6 +95,9 @@ public class CommitLogModuleExtender {
}
private ListBuilder<CommitLogListener> contributeCommitLogListeners() {
- return commitLogListeners != null ? commitLogListeners : (commitLogListeners = binder.bindList(CommitLogListener.class));
+ if (commitLogListeners == null) {
+ commitLogListeners = binder.bindList(CommitLogListener.class);
+ }
+ return commitLogListeners;
}
}
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/ProjectModuleExtender.java b/cayenne-project/src/main/java/org/apache/cayenne/project/ProjectModuleExtender.java
index 758d8f7bd..de9c3aca8 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/ProjectModuleExtender.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/ProjectModuleExtender.java
@@ -46,10 +46,16 @@ public class ProjectModuleExtender {
}
private ListBuilder<ProjectExtension> contributeExtensions() {
- return extensions != null ? extensions : (extensions = binder.bindList(ProjectExtension.class));
+ if (extensions == null) {
+ extensions = binder.bindList(ProjectExtension.class);
+ }
+ return extensions;
}
private ListBuilder<UpgradeHandler> contributeUpgradeHandler() {
- return upgradeHandlers != null ? upgradeHandlers : (upgradeHandlers = binder.bindList(UpgradeHandler.class));
+ if (upgradeHandlers == null) {
+ upgradeHandlers = binder.bindList(UpgradeHandler.class);
+ }
+ return upgradeHandlers;
}
}
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModuleExtender.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModuleExtender.java
index dd3269a89..540edc6d1 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModuleExtender.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModuleExtender.java
@@ -292,46 +292,83 @@ public class ServerModuleExtender {
}
private ListBuilder<String> contributeProjectLocations() {
- return projectLocations != null ? projectLocations : (projectLocations = binder.bindList(String.class, Constants.SERVER_PROJECT_LOCATIONS_LIST));
+ if (projectLocations == null) {
+ projectLocations = binder.bindList(String.class, Constants.SERVER_PROJECT_LOCATIONS_LIST);
+ }
+ return projectLocations;
}
private MapBuilder<String> contributeProperties() {
- return properties != null ? properties : (properties = binder.bindMap(String.class, Constants.PROPERTIES_MAP));
+ if (properties == null) {
+ properties = binder.bindMap(String.class, Constants.PROPERTIES_MAP);
+ }
+ return properties;
}
private ListBuilder<DataChannelQueryFilter> contributeQueryFilters() {
- return queryFilters != null ? queryFilters : (queryFilters = binder.bindList(DataChannelQueryFilter.class));
+ if (queryFilters == null) {
+ queryFilters = binder.bindList(DataChannelQueryFilter.class);
+ }
+ return queryFilters;
}
private ListBuilder<DataChannelSyncFilter> contributeSyncFilters() {
- return syncFilters != null ? syncFilters : (syncFilters = binder.bindList(DataChannelSyncFilter.class));
+ if (syncFilters == null) {
+ syncFilters = binder.bindList(DataChannelSyncFilter.class);
+ }
+ return syncFilters;
}
private ListBuilder<Object> contributeListeners() {
- return listeners != null ? listeners : (listeners = binder.bindList(Object.class, Constants.SERVER_DOMAIN_LISTENERS_LIST));
+ if (listeners == null) {
+ listeners = binder.bindList(Object.class, Constants.SERVER_DOMAIN_LISTENERS_LIST);
+ }
+ return listeners;
}
private ListBuilder<DbAdapterDetector> contributeAdapterDetectors() {
- return adapterDetectors != null ? adapterDetectors : (adapterDetectors = binder.bindList(DbAdapterDetector.class, Constants.SERVER_ADAPTER_DETECTORS_LIST));
+ if (adapterDetectors == null) {
+ adapterDetectors = binder.bindList(DbAdapterDetector.class,
+ Constants.SERVER_ADAPTER_DETECTORS_LIST);
+ }
+ return adapterDetectors;
}
private ListBuilder<ExtendedType> contributeDefaultExtendedTypes() {
- return defaultExtendedTypes != null ? defaultExtendedTypes : (defaultExtendedTypes = binder.bindList(ExtendedType.class, Constants.SERVER_DEFAULT_TYPES_LIST));
+ if (defaultExtendedTypes == null) {
+ defaultExtendedTypes = binder.bindList(ExtendedType.class,
+ Constants.SERVER_DEFAULT_TYPES_LIST);
+ }
+ return defaultExtendedTypes;
}
private ListBuilder<ExtendedType> contributeUserExtendedTypes() {
- return userExtendedTypes != null ? userExtendedTypes : (userExtendedTypes = binder.bindList(ExtendedType.class, Constants.SERVER_USER_TYPES_LIST));
+ if (userExtendedTypes == null) {
+ userExtendedTypes = binder.bindList(ExtendedType.class,
+ Constants.SERVER_USER_TYPES_LIST);
+ }
+ return userExtendedTypes;
}
private ListBuilder<ExtendedTypeFactory> contributeExtendedTypeFactories() {
- return extendedTypeFactories != null ? extendedTypeFactories : (extendedTypeFactories = binder.bindList(ExtendedTypeFactory.class, Constants.SERVER_TYPE_FACTORIES_LIST));
+ if (extendedTypeFactories == null) {
+ extendedTypeFactories = binder.bindList(ExtendedTypeFactory.class,
+ Constants.SERVER_TYPE_FACTORIES_LIST);
+ }
+ return extendedTypeFactories;
}
private ListBuilder<ValueObjectType> contributeValueObjectTypes() {
- return valueObjectTypes != null ? valueObjectTypes : (valueObjectTypes = binder.bindList(ValueObjectType.class));
+ if (valueObjectTypes == null) {
+ valueObjectTypes = binder.bindList(ValueObjectType.class);
+ }
+ return valueObjectTypes;
}
private MapBuilder<PkGenerator> contributePkGenerators() {
- return pkGenerators != null ? pkGenerators : (pkGenerators = binder.bindMap(PkGenerator.class));
+ if (pkGenerators == null) {
+ pkGenerators = binder.bindMap(PkGenerator.class);
+ }
+ return pkGenerators;
}
}