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 ce92acee37244a7bae5241386005fe529480284e Merge: 83cd370892 633b49f197 Author: andi-huber <[email protected]> AuthorDate: Tue Mar 12 08:49:14 2024 +0100 Merge remote-tracking branch 'origin/master' into spring6 .../applib/pages/index/annotation/Action.adoc | 13 +++++ .../applib/pages/index/annotation/Collection.adoc | 13 +++++ .../applib/pages/index/annotation/Parameter.adoc | 13 +++++ .../applib/pages/index/annotation/Property.adoc | 13 +++++ .../index/restfulobjects/client/RestfulClient.adoc | 4 +- .../apache/causeway/applib/annotation/Action.java | 12 +++++ .../causeway/applib/annotation/Collection.java | 13 +++++ .../causeway/applib/annotation/Parameter.java | 13 +++++ .../causeway/applib/annotation/Property.java | 12 +++++ core/adoc/modules/_overview/pages/about.adoc | 60 +++++++++++++++------- core/metamodel/src/main/java/module-info.java | 1 + .../action/ActionAnnotationFacetFactory.java | 12 +++++ .../ascii/AsciiFacetForActionAnnotation.java | 48 +++++++++++++++++ .../metamodel/facets/all/ascii/AsciiFacet.java | 29 +++++++++++ .../facets/all/ascii/AsciiFacetAbstract.java | 48 +++++++++++++++++ .../CollectionAnnotationFacetFactory.java | 12 +++++ .../ascii/AsciiFacetForCollectionAnnotation.java | 48 +++++++++++++++++ .../ascii/AsciiFacetForParameterAnnotation.java | 47 +++++++++++++++++ .../parameter/ParameterAnnotationFacetFactory.java | 13 +++++ .../ascii/AsciiFacetForPropertyAnnotation.java | 48 +++++++++++++++++ .../property/PropertyAnnotationFacetFactory.java | 13 +++++ serve-timeline.sh | 18 +++++-- viewers/graphql/adoc/modules/ROOT/pages/i18n.adoc | 31 +++++++++++ .../adoc/modules/ROOT/partials/module-nav.adoc | 1 + .../viewer/graphql/model/domain/TypeNames.java | 35 +++++++------ .../domain/common/query/CommonDomainObject.java | 2 +- ...monActionUtils.java => ObjectFeatureUtils.java} | 14 +++-- .../domain/common/query/meta/CommonMetaSaveAs.java | 4 +- .../rich/mutation/RichMutationForAction.java | 20 ++++---- .../rich/mutation/RichMutationForProperty.java | 12 ++--- .../model/domain/rich/query/RichAction.java | 20 ++++---- .../domain/rich/query/RichActionInvokeArgsArg.java | 11 ++-- .../domain/rich/query/RichActionParamsParam.java | 3 +- .../query/RichActionParamsParamAutoComplete.java | 5 +- .../rich/query/RichActionParamsParamChoices.java | 5 +- .../rich/query/RichActionParamsParamDefault.java | 3 +- .../rich/query/RichActionParamsParamDisabled.java | 3 +- .../rich/query/RichActionParamsParamHidden.java | 5 +- .../rich/query/RichActionParamsParamValidate.java | 3 +- .../domain/rich/query/RichActionValidity.java | 3 +- .../model/domain/rich/query/RichCollection.java | 3 +- .../model/domain/rich/query/RichProperty.java | 9 ++-- .../rich/query/RichPropertyGetBlobBytes.java | 3 +- .../rich/query/RichPropertyGetClobChars.java | 3 +- .../model/domain/rich/query/RichPropertySet.java | 19 +++---- .../domain/rich/query/RichPropertyValidate.java | 9 ++-- .../simple/mutation/SimpleMutationForAction.java | 22 ++++---- .../simple/mutation/SimpleMutationForProperty.java | 12 ++--- .../model/domain/simple/query/SimpleAction.java | 24 ++++----- .../domain/simple/query/SimpleCollection.java | 3 +- .../model/domain/simple/query/SimpleProperty.java | 3 +- .../simple/query/SimplePropertyLobBytes.java | 3 +- .../simple/query/SimplePropertyLobChars.java | 3 +- .../viewer/test/domain/i18n/I18nCalculator.java | 31 +++++++++++ .../I18nCalculator_IntegTest.each.concat._.gql | 11 ++++ ...nCalculator_IntegTest.each.concat.approved.json | 13 +++++ .../e2e/i18ncalc/I18nCalculator_IntegTest.java | 41 +++++++++++++++ viewers/graphql/test/src/test/resources/schema.gql | 55 ++++++++++++++++++++ 58 files changed, 808 insertions(+), 142 deletions(-) diff --cc core/metamodel/src/main/java/module-info.java index 3fb4380d35,f8b25dc9d0..84ec88a0d1 --- a/core/metamodel/src/main/java/module-info.java +++ b/core/metamodel/src/main/java/module-info.java @@@ -145,15 -145,16 +145,16 @@@ open module org.apache.causeway.core.me exports org.apache.causeway.core.metamodel.services.grid.spi; exports org.apache.causeway.core.metamodel.facets.object.layout; exports org.apache.causeway.core.metamodel.facets.all.hide; + exports org.apache.causeway.core.metamodel.facets.all.ascii; requires jakarta.activation; - requires java.annotation; + requires jakarta.annotation; requires java.desktop; requires java.sql; - requires java.validation; + requires jakarta.validation; requires java.xml; - requires java.xml.bind; - requires java.inject; + requires jakarta.xml.bind; + requires jakarta.inject; requires lombok; requires transitive org.apache.causeway.applib; requires transitive org.apache.causeway.commons; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java index de18c02b79,459a394ee6..fc5a3689bc --- 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,8 -24,8 +24,9 @@@ 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.ascii.AsciiFacetForParameterAnnotation; 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/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleCollection.java index bc9130613d,941e91aaa2..928d4861e8 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleCollection.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleCollection.java @@@ -25,9 -27,9 +25,10 @@@ import org.apache.causeway.core.metamod import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.domain.Element; import org.apache.causeway.viewer.graphql.model.domain.common.interactors.ObjectInteractor; + import org.apache.causeway.viewer.graphql.model.domain.common.query.ObjectFeatureUtils; import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; +import graphql.schema.DataFetchingEnvironment; import lombok.val; public class SimpleCollection diff --cc viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleProperty.java index 529b00a1e4,7661daec07..ba4a034a23 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleProperty.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleProperty.java @@@ -33,13 -39,9 +33,14 @@@ import org.apache.causeway.viewer.graph import org.apache.causeway.viewer.graphql.model.domain.TypeNames; import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor; import org.apache.causeway.viewer.graphql.model.domain.common.interactors.ObjectInteractor; + import org.apache.causeway.viewer.graphql.model.domain.common.query.ObjectFeatureUtils; import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; +import graphql.schema.DataFetchingEnvironment; +import graphql.schema.FieldCoordinates; +import graphql.schema.GraphQLFieldDefinition; +import graphql.schema.GraphQLObjectType; +import graphql.schema.GraphQLOutputType; import lombok.Getter; import lombok.val; diff --cc viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobBytes.java index ad72892081,a0cc7ec016..197f90da7c --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobBytes.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobBytes.java @@@ -21,9 -21,11 +21,10 @@@ package org.apache.causeway.viewer.grap import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor; + import org.apache.causeway.viewer.graphql.model.domain.common.query.ObjectFeatureUtils; import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; +import graphql.schema.DataFetchingEnvironment; import lombok.val; public class SimplePropertyLobBytes extends SimplePropertyLobAbstract { diff --cc viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobChars.java index 946aa25469,be7473b58f..f93698205d --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobChars.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobChars.java @@@ -21,9 -21,11 +21,10 @@@ package org.apache.causeway.viewer.grap import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor; + import org.apache.causeway.viewer.graphql.model.domain.common.query.ObjectFeatureUtils; import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; +import graphql.schema.DataFetchingEnvironment; import lombok.val; public class SimplePropertyLobChars extends SimplePropertyLobAbstract {
