You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/09/08 04:41:53 UTC
[causeway] branch master updated: CAUSEWAY-3565: just polishing prev. commit
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new 4c2640bed7 CAUSEWAY-3565: just polishing prev. commit
4c2640bed7 is described below
commit 4c2640bed71ce511ac726983636ef120443086fb
Author: andi-huber <ah...@apache.org>
AuthorDate: Fri Sep 8 06:41:48 2023 +0200
CAUSEWAY-3565: just polishing prev. commit
---
.../metamodel/services/metamodel/MetaModelServiceDefault.java | 8 +++++---
.../core/metamodel/services/metamodel/_ObjectGraphFactory.java | 3 ---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index 9181dc0d6d..4129398ebd 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -242,11 +242,13 @@ public class MetaModelServiceDefault implements MetaModelService {
@Override
public ObjectGraph exportObjectGraph(final @NonNull BiPredicate<BeanSort, LogicalType> filter) {
- val specifications = specificationLoader.snapshotSpecifications();
- val objectSpecs = specifications.stream()
+ val objectSpecs = specificationLoader
+ .snapshotSpecifications()
+ .stream()
.filter(spec->filter.test(spec.getBeanSort(), spec.getLogicalType()))
.collect(Collectors.toList());
- return ObjectGraph.create(new _ObjectGraphFactory(objectSpecs))
+ return ObjectGraph
+ .create(new _ObjectGraphFactory(objectSpecs))
.transform(new _ObjectGraphRelationMerger());
}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/_ObjectGraphFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/_ObjectGraphFactory.java
index 07e509f1b1..d23125a0a0 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/_ObjectGraphFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/_ObjectGraphFactory.java
@@ -52,11 +52,8 @@ class _ObjectGraphFactory implements ObjectGraph.Factory {
@Override
public final ObjectGraph create() {
-
objectSpecifications.forEach(this::registerObject);
- createInheritanceRelations();
-
// single use only! (we cannot call this repeatedly, as it adds more and more duplicates)
objectGraph.relations().addAll(createInheritanceRelations());