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 154786eecf21de7f250f8876ce3587d88126abcc Author: danhaywood <[email protected]> AuthorDate: Fri Feb 23 08:21:51 2024 +0000 CAUSEWAY-3676: simplifies holders (16) --- .../graphql/model/domain/rich/query/GqlvProperty.java | 3 +-- .../model/domain/rich/query/GqlvPropertyGetBlob.java | 4 ++-- .../model/domain/rich/query/GqlvPropertyGetClob.java | 4 ++-- .../model/domain/rich/query/HolderPropertyGetXlob.java | 13 ------------- .../domain/rich/query/HolderPropertyGetXlobDetails.java | 8 -------- 5 files changed, 5 insertions(+), 27 deletions(-) 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 e831483a76..d7d70cf71e 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 @@ -43,8 +43,7 @@ public class GqlvProperty HolderPropertyAutoComplete, HolderPropertySet, HolderAssociationDatatype<OneToOneAssociation>, - HolderPropertyGetXlob, - ObjectSpecificationProvider, ObjectMemberProvider<OneToOneAssociation>, SchemaTypeProvider { + ObjectSpecificationProvider, ObjectMemberProvider<OneToOneAssociation>, SchemaTypeProvider { 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/GqlvPropertyGetBlob.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetBlob.java index 07b2d2fdad..025a042c49 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 @@ -36,7 +36,7 @@ public class GqlvPropertyGetBlob implements HolderMember<OneToOneAssociation> { - final HolderPropertyGetXlob holder; + final HolderMember<OneToOneAssociation> 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 HolderPropertyGetXlob holder, + final HolderMember<OneToOneAssociation> 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/GqlvPropertyGetClob.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGetClob.java index a115facfb7..3ab07af630 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 @@ -37,7 +37,7 @@ public class GqlvPropertyGetClob implements HolderMember<OneToOneAssociation>, SchemaTypeProvider { - final HolderPropertyGetXlob holder; + final HolderMember<OneToOneAssociation> holder; final GqlvPropertyGetClobName clobName; final GqlvPropertyGetClobMimeType clobMimeType; final GqlvPropertyGetClobChars clobChars; @@ -45,7 +45,7 @@ public class GqlvPropertyGetClob private final CausewayConfiguration.Viewer.Graphql graphqlConfiguration; public GqlvPropertyGetClob( - final HolderPropertyGetXlob holder, + final HolderMember<OneToOneAssociation> 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/HolderPropertyGetXlob.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetXlob.java deleted file mode 100644 index 153ce46a27..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetXlob.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 HolderPropertyGetXlob - extends ObjectSpecificationProvider, - ObjectMemberProvider<OneToOneAssociation>, - SchemaTypeProvider { - -} diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetXlobDetails.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetXlobDetails.java deleted file mode 100644 index 4e02e13dd3..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderPropertyGetXlobDetails.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 HolderPropertyGetXlobDetails - extends HolderPropertyGet, - SchemaTypeProvider { -}
