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 565e1fbf9bfa3b1ef1065f8cc25aab916a9426ad Author: danhaywood <[email protected]> AuthorDate: Fri Feb 23 06:39:53 2024 +0000 CAUSEWAY-3676: simplifies holders (7) --- .../model/domain/rich/query/GqlvAction.java | 3 +-- .../model/domain/rich/query/GqlvActionInvoke.java | 6 ++--- .../domain/rich/query/GqlvActionInvokeArgs.java | 6 ++--- .../domain/rich/query/GqlvActionInvokeArgsArg.java | 4 +-- .../domain/rich/query/GqlvActionInvokeResult.java | 4 +-- .../model/domain/rich/query/GqlvActionParams.java | 6 ++--- .../domain/rich/query/GqlvActionParamsParam.java | 4 +-- ...rActionInvoke.java => HolderActionDetails.java} | 6 ++--- .../rich/query/HolderActionParamDetails.java | 6 ++--- .../domain/rich/query/HolderActionParams.java | 30 ---------------------- 10 files changed, 22 insertions(+), 53 deletions(-) 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 a597a3709e..d174f3eeed 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 @@ -52,9 +52,8 @@ public class GqlvAction extends GqlvMember<ObjectAction, org.apache.causeway.viewer.graphql.model.domain.common.query.GqlvMemberHolder> implements HolderMember<ObjectAction>, - HolderActionInvoke, + HolderActionDetails, HolderActionValidity, - HolderActionParams, Parent, org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider, org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider<ObjectAction>, org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider { private final GqlvMemberHidden<ObjectAction> hidden; 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 c5405e8120..b3848f3a5b 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 @@ -42,14 +42,14 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionInvoke extends GqlvAbstractCustom - implements HolderActionInvoke { + implements HolderActionDetails { - private final HolderActionInvoke holder; + private final HolderActionDetails holder; private final GqlvActionInvokeResult result; private final GqlvActionInvokeArgs args; public GqlvActionInvoke( - final HolderActionInvoke holder, + final HolderActionDetails holder, final Context context) { super(TypeNames.actionInvokeTypeNameFor(holder.getObjectSpecification(), holder.getObjectAction(), holder.getSchemaType()), context); 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 6a014f017e..0e0a38bfff 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 @@ -46,14 +46,14 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionInvokeArgs extends GqlvAbstractCustom - implements HolderActionInvoke { + implements HolderActionDetails { - @Getter private final HolderActionInvoke holder; + @Getter private final HolderActionDetails holder; private final List<GqlvActionInvokeArgsArg> args = new ArrayList<>(); public GqlvActionInvokeArgs( - final HolderActionInvoke holder, + final HolderActionDetails holder, final Context context) { super(TypeNames.actionArgsTypeNameFor(holder.getObjectSpecification(), holder.getObjectAction(), holder.getSchemaType()), context); this.holder = holder; 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 2252dbfa6e..7cc5b0dfb5 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 @@ -37,12 +37,12 @@ import lombok.extern.log4j.Log4j2; public class GqlvActionInvokeArgsArg extends GqlvAbstract { - @Getter private final HolderActionInvoke holder; + @Getter private final HolderActionDetails holder; @Getter private final ObjectActionParameter objectActionParameter; @Getter private final int paramNum; public GqlvActionInvokeArgsArg( - final HolderActionInvoke holder, + final HolderActionDetails holder, final ObjectActionParameter objectActionParameter, final Context context, final int paramNum) { 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 ed9eca9da5..12ce8923c6 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 @@ -46,10 +46,10 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionInvokeResult extends GqlvAbstract { - private final HolderActionInvoke holder; + private final HolderActionDetails holder; public GqlvActionInvokeResult( - final HolderActionInvoke holder, + final HolderActionDetails holder, final Context context) { super(context); 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 8d4de85afa..234a741fa1 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 @@ -45,14 +45,14 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionParams extends GqlvAbstractCustom - implements HolderActionParams { + implements HolderActionDetails { - @Getter private final HolderActionParams holder; + @Getter private final HolderActionDetails holder; private final List<GqlvActionParamsParam> params = new ArrayList<>(); public GqlvActionParams( - final HolderActionParams holder, + final HolderActionDetails holder, final Context context) { super(TypeNames.actionParamsTypeNameFor(holder.getObjectSpecification(), holder.getObjectAction(), holder.getSchemaType()), context); this.holder = holder; 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 2614163b59..64799af89c 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 @@ -46,7 +46,7 @@ public class GqlvActionParamsParam implements HolderActionParamDetails, ObjectActionParameterProvider, SchemaTypeProvider { - @Getter private final HolderActionParams holder; + @Getter private final HolderActionDetails holder; @Getter private final ObjectActionParameter objectActionParameter; @Getter private final int paramNum; @@ -68,7 +68,7 @@ public class GqlvActionParamsParam private final GqlvActionParamsParamDatatype datatype; public GqlvActionParamsParam( - final HolderActionParams holder, + final HolderActionDetails holder, final ObjectActionParameter oap, final Context context, final int paramNum) { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionInvoke.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionDetails.java similarity index 91% rename from viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionInvoke.java rename to viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionDetails.java index 1a3c231261..57c58555b9 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionInvoke.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionDetails.java @@ -12,10 +12,10 @@ import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationP import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; import org.apache.causeway.viewer.graphql.model.types.TypeMapper; -public interface HolderActionInvoke +public interface HolderActionDetails extends ObjectSpecificationProvider, - ObjectActionProvider, - SchemaTypeProvider { + ObjectActionProvider, + SchemaTypeProvider { void addGqlArguments( final ObjectAction objectAction, diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamDetails.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamDetails.java index 9dd84160f4..e73db92565 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamDetails.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamDetails.java @@ -7,10 +7,10 @@ import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionParamete import org.apache.causeway.viewer.graphql.model.types.TypeMapper; public interface HolderActionParamDetails - extends HolderActionParams, - ObjectActionParameterProvider{ + extends HolderActionDetails, + ObjectActionParameterProvider{ - HolderActionParams getHolder(); + HolderActionDetails getHolder(); void addGqlArgument( ObjectAction objectAction, diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParams.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParams.java deleted file mode 100644 index 4f2c773bb3..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParams.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.apache.causeway.viewer.graphql.model.domain.rich.query; - -import graphql.schema.GraphQLFieldDefinition; - -import org.apache.causeway.applib.services.bookmark.BookmarkService; -import org.apache.causeway.commons.collections.Can; -import org.apache.causeway.core.metamodel.object.ManagedObject; -import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; -import org.apache.causeway.viewer.graphql.model.domain.Environment; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; -import org.apache.causeway.viewer.graphql.model.types.TypeMapper; - -public interface HolderActionParams - extends ObjectSpecificationProvider, - ObjectActionProvider, - SchemaTypeProvider { - - void addGqlArguments( - ObjectAction objectAction, - GraphQLFieldDefinition.Builder fieldBuilder, - TypeMapper.InputContext inputContext, - int paramNum); - - Can<ManagedObject> argumentManagedObjectsFor( - Environment dataFetchingEnvironment, - ObjectAction objectAction, - BookmarkService bookmarkService); -}
