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 0c0d1391473f464262ca8f2bd514b38f87a4cc28 Author: danhaywood <[email protected]> AuthorDate: Thu Feb 22 22:02:43 2024 +0000 CAUSEWAY-3676: simplifies holders (4) --- .../domain/rich/query/GqlvActionParamsParam.java | 10 +++---- .../query/GqlvActionParamsParamAutoComplete.java | 4 +-- .../rich/query/GqlvActionParamsParamChoices.java | 4 +-- .../rich/query/GqlvActionParamsParamDatatype.java | 4 +-- .../rich/query/GqlvActionParamsParamDefault.java | 4 +-- .../rich/query/GqlvActionParamsParamDisabled.java | 4 +-- .../rich/query/GqlvActionParamsParamHidden.java | 4 +-- .../rich/query/GqlvActionParamsParamValidate.java | 4 +-- .../rich/query/HolderActionParamDetails.java | 20 +++++++++++++ .../query/HolderActionParamsParamDatatype.java | 9 ------ .../rich/query/HolderActionParamsParamDefault.java | 34 ---------------------- .../rich/query/HolderActionParamsParamDetails.java | 33 --------------------- .../query/HolderActionParamsParamDisabled.java | 29 ------------------ .../rich/query/HolderActionParamsParamHidden.java | 32 -------------------- .../query/HolderActionParamsParamValidate.java | 28 ------------------ 15 files changed, 38 insertions(+), 185 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 3f86d09215..2614163b59 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 @@ -33,6 +33,8 @@ import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstractCustom; import org.apache.causeway.viewer.graphql.model.domain.SchemaType; import org.apache.causeway.viewer.graphql.model.domain.TypeNames; import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; +import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionParameterProvider; +import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; import org.apache.causeway.viewer.graphql.model.types.TypeMapper; import lombok.Getter; @@ -41,12 +43,8 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionParamsParam extends GqlvAbstractCustom - implements HolderActionParamsParamHidden, - HolderActionParamsParamDisabled, - HolderActionParamsParamDetails, - HolderActionParamsParamDefault, - HolderActionParamsParamValidate, - HolderActionParamsParamDatatype { + implements HolderActionParamDetails, + ObjectActionParameterProvider, SchemaTypeProvider { @Getter private final HolderActionParams holder; @Getter private final ObjectActionParameter objectActionParameter; 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 0f49e90066..1d53eae7c2 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 HolderActionParamsParamDetails holder; + private final HolderActionParamDetails holder; public GqlvActionParamsParamAutoComplete( - final HolderActionParamsParamDetails holder, + final HolderActionParamDetails 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 de1fa7289c..2d24eb41ba 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 HolderActionParamsParamDetails holder; + private final HolderActionParamDetails holder; public GqlvActionParamsParamChoices( - final HolderActionParamsParamDetails holder, + final HolderActionParamDetails 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/GqlvActionParamsParamDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDatatype.java index 52e74b7565..329aca8ed7 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDatatype.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDatatype.java @@ -31,10 +31,10 @@ import lombok.val; public class GqlvActionParamsParamDatatype extends GqlvAbstract { - private final HolderActionParamsParamDatatype holder; + private final HolderActionParamDetails holder; public GqlvActionParamsParamDatatype( - final HolderActionParamsParamDatatype holder, + final HolderActionParamDetails 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/GqlvActionParamsParamDefault.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDefault.java index 281b9e6070..e5f306afaf 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDefault.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDefault.java @@ -39,10 +39,10 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionParamsParamDefault extends GqlvAbstract { - private final HolderActionParamsParamDefault holder; + private final HolderActionParamDetails holder; public GqlvActionParamsParamDefault( - final HolderActionParamsParamDefault holder, + final HolderActionParamDetails 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/GqlvActionParamsParamDisabled.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDisabled.java index fc3eccdeac..f7eba01053 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDisabled.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamDisabled.java @@ -38,10 +38,10 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionParamsParamDisabled extends GqlvAbstract { - private final HolderActionParamsParamDisabled holder; + private final HolderActionParamDetails holder; public GqlvActionParamsParamDisabled( - final HolderActionParamsParamDisabled holder, + final HolderActionParamDetails 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/GqlvActionParamsParamHidden.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamHidden.java index 5219ef309a..104cd547f6 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamHidden.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamHidden.java @@ -37,10 +37,10 @@ package org.apache.causeway.viewer.graphql.model.domain.rich.query; @Log4j2 public class GqlvActionParamsParamHidden extends GqlvAbstract { - private final HolderActionParamsParamHidden holder; + private final HolderActionParamDetails holder; public GqlvActionParamsParamHidden( - final HolderActionParamsParamHidden holder, + final HolderActionParamDetails 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/GqlvActionParamsParamValidate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamValidate.java index b407de6742..2cc0930530 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamValidate.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvActionParamsParamValidate.java @@ -37,10 +37,10 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionParamsParamValidate extends GqlvAbstract { - private final HolderActionParamsParamValidate holder; + private final HolderActionParamDetails holder; public GqlvActionParamsParamValidate( - final HolderActionParamsParamValidate holder, + final HolderActionParamDetails 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/HolderActionParamDetails.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamDetails.java new file mode 100644 index 0000000000..9dd84160f4 --- /dev/null +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamDetails.java @@ -0,0 +1,20 @@ +package org.apache.causeway.viewer.graphql.model.domain.rich.query; + +import graphql.schema.GraphQLFieldDefinition; + +import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; +import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionParameterProvider; +import org.apache.causeway.viewer.graphql.model.types.TypeMapper; + +public interface HolderActionParamDetails + extends HolderActionParams, + ObjectActionParameterProvider{ + + HolderActionParams getHolder(); + + void addGqlArgument( + ObjectAction objectAction, + GraphQLFieldDefinition.Builder fieldBuilder, + TypeMapper.InputContext inputContext, + int paramNum); +} diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamDatatype.java deleted file mode 100644 index 38aa044cf5..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamDatatype.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.apache.causeway.viewer.graphql.model.domain.rich.query; - -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectActionParameterProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; - -public interface HolderActionParamsParamDatatype - extends ObjectActionParameterProvider, - SchemaTypeProvider { -} 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 deleted file mode 100644 index fa455a5d09..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamDefault.java +++ /dev/null @@ -1,34 +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 HolderActionParamsParamDefault - 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/HolderActionParamsParamDetails.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamDetails.java deleted file mode 100644 index dcdad80e97..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamDetails.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 HolderActionParamsParamDetails - 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/HolderActionParamsParamDisabled.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamDisabled.java deleted file mode 100644 index a6b27f9c3a..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamDisabled.java +++ /dev/null @@ -1,29 +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.types.TypeMapper; - -public interface HolderActionParamsParamDisabled - extends ObjectSpecificationProvider, - ObjectActionProvider, - ObjectActionParameterProvider { - void addGqlArguments( - ObjectAction objectAction, - GraphQLFieldDefinition.Builder fieldBuilder, - TypeMapper.InputContext inputContext, - int i); - - 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/HolderActionParamsParamHidden.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamHidden.java deleted file mode 100644 index 2cf3262d10..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamHidden.java +++ /dev/null @@ -1,32 +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 HolderActionParamsParamHidden - extends ObjectSpecificationProvider, - ObjectActionProvider, - ObjectActionParameterProvider, - SchemaTypeProvider { - - 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/HolderActionParamsParamValidate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamValidate.java deleted file mode 100644 index 96114798b0..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionParamsParamValidate.java +++ /dev/null @@ -1,28 +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 HolderActionParamsParamValidate - extends ObjectSpecificationProvider, - ObjectActionProvider, - ObjectActionParameterProvider, - SchemaTypeProvider { - - void addGqlArgument(ObjectAction objectAction, GraphQLFieldDefinition.Builder fieldBuilder, TypeMapper.InputContext inputContext, int paramNum); - - Can<ManagedObject> argumentManagedObjectsFor( - Environment environment, - ObjectAction objectAction, - BookmarkService bookmarkService); -}
