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 51e8fa04da431cdd082bc435c0c0a7f7d42c9688 Author: danhaywood <[email protected]> AuthorDate: Fri Feb 23 09:46:50 2024 +0000 CAUSEWAY-3676: renames holder -> interactor (2) --- .../graphql/model/domain/simple/query/GqlvAction.java | 8 ++++---- .../model/domain/simple/query/GqlvActionInvoke.java | 15 ++++++--------- .../domain/simple/query/GqlvActionInvokeArgs.java | 12 ++++++------ .../domain/simple/query/GqlvActionInvokeArgsArg.java | 10 +++++----- .../domain/simple/query/GqlvActionInvokeResult.java | 16 ++++++++-------- .../model/domain/simple/query/GqlvActionParams.java | 12 ++++++------ .../query/GqlvActionParamsParamAutoComplete.java | 18 +++++++++--------- .../simple/query/GqlvActionParamsParamChoices.java | 18 +++++++++--------- .../simple/query/GqlvActionParamsParamDatatype.java | 10 +++++----- .../simple/query/GqlvActionParamsParamDefault.java | 19 ++++++++++--------- .../simple/query/GqlvActionParamsParamDisabled.java | 14 +++++++------- .../simple/query/GqlvActionParamsParamHidden.java | 16 ++++++++-------- .../simple/query/GqlvActionParamsParamValidate.java | 14 +++++++------- .../model/domain/simple/query/GqlvActionValidity.java | 12 ++++++------ .../domain/simple/query/GqlvAssociationDatatype.java | 10 +++++----- .../model/domain/simple/query/GqlvAssociationGet.java | 14 +++++++------- .../model/domain/simple/query/GqlvCollection.java | 8 ++++---- .../domain/simple/query/GqlvCollectionDatatype.java | 4 ++-- .../model/domain/simple/query/GqlvCollectionGet.java | 4 ++-- .../graphql/model/domain/simple/query/GqlvMember.java | 6 +++--- .../model/domain/simple/query/GqlvMemberDisabled.java | 8 ++++---- .../model/domain/simple/query/GqlvMemberHidden.java | 8 ++++---- .../model/domain/simple/query/GqlvProperty.java | 4 ++-- .../domain/simple/query/GqlvPropertyAutoComplete.java | 10 +++++----- .../domain/simple/query/GqlvPropertyChoices.java | 12 ++++++------ .../domain/simple/query/GqlvPropertyDatatype.java | 4 ++-- .../model/domain/simple/query/GqlvPropertyGet.java | 4 ++-- .../domain/simple/query/GqlvPropertyGetBlob.java | 15 ++++++++------- .../simple/query/GqlvPropertyGetBlobAbstract.java | 8 ++++---- .../domain/simple/query/GqlvPropertyGetBlobBytes.java | 6 +++--- .../simple/query/GqlvPropertyGetBlobMimeType.java | 4 ++-- .../domain/simple/query/GqlvPropertyGetBlobName.java | 4 ++-- .../domain/simple/query/GqlvPropertyGetClob.java | 14 +++++++------- .../simple/query/GqlvPropertyGetClobAbstract.java | 4 ++-- .../domain/simple/query/GqlvPropertyGetClobChars.java | 4 ++-- .../simple/query/GqlvPropertyGetClobMimeType.java | 4 ++-- .../domain/simple/query/GqlvPropertyGetClobName.java | 4 ++-- .../model/domain/simple/query/GqlvPropertySet.java | 12 ++++++------ .../domain/simple/query/GqlvPropertyValidate.java | 6 +++--- 39 files changed, 187 insertions(+), 188 deletions(-) diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAction.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAction.java index 9e2d43068f..b547622a1d 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAction.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvActionInvoke.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionInvoke.java index 052d7c91e5..0d6e38014f 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionInvoke.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvActionInvokeArgs.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionInvokeArgs.java index 1db163e3e5..2b602a5b76 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionInvokeArgs.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvActionInvokeArgsArg.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionInvokeArgsArg.java index b223b5e7c7..0371bf3ecd 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionInvokeArgsArg.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvActionInvokeResult.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionInvokeResult.java index be3c2a3e2c..8faa024be4 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionInvokeResult.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionInvokeResult.java @@ -46,16 +46,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) { @@ -81,7 +81,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(), @@ -94,7 +94,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()); } } @@ -111,7 +111,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); @@ -125,7 +125,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/simple/query/GqlvActionParams.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParams.java index 333dff113f..67ead1dfe1 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParams.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvActionParamsParamAutoComplete.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParamAutoComplete.java index 9d588370f9..d7afbafe0b 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParamAutoComplete.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParamAutoComplete.java @@ -49,21 +49,21 @@ package org.apache.causeway.viewer.graphql.model.domain.simple.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.simple.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/simple/query/GqlvActionParamsParamChoices.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParamChoices.java index 26d05a305d..0b6e6a2199 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParamChoices.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParamChoices.java @@ -45,21 +45,21 @@ package org.apache.causeway.viewer.graphql.model.domain.simple.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.simple.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/simple/query/GqlvActionParamsParamDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParamDatatype.java index 25db509556..f9f4076eb8 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParamDatatype.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvActionParamsParamDefault.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParamDefault.java index 18d5909911..34c06d5fb5 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParamDefault.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvActionParamsParamDisabled.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParamDisabled.java index 8db900b724..3251ed12a2 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParamDisabled.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvActionParamsParamHidden.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParamHidden.java index 92dc02b224..78f2a73c96 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParamHidden.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParamHidden.java @@ -1,4 +1,4 @@ -/* + /* * 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 @@ -38,18 +38,18 @@ package org.apache.causeway.viewer.graphql.model.domain.simple.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/simple/query/GqlvActionParamsParamValidate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParamValidate.java index 66dacabb9c..3c4ca8c2fb 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionParamsParamValidate.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvActionValidity.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionValidity.java index 33ca703329..e4cd560201 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvActionValidity.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvAssociationDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAssociationDatatype.java index ff0b66e402..072e76ca05 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAssociationDatatype.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvAssociationGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAssociationGet.java index 8bdc652b0a..0763b453c3 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAssociationGet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAssociationGet.java @@ -21,7 +21,7 @@ package org.apache.causeway.viewer.graphql.model.domain.simple.query; import graphql.schema.DataFetchingEnvironment; import graphql.schema.GraphQLOutputType; -import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; +import lombok.val; import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation; @@ -30,19 +30,19 @@ import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract; import org.apache.causeway.viewer.graphql.model.domain.common.interactors.MemberInteractor; import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; -import lombok.val; +import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; 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/simple/query/GqlvCollection.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvCollection.java index 1c27101396..a895e61a6c 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvCollection.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvCollectionDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvCollectionDatatype.java index 09380938bd..7d17783367 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvCollectionDatatype.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvCollectionGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvCollectionGet.java index 24ff886803..a69a5a593b 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvCollectionGet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvMember.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvMember.java index d60e684975..d5d98c306b 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvMember.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvMemberDisabled.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvMemberDisabled.java index b081c5cee3..e5b6b41044 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvMemberDisabled.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvMemberHidden.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvMemberHidden.java index 40e5b1eeca..6d15f670d9 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvMemberHidden.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvProperty.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvProperty.java index 8b6aeea948..ccfce9e48c 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvProperty.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvPropertyAutoComplete.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyAutoComplete.java index cb8ef8ccc3..c8abe674e4 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyAutoComplete.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvPropertyChoices.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyChoices.java index 7bfee6f925..0e3bc443be 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyChoices.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvPropertyDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyDatatype.java index 41da1fa3ad..f9ad6655c7 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyDatatype.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvPropertyGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGet.java index a2d45e7853..f29297886a 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvPropertyGetBlob.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlob.java index fe1b234ec1..6c6b93ff3e 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlob.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvPropertyGetBlobAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlobAbstract.java index 1c439d0863..d25550358f 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlobAbstract.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvPropertyGetBlobBytes.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlobBytes.java index 290b99b232..8e25fa3170 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlobBytes.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvPropertyGetBlobMimeType.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlobMimeType.java index e466630c5c..4e50483a0f 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlobMimeType.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvPropertyGetBlobName.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlobName.java index 51da3a60c8..a242a612cf 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlobName.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvPropertyGetClob.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClob.java index 4346307e18..b57efcbd56 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClob.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvPropertyGetClobAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClobAbstract.java index bfecf39d6c..4a7917e245 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClobAbstract.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvPropertyGetClobChars.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClobChars.java index be75d6d9aa..b0b7aa9f1c 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClobChars.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvPropertyGetClobMimeType.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClobMimeType.java index aa8a26aad3..7071d986de 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClobMimeType.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvPropertyGetClobName.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClobName.java index fe4e42ea43..7575c5fbd7 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClobName.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvPropertySet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertySet.java index ac2b1973b6..b64d2a5ccf 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertySet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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/simple/query/GqlvPropertyValidate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyValidate.java index d62d3cd6c4..47f8fb4d1a 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyValidate.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/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()); }
