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 8de1a786804663cf638447a8d840ade81722b43c Author: danhaywood <[email protected]> AuthorDate: Thu Feb 22 21:51:03 2024 +0000 CAUSEWAY-3676: simplifies holders --- .../domain/rich/query/GqlvActionParamsParam.java | 3 +- .../query/GqlvActionParamsParamAutoComplete.java | 4 +-- .../rich/query/GqlvActionParamsParamChoices.java | 4 +-- .../query/HolderActionParamsParamAutoComplete.java | 33 ---------------------- ...es.java => HolderActionParamsParamDetails.java} | 2 +- 5 files changed, 6 insertions(+), 40 deletions(-) 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 799f02e4e5..3f86d09215 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 @@ -43,8 +43,7 @@ public class GqlvActionParamsParam extends GqlvAbstractCustom implements HolderActionParamsParamHidden, HolderActionParamsParamDisabled, - HolderActionParamsParamChoices, - HolderActionParamsParamAutoComplete, + HolderActionParamsParamDetails, HolderActionParamsParamDefault, HolderActionParamsParamValidate, HolderActionParamsParamDatatype { 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 a38c7c7ea7..0f49e90066 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 @@ -48,10 +48,10 @@ package org.apache.causeway.viewer.graphql.model.domain.rich.query; private static final String SEARCH_PARAM_NAME = "search"; - private final HolderActionParamsParamAutoComplete holder; + private final HolderActionParamsParamDetails holder; public GqlvActionParamsParamAutoComplete( - final HolderActionParamsParamAutoComplete holder, + final HolderActionParamsParamDetails holder, final Context context) { super(context); this.holder = holder; 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 ff1a5b5c4d..de1fa7289c 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 @@ -44,10 +44,10 @@ package org.apache.causeway.viewer.graphql.model.domain.rich.query; @Log4j2 public class GqlvActionParamsParamChoices extends GqlvAbstract { - private final HolderActionParamsParamChoices holder; + private final HolderActionParamsParamDetails holder; public GqlvActionParamsParamChoices( - final HolderActionParamsParamChoices holder, + final HolderActionParamsParamDetails holder, final Context context) { super(context); this.holder = holder; diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamAutoComplete.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamAutoComplete.java deleted file mode 100644 index 00ab3e38ca..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamAutoComplete.java +++ /dev/null @@ -1,33 +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.ObjectActionParameterProvider; -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 HolderActionParamsParamAutoComplete - extends ObjectSpecificationProvider, - ObjectActionProvider, - ObjectActionParameterProvider, - SchemaTypeProvider { - HolderActionParams getHolder(); - - void addGqlArguments( - ObjectAction objectAction, - GraphQLFieldDefinition.Builder fieldBuilder, - TypeMapper.InputContext inputContext, - int paramNum); - - Can<ManagedObject> argumentManagedObjectsFor( - Environment environment, - ObjectAction objectAction, - BookmarkService bookmarkService); -} diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamChoices.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamDetails.java similarity index 96% rename from viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamChoices.java rename to viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamDetails.java index 1b16929949..dcdad80e97 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamChoices.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamDetails.java @@ -13,7 +13,7 @@ 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 HolderActionParamsParamChoices +public interface HolderActionParamsParamDetails extends ObjectSpecificationProvider, ObjectActionProvider, ObjectActionParameterProvider,
