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 872d628a1d04b58d829af716cd6f48a9bb556c8a Merge: b725b324a2 f1d4898460 Author: Andi Huber <[email protected]> AuthorDate: Sat Jan 28 08:32:12 2023 +0100 Merge remote-tracking branch 'origin/master' into spring6 .../extensions/docgen/CausewayModuleExtDocgen.java | 14 ++- .../domainobjects/CausewayEntityDiagramPage.java | 54 ++++++++++ .../domainobjects/DomainEntityDiagramPage.java | 54 ++++++++++ ...ramPage.java => EntityDiagramPageAbstract.java} | 17 +--- .../docgen/topics/domainobjects/ObjectGraph.java | 110 +++++++++++++++++---- 5 files changed, 215 insertions(+), 34 deletions(-) diff --cc extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/topics/domainobjects/CausewayEntityDiagramPage.java index 0000000000,0af2b1c501..73c6f9424d mode 000000,100644..100644 --- a/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/topics/domainobjects/CausewayEntityDiagramPage.java +++ b/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/topics/domainobjects/CausewayEntityDiagramPage.java @@@ -1,0 -1,54 +1,54 @@@ + /* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package org.apache.causeway.extensions.docgen.topics.domainobjects; + -import javax.inject.Inject; -import javax.inject.Named; ++import jakarta.inject.Inject; ++import jakarta.inject.Named; + + import org.springframework.stereotype.Component; + + import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry; + import org.apache.causeway.core.metamodel.spec.ObjectSpecification; + import org.apache.causeway.core.metamodel.specloader.SpecificationLoader; + import org.apache.causeway.extensions.docgen.CausewayModuleExtDocgen; + + import lombok.val; + + @Component + @Named(CausewayModuleExtDocgen.NAMESPACE + ".CausewayEntityDiagramPage") + public class CausewayEntityDiagramPage extends EntityDiagramPageAbstract { + + @Inject + public CausewayEntityDiagramPage(final SpecificationLoader specLoader, final CausewayBeanTypeRegistry beanTypeRegistry) { + super(specLoader, beanTypeRegistry); + } + + @Override + public String getTitle() { + return "Causeway Entity Diagram"; + } + + protected boolean accept(final ObjectSpecification objSpec) { + val ns = "" + objSpec.getLogicalType().getNamespace(); + return ns.equals("causeway") + || ns.startsWith("causeway."); + } + + } + diff --cc extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/topics/domainobjects/DomainEntityDiagramPage.java index 0000000000,5149656eb3..0db3b2626c mode 000000,100644..100644 --- a/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/topics/domainobjects/DomainEntityDiagramPage.java +++ b/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/topics/domainobjects/DomainEntityDiagramPage.java @@@ -1,0 -1,54 +1,54 @@@ + /* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package org.apache.causeway.extensions.docgen.topics.domainobjects; + -import javax.inject.Inject; -import javax.inject.Named; ++import jakarta.inject.Inject; ++import jakarta.inject.Named; + + import org.springframework.stereotype.Component; + + import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry; + import org.apache.causeway.core.metamodel.spec.ObjectSpecification; + import org.apache.causeway.core.metamodel.specloader.SpecificationLoader; + import org.apache.causeway.extensions.docgen.CausewayModuleExtDocgen; + + import lombok.val; + + @Component + @Named(CausewayModuleExtDocgen.NAMESPACE + ".DomainEntityDiagramPage") + public class DomainEntityDiagramPage extends EntityDiagramPageAbstract { + + @Inject + public DomainEntityDiagramPage(final SpecificationLoader specLoader, final CausewayBeanTypeRegistry beanTypeRegistry) { + super(specLoader, beanTypeRegistry); + } + + @Override + public String getTitle() { + return "Domain Entity Diagram"; + } + + protected boolean accept(final ObjectSpecification objSpec) { + val ns = "" + objSpec.getLogicalType().getNamespace(); + return !ns.equals("causeway") + && !ns.startsWith("causeway."); + } + + } + diff --cc extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/topics/domainobjects/EntityDiagramPageAbstract.java index 43a80480bb,38faf7748d..ab820e2ca1 --- a/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/topics/domainobjects/EntityDiagramPageAbstract.java +++ b/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/topics/domainobjects/EntityDiagramPageAbstract.java @@@ -21,8 -21,7 +21,7 @@@ package org.apache.causeway.extensions. import java.util.Optional; import java.util.stream.Stream; - import jakarta.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Named; import org.springframework.stereotype.Component;
