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 699d0992c9f864024bc9f2d3d6342aa02ddaa8c9 Merge: efd32c874d a311294f24 Author: Andi Huber <[email protected]> AuthorDate: Wed Mar 13 06:05:17 2024 +0100 Merge remote-tracking branch 'origin/master' into spring6 api/applib/src/main/java/module-info.java | 1 + .../apache/causeway/applib/annotation/Action.java | 13 ------ .../causeway/applib/annotation/Collection.java | 13 ------ .../causeway/applib/annotation/Parameter.java | 13 ------ .../causeway/applib/annotation/Property.java | 13 ------ .../services/ascii/AsciiIdentifierService.java | 20 +++++++++ core/metamodel/src/main/java/module-info.java | 1 - .../metamodel/context/HasMetaModelContext.java | 6 +++ .../action/ActionAnnotationFacetFactory.java | 12 ------ .../ascii/AsciiFacetForActionAnnotation.java | 48 ---------------------- .../metamodel/facets/all/ascii/AsciiFacet.java | 29 ------------- .../facets/all/ascii/AsciiFacetAbstract.java | 48 ---------------------- .../CollectionAnnotationFacetFactory.java | 11 ----- .../ascii/AsciiFacetForCollectionAnnotation.java | 48 ---------------------- .../ascii/AsciiFacetForParameterAnnotation.java | 47 --------------------- .../parameter/ParameterAnnotationFacetFactory.java | 13 ------ .../ascii/AsciiFacetForPropertyAnnotation.java | 48 ---------------------- .../property/PropertyAnnotationFacetFactory.java | 12 ------ .../core/metamodel/spec/feature/ObjectFeature.java | 1 + .../specloader/specimpl/ObjectActionDefault.java | 5 +++ .../specimpl/ObjectActionParameterAbstract.java | 7 ++++ .../specloader/specimpl/ObjectMemberAbstract.java | 5 +++ .../logonlog/CausewayLogOnExceptionFilter.java | 29 ++++++++++++- viewers/graphql/adoc/modules/ROOT/pages/i18n.adoc | 27 +++++++++--- .../viewer/graphql/model/context/Context.java | 1 - .../viewer/graphql/model/domain/TypeNames.java | 26 +++++------- .../domain/common/query/ObjectFeatureUtils.java | 9 +--- .../rich/mutation/RichMutationForAction.java | 11 ++--- .../rich/mutation/RichMutationForProperty.java | 6 +-- .../model/domain/rich/query/RichAction.java | 8 ++-- .../domain/rich/query/RichActionInvokeArgsArg.java | 3 +- .../domain/rich/query/RichActionParamsParam.java | 3 +- .../query/RichActionParamsParamAutoComplete.java | 7 ++-- .../rich/query/RichActionParamsParamChoices.java | 7 ++-- .../rich/query/RichActionParamsParamDefault.java | 5 ++- .../rich/query/RichActionParamsParamDisabled.java | 5 ++- .../rich/query/RichActionParamsParamHidden.java | 7 ++-- .../rich/query/RichActionParamsParamValidate.java | 5 ++- .../domain/rich/query/RichActionValidity.java | 3 +- .../model/domain/rich/query/RichCollection.java | 3 +- .../model/domain/rich/query/RichProperty.java | 5 +-- .../rich/query/RichPropertyGetBlobBytes.java | 9 ++-- .../rich/query/RichPropertyGetClobChars.java | 9 ++-- .../model/domain/rich/query/RichPropertySet.java | 3 +- .../domain/rich/query/RichPropertyValidate.java | 3 +- .../simple/mutation/SimpleMutationForAction.java | 11 ++--- .../simple/mutation/SimpleMutationForProperty.java | 6 +-- .../model/domain/simple/query/SimpleAction.java | 13 +++--- .../domain/simple/query/SimpleCollection.java | 3 +- .../model/domain/simple/query/SimpleProperty.java | 3 +- .../simple/query/SimplePropertyLobBytes.java | 12 ++++-- .../simple/query/SimplePropertyLobChars.java | 12 ++++-- ...iiIdentifierServiceSupportingGraphqlViewer.java | 13 ++++++ .../viewer/test/domain/i18n/I18nCalculator.java | 9 ++-- ...sewayViewerRestfulObjectsIntegTestAbstract.java | 4 ++ ....collection_with_no_staff_members.approved.json | 25 +++++++++++ ...est.collection_with_staff_members.approved.json | 37 +++++++++++++++++ .../dept/Department_IntegTest.exists.approved.json | 30 +++++++------- .../test/scenarios/dept/Department_IntegTest.java | 48 ++++++++++++++++++++++ .../viewer/resources/ResourceAbstract.java | 9 ++-- 60 files changed, 336 insertions(+), 507 deletions(-) diff --cc core/metamodel/src/main/java/module-info.java index 84ec88a0d1,e3f8907630..3fb4380d35 --- a/core/metamodel/src/main/java/module-info.java +++ b/core/metamodel/src/main/java/module-info.java @@@ -145,16 -145,15 +145,15 @@@ 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 viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimpleCollection.java index 928d4861e8,87053a7f35..07ea1d2063 --- 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,10 -27,8 +25,9 @@@ 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 ba4a034a23,edf7694837..9afc679d48 --- 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,14 -39,8 +33,13 @@@ 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/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java index 4398442766,a3b4e10112..d58c1a1e5b --- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java +++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java @@@ -22,18 -22,15 +22,15 @@@ import java.io.InputStream import java.util.Map; import java.util.function.UnaryOperator; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.Providers; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Request; +import jakarta.ws.rs.core.SecurityContext; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.Providers; - import org.apache.causeway.commons.internal.functions._Predicates; - import org.apache.causeway.core.metamodel.object.ManagedObjects; - import org.springframework.beans.factory.annotation.Autowired; import org.apache.causeway.applib.annotation.Where;
