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 05:16:01 UTC
[causeway] branch master updated: CAUSEWAY-3565: fixes prev.prev. commit (duplicated objects in diagram)
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 70fb2fc22c CAUSEWAY-3565: fixes prev.prev. commit (duplicated objects in diagram)
70fb2fc22c is described below
commit 70fb2fc22c0ce12965fe16e2e8c5bd45b17756df
Author: andi-huber <ah...@apache.org>
AuthorDate: Fri Sep 8 07:15:55 2023 +0200
CAUSEWAY-3565: fixes prev.prev. commit (duplicated objects in diagram)
---
.../core/metamodel/services/metamodel/_ObjectGraphFactory.java | 2 +-
.../causeway/extensions/docgen/help/CausewayModuleExtDocgenHelp.java | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
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 d23125a0a0..6847d6fa84 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
@@ -72,6 +72,7 @@ class _ObjectGraphFactory implements ObjectGraph.Factory {
val newObj = object(newObjId, objSpec);
objectById.put(newObjId, newObj);
addFieldsLater.setValue(true);
+ objectGraph.objects().add(newObj);
return newObj;
});
@@ -110,7 +111,6 @@ class _ObjectGraphFactory implements ObjectGraph.Factory {
.map(this::fieldForAss)
.forEach(obj.fields()::add);
}
- objectGraph.objects().add(obj);
return obj;
}
diff --git a/extensions/core/docgen/help/src/main/java/org/apache/causeway/extensions/docgen/help/CausewayModuleExtDocgenHelp.java b/extensions/core/docgen/help/src/main/java/org/apache/causeway/extensions/docgen/help/CausewayModuleExtDocgenHelp.java
index e43df3a757..52291ffc56 100644
--- a/extensions/core/docgen/help/src/main/java/org/apache/causeway/extensions/docgen/help/CausewayModuleExtDocgenHelp.java
+++ b/extensions/core/docgen/help/src/main/java/org/apache/causeway/extensions/docgen/help/CausewayModuleExtDocgenHelp.java
@@ -55,6 +55,10 @@ public class CausewayModuleExtDocgenHelp {
/**
* The help index (tree), if not provided already (somewhere else).
+ *
+ * @apiNote Be aware to override this, simply using {@code @Primary} will not be sufficient.
+ * One must also make sure the overriding config gets registered to the Spring context
+ * before this one.
*/
@Bean(NAMESPACE + ".RootHelpTopic")
@ConditionalOnMissingBean(HelpTopic.class)