This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch CAUSEWAY-3676 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit c6742efaf0888cee9207e95034b9584f8f79f869 Author: danhaywood <[email protected]> AuthorDate: Fri Feb 23 09:43:34 2024 +0000 CAUSEWAY-3676: renames holder -> interactor --- .../graphql/model/src/main/java/module-info.java | 1 + .../common/interactors/ActionParamInteractor.java | 2 +- .../domain/common/interactors/GqlvMetaHolder.java | 28 ---------------------- .../domain/common/query/GqlvDomainObject.java | 3 +-- .../model/domain/common/query/GqlvMeta.java | 20 ++++++++++++---- .../common/query/{ => meta}/GqlvMetaCssClass.java | 3 +-- .../common/query/{ => meta}/GqlvMetaFetcher.java | 2 +- .../common/query/{ => meta}/GqlvMetaGrid.java | 3 +-- .../common/query/{ => meta}/GqlvMetaIcon.java | 3 +-- .../domain/common/query/{ => meta}/GqlvMetaId.java | 3 +-- .../common/query/{ => meta}/GqlvMetaLayout.java | 3 +-- .../query/{ => meta}/GqlvMetaLogicalTypeName.java | 3 +-- .../common/query/{ => meta}/GqlvMetaSaveAs.java | 3 +-- .../common/query/{ => meta}/GqlvMetaTitle.java | 3 +-- .../common/query/{ => meta}/GqlvMetaVersion.java | 3 +-- .../model/domain/rich/query/GqlvAction.java | 8 +++---- .../model/domain/rich/query/GqlvActionInvoke.java | 15 +++++------- .../domain/rich/query/GqlvActionInvokeArgs.java | 12 +++++----- .../domain/rich/query/GqlvActionInvokeArgsArg.java | 10 ++++---- .../domain/rich/query/GqlvActionInvokeResult.java | 16 ++++++------- .../model/domain/rich/query/GqlvActionParams.java | 12 +++++----- .../domain/rich/query/GqlvActionParamsParam.java | 14 +++++------ .../query/GqlvActionParamsParamAutoComplete.java | 18 +++++++------- .../rich/query/GqlvActionParamsParamChoices.java | 18 +++++++------- .../rich/query/GqlvActionParamsParamDatatype.java | 10 ++++---- .../rich/query/GqlvActionParamsParamDefault.java | 19 ++++++++------- .../rich/query/GqlvActionParamsParamDisabled.java | 14 +++++------ .../rich/query/GqlvActionParamsParamHidden.java | 14 +++++------ .../rich/query/GqlvActionParamsParamValidate.java | 14 +++++------ .../domain/rich/query/GqlvActionValidity.java | 12 +++++----- .../domain/rich/query/GqlvAssociationDatatype.java | 10 ++++---- .../domain/rich/query/GqlvAssociationGet.java | 10 ++++---- .../model/domain/rich/query/GqlvCollection.java | 8 +++---- .../domain/rich/query/GqlvCollectionDatatype.java | 4 ++-- .../model/domain/rich/query/GqlvCollectionGet.java | 4 ++-- .../model/domain/rich/query/GqlvMember.java | 6 ++--- .../domain/rich/query/GqlvMemberDisabled.java | 8 +++---- .../model/domain/rich/query/GqlvMemberHidden.java | 8 +++---- .../model/domain/rich/query/GqlvProperty.java | 4 ++-- .../rich/query/GqlvPropertyAutoComplete.java | 10 ++++---- .../domain/rich/query/GqlvPropertyChoices.java | 12 +++++----- .../domain/rich/query/GqlvPropertyDatatype.java | 4 ++-- .../model/domain/rich/query/GqlvPropertyGet.java | 4 ++-- .../domain/rich/query/GqlvPropertyGetBlob.java | 15 ++++++------ .../rich/query/GqlvPropertyGetBlobAbstract.java | 8 +++---- .../rich/query/GqlvPropertyGetBlobBytes.java | 6 ++--- .../rich/query/GqlvPropertyGetBlobMimeType.java | 4 ++-- .../domain/rich/query/GqlvPropertyGetBlobName.java | 4 ++-- .../domain/rich/query/GqlvPropertyGetClob.java | 14 +++++------ .../rich/query/GqlvPropertyGetClobAbstract.java | 4 ++-- .../rich/query/GqlvPropertyGetClobChars.java | 4 ++-- .../rich/query/GqlvPropertyGetClobMimeType.java | 4 ++-- .../domain/rich/query/GqlvPropertyGetClobName.java | 4 ++-- .../model/domain/rich/query/GqlvPropertySet.java | 12 +++++----- .../domain/rich/query/GqlvPropertyValidate.java | 6 ++--- .../domain/simple/query/GqlvActionParamsParam.java | 14 +++++------ 56 files changed, 226 insertions(+), 254 deletions(-) diff --git a/viewers/graphql/model/src/main/java/module-info.java b/viewers/graphql/model/src/main/java/module-info.java index 6931ce647b..4bdd45dfb7 100644 --- a/viewers/graphql/model/src/main/java/module-info.java +++ b/viewers/graphql/model/src/main/java/module-info.java @@ -5,6 +5,7 @@ module org.apache.causeway.incubator.viewer.graphql.model { exports org.apache.causeway.viewer.graphql.model.domain.common; exports org.apache.causeway.viewer.graphql.model.domain.common.interactors; exports org.apache.causeway.viewer.graphql.model.domain.common.query; + exports org.apache.causeway.viewer.graphql.model.domain.common.query.meta; exports org.apache.causeway.viewer.graphql.model.domain.rich; exports org.apache.causeway.viewer.graphql.model.domain.rich.query; exports org.apache.causeway.viewer.graphql.model.domain.rich.mutation; diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/ActionParamInteractor.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/ActionParamInteractor.java index cb3239674c..4f200dac9b 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/ActionParamInteractor.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/ActionParamInteractor.java @@ -28,7 +28,7 @@ public interface ActionParamInteractor extends ActionInteractor, ObjectActionParameterProvider{ - ActionInteractor getHolder(); + ActionInteractor getActionInteractor(); void addGqlArgument( ObjectAction objectAction, diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/GqlvMetaHolder.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/GqlvMetaHolder.java deleted file mode 100644 index 47c2eac319..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/interactors/GqlvMetaHolder.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.viewer.graphql.model.domain.common.interactors; - -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; - -public interface GqlvMetaHolder - extends ObjectSpecificationProvider, - SchemaTypeProvider { - -} diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvDomainObject.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvDomainObject.java index f8d4cc02d9..c97f50a353 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvDomainObject.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvDomainObject.java @@ -40,7 +40,6 @@ import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstractCustom; import org.apache.causeway.viewer.graphql.model.domain.SchemaType; import org.apache.causeway.viewer.graphql.model.domain.TypeNames; import org.apache.causeway.viewer.graphql.model.domain.common.SchemaStrategy; -import org.apache.causeway.viewer.graphql.model.domain.common.interactors.GqlvMetaHolder; import org.apache.causeway.viewer.graphql.model.domain.common.interactors.ObjectInteractor; import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; @@ -53,7 +52,7 @@ import lombok.val; */ public class GqlvDomainObject extends GqlvAbstractCustom - implements GqlvMetaHolder, ObjectInteractor, ObjectSpecificationProvider, SchemaTypeProvider { + implements ObjectInteractor, ObjectSpecificationProvider, SchemaTypeProvider { private final SchemaStrategy schemaStrategy; @Getter private final ObjectSpecification objectSpecification; diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMeta.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMeta.java index 96c04a7155..8c32e71e7b 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMeta.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMeta.java @@ -25,13 +25,23 @@ import org.apache.causeway.core.config.CausewayConfiguration; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstractCustom; import org.apache.causeway.viewer.graphql.model.domain.TypeNames; -import org.apache.causeway.viewer.graphql.model.domain.common.interactors.GqlvMetaHolder; +import org.apache.causeway.viewer.graphql.model.domain.common.interactors.ObjectInteractor; +import org.apache.causeway.viewer.graphql.model.domain.common.query.meta.GqlvMetaCssClass; +import org.apache.causeway.viewer.graphql.model.domain.common.query.meta.GqlvMetaFetcher; +import org.apache.causeway.viewer.graphql.model.domain.common.query.meta.GqlvMetaGrid; +import org.apache.causeway.viewer.graphql.model.domain.common.query.meta.GqlvMetaIcon; +import org.apache.causeway.viewer.graphql.model.domain.common.query.meta.GqlvMetaId; +import org.apache.causeway.viewer.graphql.model.domain.common.query.meta.GqlvMetaLayout; +import org.apache.causeway.viewer.graphql.model.domain.common.query.meta.GqlvMetaLogicalTypeName; +import org.apache.causeway.viewer.graphql.model.domain.common.query.meta.GqlvMetaSaveAs; +import org.apache.causeway.viewer.graphql.model.domain.common.query.meta.GqlvMetaTitle; +import org.apache.causeway.viewer.graphql.model.domain.common.query.meta.GqlvMetaVersion; import lombok.val; public class GqlvMeta extends GqlvAbstractCustom { - private final GqlvMetaHolder holder; + private final ObjectInteractor holder; private final GqlvMetaId metaId; private final GqlvMetaLogicalTypeName metaLogicalTypeName; private final GqlvMetaVersion metaVersion; @@ -45,11 +55,11 @@ public class GqlvMeta extends GqlvAbstractCustom { private final CausewayConfiguration.Viewer.Graphql graphqlConfiguration; public GqlvMeta( - final GqlvMetaHolder holder, + final ObjectInteractor objectInteractor, final Context context ) { - super(TypeNames.metaTypeNameFor(holder.getObjectSpecification(), holder.getSchemaType()), context); - this.holder = holder; + super(TypeNames.metaTypeNameFor(objectInteractor.getObjectSpecification(), objectInteractor.getSchemaType()), context); + this.holder = objectInteractor; this.graphqlConfiguration = context.causewayConfiguration.getViewer().getGraphql(); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaCssClass.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaCssClass.java similarity index 94% rename from viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaCssClass.java rename to viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaCssClass.java index bbca91cbcc..6824bc9b4f 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaCssClass.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaCssClass.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.causeway.viewer.graphql.model.domain.common.query; +package org.apache.causeway.viewer.graphql.model.domain.common.query.meta; import graphql.Scalars; import graphql.schema.DataFetchingEnvironment; @@ -25,7 +25,6 @@ import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract; -import org.apache.causeway.viewer.graphql.model.domain.common.query.GqlvMetaFetcher; public class GqlvMetaCssClass extends GqlvAbstract { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaFetcher.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaFetcher.java similarity index 99% rename from viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaFetcher.java rename to viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaFetcher.java index 7ed3fd3766..b4f28bd574 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaFetcher.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaFetcher.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.causeway.viewer.graphql.model.domain.common.query; +package org.apache.causeway.viewer.graphql.model.domain.common.query.meta; import lombok.val; diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaGrid.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaGrid.java similarity index 94% rename from viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaGrid.java rename to viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaGrid.java index bf6bcf054b..a8fc179eb0 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaGrid.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaGrid.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.causeway.viewer.graphql.model.domain.common.query; +package org.apache.causeway.viewer.graphql.model.domain.common.query.meta; import graphql.Scalars; import graphql.schema.DataFetchingEnvironment; @@ -25,7 +25,6 @@ import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract; -import org.apache.causeway.viewer.graphql.model.domain.common.query.GqlvMetaFetcher; public class GqlvMetaGrid extends GqlvAbstract { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaIcon.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaIcon.java similarity index 94% rename from viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaIcon.java rename to viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaIcon.java index dd00666788..963ac5691e 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaIcon.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaIcon.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.causeway.viewer.graphql.model.domain.common.query; +package org.apache.causeway.viewer.graphql.model.domain.common.query.meta; import graphql.Scalars; import graphql.schema.DataFetchingEnvironment; @@ -25,7 +25,6 @@ import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract; -import org.apache.causeway.viewer.graphql.model.domain.common.query.GqlvMetaFetcher; public class GqlvMetaIcon extends GqlvAbstract { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaId.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaId.java similarity index 94% rename from viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaId.java rename to viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaId.java index af2a676dec..93ad0449ae 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaId.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaId.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.causeway.viewer.graphql.model.domain.common.query; +package org.apache.causeway.viewer.graphql.model.domain.common.query.meta; import graphql.Scalars; import graphql.schema.DataFetchingEnvironment; @@ -26,7 +26,6 @@ import static graphql.schema.GraphQLNonNull.nonNull; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract; -import org.apache.causeway.viewer.graphql.model.domain.common.query.GqlvMetaFetcher; public class GqlvMetaId extends GqlvAbstract { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaLayout.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaLayout.java similarity index 94% rename from viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaLayout.java rename to viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaLayout.java index 681e2c9b43..eb22e0ac5b 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaLayout.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaLayout.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.causeway.viewer.graphql.model.domain.common.query; +package org.apache.causeway.viewer.graphql.model.domain.common.query.meta; import graphql.Scalars; import graphql.schema.DataFetchingEnvironment; @@ -25,7 +25,6 @@ import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract; -import org.apache.causeway.viewer.graphql.model.domain.common.query.GqlvMetaFetcher; public class GqlvMetaLayout extends GqlvAbstract { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaLogicalTypeName.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaLogicalTypeName.java similarity index 94% rename from viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaLogicalTypeName.java rename to viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaLogicalTypeName.java index 38a1b8cdbe..bbdcec1a74 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaLogicalTypeName.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaLogicalTypeName.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.causeway.viewer.graphql.model.domain.common.query; +package org.apache.causeway.viewer.graphql.model.domain.common.query.meta; import graphql.Scalars; import graphql.schema.DataFetchingEnvironment; @@ -26,7 +26,6 @@ import static graphql.schema.GraphQLNonNull.nonNull; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract; -import org.apache.causeway.viewer.graphql.model.domain.common.query.GqlvMetaFetcher; public class GqlvMetaLogicalTypeName extends GqlvAbstract { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaSaveAs.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaSaveAs.java similarity index 96% rename from viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaSaveAs.java rename to viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaSaveAs.java index 662fe82b00..ca698115d9 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaSaveAs.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaSaveAs.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.causeway.viewer.graphql.model.domain.common.query; +package org.apache.causeway.viewer.graphql.model.domain.common.query.meta; import graphql.GraphQLContext; import graphql.Scalars; @@ -27,7 +27,6 @@ import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract; -import org.apache.causeway.viewer.graphql.model.domain.common.query.GqlvMetaFetcher; import org.apache.causeway.viewer.graphql.model.domain.common.query.GvqlActionUtils; import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaTitle.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaTitle.java similarity index 94% rename from viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaTitle.java rename to viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaTitle.java index 3186c5c753..136e970380 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaTitle.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaTitle.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.causeway.viewer.graphql.model.domain.common.query; +package org.apache.causeway.viewer.graphql.model.domain.common.query.meta; import graphql.Scalars; import graphql.schema.DataFetchingEnvironment; @@ -26,7 +26,6 @@ import static graphql.schema.GraphQLNonNull.nonNull; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract; -import org.apache.causeway.viewer.graphql.model.domain.common.query.GqlvMetaFetcher; public class GqlvMetaTitle extends GqlvAbstract { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaVersion.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaVersion.java similarity index 94% rename from viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaVersion.java rename to viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaVersion.java index fb55642e9a..de5034fd25 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/GqlvMetaVersion.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/GqlvMetaVersion.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.causeway.viewer.graphql.model.domain.common.query; +package org.apache.causeway.viewer.graphql.model.domain.common.query.meta; import graphql.Scalars; import graphql.schema.DataFetchingEnvironment; @@ -25,7 +25,6 @@ import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract; -import org.apache.causeway.viewer.graphql.model.domain.common.query.GqlvMetaFetcher; public class GqlvMetaVersion extends GqlvAbstract { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAction.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAction.java index 2960ba2bf1..5f990c831c 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAction.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAction.java @@ -68,10 +68,10 @@ public class GqlvAction private final GqlvActionParams params; public GqlvAction( - final ObjectInteractor holder, + final ObjectInteractor objectInteractor, final ObjectAction objectAction, final Context context) { - super(holder, objectAction, TypeNames.actionTypeNameFor(holder.getObjectSpecification(), objectAction, holder.getSchemaType()), context); + super(objectInteractor, objectAction, TypeNames.actionTypeNameFor(objectInteractor.getObjectSpecification(), objectAction, objectInteractor.getSchemaType()), context); if(isBuilt()) { this.hidden = null; @@ -295,7 +295,7 @@ public class GqlvAction @Override public ObjectSpecification getObjectSpecification() { - return holder.getObjectSpecification(); + return interactor.getObjectSpecification(); } @Override @@ -316,7 +316,7 @@ public class GqlvAction @Override public SchemaType getSchemaType() { - return holder.getSchemaType(); + return interactor.getSchemaType(); } } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvoke.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvoke.java index e6f4fb92f5..ab009ca238 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvoke.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvoke.java @@ -37,16 +37,13 @@ import lombok.extern.log4j.Log4j2; public class GqlvActionInvoke extends GqlvAbstractCustom { - private final ActionInteractor holder; private final GqlvActionInvokeResult result; private final GqlvActionInvokeArgs args; public GqlvActionInvoke( - final ActionInteractor holder, + final ActionInteractor actionInteractor, final Context context) { - super(TypeNames.actionInvokeTypeNameFor(holder.getObjectSpecification(), holder.getObjectMember(), holder.getSchemaType()), context); - - this.holder = holder; + super(TypeNames.actionInvokeTypeNameFor(actionInteractor.getObjectSpecification(), actionInteractor.getObjectMember(), actionInteractor.getSchemaType()), context); if(isBuilt()) { this.result = null; @@ -54,15 +51,15 @@ public class GqlvActionInvoke return; } - addChildFieldFor(this.result = new GqlvActionInvokeResult(holder, context)); - addChildFieldFor(this.args = new GqlvActionInvokeArgs(holder, context)); + addChildFieldFor(this.result = new GqlvActionInvokeResult(actionInteractor, context)); + addChildFieldFor(this.args = new GqlvActionInvokeArgs(actionInteractor, context)); val gqlObjectType = buildObjectType(); - val objectAction = holder.getObjectMember(); + val objectAction = actionInteractor.getObjectMember(); val fieldBuilder = newFieldDefinition() .name(fieldNameForSemanticsOf(objectAction)) .type(gqlObjectType); - holder.addGqlArguments(objectAction, fieldBuilder, TypeMapper.InputContext.INVOKE, objectAction.getParameterCount()); + actionInteractor.addGqlArguments(objectAction, fieldBuilder, TypeMapper.InputContext.INVOKE, objectAction.getParameterCount()); setField(fieldBuilder.build()); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeArgs.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeArgs.java index 8c7f4e8663..8e7ac9b664 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeArgs.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeArgs.java @@ -38,15 +38,15 @@ import lombok.extern.log4j.Log4j2; public class GqlvActionInvokeArgs extends GqlvAbstractCustom { - @Getter private final ActionInteractor holder; + @Getter private final ActionInteractor actionInteractor; private final List<GqlvActionInvokeArgsArg> args = new ArrayList<>(); public GqlvActionInvokeArgs( - final ActionInteractor holder, + final ActionInteractor actionInteractor, final Context context) { - super(TypeNames.actionArgsTypeNameFor(holder.getObjectSpecification(), holder.getObjectMember(), holder.getSchemaType()), context); - this.holder = holder; + super(TypeNames.actionArgsTypeNameFor(actionInteractor.getObjectSpecification(), actionInteractor.getObjectMember(), actionInteractor.getSchemaType()), context); + this.actionInteractor = actionInteractor; if (isBuilt()) { // nothing else to be done @@ -54,8 +54,8 @@ public class GqlvActionInvokeArgs } val idx = new AtomicInteger(0); - holder.getObjectMember().getParameters().forEach(objectActionParameter -> { - args.add(addChildFieldFor(new GqlvActionInvokeArgsArg(holder, objectActionParameter, this.context, idx.getAndIncrement()))); + actionInteractor.getObjectMember().getParameters().forEach(objectActionParameter -> { + args.add(addChildFieldFor(new GqlvActionInvokeArgsArg(actionInteractor, objectActionParameter, this.context, idx.getAndIncrement()))); }); if (args.isEmpty()) { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeArgsArg.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeArgsArg.java index 59a498b594..ac1153c1fc 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeArgsArg.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeArgsArg.java @@ -38,24 +38,24 @@ import lombok.extern.log4j.Log4j2; public class GqlvActionInvokeArgsArg extends GqlvAbstract { - @Getter private final ActionInteractor holder; + @Getter private final ActionInteractor actionInteractor; @Getter private final ObjectActionParameter objectActionParameter; @Getter private final int paramNum; public GqlvActionInvokeArgsArg( - final ActionInteractor holder, + final ActionInteractor actionInteractor, final ObjectActionParameter objectActionParameter, final Context context, final int paramNum) { super(context); - this.holder = holder; + this.actionInteractor = actionInteractor; this.objectActionParameter = objectActionParameter; this.paramNum = paramNum; val elementType = objectActionParameter.getElementType();; - val gqlObjectTypeForElementType = context.typeMapper.outputTypeFor(elementType, holder.getSchemaType()); + val gqlObjectTypeForElementType = context.typeMapper.outputTypeFor(elementType, actionInteractor.getSchemaType()); if (gqlObjectTypeForElementType != null) { val gqlOutputType = objectActionParameter.isPlural() ? GraphQLList.list(gqlObjectTypeForElementType) @@ -74,7 +74,7 @@ public class GqlvActionInvokeArgsArg @Override protected Object fetchData(DataFetchingEnvironment dataFetchingEnvironment) { val environment = new Environment.ForTunnelled(dataFetchingEnvironment); - val managedObjects = holder.argumentManagedObjectsFor(environment, holder.getObjectMember(), context.bookmarkService); + val managedObjects = actionInteractor.argumentManagedObjectsFor(environment, actionInteractor.getObjectMember(), context.bookmarkService); return managedObjects.get(paramNum).map(ManagedObject::getPojo).orElse(null); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeResult.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeResult.java index 0cc35a638e..9c7b45dc0a 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeResult.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionInvokeResult.java @@ -47,16 +47,16 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionInvokeResult extends GqlvAbstract { - private final ActionInteractor holder; + private final ActionInteractor actionInteractor; public GqlvActionInvokeResult( - final ActionInteractor holder, + final ActionInteractor actionInteractor, final Context context) { super(context); - this.holder = holder; + this.actionInteractor = actionInteractor; - val objectAction = holder.getObjectMember(); + val objectAction = actionInteractor.getObjectMember(); val graphQLOutputType = typeFor(objectAction); if (graphQLOutputType != null) { @@ -82,7 +82,7 @@ public class GqlvActionInvokeResult extends GqlvAbstract { return null; } val objectSpecificationOfCollectionElement = facet.elementSpec(); - GraphQLType wrappedType = context.typeMapper.outputTypeFor(objectSpecificationOfCollectionElement, holder.getSchemaType()); + GraphQLType wrappedType = context.typeMapper.outputTypeFor(objectSpecificationOfCollectionElement, actionInteractor.getSchemaType()); if (wrappedType == null) { log.warn("Unable to create wrapped type of for {} for action {}", objectSpecificationOfCollectionElement.getFullIdentifier(), @@ -95,7 +95,7 @@ public class GqlvActionInvokeResult extends GqlvAbstract { case ENTITY: case VIEW_MODEL: default: - return context.typeMapper.outputTypeFor(objectSpecification, holder.getSchemaType()); + return context.typeMapper.outputTypeFor(objectSpecification, actionInteractor.getSchemaType()); } } @@ -112,7 +112,7 @@ public class GqlvActionInvokeResult extends GqlvAbstract { return null; } - val objectAction = holder.getObjectMember(); + val objectAction = actionInteractor.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); val visibleConsent = objectAction.isVisible(managedObject, InteractionInitiatedBy.USER, Where.ANYWHERE); @@ -126,7 +126,7 @@ public class GqlvActionInvokeResult extends GqlvAbstract { } val head = objectAction.interactionHead(managedObject); - val argumentManagedObjects = holder.argumentManagedObjectsFor(environment, objectAction, context.bookmarkService); + val argumentManagedObjects = actionInteractor.argumentManagedObjectsFor(environment, objectAction, context.bookmarkService); val validityConsent = objectAction.isArgumentSetValid(head, argumentManagedObjects, InteractionInitiatedBy.USER); if (validityConsent.isVetoed()) { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParams.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParams.java index 056afc7922..4de63a2209 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParams.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParams.java @@ -38,15 +38,15 @@ import lombok.extern.log4j.Log4j2; public class GqlvActionParams extends GqlvAbstractCustom { - @Getter private final ActionInteractor holder; + @Getter private final ActionInteractor actionInteractor; private final List<GqlvActionParamsParam> params = new ArrayList<>(); public GqlvActionParams( - final ActionInteractor holder, + final ActionInteractor actionInteractor, final Context context) { - super(TypeNames.actionParamsTypeNameFor(holder.getObjectSpecification(), holder.getObjectMember(), holder.getSchemaType()), context); - this.holder = holder; + super(TypeNames.actionParamsTypeNameFor(actionInteractor.getObjectSpecification(), actionInteractor.getObjectMember(), actionInteractor.getSchemaType()), context); + this.actionInteractor = actionInteractor; if (isBuilt()) { // nothing else to be done @@ -54,8 +54,8 @@ public class GqlvActionParams } val idx = new AtomicInteger(0); - holder.getObjectMember().getParameters() - .forEach(oap -> params.add(addChildFieldFor(new GqlvActionParamsParam(holder, oap, this.context, idx.getAndIncrement())))); + actionInteractor.getObjectMember().getParameters() + .forEach(oap -> params.add(addChildFieldFor(new GqlvActionParamsParam(actionInteractor, oap, this.context, idx.getAndIncrement())))); if (params.isEmpty()) { return; diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParam.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParam.java index 5953268b61..2ac632ddea 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParam.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParam.java @@ -47,7 +47,7 @@ public class GqlvActionParamsParam implements ActionParamInteractor, ObjectActionParameterProvider { - @Getter private final ActionInteractor holder; + @Getter private final ActionInteractor actionInteractor; @Getter private final ObjectActionParameter objectActionParameter; @Getter private final int paramNum; @@ -74,7 +74,7 @@ public class GqlvActionParamsParam final Context context, final int paramNum) { super(TypeNames.actionParamTypeNameFor(holder.getObjectSpecification(), oap, holder.getSchemaType()), context); - this.holder = holder; + this.actionInteractor = holder; this.objectActionParameter = oap; this.paramNum = paramNum; @@ -105,12 +105,12 @@ public class GqlvActionParamsParam @Override public ObjectSpecification getObjectSpecification() { - return holder.getObjectSpecification(); + return actionInteractor.getObjectSpecification(); } @Override public ObjectAction getObjectMember() { - return holder.getObjectMember(); + return actionInteractor.getObjectMember(); } @Override @@ -151,7 +151,7 @@ public class GqlvActionParamsParam final GraphQLFieldDefinition.Builder fieldBuilder, final TypeMapper.InputContext inputContext, final int paramNum) { - holder.addGqlArguments(objectAction, fieldBuilder, inputContext, paramNum); + actionInteractor.addGqlArguments(objectAction, fieldBuilder, inputContext, paramNum); } @Override @@ -159,7 +159,7 @@ public class GqlvActionParamsParam final Environment environment, final ObjectAction objectAction, final BookmarkService bookmarkService) { - return holder.argumentManagedObjectsFor(environment, objectAction, bookmarkService); + return actionInteractor.argumentManagedObjectsFor(environment, objectAction, bookmarkService); } @Override @@ -169,7 +169,7 @@ public class GqlvActionParamsParam @Override public SchemaType getSchemaType() { - return holder.getSchemaType(); + return actionInteractor.getSchemaType(); } } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamAutoComplete.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamAutoComplete.java index 9816f6fe4c..7b48a6cd6d 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamAutoComplete.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamAutoComplete.java @@ -49,21 +49,21 @@ package org.apache.causeway.viewer.graphql.model.domain.rich.query; private static final String SEARCH_PARAM_NAME = "search"; - private final ActionParamInteractor holder; + private final ActionParamInteractor actionParamInteractor; public GqlvActionParamsParamAutoComplete( - final ActionParamInteractor holder, + final ActionParamInteractor actionParamInteractor, final Context context) { super(context); - this.holder = holder; + this.actionParamInteractor = actionParamInteractor; - val objectActionParameter = holder.getObjectActionParameter(); + val objectActionParameter = actionParamInteractor.getObjectActionParameter(); if (objectActionParameter.hasAutoComplete()) { val elementType = objectActionParameter.getElementType(); val fieldBuilder = newFieldDefinition() .name("autoComplete") - .type(GraphQLList.list(context.typeMapper.outputTypeFor(elementType, holder.getSchemaType()))); - holder.addGqlArguments(holder.getObjectMember(), fieldBuilder, TypeMapper.InputContext.AUTOCOMPLETE, holder.getParamNum()); + .type(GraphQLList.list(context.typeMapper.outputTypeFor(elementType, actionParamInteractor.getSchemaType()))); + actionParamInteractor.addGqlArguments(actionParamInteractor.getObjectMember(), fieldBuilder, TypeMapper.InputContext.AUTOCOMPLETE, actionParamInteractor.getParamNum()); fieldBuilder.argument(GraphQLArgument.newArgument() .name(SEARCH_PARAM_NAME) .type(nonNull(context.typeMapper.outputTypeFor(String.class)))) @@ -83,11 +83,11 @@ package org.apache.causeway.viewer.graphql.model.domain.rich.query; return Collections.emptyList(); } - val objectAction = holder.getObjectMember(); + val objectAction = actionParamInteractor.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); - val objectActionParameter = objectAction.getParameterById(holder.getObjectActionParameter().getId()); - val argumentManagedObjects = holder.argumentManagedObjectsFor(new Environment.For(dataFetchingEnvironment), objectAction, context.bookmarkService); + val objectActionParameter = objectAction.getParameterById(actionParamInteractor.getObjectActionParameter().getId()); + val argumentManagedObjects = actionParamInteractor.argumentManagedObjectsFor(new Environment.For(dataFetchingEnvironment), objectAction, context.bookmarkService); val managedAction = ManagedAction.of(managedObject, objectAction, Where.ANYWHERE); val pendingArgs = ParameterNegotiationModel.of(managedAction, argumentManagedObjects); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamChoices.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamChoices.java index 8b60533ee5..8ce3be2d42 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamChoices.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamChoices.java @@ -45,21 +45,21 @@ package org.apache.causeway.viewer.graphql.model.domain.rich.query; @Log4j2 public class GqlvActionParamsParamChoices extends GqlvAbstract { - private final ActionParamInteractor holder; + private final ActionParamInteractor actionParamInteractor; public GqlvActionParamsParamChoices( - final ActionParamInteractor holder, + final ActionParamInteractor actionParamInteractor, final Context context) { super(context); - this.holder = holder; + this.actionParamInteractor = actionParamInteractor; - val objectActionParameter = holder.getObjectActionParameter(); + val objectActionParameter = actionParamInteractor.getObjectActionParameter(); if (objectActionParameter.hasChoices()) { val elementType = objectActionParameter.getElementType(); val fieldBuilder = newFieldDefinition() .name("choices") - .type(GraphQLList.list(context.typeMapper.outputTypeFor(elementType, holder.getSchemaType()))); - holder.addGqlArguments(holder.getObjectMember(), fieldBuilder, TypeMapper.InputContext.CHOICES, holder.getParamNum()); + .type(GraphQLList.list(context.typeMapper.outputTypeFor(elementType, actionParamInteractor.getSchemaType()))); + actionParamInteractor.addGqlArguments(actionParamInteractor.getObjectMember(), fieldBuilder, TypeMapper.InputContext.CHOICES, actionParamInteractor.getParamNum()); setField(fieldBuilder.build()); } else { setField(null); @@ -75,11 +75,11 @@ package org.apache.causeway.viewer.graphql.model.domain.rich.query; return Collections.emptyList(); } - val objectAction = holder.getObjectMember(); + val objectAction = actionParamInteractor.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); - val objectActionParameter = objectAction.getParameterById(holder.getObjectActionParameter().getId()); - val argumentManagedObjects = holder.argumentManagedObjectsFor(new Environment.For(dataFetchingEnvironment), objectAction, context.bookmarkService); + val objectActionParameter = objectAction.getParameterById(actionParamInteractor.getObjectActionParameter().getId()); + val argumentManagedObjects = actionParamInteractor.argumentManagedObjectsFor(new Environment.For(dataFetchingEnvironment), objectAction, context.bookmarkService); val managedAction = ManagedAction.of(managedObject, objectAction, Where.ANYWHERE); val pendingArgs = ParameterNegotiationModel.of(managedAction, argumentManagedObjects); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDatatype.java index b2fcdd3ef5..78d8604a3b 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDatatype.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDatatype.java @@ -32,13 +32,13 @@ import lombok.val; public class GqlvActionParamsParamDatatype extends GqlvAbstract { - private final ActionParamInteractor holder; + private final ActionParamInteractor actionParamInteractor; public GqlvActionParamsParamDatatype( - final ActionParamInteractor holder, + final ActionParamInteractor actionParamInteractor, final Context context) { super(context); - this.holder = holder; + this.actionParamInteractor = actionParamInteractor; setField(newFieldDefinition() .name("datatype") @@ -48,8 +48,8 @@ public class GqlvActionParamsParamDatatype extends GqlvAbstract { @Override protected Object fetchData(DataFetchingEnvironment environment) { - val returnType = holder.getObjectActionParameter().getElementType(); - return TypeNames.objectTypeNameFor(returnType, holder.getSchemaType()); + val returnType = actionParamInteractor.getObjectActionParameter().getElementType(); + return TypeNames.objectTypeNameFor(returnType, actionParamInteractor.getSchemaType()); } } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDefault.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDefault.java index e28d004b28..b99eb918e5 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDefault.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDefault.java @@ -40,20 +40,21 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionParamsParamDefault extends GqlvAbstract { - private final ActionParamInteractor holder; + + private final ActionParamInteractor actionParamInteractor; public GqlvActionParamsParamDefault( - final ActionParamInteractor holder, + final ActionParamInteractor actionParamInteractor, final Context context) { super(context); - this.holder = holder; - val objectActionParameter = holder.getObjectActionParameter(); + this.actionParamInteractor = actionParamInteractor; + val objectActionParameter = actionParamInteractor.getObjectActionParameter(); if (objectActionParameter.hasDefaults()) { val elementType = objectActionParameter.getElementType(); val fieldBuilder = newFieldDefinition() .name("default") - .type(context.typeMapper.outputTypeFor(elementType, holder.getSchemaType())); - holder.addGqlArguments(holder.getObjectMember(), fieldBuilder, TypeMapper.InputContext.DEFAULT, holder.getParamNum()); + .type(context.typeMapper.outputTypeFor(elementType, actionParamInteractor.getSchemaType())); + actionParamInteractor.addGqlArguments(actionParamInteractor.getObjectMember(), fieldBuilder, TypeMapper.InputContext.DEFAULT, actionParamInteractor.getParamNum()); setField(fieldBuilder.build()); } else { setField(null); @@ -67,10 +68,10 @@ public class GqlvActionParamsParamDefault extends GqlvAbstract { if (objectSpecification == null) { return Collections.emptyList(); } - val objectAction = holder.getObjectMember(); + val objectAction = actionParamInteractor.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); - val objectActionParameter = objectAction.getParameterById(holder.getObjectActionParameter().getId()); - val argumentManagedObjects = holder.argumentManagedObjectsFor(new Environment.For(dataFetchingEnvironment), objectAction, context.bookmarkService); + val objectActionParameter = objectAction.getParameterById(actionParamInteractor.getObjectActionParameter().getId()); + val argumentManagedObjects = actionParamInteractor.argumentManagedObjectsFor(new Environment.For(dataFetchingEnvironment), objectAction, context.bookmarkService); val managedAction = ManagedAction.of(managedObject, objectAction, Where.ANYWHERE); val pendingArgs = ParameterNegotiationModel.of(managedAction, argumentManagedObjects); val defaultManagedObject = objectActionParameter.getDefault(pendingArgs); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDisabled.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDisabled.java index 41fb15772d..e3f170255f 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDisabled.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDisabled.java @@ -39,18 +39,18 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionParamsParamDisabled extends GqlvAbstract { - private final ActionParamInteractor holder; + private final ActionParamInteractor actionParamInteractor; public GqlvActionParamsParamDisabled( - final ActionParamInteractor holder, + final ActionParamInteractor actionParamInteractor, final Context context) { super(context); - this.holder = holder; + this.actionParamInteractor = actionParamInteractor; val fieldBuilder = newFieldDefinition() .name("disabled") .type((GraphQLOutputType) context.typeMapper.outputTypeFor(String.class)); - holder.addGqlArguments(holder.getObjectMember(), fieldBuilder, TypeMapper.InputContext.DISABLE, holder.getParamNum()+1); + actionParamInteractor.addGqlArguments(actionParamInteractor.getObjectMember(), fieldBuilder, TypeMapper.InputContext.DISABLE, actionParamInteractor.getParamNum()+1); setField(fieldBuilder.build()); } @@ -63,12 +63,12 @@ public class GqlvActionParamsParamDisabled extends GqlvAbstract { return "Disabled"; } - val objectAction = holder.getObjectMember(); + val objectAction = actionParamInteractor.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); val actionInteractionHead = objectAction.interactionHead(managedObject); - val objectActionParameter = objectAction.getParameterById(holder.getObjectActionParameter().getId()); - val argumentManagedObjects = holder.argumentManagedObjectsFor(new Environment.For(dataFetchingEnvironment), objectAction, context.bookmarkService); + val objectActionParameter = objectAction.getParameterById(actionParamInteractor.getObjectActionParameter().getId()); + val argumentManagedObjects = actionParamInteractor.argumentManagedObjectsFor(new Environment.For(dataFetchingEnvironment), objectAction, context.bookmarkService); val usable = objectActionParameter.isUsable(actionInteractionHead, argumentManagedObjects, InteractionInitiatedBy.USER); return usable.isVetoed() ? usable.getReasonAsString().orElse("Disabled") : null; diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamHidden.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamHidden.java index 19f09d4438..b78f4b2022 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamHidden.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamHidden.java @@ -38,18 +38,18 @@ package org.apache.causeway.viewer.graphql.model.domain.rich.query; @Log4j2 public class GqlvActionParamsParamHidden extends GqlvAbstract { - private final ActionParamInteractor holder; + private final ActionParamInteractor actionParamInteractor; public GqlvActionParamsParamHidden( - final ActionParamInteractor holder, + final ActionParamInteractor actionParamInteractor, final Context context) { super(context); - this.holder = holder; + this.actionParamInteractor = actionParamInteractor; GraphQLFieldDefinition.Builder fieldBuilder = newFieldDefinition() .name("hidden") .type(context.typeMapper.outputTypeFor(boolean.class)); - holder.addGqlArguments(holder.getObjectMember(), fieldBuilder, TypeMapper.InputContext.DISABLE, holder.getParamNum()); + actionParamInteractor.addGqlArguments(actionParamInteractor.getObjectMember(), fieldBuilder, TypeMapper.InputContext.DISABLE, actionParamInteractor.getParamNum()); setField(fieldBuilder.build()); } @@ -65,13 +65,13 @@ public class GqlvActionParamsParamHidden extends GqlvAbstract { return true; } - val objectAction = holder.getObjectMember(); + val objectAction = actionParamInteractor.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); val actionInteractionHead = objectAction.interactionHead(managedObject); - val objectActionParameter = objectAction.getParameterById(holder.getObjectActionParameter().getId()); + val objectActionParameter = objectAction.getParameterById(actionParamInteractor.getObjectActionParameter().getId()); - val argumentManagedObjects = holder.argumentManagedObjectsFor(new Environment.For(dataFetchingEnvironment), objectAction, context.bookmarkService); + val argumentManagedObjects = actionParamInteractor.argumentManagedObjectsFor(new Environment.For(dataFetchingEnvironment), objectAction, context.bookmarkService); val visible = objectActionParameter.isVisible(actionInteractionHead, argumentManagedObjects, InteractionInitiatedBy.USER); return visible.isVetoed(); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamValidate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamValidate.java index ef0076fa8a..e4696d6e4e 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamValidate.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamValidate.java @@ -38,18 +38,18 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionParamsParamValidate extends GqlvAbstract { - private final ActionParamInteractor holder; + private final ActionParamInteractor actionParamInteractor; public GqlvActionParamsParamValidate( - final ActionParamInteractor holder, + final ActionParamInteractor actionParamInteractor, final Context context) { super(context); - this.holder = holder; + this.actionParamInteractor = actionParamInteractor; val fieldBuilder = newFieldDefinition() .name("validity") .type((GraphQLOutputType) context.typeMapper.outputTypeFor(String.class)); - holder.addGqlArgument(holder.getObjectMember(), fieldBuilder, TypeMapper.InputContext.DISABLE, holder.getParamNum()); + actionParamInteractor.addGqlArgument(actionParamInteractor.getObjectMember(), fieldBuilder, TypeMapper.InputContext.DISABLE, actionParamInteractor.getParamNum()); setField(fieldBuilder.build()); } @@ -64,13 +64,13 @@ public class GqlvActionParamsParamValidate extends GqlvAbstract { return "Invalid"; } - val objectAction = holder.getObjectMember(); + val objectAction = actionParamInteractor.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); val actionInteractionHead = objectAction.interactionHead(managedObject); - val objectActionParameter = objectAction.getParameterById(holder.getObjectActionParameter().getId()); + val objectActionParameter = objectAction.getParameterById(actionParamInteractor.getObjectActionParameter().getId()); - val argumentManagedObjects = holder.argumentManagedObjectsFor(new Environment.For(dataFetchingEnvironment), objectAction, context.bookmarkService); + val argumentManagedObjects = actionParamInteractor.argumentManagedObjectsFor(new Environment.For(dataFetchingEnvironment), objectAction, context.bookmarkService); val usable = objectActionParameter.isUsable(actionInteractionHead, argumentManagedObjects, InteractionInitiatedBy.USER); return usable.isVetoed() ? usable.getReasonAsString().orElse("Invalid") : null; diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionValidity.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionValidity.java index 88b95f744f..4831256999 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionValidity.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionValidity.java @@ -43,29 +43,29 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionValidity extends GqlvAbstract { - private final ActionInteractor holder; + private final ActionInteractor actionInteractor; public GqlvActionValidity( - final ActionInteractor holder, + final ActionInteractor actionInteractor, final Context context ) { super(context); - this.holder = holder; + this.actionInteractor = actionInteractor; - val objectAction = holder.getObjectMember(); + val objectAction = actionInteractor.getObjectMember(); val fieldBuilder = newFieldDefinition() .name("validate") .type((GraphQLOutputType) this.context.typeMapper.outputTypeFor(String.class)); - holder.addGqlArguments(objectAction, fieldBuilder, TypeMapper.InputContext.VALIDATE, objectAction.getParameterCount()); + actionInteractor.addGqlArguments(objectAction, fieldBuilder, TypeMapper.InputContext.VALIDATE, objectAction.getParameterCount()); setField(fieldBuilder.build()); } @Override protected Object fetchData(final DataFetchingEnvironment dataFetchingEnvironment) { - final ObjectAction objectAction = holder.getObjectMember(); + final ObjectAction objectAction = actionInteractor.getObjectMember(); val sourcePojo = BookmarkedPojo.sourceFrom(dataFetchingEnvironment); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationDatatype.java index b1e05e167c..b7207de119 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationDatatype.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationDatatype.java @@ -33,13 +33,13 @@ import lombok.val; public abstract class GqlvAssociationDatatype<T extends ObjectAssociation> extends GqlvAbstract { - private final MemberInteractor<T> holder; + private final MemberInteractor<T> memberInteractor; public GqlvAssociationDatatype( - final MemberInteractor<T> holder, + final MemberInteractor<T> memberInteractor, final Context context) { super(context); - this.holder = holder; + this.memberInteractor = memberInteractor; setField(newFieldDefinition() .name("datatype") @@ -49,8 +49,8 @@ public abstract class GqlvAssociationDatatype<T extends ObjectAssociation> exten @Override protected Object fetchData(DataFetchingEnvironment environment) { - val returnType = holder.getObjectMember().getElementType(); - return TypeNames.objectTypeNameFor(returnType, holder.getSchemaType()); + val returnType = memberInteractor.getObjectMember().getElementType(); + return TypeNames.objectTypeNameFor(returnType, memberInteractor.getSchemaType()); } } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationGet.java index 5011eed03d..6c8f14ebdd 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationGet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationGet.java @@ -34,15 +34,15 @@ import lombok.val; public abstract class GqlvAssociationGet<T extends ObjectAssociation> extends GqlvAbstract { - final MemberInteractor<T> holder; + final MemberInteractor<T> memberInteractor; public GqlvAssociationGet( - final MemberInteractor<T> holder, + final MemberInteractor<T> memberInteractor, final Context context) { super(context); - this.holder = holder; + this.memberInteractor = memberInteractor; - GraphQLOutputType type = outputTypeFor(holder); + GraphQLOutputType type = outputTypeFor(memberInteractor); if (type != null) { val fieldBuilder = newFieldDefinition() .name("get") @@ -68,7 +68,7 @@ public abstract class GqlvAssociationGet<T extends ObjectAssociation> extends Gq return null; } - val association = holder.getObjectMember(); + val association = memberInteractor.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); val resultManagedObject = association.get(managedObject); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollection.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollection.java index 86d7c598bb..d4bd3d66f4 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollection.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollection.java @@ -36,11 +36,11 @@ public class GqlvCollection private final GqlvCollectionDatatype datatype; public GqlvCollection( - final ObjectInteractor holder, + final ObjectInteractor objectInteractor, final OneToManyAssociation otma, final Context context ) { - super(holder, otma, TypeNames.collectionTypeNameFor(holder.getObjectSpecification(), otma, holder.getSchemaType()), context); + super(objectInteractor, otma, TypeNames.collectionTypeNameFor(objectInteractor.getObjectSpecification(), otma, objectInteractor.getSchemaType()), context); if(isBuilt()) { this.hidden = null; @@ -59,7 +59,7 @@ public class GqlvCollection @Override public ObjectSpecification getObjectSpecification() { - return holder.getObjectSpecification(); + return interactor.getObjectSpecification(); } @@ -76,7 +76,7 @@ public class GqlvCollection @Override public SchemaType getSchemaType() { - return holder.getSchemaType(); + return interactor.getSchemaType(); } } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionDatatype.java index c963fc76df..93e681349d 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionDatatype.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionDatatype.java @@ -25,9 +25,9 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Member public class GqlvCollectionDatatype extends GqlvAssociationDatatype<OneToManyAssociation> { public GqlvCollectionDatatype( - final MemberInteractor<OneToManyAssociation> holder, + final MemberInteractor<OneToManyAssociation> memberInteractor, final Context context) { - super(holder, context); + super(memberInteractor, context); } } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionGet.java index 25cb89f02f..a675b827e6 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionGet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionGet.java @@ -29,9 +29,9 @@ import lombok.val; public class GqlvCollectionGet extends GqlvAssociationGet<OneToManyAssociation> { public GqlvCollectionGet( - final MemberInteractor<OneToManyAssociation> holder, + final MemberInteractor<OneToManyAssociation> memberInteractor, final Context context) { - super(holder, context); + super(memberInteractor, context); } @Override diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMember.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMember.java index d8691e2692..094ab5213a 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMember.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMember.java @@ -32,17 +32,17 @@ import lombok.Getter; public abstract class GqlvMember<T extends ObjectMember, H extends ObjectSpecificationProvider & SchemaTypeProvider> extends GqlvAbstractCustom { - @Getter final H holder; + @Getter final H interactor; @Getter private final T objectMember; public GqlvMember( - final H holder, + final H interactor, final T objectMember, final String typeName, final Context context ) { super(typeName, context); - this.holder = holder; + this.interactor = interactor; this.objectMember = objectMember; objectMember.getCanonicalDescription().ifPresent(gqlObjectTypeBuilder::description); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMemberDisabled.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMemberDisabled.java index 27b6376ecb..ced1c9a045 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMemberDisabled.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMemberDisabled.java @@ -38,14 +38,14 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvMemberDisabled<T extends ObjectMember> extends GqlvAbstract { - private final MemberInteractor<T> holder; + private final MemberInteractor<T> memberInteractor; public GqlvMemberDisabled( - final MemberInteractor<T> holder, + final MemberInteractor<T> memberInteractor, final Context context ) { super(context); - this.holder = holder; + this.memberInteractor = memberInteractor; setField(newFieldDefinition() .name("disabled") @@ -64,7 +64,7 @@ public class GqlvMemberDisabled<T extends ObjectMember> extends GqlvAbstract { return String.format("Disabled; could not determine target object's type ('%s')", sourcePojoClass.getName()); } - val objectMember = holder.getObjectMember(); + val objectMember = memberInteractor.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); val usable = objectMember.isUsable(managedObject, InteractionInitiatedBy.USER, Where.ANYWHERE); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMemberHidden.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMemberHidden.java index c8dc796216..7dfd0347e4 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMemberHidden.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvMemberHidden.java @@ -38,14 +38,14 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvMemberHidden<T extends ObjectMember> extends GqlvAbstract { - private final MemberInteractor<T> holder; + private final MemberInteractor<T> memberInteractor; public GqlvMemberHidden( - final MemberInteractor<T> holder, + final MemberInteractor<T> memberInteractor, final Context context ) { super(context); - this.holder = holder; + this.memberInteractor = memberInteractor; setField(newFieldDefinition() .name("hidden") @@ -65,7 +65,7 @@ public class GqlvMemberHidden<T extends ObjectMember> extends GqlvAbstract { return true; } - val objectMember = holder.getObjectMember(); + val objectMember = memberInteractor.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); val visibleConsent = objectMember.isVisible(managedObject, InteractionInitiatedBy.USER, Where.ANYWHERE); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvProperty.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvProperty.java index 7c38398184..8fb174e6e5 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvProperty.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvProperty.java @@ -145,7 +145,7 @@ public class GqlvProperty @Override public ObjectSpecification getObjectSpecification() { - return holder.getObjectSpecification(); + return interactor.getObjectSpecification(); } public OneToOneAssociation getOneToOneAssociation() { @@ -177,7 +177,7 @@ public class GqlvProperty @Override public SchemaType getSchemaType() { - return holder.getSchemaType(); + return interactor.getSchemaType(); } } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyAutoComplete.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyAutoComplete.java index a53d3f63bf..6a2b2bf5c4 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyAutoComplete.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyAutoComplete.java @@ -42,15 +42,15 @@ public class GqlvPropertyAutoComplete extends GqlvAbstract { private static final String SEARCH_PARAM_NAME = "search"; - private final MemberInteractor<OneToOneAssociation> holder; + private final MemberInteractor<OneToOneAssociation> memberInteractor; public GqlvPropertyAutoComplete( - final MemberInteractor<OneToOneAssociation> holder, + final MemberInteractor<OneToOneAssociation> memberInteractor, final Context context) { super(context); - this.holder = holder; + this.memberInteractor = memberInteractor; - val otoa = holder.getObjectMember(); + val otoa = memberInteractor.getObjectMember(); if (otoa.hasAutoComplete()) { val elementType = otoa.getElementType(); val fieldBuilder = newFieldDefinition() @@ -76,7 +76,7 @@ public class GqlvPropertyAutoComplete extends GqlvAbstract { return null; } - val association = holder.getObjectMember(); + val association = memberInteractor.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); val searchArg = dataFetchingEnvironment.<String>getArgument(SEARCH_PARAM_NAME); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyChoices.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyChoices.java index 3852004577..35728a5e22 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyChoices.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyChoices.java @@ -38,21 +38,21 @@ import lombok.val; public class GqlvPropertyChoices extends GqlvAbstract { - final PropertyInteractor holder; + final PropertyInteractor propertyInteractor; public GqlvPropertyChoices( - final PropertyInteractor holder, + final PropertyInteractor propertyInteractor, final Context context) { super(context); - this.holder = holder; + this.propertyInteractor = propertyInteractor; - val otoa = holder.getObjectMember(); + val otoa = propertyInteractor.getObjectMember(); if (otoa.hasChoices()) { val elementType = otoa.getElementType(); val fieldBuilder = newFieldDefinition() .name("choices") .type(GraphQLList.list(context.typeMapper.outputTypeFor(elementType, SchemaType.RICH))); - holder.addGqlArgument(otoa, fieldBuilder, TypeMapper.InputContext.CHOICES); + propertyInteractor.addGqlArgument(otoa, fieldBuilder, TypeMapper.InputContext.CHOICES); setField(fieldBuilder.build()); } else { setField(null); @@ -69,7 +69,7 @@ public class GqlvPropertyChoices extends GqlvAbstract { return null; } - val association = holder.getObjectMember(); + val association = propertyInteractor.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); val choicesManagedObject = association.getChoices(managedObject, InteractionInitiatedBy.USER); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyDatatype.java index a72736c83e..3f8d299df2 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyDatatype.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyDatatype.java @@ -25,9 +25,9 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Proper public class GqlvPropertyDatatype extends GqlvAssociationDatatype<OneToOneAssociation> { public GqlvPropertyDatatype( - final PropertyInteractor holder, + final PropertyInteractor propertyInteractor, final Context context) { - super(holder.asHolderMemberDetails(), context); + super(propertyInteractor.asHolderMemberDetails(), context); } } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGet.java index 1d64cd140f..3635150a70 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGet.java @@ -29,9 +29,9 @@ import lombok.val; public class GqlvPropertyGet extends GqlvAssociationGet<OneToOneAssociation> { public GqlvPropertyGet( - final MemberInteractor<OneToOneAssociation> holder, + final MemberInteractor<OneToOneAssociation> memberInteractor, final Context context) { - super(holder, context); + super(memberInteractor, context); } @Override diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlob.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlob.java index 28879acef7..f22854726f 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlob.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlob.java @@ -33,7 +33,8 @@ import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; public class GqlvPropertyGetBlob extends GqlvAbstractCustom { - final MemberInteractor<OneToOneAssociation> holder; + final MemberInteractor<OneToOneAssociation> memberInteractor; + final GqlvPropertyGetBlobBytes blobName; final GqlvPropertyGetBlobMimeType blobMimeType; final GqlvPropertyGetBlobName blobBytes; @@ -41,10 +42,10 @@ public class GqlvPropertyGetBlob private final CausewayConfiguration.Viewer.Graphql graphqlConfiguration; public GqlvPropertyGetBlob( - final MemberInteractor<OneToOneAssociation> holder, + final MemberInteractor<OneToOneAssociation> memberInteractor, final Context context) { - super(TypeNames.propertyBlobTypeNameFor(holder.getObjectSpecification(), holder.getObjectMember(), holder.getSchemaType()), context); - this.holder = holder; + super(TypeNames.propertyBlobTypeNameFor(memberInteractor.getObjectSpecification(), memberInteractor.getObjectMember(), memberInteractor.getSchemaType()), context); + this.memberInteractor = memberInteractor; this.graphqlConfiguration = context.causewayConfiguration.getViewer().getGraphql(); @@ -56,9 +57,9 @@ public class GqlvPropertyGetBlob return; } - addChildFieldFor(blobName = new GqlvPropertyGetBlobBytes(holder, context)); - addChildFieldFor(blobMimeType = new GqlvPropertyGetBlobMimeType(holder, context)); - addChildFieldFor(blobBytes = isResourceNotForbidden() ? new GqlvPropertyGetBlobName(holder, context) : null); + addChildFieldFor(blobName = new GqlvPropertyGetBlobBytes(memberInteractor, context)); + addChildFieldFor(blobMimeType = new GqlvPropertyGetBlobMimeType(memberInteractor, context)); + addChildFieldFor(blobBytes = isResourceNotForbidden() ? new GqlvPropertyGetBlobName(memberInteractor, context) : null); setField(newFieldDefinition() .name("get") diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobAbstract.java index 44a9826ca0..0f9bb584f5 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobAbstract.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobAbstract.java @@ -37,13 +37,13 @@ import lombok.val; public abstract class GqlvPropertyGetBlobAbstract extends GqlvAbstract { - final MemberInteractor<OneToOneAssociation> holder; + final MemberInteractor<OneToOneAssociation> memberInteractor; public GqlvPropertyGetBlobAbstract( - final MemberInteractor<OneToOneAssociation> holder, + final MemberInteractor<OneToOneAssociation> memberInteractor, final Context context, String name) { super(context); - this.holder = holder; + this.memberInteractor = memberInteractor; setField(GraphQLFieldDefinition.newFieldDefinition() .name(name) @@ -61,7 +61,7 @@ public abstract class GqlvPropertyGetBlobAbstract extends GqlvAbstract { return null; } - val association = holder.getObjectMember(); + val association = memberInteractor.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); val resultManagedObject = association.get(managedObject); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobBytes.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobBytes.java index 84ea9d1365..a0bf5d5916 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobBytes.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobBytes.java @@ -32,9 +32,9 @@ public class GqlvPropertyGetBlobBytes extends GqlvPropertyGetBlobAbstract { private final String graphqlPath; public GqlvPropertyGetBlobBytes( - final MemberInteractor<OneToOneAssociation> holder, + final MemberInteractor<OneToOneAssociation> memberInteractor, final Context context) { - super(holder, context, "bytes"); + super(memberInteractor, context, "bytes"); this.graphqlPath = context.causewayConfiguration.valueOf("spring.graphql.path").orElse("/graphql"); } @@ -45,7 +45,7 @@ public class GqlvPropertyGetBlobBytes extends GqlvPropertyGetBlobAbstract { val bookmarkIfAny = context.bookmarkService.bookmarkFor(sourcePojo); return bookmarkIfAny.map(x -> String.format( - "//%s/object/%s:%s/%s/blobBytes", graphqlPath, x.getLogicalTypeName(), x.getIdentifier(), holder.getObjectMember().getId())).orElse(null); + "//%s/object/%s:%s/%s/blobBytes", graphqlPath, x.getLogicalTypeName(), x.getIdentifier(), memberInteractor.getObjectMember().getId())).orElse(null); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobMimeType.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobMimeType.java index 353efe7f83..0017072a43 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobMimeType.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobMimeType.java @@ -27,9 +27,9 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Member public class GqlvPropertyGetBlobMimeType extends GqlvPropertyGetBlobAbstract { public GqlvPropertyGetBlobMimeType( - final MemberInteractor<OneToOneAssociation> holder, + final MemberInteractor<OneToOneAssociation> memberInteractor, final Context context) { - super(holder, context, "mimeType"); + super(memberInteractor, context, "mimeType"); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobName.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobName.java index 6dfd96fd29..231803b84f 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobName.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobName.java @@ -28,9 +28,9 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Member public class GqlvPropertyGetBlobName extends GqlvPropertyGetBlobAbstract { public GqlvPropertyGetBlobName( - final MemberInteractor<OneToOneAssociation> holder, + final MemberInteractor<OneToOneAssociation> memberInteractor, final Context context) { - super(holder, context, "name"); + super(memberInteractor, context, "name"); } @Override diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClob.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClob.java index 96aa32a6e6..625db01b43 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClob.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClob.java @@ -33,7 +33,7 @@ import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; public class GqlvPropertyGetClob extends GqlvAbstractCustom { - final MemberInteractor<OneToOneAssociation> holder; + final MemberInteractor<OneToOneAssociation> memberInteractor; final GqlvPropertyGetClobName clobName; final GqlvPropertyGetClobMimeType clobMimeType; final GqlvPropertyGetClobChars clobChars; @@ -41,10 +41,10 @@ public class GqlvPropertyGetClob private final CausewayConfiguration.Viewer.Graphql graphqlConfiguration; public GqlvPropertyGetClob( - final MemberInteractor<OneToOneAssociation> holder, + final MemberInteractor<OneToOneAssociation> memberInteractor, final Context context) { - super(TypeNames.propertyBlobTypeNameFor(holder.getObjectSpecification(), holder.getObjectMember(), holder.getSchemaType()), context); - this.holder = holder; + super(TypeNames.propertyBlobTypeNameFor(memberInteractor.getObjectSpecification(), memberInteractor.getObjectMember(), memberInteractor.getSchemaType()), context); + this.memberInteractor = memberInteractor; this.graphqlConfiguration = context.causewayConfiguration.getViewer().getGraphql(); @@ -56,9 +56,9 @@ public class GqlvPropertyGetClob return; } - addChildFieldFor(clobName = new GqlvPropertyGetClobName(holder, context)); - addChildFieldFor(clobMimeType = new GqlvPropertyGetClobMimeType(holder, context)); - addChildFieldFor(clobChars = isResourceNotForbidden() ? new GqlvPropertyGetClobChars(holder, context) : null); + addChildFieldFor(clobName = new GqlvPropertyGetClobName(memberInteractor, context)); + addChildFieldFor(clobMimeType = new GqlvPropertyGetClobMimeType(memberInteractor, context)); + addChildFieldFor(clobChars = isResourceNotForbidden() ? new GqlvPropertyGetClobChars(memberInteractor, context) : null); setField(newFieldDefinition() .name("get") diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobAbstract.java index df6d014673..0f7c29ffbb 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobAbstract.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobAbstract.java @@ -40,10 +40,10 @@ public abstract class GqlvPropertyGetClobAbstract extends GqlvAbstract { final MemberInteractor<OneToOneAssociation> holder; public GqlvPropertyGetClobAbstract( - final MemberInteractor<OneToOneAssociation> holder, + final MemberInteractor<OneToOneAssociation> memberInteractor, final Context context, String name) { super(context); - this.holder = holder; + this.holder = memberInteractor; setField(GraphQLFieldDefinition.newFieldDefinition() .name(name) diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobChars.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobChars.java index c27a4a4fb2..8a5a8d772c 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobChars.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobChars.java @@ -32,9 +32,9 @@ public class GqlvPropertyGetClobChars extends GqlvPropertyGetClobAbstract { private final String graphqlPath; public GqlvPropertyGetClobChars( - final MemberInteractor<OneToOneAssociation> holder, + final MemberInteractor<OneToOneAssociation> memberInteractor, final Context context) { - super(holder, context, "chars"); + super(memberInteractor, context, "chars"); this.graphqlPath = context.causewayConfiguration.valueOf("spring.graphql.path").orElse("/graphql"); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobMimeType.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobMimeType.java index 8564a372df..a7ccd99f0b 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobMimeType.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobMimeType.java @@ -27,9 +27,9 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Member public class GqlvPropertyGetClobMimeType extends GqlvPropertyGetClobAbstract { public GqlvPropertyGetClobMimeType( - final MemberInteractor<OneToOneAssociation> holder, + final MemberInteractor<OneToOneAssociation> memberInteractor, final Context context) { - super(holder, context, "mimeType"); + super(memberInteractor, context, "mimeType"); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobName.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobName.java index 2a6309cd87..011c5005c4 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobName.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobName.java @@ -28,9 +28,9 @@ import org.apache.causeway.viewer.graphql.model.domain.common.interactors.Member public class GqlvPropertyGetClobName extends GqlvPropertyGetClobAbstract { public GqlvPropertyGetClobName( - final MemberInteractor<OneToOneAssociation> holder, + final MemberInteractor<OneToOneAssociation> memberInteractor, final Context context) { - super(holder, context, "name"); + super(memberInteractor, context, "name"); } @Override diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertySet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertySet.java index 53d4c963c2..eebe1c8192 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertySet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertySet.java @@ -41,21 +41,21 @@ import lombok.val; public class GqlvPropertySet extends GqlvAbstract { - final PropertyInteractor holder; + final PropertyInteractor propertyInteractor; public GqlvPropertySet( - final PropertyInteractor holder, + final PropertyInteractor propertyInteractor, final Context context) { super(context); - this.holder = holder; + this.propertyInteractor = propertyInteractor; // setters return void, so we return the domain object instead - val graphQLOutputType = this.context.typeMapper.outputTypeFor(holder.getObjectSpecification(), SchemaType.RICH); + val graphQLOutputType = this.context.typeMapper.outputTypeFor(propertyInteractor.getObjectSpecification(), SchemaType.RICH); val fieldBuilder = newFieldDefinition() .name("set") .type(graphQLOutputType); - holder.addGqlArgument(holder.getObjectMember(), fieldBuilder, TypeMapper.InputContext.INVOKE); + propertyInteractor.addGqlArgument(propertyInteractor.getObjectMember(), fieldBuilder, TypeMapper.InputContext.INVOKE); setField(fieldBuilder.build()); } @@ -70,7 +70,7 @@ public class GqlvPropertySet extends GqlvAbstract { return null; } - val association = holder.getObjectMember(); + val association = propertyInteractor.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); Map<String, Object> arguments = dataFetchingEnvironment.getArguments(); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyValidate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyValidate.java index 839059cc19..fa8d200ab5 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyValidate.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyValidate.java @@ -38,15 +38,15 @@ public class GqlvPropertyValidate extends GqlvAbstract { final PropertyInteractor holder; public GqlvPropertyValidate( - final PropertyInteractor holder, + final PropertyInteractor propertyInteractor, final Context context) { super(context); - this.holder = holder; + this.holder = propertyInteractor; val fieldBuilder = newFieldDefinition() .name("validate") .type((GraphQLOutputType) context.typeMapper.outputTypeFor(String.class)); - holder.addGqlArgument(holder.getObjectMember(), fieldBuilder, TypeMapper.InputContext.VALIDATE); + propertyInteractor.addGqlArgument(propertyInteractor.getObjectMember(), fieldBuilder, TypeMapper.InputContext.VALIDATE); setField(fieldBuilder.build()); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParam.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParam.java index d45f1ab539..1f7a0d426c 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParam.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParam.java @@ -47,7 +47,7 @@ public class GqlvActionParamsParam implements ActionParamInteractor, ObjectActionParameterProvider { - @Getter private final ActionInteractor holder; + @Getter private final ActionInteractor actionInteractor; @Getter private final ObjectActionParameter objectActionParameter; @Getter private final int paramNum; @@ -74,7 +74,7 @@ public class GqlvActionParamsParam final Context context, final int paramNum) { super(TypeNames.actionParamTypeNameFor(holder.getObjectSpecification(), oap, holder.getSchemaType()), context); - this.holder = holder; + this.actionInteractor = holder; this.objectActionParameter = oap; this.paramNum = paramNum; @@ -105,12 +105,12 @@ public class GqlvActionParamsParam @Override public ObjectSpecification getObjectSpecification() { - return holder.getObjectSpecification(); + return actionInteractor.getObjectSpecification(); } @Override public ObjectAction getObjectMember() { - return holder.getObjectMember(); + return actionInteractor.getObjectMember(); } @Override @@ -151,7 +151,7 @@ public class GqlvActionParamsParam final GraphQLFieldDefinition.Builder fieldBuilder, final TypeMapper.InputContext inputContext, final int paramNum) { - holder.addGqlArguments(objectAction, fieldBuilder, inputContext, paramNum); + actionInteractor.addGqlArguments(objectAction, fieldBuilder, inputContext, paramNum); } @Override @@ -159,7 +159,7 @@ public class GqlvActionParamsParam final Environment environment, final ObjectAction objectAction, final BookmarkService bookmarkService) { - return holder.argumentManagedObjectsFor(environment, objectAction, bookmarkService); + return actionInteractor.argumentManagedObjectsFor(environment, objectAction, bookmarkService); } @Override @@ -169,7 +169,7 @@ public class GqlvActionParamsParam @Override public SchemaType getSchemaType() { - return holder.getSchemaType(); + return actionInteractor.getSchemaType(); } }
