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 73b3a0f47b97c4373835cb8703feb7233e91fa6a Author: danhaywood <[email protected]> AuthorDate: Fri Feb 23 09:05:52 2024 +0000 CAUSEWAY-3676: passes holder down the line rather than each element implement (4) --- .../domain/rich/query/GqlvPropertyGetBlob.java | 25 ++++------------------ .../domain/rich/query/GqlvPropertyGetClob.java | 25 ++++------------------ .../domain/rich/query/HolderActionDetails.java | 2 +- 3 files changed, 9 insertions(+), 43 deletions(-) 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 ceb0b31c33..9a75217067 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 @@ -32,9 +32,7 @@ import org.apache.causeway.viewer.graphql.model.domain.TypeNames; import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; public class GqlvPropertyGetBlob - extends GqlvAbstractCustom - implements HolderMemberDetails<OneToOneAssociation> -{ + extends GqlvAbstractCustom { final HolderMemberDetails<OneToOneAssociation> holder; final GqlvPropertyGetBlobBytes blobName; @@ -59,9 +57,9 @@ public class GqlvPropertyGetBlob return; } - addChildFieldFor(blobName = new GqlvPropertyGetBlobBytes(this, context)); - addChildFieldFor(blobMimeType = new GqlvPropertyGetBlobMimeType(this, context)); - addChildFieldFor(blobBytes = isResourceNotForbidden() ? new GqlvPropertyGetBlobName(this, context) : null); + addChildFieldFor(blobName = new GqlvPropertyGetBlobBytes(holder, context)); + addChildFieldFor(blobMimeType = new GqlvPropertyGetBlobMimeType(holder, context)); + addChildFieldFor(blobBytes = isResourceNotForbidden() ? new GqlvPropertyGetBlobName(holder, context) : null); setField(newFieldDefinition() .name("get") @@ -90,19 +88,4 @@ public class GqlvPropertyGetBlob } } - @Override - public OneToOneAssociation getObjectMember() { - return holder.getObjectMember(); - } - - @Override - public ObjectSpecification getObjectSpecification() { - return holder.getObjectSpecification(); - } - - @Override - public SchemaType getSchemaType() { - return holder.getSchemaType(); - } - } 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 a5491fa5a7..7eb228003b 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 @@ -33,9 +33,7 @@ import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; public class GqlvPropertyGetClob - extends GqlvAbstractCustom - implements HolderMemberDetails<OneToOneAssociation>, - SchemaTypeProvider { + extends GqlvAbstractCustom { final HolderMemberDetails<OneToOneAssociation> holder; final GqlvPropertyGetClobName clobName; @@ -60,9 +58,9 @@ public class GqlvPropertyGetClob return; } - addChildFieldFor(clobName = new GqlvPropertyGetClobName(this, context)); - addChildFieldFor(clobMimeType = new GqlvPropertyGetClobMimeType(this, context)); - addChildFieldFor(clobChars = isResourceNotForbidden() ? new GqlvPropertyGetClobChars(this, context) : null); + addChildFieldFor(clobName = new GqlvPropertyGetClobName(holder, context)); + addChildFieldFor(clobMimeType = new GqlvPropertyGetClobMimeType(holder, context)); + addChildFieldFor(clobChars = isResourceNotForbidden() ? new GqlvPropertyGetClobChars(holder, context) : null); setField(newFieldDefinition() .name("get") @@ -91,19 +89,4 @@ public class GqlvPropertyGetClob } } - @Override - public OneToOneAssociation getObjectMember() { - return holder.getObjectMember(); - } - - @Override - public ObjectSpecification getObjectSpecification() { - return holder.getObjectSpecification(); - } - - @Override - public SchemaType getSchemaType() { - return holder.getSchemaType(); - } - } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionDetails.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionDetails.java index 011fadaaa1..9c9e76ad6f 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionDetails.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderActionDetails.java @@ -13,7 +13,7 @@ import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; import org.apache.causeway.viewer.graphql.model.types.TypeMapper; public interface HolderActionDetails - extends SchemaTypeProvider, + extends HolderSchemaTypeProvider, ObjectSpecificationProvider, ObjectMemberProvider<ObjectAction> {
