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 ee3d0ea058db1ed67148f9fd96b6921d8c53323e Author: danhaywood <[email protected]> AuthorDate: Thu Feb 22 21:49:54 2024 +0000 CAUSEWAY-3676: simplifies holders --- .../model/domain/rich/query/GqlvActionParams.java | 2 +- .../domain/rich/query/GqlvActionParamsParam.java | 4 +-- .../domain/rich/query/HolderActionParamsParam.java | 30 ---------------------- .../query/HolderActionParamsParamAutoComplete.java | 2 +- .../rich/query/HolderActionParamsParamChoices.java | 2 +- .../rich/query/HolderActionParamsParamDefault.java | 2 +- 6 files changed, 6 insertions(+), 36 deletions(-) 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 e058e28184..8d4de85afa 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,7 +45,7 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionParams extends GqlvAbstractCustom - implements HolderActionParamsParam { + implements HolderActionParams { @Getter private final HolderActionParams 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 7581e0f62a..799f02e4e5 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 @@ -49,7 +49,7 @@ public class GqlvActionParamsParam HolderActionParamsParamValidate, HolderActionParamsParamDatatype { - @Getter private final HolderActionParamsParam holder; + @Getter private final HolderActionParams holder; @Getter private final ObjectActionParameter objectActionParameter; @Getter private final int paramNum; @@ -71,7 +71,7 @@ public class GqlvActionParamsParam private final GqlvActionParamsParamDatatype datatype; public GqlvActionParamsParam( - final HolderActionParamsParam holder, + final HolderActionParams 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/HolderActionParamsParam.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParam.java deleted file mode 100644 index 9ea0c078c2..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParam.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 HolderActionParamsParam - 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); -} 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 index 09f509a6f7..00ab3e38ca 100644 --- 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 @@ -18,7 +18,7 @@ public interface HolderActionParamsParamAutoComplete ObjectActionProvider, ObjectActionParameterProvider, SchemaTypeProvider { - HolderActionParamsParam getHolder(); + HolderActionParams getHolder(); void addGqlArguments( ObjectAction objectAction, 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/HolderActionParamsParamChoices.java index b0082c4a51..1b16929949 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/HolderActionParamsParamChoices.java @@ -18,7 +18,7 @@ public interface HolderActionParamsParamChoices ObjectActionProvider, ObjectActionParameterProvider, SchemaTypeProvider { - HolderActionParamsParam getHolder(); + HolderActionParams getHolder(); void addGqlArguments( ObjectAction objectAction, diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamDefault.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamDefault.java index b974e0eca2..fa455a5d09 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamDefault.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamDefault.java @@ -19,7 +19,7 @@ public interface HolderActionParamsParamDefault ObjectActionParameterProvider, SchemaTypeProvider { - HolderActionParamsParam getHolder(); + HolderActionParams getHolder(); void addGqlArguments( ObjectAction objectAction,
