You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2018/08/23 09:48:53 UTC
[isis] 03/07: ISIS-1974: makes catalogNamedQueries (the method that
populates SpecificatoinLoader) static.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a3d002b048d0fefde351d573eb64044c73b84d14
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Aug 22 13:24:46 2018 +0100
ISIS-1974: makes catalogNamedQueries (the method that populates SpecificatoinLoader) static.
---
.../runtime/system/persistence/DataNucleusApplicationComponents.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
index 52ac35b..ca45ec9 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
@@ -107,7 +107,7 @@ public class DataNucleusApplicationComponents implements ApplicationScopedCompon
private void initialize() {
persistenceManagerFactory = createPmfAndSchemaIfRequired(persistableClassNameSet, datanucleusProps);
- namedQueryByName = catalogNamedQueries(persistableClassNameSet);
+ namedQueryByName = catalogNamedQueries(persistableClassNameSet, specificationLoader);
}
private static boolean isSchemaAwareStoreManager(Map<String,String> datanucleusProps) {
@@ -232,7 +232,8 @@ public class DataNucleusApplicationComponents implements ApplicationScopedCompon
return properties;
}
- private Map<String, JdoNamedQuery> catalogNamedQueries(Set<String> persistableClassNames) {
+ static Map<String, JdoNamedQuery> catalogNamedQueries(
+ Set<String> persistableClassNames, final SpecificationLoader specificationLoader) {
final Map<String, JdoNamedQuery> namedQueryByName = Maps.newHashMap();
for (final String persistableClassName: persistableClassNames) {
final ObjectSpecification spec = specificationLoader.loadSpecification(persistableClassName);