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 2024/01/19 16:51:23 UTC
(causeway) branch spring6 updated (5727bc8898 -> 4f1b480971)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git
from 5727bc8898 Merge remote-tracking branch 'origin/master' into spring6
add 3c982cef83 CAUSEWAY-3404: adds GraphUtils (basic graph algorithms)
new 4f1b480971 Merge remote-tracking branch 'origin/master' into spring6
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../services/metamodel/MetaModelService.java | 4 +-
.../services/metamodel/objgraph/ObjectGraph.java | 85 +++++++++-
.../objgraph/_ObjectGraphObjectModifier.java | 33 ++--
.../objgraph/_ObjectGraphRelationMerger.java | 13 +-
commons/src/main/java/module-info.java | 2 +-
.../apache/causeway/commons/graph/GraphUtils.java | 182 +++++++++++++++++++++
.../collections/_PrimitiveCollections.java | 135 +++++++++++++++
.../causeway/commons/internal/graph/_Graph.java | 53 ------
.../collections/_PrimitiveCollectionsTest.java | 105 ++++++++++++
.../domainobjects/EntityDiagramPageAbstract.java | 6 +
.../tooling/cli/projdoc/ProjectDocModel.java | 22 +--
.../d3js/ObjectGraphRendererEdgeListing.java | 68 ++++++++
12 files changed, 614 insertions(+), 94 deletions(-)
copy tooling/metaprog/src/main/resources/holder/$TemplateHolder_actionReturningCollection~primitive.java => api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/objgraph/_ObjectGraphObjectModifier.java (61%)
create mode 100644 commons/src/main/java/org/apache/causeway/commons/graph/GraphUtils.java
create mode 100644 commons/src/main/java/org/apache/causeway/commons/internal/collections/_PrimitiveCollections.java
delete mode 100644 commons/src/main/java/org/apache/causeway/commons/internal/graph/_Graph.java
create mode 100644 commons/src/test/java/org/apache/causeway/commons/internal/collections/_PrimitiveCollectionsTest.java
create mode 100644 valuetypes/asciidoc/builder/src/main/java/org/apache/causeway/valuetypes/asciidoc/builder/objgraph/d3js/ObjectGraphRendererEdgeListing.java
(causeway) 01/01: Merge remote-tracking branch 'origin/master' into spring6
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 4f1b48097196d49c5c374ddd9de69ed0ecd68138
Merge: 5727bc8898 3c982cef83
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jan 19 17:50:27 2024 +0100
Merge remote-tracking branch 'origin/master' into spring6
.../services/metamodel/MetaModelService.java | 4 +-
.../services/metamodel/objgraph/ObjectGraph.java | 85 +++++++++-
.../objgraph/_ObjectGraphObjectModifier.java | 43 ++---
.../objgraph/_ObjectGraphRelationMerger.java | 13 +-
commons/src/main/java/module-info.java | 2 +-
.../apache/causeway/commons/graph/GraphUtils.java | 182 +++++++++++++++++++++
.../collections/_PrimitiveCollections.java | 135 +++++++++++++++
.../collections/_PrimitiveCollectionsTest.java | 105 ++++++++++++
.../domainobjects/EntityDiagramPageAbstract.java | 6 +
.../tooling/cli/projdoc/ProjectDocModel.java | 22 +--
.../d3js/ObjectGraphRendererEdgeListing.java | 68 ++++++++
11 files changed, 617 insertions(+), 48 deletions(-)
diff --cc api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelService.java
index 04a3f2465f,808a764f0b..b6c5b6966c
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelService.java
@@@ -21,10 -21,8 +21,8 @@@ package org.apache.causeway.applib.serv
import java.util.Optional;
import java.util.function.BiPredicate;
-import javax.inject.Named;
+import jakarta.inject.Named;
- import org.apache.causeway.commons.collections.Can;
-
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.Action;