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/03/08 14:59:42 UTC
(causeway) branch spring6 updated (36572ba283 -> 7517c7812a)
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 36572ba283 Merge remote-tracking branch 'origin/master' into spring6
add ca8a22c6ae CAUSEWAY-3676: cleaning up dependencies for graphql and common viewer, adds missing modules
add f72e063548 CAUSEWAY-3676: fixes integ tests bootstrapping
add b68a32413d Merge pull request #2257 from apache/CAUSEWAY-3676
add b3795574b1 CAUSEWAY-3692: renames to PrecedingParamsPolicy (enum x2, config prop and @Parameter attribute)
add 5516a551a8 CAUSEWAY-3692: adds mignotes
add d0f0a71410 CAUSEWAY-3692: recreate doc index
add 8a180699e4 CAUSEWAY-3692: test approvals
add aa4fd8c693 CAUSEWAY-3692: remove unused imports
add 5ccffc3e44 CAUSEWAY-3692: renaming facets related to PrecedingParametersPolicy
add 31fd370521 CAUSEWAY-3692: test approvals
add 82bb2c4593 CAUSEWAY-3692: site doc fixes
add 416573c4e6 Merge pull request #2258 from apache/CAUSEWAY-3692
new bc910c7d8b Merge remote-tracking branch 'origin/master' into spring6
new 7517c7812a CAUSEWAY-3692: test approvals
The 2 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:
.../applib/pages/index/annotation/Parameter.adoc | 12 +-
...aultsPolicy.adoc => PrecedingParamsPolicy.adoc} | 28 +-
.../index/services/registry/ServiceRegistry.adoc | 8 +-
.../simple}/CollectionContentsExporter.adoc | 11 +
.../index/metamodel/tabular/simple/DataTable.adoc | 62 +-
.../github/menu/LayoutLoadersGitHubMenu.adoc | 2 +-
.../CausewayViewerGraphqlIntegTestAbstract.adoc} | 49 +-
.../schema/PrintSchemaIntegTestAbstract.adoc | 35 +
.../applib-methods/partials/prefixes/default.adoc | 4 +-
.../pages/2024/{2.0.0-RC5 => 2.0.0}/mignotes.adoc | 20 +-
.../pages/2024/{2.0.0-RC5 => 2.0.0}/relnotes.adoc | 0
.../relnotes/modules/ROOT/pages/about.adoc | 8 +-
.../causeway/applib/annotation/Parameter.java | 11 +-
...aultsPolicy.java => PrecedingParamsPolicy.java} | 25 +-
core/adoc/modules/_overview/pages/about.adoc | 406 +++----
.../config/pages/sections/causeway.applib.adoc | 2 +-
.../core/config/CausewayConfiguration.java | 6 +-
.../metamodel/facets/ParameterConfigOptions.java | 20 +-
.../parameter/ParameterAnnotationFacetFactory.java | 6 +-
.../PrecedingParametersPolicyFacet.java} | 34 +-
.../PrecedingParametersPolicyFacetAbstract.java} | 14 +-
...olicyFacetForActionAnnotationAsConfigured.java} | 10 +-
...rametersPolicyFacetForParameterAnnotation.java} | 10 +-
...ingParametersPolicyFacetFromConfiguration.java} | 10 +-
.../spec/feature/ObjectActionParameter.java | 4 +-
.../causeway/core/metamodel/util/Facets.java | 10 +-
.../logonlog/WebModuleLogOnExceptionLogger.java | 12 +-
.../github/menu/LayoutLoadersGitHubMenu.java | 12 +-
.../applib/value/CalendarEventSemantics.java | 8 +-
...hPdfJsViewer_IntegTest.dump_facets.approved.xml | 30 +-
..._MixinDomain_IntegTest.dump_facets.approved.xml | 30 +-
...hPdfjsViewer_IntegTest.dump_facets.approved.xml | 30 +-
...r_PropDomain_IntegTest.dump_facets.approved.xml | 30 +-
.../MetaModelRegressionTest.verify.approved.xml | 1104 ++++++++++----------
.../applib/CausewayModuleViewerCommonsApplib.java | 5 +
.../commons/model/src/main/java/module-info.java | 2 +
.../model/CausewayModuleViewerCommonsModel.java | 16 +-
viewers/commons/services/pom.xml | 15 +-
.../services/src/main/java/module-info.java | 1 +
.../CausewayModuleViewerCommonsServices.java | 7 +-
viewers/graphql/test/pom.xml | 50 +-
.../viewer/test/e2e/Abstract_IntegTest.java | 4 +-
.../viewer/test/schema/PrintSchemaIntegTest.java | 7 +-
.../CausewayViewerGraphqlIntegTestAbstract.java | 5 -
.../graphql/viewer/src/main/java/module-info.java | 1 +
.../viewer/CausewayModuleViewerGraphqlViewer.java | 3 +
46 files changed, 1191 insertions(+), 988 deletions(-)
rename antora/components/refguide-index/modules/applib/pages/index/annotation/{DependentDefaultsPolicy.adoc => PrecedingParamsPolicy.adoc} (58%)
rename antora/components/refguide-index/modules/{viewer/pages/index/commons/applib/services/tabular => core/pages/index/metamodel/tabular/simple}/CollectionContentsExporter.adoc (87%)
copy antora/components/refguide-index/modules/viewer/pages/index/{restfulobjects/applib/util/JsonNodeUtils.adoc => graphql/viewer/testsupport/CausewayViewerGraphqlIntegTestAbstract.adoc} (50%)
create mode 100644 antora/components/refguide-index/modules/viewer/pages/index/graphql/viewer/testsupport/schema/PrintSchemaIntegTestAbstract.adoc
rename antora/components/relnotes/modules/ROOT/pages/2024/{2.0.0-RC5 => 2.0.0}/mignotes.adoc (88%)
rename antora/components/relnotes/modules/ROOT/pages/2024/{2.0.0-RC5 => 2.0.0}/relnotes.adoc (100%)
rename api/applib/src/main/java/org/apache/causeway/applib/annotation/{DependentDefaultsPolicy.java => PrecedingParamsPolicy.java} (61%)
rename core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/{depdef/ParameterDependentDefaultsFacet.java => precpol/PrecedingParametersPolicyFacet.java} (61%)
rename core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/{depdef/ParameterDependentDefaultsFacetAbstract.java => precpol/PrecedingParametersPolicyFacetAbstract.java} (76%)
rename core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/{depdef/ParameterDependentDefaultsActionFacetForActionAnnotationAsConfigured.java => precpol/PrecedingParametersPolicyFacetForActionAnnotationAsConfigured.java} (76%)
rename core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/{depdef/ParameterDependentDefaultsFacetForParameterAnnotation.java => precpol/PrecedingParametersPolicyFacetForParameterAnnotation.java} (79%)
rename core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/{depdef/ParameterDependentDefaultsFacetFromConfiguration.java => precpol/PrecedingParametersPolicyFacetFromConfiguration.java} (79%)
copy core/interaction/src/main/java/org/apache/causeway/core/interaction/CausewayModuleCoreInteraction.java => viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/CausewayModuleViewerCommonsModel.java (74%)
(causeway) 01/02: 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 bc910c7d8b3efa5b51eaf2208853a4e41b9a471b
Merge: 36572ba283 416573c4e6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Mar 8 15:51:52 2024 +0100
Merge remote-tracking branch 'origin/master' into spring6
.../applib/pages/index/annotation/Parameter.adoc | 12 +-
...aultsPolicy.adoc => PrecedingParamsPolicy.adoc} | 28 +-
.../index/services/registry/ServiceRegistry.adoc | 8 +-
.../simple}/CollectionContentsExporter.adoc | 11 +
.../index/metamodel/tabular/simple/DataTable.adoc | 62 +-
.../github/menu/LayoutLoadersGitHubMenu.adoc | 2 +-
.../CausewayViewerGraphqlIntegTestAbstract.adoc | 32 +
.../schema/PrintSchemaIntegTestAbstract.adoc | 35 +
.../applib-methods/partials/prefixes/default.adoc | 4 +-
.../pages/2024/{2.0.0-RC5 => 2.0.0}/mignotes.adoc | 20 +-
.../pages/2024/{2.0.0-RC5 => 2.0.0}/relnotes.adoc | 0
.../relnotes/modules/ROOT/pages/about.adoc | 8 +-
.../causeway/applib/annotation/Parameter.java | 11 +-
...aultsPolicy.java => PrecedingParamsPolicy.java} | 25 +-
core/adoc/modules/_overview/pages/about.adoc | 406 ++++----
.../config/pages/sections/causeway.applib.adoc | 2 +-
.../core/config/CausewayConfiguration.java | 6 +-
.../metamodel/facets/ParameterConfigOptions.java | 20 +-
.../parameter/ParameterAnnotationFacetFactory.java | 6 +-
.../PrecedingParametersPolicyFacet.java} | 34 +-
.../PrecedingParametersPolicyFacetAbstract.java} | 14 +-
...olicyFacetForActionAnnotationAsConfigured.java} | 10 +-
...rametersPolicyFacetForParameterAnnotation.java} | 10 +-
...ingParametersPolicyFacetFromConfiguration.java} | 10 +-
.../spec/feature/ObjectActionParameter.java | 4 +-
.../causeway/core/metamodel/util/Facets.java | 10 +-
.../logonlog/WebModuleLogOnExceptionLogger.java | 12 +-
.../github/menu/LayoutLoadersGitHubMenu.java | 12 +-
.../applib/value/CalendarEventSemantics.java | 8 +-
...hPdfJsViewer_IntegTest.dump_facets.approved.xml | 30 +-
..._MixinDomain_IntegTest.dump_facets.approved.xml | 30 +-
...hPdfjsViewer_IntegTest.dump_facets.approved.xml | 30 +-
...r_PropDomain_IntegTest.dump_facets.approved.xml | 30 +-
.../MetaModelRegressionTest.verify.approved.xml | 1074 ++++++++++----------
.../applib/CausewayModuleViewerCommonsApplib.java | 5 +
.../commons/model/src/main/java/module-info.java | 2 +
.../model/CausewayModuleViewerCommonsModel.java} | 16 +-
viewers/commons/services/pom.xml | 15 +-
.../services/src/main/java/module-info.java | 1 +
.../CausewayModuleViewerCommonsServices.java | 7 +-
viewers/graphql/test/pom.xml | 50 +-
.../viewer/test/e2e/Abstract_IntegTest.java | 4 +-
.../viewer/test/schema/PrintSchemaIntegTest.java | 7 +-
.../CausewayViewerGraphqlIntegTestAbstract.java | 5 -
.../graphql/viewer/src/main/java/module-info.java | 1 +
.../viewer/CausewayModuleViewerGraphqlViewer.java | 3 +
46 files changed, 1188 insertions(+), 944 deletions(-)
diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
index 08b400420c,27cc28acfe..f0bd415fb7
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
@@@ -24,9 -24,7 +24,8 @@@ import jakarta.validation.constraints.P
import org.apache.causeway.applib.annotation.Parameter;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessParameterContext;
import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
- import org.apache.causeway.core.metamodel.facets.param.parameter.depdef.ParameterDependentDefaultsFacet;
import org.apache.causeway.core.metamodel.facets.param.parameter.fileaccept.FileAcceptFacetForParameterAnnotation;
import org.apache.causeway.core.metamodel.facets.param.parameter.mandatory.MandatoryFacetForParameterAnnotation;
import org.apache.causeway.core.metamodel.facets.param.parameter.mandatory.MandatoryFacetInvertedByNullableAnnotationOnParameter;
diff --cc viewers/commons/services/pom.xml
index dc8ead658e,5a2b200eba..2e396c5dd9
--- a/viewers/commons/services/pom.xml
+++ b/viewers/commons/services/pom.xml
@@@ -41,18 -41,13 +41,13 @@@
<groupId>org.apache.causeway.viewer</groupId>
<artifactId>causeway-viewer-commons-model</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.causeway.core</groupId>
- <artifactId>causeway-core-runtime</artifactId>
- </dependency>
- <!-- for access to /WEB-INF/ where translation files may reside -->
+ <!-- for access to /WEB-INF/ where translation files may reside -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
-
+
<!-- TESTING -->
<dependency>
diff --cc viewers/commons/services/src/main/java/module-info.java
index 9e8df752b9,e1e1677bbe..0aff30f015
--- a/viewers/commons/services/src/main/java/module-info.java
+++ b/viewers/commons/services/src/main/java/module-info.java
@@@ -39,4 -34,6 +39,5 @@@ module org.apache.causeway.viewer.commo
requires org.apache.logging.log4j;
requires spring.beans;
requires spring.context;
- requires javax.servlet.api;
+ requires org.apache.causeway.viewer.commons.model;
}
diff --cc viewers/graphql/test/pom.xml
index 9c386e3184,579c3a2256..3338873d41
--- a/viewers/graphql/test/pom.xml
+++ b/viewers/graphql/test/pom.xml
@@@ -37,11 -37,32 +37,27 @@@
<git-plugin.propertiesDir>org/apache/causeway/viewer/graphql/test</git-plugin.propertiesDir>
<maven.install.skip>true</maven.install.skip>
<maven.deploy.skip>true</maven.deploy.skip>
-
- <!-- as a minimum requirement of
- org.springframework.graphql:spring-graphql-test:1.2.4 -->
- <maven.compiler.release>17</maven.compiler.release>
-
- <datasource-proxy-spring-boot-starter.version>1.8.1</datasource-proxy-spring-boot-starter.version>
+
+ <datasource-proxy-spring-boot-starter.version>1.9.1</datasource-proxy-spring-boot-starter.version>
<sql-formatter.version>2.0.4</sql-formatter.version>
-
</properties>
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>com.github.gavlyukovskiy</groupId>
+ <artifactId>datasource-proxy-spring-boot-starter</artifactId>
+ <version>${datasource-proxy-spring-boot-starter.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.vertical-blank</groupId>
+ <artifactId>sql-formatter</artifactId>
+ <version>${sql-formatter.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<testResources>
<testResource>
(causeway) 02/02: CAUSEWAY-3692: test approvals
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 7517c7812ac0dc5b40a107a077b49e038f5c57c5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Mar 8 15:55:26 2024 +0100
CAUSEWAY-3692: test approvals
---
.../MetaModelRegressionTest.verify.approved.xml | 30 +++++++++++-----------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/regressiontests/domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.verify.approved.xml b/regressiontests/domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.verify.approved.xml
index 79d685691b..35637469e4 100644
--- a/regressiontests/domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.verify.approved.xml
+++ b/regressiontests/domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.verify.approved.xml
@@ -36545,10 +36545,10 @@
<mml:attr name="methods" value="public java.lang.String org.apache.causeway.applib.services.columnorder.Object_downloadColumnOrderTxtFilesAsZip.default0Act()"/>
<mml:attr name="precedence" value="DEFAULT"/>
</mml:facet>
- <mml:facet id="org.apache.causeway.core.metamodel.facets.param.parameter.depdef.ParameterDependentDefaultsFacet" fqcn="org.apache.causeway.core.metamodel.facets.param.parameter.depdef.ParameterDependentDefaultsFacetFromConfiguration">
-<mml:attr name="facet" value="ParameterDependentDefaultsFacetFromConfiguration"/>
+ <mml:facet id="org.apache.causeway.core.metamodel.facets.param.parameter.precpol.PrecedingParametersPolicyFacet" fqcn="org.apache.causeway.core.metamodel.facets.param.parameter.precpol.PrecedingParametersPolicyFacetFromConfiguration">
+<mml:attr name="facet" value="PrecedingParametersPolicyFacetFromConfiguration"/>
<mml:attr name="precedence" value="DEFAULT"/>
-<mml:attr name="value" value="UPDATE_DEPENDENT"/>
+<mml:attr name="value" value="RESET"/>
</mml:facet>
</mml:facets>
<mml:type>java.lang.String</mml:type>
@@ -36690,10 +36690,10 @@
<mml:attr name="methods" value="public java.lang.String org.apache.causeway.applib.mixins.layout.Object_downloadLayout.default0Act()"/>
<mml:attr name="precedence" value="DEFAULT"/>
</mml:facet>
- <mml:facet id="org.apache.causeway.core.metamodel.facets.param.parameter.depdef.ParameterDependentDefaultsFacet" fqcn="org.apache.causeway.core.metamodel.facets.param.parameter.depdef.ParameterDependentDefaultsFacetFromConfiguration">
-<mml:attr name="facet" value="ParameterDependentDefaultsFacetFromConfiguration"/>
+ <mml:facet id="org.apache.causeway.core.metamodel.facets.param.parameter.precpol.PrecedingParametersPolicyFacet" fqcn="org.apache.causeway.core.metamodel.facets.param.parameter.precpol.PrecedingParametersPolicyFacetFromConfiguration">
+<mml:attr name="facet" value="PrecedingParametersPolicyFacetFromConfiguration"/>
<mml:attr name="precedence" value="DEFAULT"/>
-<mml:attr name="value" value="UPDATE_DEPENDENT"/>
+<mml:attr name="value" value="RESET"/>
</mml:facet>
</mml:facets>
<mml:type>java.lang.String</mml:type>
@@ -36718,10 +36718,10 @@
<mml:attr name="methods" value="public org.apache.causeway.applib.services.layout.LayoutExportStyle org.apache.causeway.applib.mixins.layout.Object_downloadLayout.default1Act()"/>
<mml:attr name="precedence" value="DEFAULT"/>
</mml:facet>
- <mml:facet id="org.apache.causeway.core.metamodel.facets.param.parameter.depdef.ParameterDependentDefaultsFacet" fqcn="org.apache.causeway.core.metamodel.facets.param.parameter.depdef.ParameterDependentDefaultsFacetFromConfiguration">
-<mml:attr name="facet" value="ParameterDependentDefaultsFacetFromConfiguration"/>
+ <mml:facet id="org.apache.causeway.core.metamodel.facets.param.parameter.precpol.PrecedingParametersPolicyFacet" fqcn="org.apache.causeway.core.metamodel.facets.param.parameter.precpol.PrecedingParametersPolicyFacetFromConfiguration">
+<mml:attr name="facet" value="PrecedingParametersPolicyFacetFromConfiguration"/>
<mml:attr name="precedence" value="DEFAULT"/>
-<mml:attr name="value" value="UPDATE_DEPENDENT"/>
+<mml:attr name="value" value="RESET"/>
</mml:facet>
</mml:facets>
<mml:type>org.apache.causeway.applib.services.layout.LayoutExportStyle</mml:type>
@@ -36753,10 +36753,10 @@
<mml:attr name="methods" value="public org.apache.causeway.applib.value.NamedWithMimeType$CommonMimeType org.apache.causeway.applib.mixins.layout.Object_downloadLayout.default2Act()"/>
<mml:attr name="precedence" value="DEFAULT"/>
</mml:facet>
- <mml:facet id="org.apache.causeway.core.metamodel.facets.param.parameter.depdef.ParameterDependentDefaultsFacet" fqcn="org.apache.causeway.core.metamodel.facets.param.parameter.depdef.ParameterDependentDefaultsFacetFromConfiguration">
-<mml:attr name="facet" value="ParameterDependentDefaultsFacetFromConfiguration"/>
+ <mml:facet id="org.apache.causeway.core.metamodel.facets.param.parameter.precpol.PrecedingParametersPolicyFacet" fqcn="org.apache.causeway.core.metamodel.facets.param.parameter.precpol.PrecedingParametersPolicyFacetFromConfiguration">
+<mml:attr name="facet" value="PrecedingParametersPolicyFacetFromConfiguration"/>
<mml:attr name="precedence" value="DEFAULT"/>
-<mml:attr name="value" value="UPDATE_DEPENDENT"/>
+<mml:attr name="value" value="RESET"/>
</mml:facet>
</mml:facets>
<mml:type>org.apache.causeway.applib.value.NamedWithMimeType$CommonMimeType</mml:type>
@@ -36898,10 +36898,10 @@
<mml:attr name="methods" value="public java.lang.String org.apache.causeway.applib.mixins.metamodel.Object_downloadMetamodelXml.default0Act()"/>
<mml:attr name="precedence" value="DEFAULT"/>
</mml:facet>
- <mml:facet id="org.apache.causeway.core.metamodel.facets.param.parameter.depdef.ParameterDependentDefaultsFacet" fqcn="org.apache.causeway.core.metamodel.facets.param.parameter.depdef.ParameterDependentDefaultsFacetFromConfiguration">
-<mml:attr name="facet" value="ParameterDependentDefaultsFacetFromConfiguration"/>
+ <mml:facet id="org.apache.causeway.core.metamodel.facets.param.parameter.precpol.PrecedingParametersPolicyFacet" fqcn="org.apache.causeway.core.metamodel.facets.param.parameter.precpol.PrecedingParametersPolicyFacetFromConfiguration">
+<mml:attr name="facet" value="PrecedingParametersPolicyFacetFromConfiguration"/>
<mml:attr name="precedence" value="DEFAULT"/>
-<mml:attr name="value" value="UPDATE_DEPENDENT"/>
+<mml:attr name="value" value="RESET"/>
</mml:facet>
</mml:facets>
<mml:type>java.lang.String</mml:type>