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 9edc02b7d0950f81cda5955f124335eef333087a Author: danhaywood <[email protected]> AuthorDate: Fri Feb 23 08:51:57 2024 +0000 CAUSEWAY-3676: simplifies holders (17) --- .../model/domain/rich/query/GqlvAssociationDatatype.java | 4 ++-- .../graphql/model/domain/rich/query/GqlvCollection.java | 10 +++++++--- .../model/domain/rich/query/GqlvCollectionDatatype.java | 2 +- .../graphql/model/domain/rich/query/GqlvProperty.java | 4 +--- .../model/domain/rich/query/GqlvPropertyAutoComplete.java | 5 +++-- .../model/domain/rich/query/GqlvPropertyChoices.java | 4 ++-- .../model/domain/rich/query/GqlvPropertyDatatype.java | 2 +- .../graphql/model/domain/rich/query/GqlvPropertySet.java | 4 ++-- .../model/domain/rich/query/GqlvPropertyValidate.java | 4 ++-- .../model/domain/rich/query/HolderAssociationDatatype.java | 10 ---------- .../model/domain/rich/query/HolderAssociationGet.java | 13 ------------- .../model/domain/rich/query/HolderPropertyAutoComplete.java | 13 ------------- .../{HolderPropertySet.java => HolderPropertyDetails.java} | 2 +- .../graphql/model/domain/rich/query/HolderPropertyGet.java | 8 -------- 14 files changed, 22 insertions(+), 63 deletions(-) diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationDatatype.java index 853a8eef4f..62e8206fbf 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationDatatype.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationDatatype.java @@ -32,10 +32,10 @@ import lombok.val; public abstract class GqlvAssociationDatatype<T extends ObjectAssociation> extends GqlvAbstract { - private final HolderAssociationDatatype<T> holder; + private final HolderPropertyDetails holder; public GqlvAssociationDatatype( - final HolderAssociationDatatype<T> holder, + final HolderPropertyDetails 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/GqlvCollection.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollection.java index 2d2e5b2856..755684bb02 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollection.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollection.java @@ -23,11 +23,15 @@ import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation; import org.apache.causeway.viewer.graphql.model.context.Context; 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.domain.common.query.GqlvMemberHolder; +import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider; +import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; +import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; public class GqlvCollection - extends GqlvAssociation<OneToManyAssociation, org.apache.causeway.viewer.graphql.model.domain.common.query.GqlvMemberHolder> + extends GqlvAssociation<OneToManyAssociation, GqlvMemberHolder> implements HolderMember<OneToManyAssociation>, - HolderAssociationDatatype<OneToManyAssociation>, org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider, org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider<OneToManyAssociation>, org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider { + ObjectSpecificationProvider, ObjectMemberProvider<OneToManyAssociation>, SchemaTypeProvider { private final GqlvMemberHidden<OneToManyAssociation> hidden; private final GqlvMemberDisabled<OneToManyAssociation> disabled; @@ -35,7 +39,7 @@ public class GqlvCollection private final GqlvCollectionDatatype datatype; public GqlvCollection( - final org.apache.causeway.viewer.graphql.model.domain.common.query.GqlvMemberHolder holder, + final GqlvMemberHolder holder, final OneToManyAssociation otma, final Context context ) { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionDatatype.java index e2026f17ad..93a37b1700 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionDatatype.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionDatatype.java @@ -24,7 +24,7 @@ import org.apache.causeway.viewer.graphql.model.context.Context; public class GqlvCollectionDatatype extends GqlvAssociationDatatype<OneToManyAssociation> { public GqlvCollectionDatatype( - final HolderAssociationDatatype<OneToManyAssociation> holder, + final HolderPropertyDetails holder, final Context context) { super(holder, context); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvProperty.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvProperty.java index d7d70cf71e..beb251f705 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvProperty.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvProperty.java @@ -40,9 +40,7 @@ public class GqlvProperty extends GqlvAssociation<OneToOneAssociation, org.apache.causeway.viewer.graphql.model.domain.common.query.GqlvMemberHolder> implements HolderMember<OneToOneAssociation>, - HolderPropertyAutoComplete, - HolderPropertySet, - HolderAssociationDatatype<OneToOneAssociation>, + HolderPropertyDetails, ObjectSpecificationProvider, ObjectMemberProvider<OneToOneAssociation>, SchemaTypeProvider { private final GqlvMemberHidden<OneToOneAssociation> hidden; diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyAutoComplete.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyAutoComplete.java index e420687bad..1f773a9fd5 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyAutoComplete.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyAutoComplete.java @@ -29,6 +29,7 @@ import static graphql.schema.GraphQLNonNull.nonNull; import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy; import org.apache.causeway.core.metamodel.object.ManagedObject; +import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.domain.GqlvAbstract; import org.apache.causeway.viewer.graphql.model.domain.SchemaType; @@ -40,10 +41,10 @@ public class GqlvPropertyAutoComplete extends GqlvAbstract { private static final String SEARCH_PARAM_NAME = "search"; - private final HolderPropertyAutoComplete holder; + private final HolderMember<OneToOneAssociation> holder; public GqlvPropertyAutoComplete( - final HolderPropertyAutoComplete holder, + final HolderMember<OneToOneAssociation> 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/GqlvPropertyChoices.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyChoices.java index 2148b534b9..7cf5ecb6fc 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyChoices.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyChoices.java @@ -37,10 +37,10 @@ import lombok.val; public class GqlvPropertyChoices extends GqlvAbstract { - final HolderPropertySet holder; + final HolderPropertyDetails holder; public GqlvPropertyChoices( - final HolderPropertySet holder, + final HolderPropertyDetails 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/GqlvPropertyDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyDatatype.java index 51da87feb0..0220218316 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyDatatype.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyDatatype.java @@ -24,7 +24,7 @@ import org.apache.causeway.viewer.graphql.model.context.Context; public class GqlvPropertyDatatype extends GqlvAssociationDatatype<OneToOneAssociation> { public GqlvPropertyDatatype( - final HolderAssociationDatatype<OneToOneAssociation> holder, + final HolderPropertyDetails holder, final Context context) { super(holder, context); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertySet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertySet.java index 79c8d6328d..1c623bad5c 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertySet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertySet.java @@ -40,10 +40,10 @@ import lombok.val; public class GqlvPropertySet extends GqlvAbstract { - final HolderPropertySet holder; + final HolderPropertyDetails holder; public GqlvPropertySet( - final HolderPropertySet holder, + final HolderPropertyDetails 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/GqlvPropertyValidate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyValidate.java index b07f15be9b..f5a1ac76f1 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyValidate.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyValidate.java @@ -34,10 +34,10 @@ import lombok.val; public class GqlvPropertyValidate extends GqlvAbstract { - final HolderPropertySet holder; + final HolderPropertyDetails holder; public GqlvPropertyValidate( - final HolderPropertySet holder, + final HolderPropertyDetails 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/HolderAssociationDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderAssociationDatatype.java deleted file mode 100644 index 7379127fd4..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderAssociationDatatype.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.apache.causeway.viewer.graphql.model.domain.rich.query; - -import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; - -public interface HolderAssociationDatatype<T extends ObjectAssociation> - extends ObjectMemberProvider<T>, - SchemaTypeProvider { -} diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderAssociationGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderAssociationGet.java deleted file mode 100644 index 6355bfe4ec..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderAssociationGet.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.apache.causeway.viewer.graphql.model.domain.rich.query; - -import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; - -public interface HolderAssociationGet<T extends ObjectAssociation> - extends SchemaTypeProvider, - ObjectSpecificationProvider, - ObjectMemberProvider<T> { - -} diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyAutoComplete.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyAutoComplete.java deleted file mode 100644 index d12996245a..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyAutoComplete.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.apache.causeway.viewer.graphql.model.domain.rich.query; - -import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; - -public interface HolderPropertyAutoComplete - extends ObjectSpecificationProvider, - ObjectMemberProvider<OneToOneAssociation>, - SchemaTypeProvider { - -} diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertySet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyDetails.java similarity index 95% rename from viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertySet.java rename to viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyDetails.java index c829867f0b..9c5afe6f4d 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertySet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyDetails.java @@ -8,7 +8,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 HolderPropertySet +public interface HolderPropertyDetails extends SchemaTypeProvider, ObjectSpecificationProvider, ObjectMemberProvider<OneToOneAssociation> { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGet.java deleted file mode 100644 index a07ff50921..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGet.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.apache.causeway.viewer.graphql.model.domain.rich.query; - -import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation; - -public interface HolderPropertyGet - extends HolderAssociationGet<OneToOneAssociation> { - -}
