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 1e1f0213c248be782e74089f5fcc02d3ee2a4884 Author: danhaywood <[email protected]> AuthorDate: Thu Feb 22 21:48:47 2024 +0000 CAUSEWAY-3676: simplifies holders --- .../domain/rich/query/GqlvActionInvokeArgs.java | 2 +- .../domain/rich/query/GqlvActionInvokeArgsArg.java | 4 ++-- .../model/domain/rich/query/GqlvProperty.java | 7 +++---- .../domain/rich/query/GqlvPropertyChoices.java | 4 ++-- .../domain/rich/query/GqlvPropertyGetBlob.java | 6 +++--- .../rich/query/GqlvPropertyGetBlobAbstract.java | 4 ++-- .../domain/rich/query/GqlvPropertyGetBlobBytes.java | 2 +- .../rich/query/GqlvPropertyGetBlobMimeType.java | 2 +- .../domain/rich/query/GqlvPropertyGetBlobName.java | 2 +- .../domain/rich/query/GqlvPropertyGetClob.java | 8 ++++---- .../rich/query/GqlvPropertyGetClobAbstract.java | 4 ++-- .../domain/rich/query/GqlvPropertyGetClobChars.java | 2 +- .../rich/query/GqlvPropertyGetClobMimeType.java | 2 +- .../domain/rich/query/GqlvPropertyGetClobName.java | 2 +- .../domain/rich/query/GqlvPropertyValidate.java | 4 ++-- .../rich/query/HolderActionInvokeArgsArg.java | 21 --------------------- .../domain/rich/query/HolderPropertyChoices.java | 17 ----------------- .../domain/rich/query/HolderPropertyGetClob.java | 13 ------------- .../rich/query/HolderPropertyGetClobAbstract.java | 8 -------- ...PropertyBlob.java => HolderPropertyGetXlob.java} | 2 +- ...tract.java => HolderPropertyGetXlobDetails.java} | 2 +- .../model/domain/rich/query/HolderPropertySet.java | 5 ++++- .../domain/rich/query/HolderPropertyValidate.java | 17 ----------------- 23 files changed, 33 insertions(+), 107 deletions(-) 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 566ede3835..1fae5576a1 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 @@ -43,7 +43,7 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class GqlvActionInvokeArgs extends GqlvAbstractCustom - implements HolderActionInvokeArgsArg { + implements HolderActionInvokeArgs { @Getter private final HolderActionInvokeArgs 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 66bd91e902..f8bd8b192c 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 HolderActionInvokeArgsArg holder; + @Getter private final HolderActionInvokeArgs holder; @Getter private final ObjectActionParameter objectActionParameter; @Getter private final int paramNum; public GqlvActionInvokeArgsArg( - final HolderActionInvokeArgsArg holder, + final HolderActionInvokeArgs 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/GqlvProperty.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvProperty.java index 604ae13ce2..0113de4f66 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 @@ -29,6 +29,7 @@ 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; import org.apache.causeway.viewer.graphql.model.domain.TypeNames; +import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectAssociationProvider; import org.apache.causeway.viewer.graphql.model.types.TypeMapper; import lombok.val; @@ -38,13 +39,11 @@ public class GqlvProperty implements HolderMember<OneToOneAssociation>, HolderPropertyGet, - HolderPropertyChoices, HolderPropertyAutoComplete, - HolderPropertyValidate, HolderPropertySet, HolderAssociationDatatype<OneToOneAssociation>, - HolderGetPropertyBlob, - HolderPropertyGetClob, org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider, org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider<OneToOneAssociation>, org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider { + HolderPropertyGetXlob, + org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider, org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider<OneToOneAssociation>, org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider, ObjectAssociationProvider<OneToOneAssociation> { private final GqlvMemberHidden<OneToOneAssociation> hidden; private final GqlvMemberDisabled<OneToOneAssociation> disabled; 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 fd7173aff6..288f6c7fe8 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 HolderPropertyChoices holder; + final HolderPropertySet holder; public GqlvPropertyChoices( - final HolderPropertyChoices holder, + final HolderPropertySet 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/GqlvPropertyGetBlob.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlob.java index 6f93b933af..27c0535277 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlob.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlob.java @@ -33,10 +33,10 @@ import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; public class GqlvPropertyGetBlob extends GqlvAbstractCustom - implements HolderPropertyGetBlobAbstract + implements HolderPropertyGetXlobDetails { - final HolderGetPropertyBlob holder; + final HolderPropertyGetXlob holder; final GqlvPropertyGetBlobBytes blobName; final GqlvPropertyGetBlobMimeType blobMimeType; final GqlvPropertyGetBlobName blobBytes; @@ -44,7 +44,7 @@ public class GqlvPropertyGetBlob private final CausewayConfiguration.Viewer.Graphql graphqlConfiguration; public GqlvPropertyGetBlob( - final HolderGetPropertyBlob holder, + final HolderPropertyGetXlob holder, final Context context) { super(TypeNames.propertyBlobTypeNameFor(holder.getObjectSpecification(), holder.getObjectMember(), holder.getSchemaType()), context); this.holder = holder; diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobAbstract.java index 36e89b2e47..3edf940220 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobAbstract.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobAbstract.java @@ -35,10 +35,10 @@ import lombok.val; public abstract class GqlvPropertyGetBlobAbstract extends GqlvAbstract { - final HolderPropertyGetBlobAbstract holder; + final HolderPropertyGetXlobDetails holder; public GqlvPropertyGetBlobAbstract( - final HolderPropertyGetBlobAbstract holder, + final HolderPropertyGetXlobDetails holder, final Context context, String name) { super(context); this.holder = holder; diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobBytes.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobBytes.java index 9abca86912..c23dcbaa0d 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobBytes.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobBytes.java @@ -30,7 +30,7 @@ public class GqlvPropertyGetBlobBytes extends GqlvPropertyGetBlobAbstract { private final String graphqlPath; public GqlvPropertyGetBlobBytes( - final HolderPropertyGetBlobAbstract holder, + final HolderPropertyGetXlobDetails holder, final Context context) { super(holder, context, "bytes"); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobMimeType.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobMimeType.java index c9f54aeec3..15e563553d 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobMimeType.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobMimeType.java @@ -25,7 +25,7 @@ import org.apache.causeway.viewer.graphql.model.context.Context; public class GqlvPropertyGetBlobMimeType extends GqlvPropertyGetBlobAbstract { public GqlvPropertyGetBlobMimeType( - final HolderPropertyGetBlobAbstract holder, + final HolderPropertyGetXlobDetails holder, final Context context) { super(holder, context, "mimeType"); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobName.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobName.java index 9fe755af79..e90e78c74e 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobName.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlobName.java @@ -26,7 +26,7 @@ import org.apache.causeway.viewer.graphql.model.context.Context; public class GqlvPropertyGetBlobName extends GqlvPropertyGetBlobAbstract { public GqlvPropertyGetBlobName( - final HolderPropertyGetBlobAbstract holder, + final HolderPropertyGetXlobDetails holder, final Context context) { super(holder, context, "name"); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClob.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClob.java index 20cc95703d..5ac77b8c8e 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClob.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClob.java @@ -30,13 +30,13 @@ 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.SchemaTypeProvider; public class GqlvPropertyGetClob extends GqlvAbstractCustom - implements HolderPropertyGetClobAbstract -{ + implements HolderPropertyGet, HolderPropertyGetXlobDetails, SchemaTypeProvider { - final HolderPropertyGetClob holder; + final HolderPropertyGetXlob holder; final GqlvPropertyGetClobName clobName; final GqlvPropertyGetClobMimeType clobMimeType; final GqlvPropertyGetClobChars clobChars; @@ -44,7 +44,7 @@ public class GqlvPropertyGetClob private final CausewayConfiguration.Viewer.Graphql graphqlConfiguration; public GqlvPropertyGetClob( - final HolderPropertyGetClob holder, + final HolderPropertyGetXlob holder, final Context context) { super(TypeNames.propertyBlobTypeNameFor(holder.getObjectSpecification(), holder.getObjectMember(), holder.getSchemaType()), context); this.holder = holder; diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobAbstract.java index 36d2f29650..b48323a3dd 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobAbstract.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobAbstract.java @@ -35,10 +35,10 @@ import lombok.val; public abstract class GqlvPropertyGetClobAbstract extends GqlvAbstract { - final HolderPropertyGetClobAbstract holder; + final HolderPropertyGetXlobDetails holder; public GqlvPropertyGetClobAbstract( - final HolderPropertyGetClobAbstract holder, + final HolderPropertyGetXlobDetails holder, final Context context, String name) { super(context); this.holder = holder; diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobChars.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobChars.java index 382d6d9879..3f999e39db 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobChars.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobChars.java @@ -30,7 +30,7 @@ public class GqlvPropertyGetClobChars extends GqlvPropertyGetClobAbstract { private final String graphqlPath; public GqlvPropertyGetClobChars( - final HolderPropertyGetClobAbstract holder, + final HolderPropertyGetXlobDetails holder, final Context context) { super(holder, context, "chars"); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobMimeType.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobMimeType.java index d7cde052b1..656e128c39 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobMimeType.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobMimeType.java @@ -25,7 +25,7 @@ import org.apache.causeway.viewer.graphql.model.context.Context; public class GqlvPropertyGetClobMimeType extends GqlvPropertyGetClobAbstract { public GqlvPropertyGetClobMimeType( - final HolderPropertyGetClobAbstract holder, + final HolderPropertyGetXlobDetails holder, final Context context) { super(holder, context, "mimeType"); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobName.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobName.java index 32d53e7a04..1510aaa2a2 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobName.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClobName.java @@ -26,7 +26,7 @@ import org.apache.causeway.viewer.graphql.model.context.Context; public class GqlvPropertyGetClobName extends GqlvPropertyGetClobAbstract { public GqlvPropertyGetClobName( - final HolderPropertyGetClobAbstract holder, + final HolderPropertyGetXlobDetails holder, final Context context) { super(holder, context, "name"); } 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 ee5d15e121..8dbf49f8cd 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 HolderPropertyValidate holder; + final HolderPropertySet holder; public GqlvPropertyValidate( - final HolderPropertyValidate holder, + final HolderPropertySet 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/HolderActionInvokeArgsArg.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionInvokeArgsArg.java deleted file mode 100644 index 1a61bc3a1c..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionInvokeArgsArg.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.apache.causeway.viewer.graphql.model.domain.rich.query; - -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; - -public interface HolderActionInvokeArgsArg - extends ObjectSpecificationProvider, - ObjectActionProvider, - SchemaTypeProvider { - - 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/HolderPropertyChoices.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyChoices.java deleted file mode 100644 index a355cebddf..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyChoices.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.apache.causeway.viewer.graphql.model.domain.rich.query; - -import graphql.schema.GraphQLFieldDefinition; - -import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.OneToOneAssociationProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; -import org.apache.causeway.viewer.graphql.model.types.TypeMapper; - -public interface HolderPropertyChoices - extends ObjectSpecificationProvider, - OneToOneAssociationProvider, - SchemaTypeProvider { - - void addGqlArgument(OneToOneAssociation otoa, GraphQLFieldDefinition.Builder fieldBuilder, TypeMapper.InputContext inputContext); -} diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetClob.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetClob.java deleted file mode 100644 index b52e4f9a3e..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetClob.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.ObjectAssociationProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; - -public interface HolderPropertyGetClob - extends ObjectSpecificationProvider, - ObjectAssociationProvider<OneToOneAssociation>, - SchemaTypeProvider { - -} diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetClobAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetClobAbstract.java deleted file mode 100644 index eea6d61132..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetClobAbstract.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.apache.causeway.viewer.graphql.model.domain.rich.query; - -import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; - -public interface HolderPropertyGetClobAbstract - extends HolderPropertyGet, - SchemaTypeProvider { -} diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderGetPropertyBlob.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetXlob.java similarity index 93% rename from viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderGetPropertyBlob.java rename to viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetXlob.java index bdd1d8fad7..62e88f5df9 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderGetPropertyBlob.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetXlob.java @@ -5,7 +5,7 @@ import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectAssociationPro import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; -public interface HolderGetPropertyBlob +public interface HolderPropertyGetXlob extends ObjectSpecificationProvider, ObjectAssociationProvider<OneToOneAssociation>, SchemaTypeProvider { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetBlobAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetXlobDetails.java similarity index 82% rename from viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetBlobAbstract.java rename to viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetXlobDetails.java index 34fe53293f..4e02e13dd3 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetBlobAbstract.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetXlobDetails.java @@ -2,7 +2,7 @@ package org.apache.causeway.viewer.graphql.model.domain.rich.query; import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; -public interface HolderPropertyGetBlobAbstract +public interface HolderPropertyGetXlobDetails extends HolderPropertyGet, 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/HolderPropertySet.java index f07804dfca..3ce4452fe7 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/HolderPropertySet.java @@ -13,5 +13,8 @@ public interface HolderPropertySet OneToOneAssociationProvider, SchemaTypeProvider { - void addGqlArgument(OneToOneAssociation oneToOneAssociation, GraphQLFieldDefinition.Builder fieldBuilder, TypeMapper.InputContext inputContext); + void addGqlArgument( + OneToOneAssociation otoa, + GraphQLFieldDefinition.Builder fieldBuilder, + TypeMapper.InputContext inputContext); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyValidate.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyValidate.java deleted file mode 100644 index ab58875854..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyValidate.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.apache.causeway.viewer.graphql.model.domain.rich.query; - -import graphql.schema.GraphQLFieldDefinition; - -import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation; -import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.OneToOneAssociationProvider; -import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; -import org.apache.causeway.viewer.graphql.model.types.TypeMapper; - -public interface HolderPropertyValidate - extends ObjectSpecificationProvider, - OneToOneAssociationProvider, - SchemaTypeProvider { - - void addGqlArgument(OneToOneAssociation oneToOneAssociation, GraphQLFieldDefinition.Builder fieldBuilder, TypeMapper.InputContext inputContext); -}
