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 a59d045622e653d3d8bb955222ca637fc325cf09 Author: danhaywood <[email protected]> AuthorDate: Fri Feb 23 06:58:02 2024 +0000 CAUSEWAY-3676: simplifies holders (11) --- .../viewer/graphql/model/domain/rich/query/GqlvAssociation.java | 7 ------- .../graphql/model/domain/rich/query/GqlvAssociationDatatype.java | 2 +- .../viewer/graphql/model/domain/rich/query/GqlvAssociationGet.java | 2 +- .../viewer/graphql/model/domain/rich/query/GqlvCollectionGet.java | 2 +- .../viewer/graphql/model/domain/rich/query/GqlvProperty.java | 2 +- .../viewer/graphql/model/domain/rich/query/GqlvPropertyGet.java | 2 +- .../graphql/model/domain/rich/query/GqlvPropertyGetBlob.java | 5 ----- .../model/domain/rich/query/GqlvPropertyGetBlobAbstract.java | 2 +- .../graphql/model/domain/rich/query/GqlvPropertyGetBlobBytes.java | 2 +- .../graphql/model/domain/rich/query/GqlvPropertyGetClob.java | 5 ----- .../model/domain/rich/query/GqlvPropertyGetClobAbstract.java | 2 +- .../graphql/model/domain/rich/query/GqlvPropertyGetClobChars.java | 2 +- .../viewer/graphql/model/domain/rich/query/HolderPropertyGet.java | 2 -- .../viewer/graphql/model/domain/simple/query/GqlvAssociation.java | 7 ------- .../graphql/model/domain/simple/query/GqlvAssociationDatatype.java | 2 +- .../graphql/model/domain/simple/query/GqlvAssociationGet.java | 2 +- .../graphql/model/domain/simple/query/GqlvCollectionGet.java | 2 +- .../viewer/graphql/model/domain/simple/query/GqlvProperty.java | 2 +- .../viewer/graphql/model/domain/simple/query/GqlvPropertyGet.java | 4 +--- .../graphql/model/domain/simple/query/GqlvPropertyGetBlob.java | 5 ----- .../model/domain/simple/query/GqlvPropertyGetBlobAbstract.java | 2 +- .../model/domain/simple/query/GqlvPropertyGetBlobBytes.java | 2 +- .../graphql/model/domain/simple/query/GqlvPropertyGetClob.java | 5 ----- .../model/domain/simple/query/GqlvPropertyGetClobAbstract.java | 2 +- .../model/domain/simple/query/GqlvPropertyGetClobChars.java | 2 +- .../graphql/model/mmproviders/ObjectAssociationProvider.java | 1 - 26 files changed, 18 insertions(+), 57 deletions(-) diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociation.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociation.java index d887a47714..d53b246bf3 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociation.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociation.java @@ -35,11 +35,4 @@ public abstract class GqlvAssociation<T extends ObjectAssociation, H extends Obj } - /** - * @see #getObjectMember() - */ - public T getObjectAssociation() { - return getObjectMember(); - } - } 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 344b40e83f..853a8eef4f 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 @@ -48,7 +48,7 @@ public abstract class GqlvAssociationDatatype<T extends ObjectAssociation> exten @Override protected Object fetchData(DataFetchingEnvironment environment) { - val returnType = holder.getObjectAssociation().getElementType(); + val returnType = holder.getObjectMember().getElementType(); return TypeNames.objectTypeNameFor(returnType, holder.getSchemaType()); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationGet.java index 1358463be1..b2588ed535 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationGet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvAssociationGet.java @@ -67,7 +67,7 @@ public abstract class GqlvAssociationGet<T extends ObjectAssociation> extends Gq return null; } - val association = holder.getObjectAssociation(); + val association = holder.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); val resultManagedObject = association.get(managedObject); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionGet.java index 5014a0e04c..b55dad3b39 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionGet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvCollectionGet.java @@ -35,7 +35,7 @@ public class GqlvCollectionGet extends GqlvAssociationGet<OneToManyAssociation> @Override GraphQLOutputType outputTypeFor(HolderAssociationGet<OneToManyAssociation> holder) { - val oneToManyAssociation = holder.getObjectAssociation(); + val oneToManyAssociation = holder.getObjectMember(); return context.typeMapper.listTypeForElementTypeOf(oneToManyAssociation, holder.getSchemaType()); } 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 0113de4f66..b59840e300 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 @@ -148,7 +148,7 @@ public class GqlvProperty } public OneToOneAssociation getOneToOneAssociation() { - return getObjectAssociation(); + return getObjectMember(); } @Override diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGet.java index 071f8b3241..65251e9faa 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/GqlvPropertyGet.java @@ -35,7 +35,7 @@ public class GqlvPropertyGet extends GqlvAssociationGet<OneToOneAssociation> { @Override GraphQLOutputType outputTypeFor(HolderAssociationGet<OneToOneAssociation> holder) { - val oneToOneAssociation = holder.getObjectAssociation(); + val oneToOneAssociation = holder.getObjectMember(); return context.typeMapper.outputTypeFor(oneToOneAssociation, holder.getSchemaType()); } 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 27c0535277..ed5eaecdd0 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 @@ -90,11 +90,6 @@ public class GqlvPropertyGetBlob } } - @Override - public OneToOneAssociation getObjectAssociation() { - return holder.getObjectAssociation(); - } - @Override public OneToOneAssociation getObjectMember() { return holder.getObjectMember(); 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 3edf940220..749bb0cd9c 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 @@ -59,7 +59,7 @@ public abstract class GqlvPropertyGetBlobAbstract extends GqlvAbstract { return null; } - val association = holder.getObjectAssociation(); + val association = holder.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); val resultManagedObject = association.get(managedObject); 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 c23dcbaa0d..ea134e523f 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 @@ -43,7 +43,7 @@ public class GqlvPropertyGetBlobBytes extends GqlvPropertyGetBlobAbstract { val bookmarkIfAny = context.bookmarkService.bookmarkFor(sourcePojo); return bookmarkIfAny.map(x -> String.format( - "//%s/object/%s:%s/%s/blobBytes", graphqlPath, x.getLogicalTypeName(), x.getIdentifier(), holder.getObjectAssociation().getId())).orElse(null); + "//%s/object/%s:%s/%s/blobBytes", graphqlPath, x.getLogicalTypeName(), x.getIdentifier(), holder.getObjectMember().getId())).orElse(null); } 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 5ac77b8c8e..a4371f3216 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 @@ -90,11 +90,6 @@ public class GqlvPropertyGetClob } } - @Override - public OneToOneAssociation getObjectAssociation() { - return holder.getObjectAssociation(); - } - @Override public OneToOneAssociation getObjectMember() { return holder.getObjectMember(); 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 b48323a3dd..5d2699e83f 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 @@ -59,7 +59,7 @@ public abstract class GqlvPropertyGetClobAbstract extends GqlvAbstract { return null; } - val association = holder.getObjectAssociation(); + val association = holder.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); val resultManagedObject = association.get(managedObject); 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 3f999e39db..fa434a03d5 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 @@ -43,7 +43,7 @@ public class GqlvPropertyGetClobChars extends GqlvPropertyGetClobAbstract { val bookmarkIfAny = context.bookmarkService.bookmarkFor(sourcePojo); return bookmarkIfAny.map(x -> String.format( - "//%s/object/%s:%s/%s/clobChars", graphqlPath, x.getLogicalTypeName(), x.getIdentifier(), holder.getObjectAssociation().getId())).orElse(null); + "//%s/object/%s:%s/%s/clobChars", graphqlPath, x.getLogicalTypeName(), x.getIdentifier(), holder.getObjectMember().getId())).orElse(null); } 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 index bdccda5dc0..e0019a3552 100644 --- 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 @@ -7,6 +7,4 @@ public interface HolderPropertyGet extends HolderAssociationGet<OneToOneAssociation>, SchemaTypeProvider { - @Override - OneToOneAssociation getObjectAssociation(); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAssociation.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAssociation.java index ac21c81896..0584827bb4 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAssociation.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAssociation.java @@ -34,11 +34,4 @@ public abstract class GqlvAssociation<T extends ObjectAssociation, H extends Gql } - /** - * @see #getObjectMember() - */ - public T getObjectAssociation() { - return getObjectMember(); - } - } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAssociationDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAssociationDatatype.java index 87c80755e1..d3fe0ffa07 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAssociationDatatype.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAssociationDatatype.java @@ -50,7 +50,7 @@ public abstract class GqlvAssociationDatatype<T extends ObjectAssociation> exten @Override protected Object fetchData(DataFetchingEnvironment environment) { - val returnType = holder.getObjectAssociation().getElementType(); + val returnType = holder.getObjectMember().getElementType(); return TypeNames.objectTypeNameFor(returnType, holder.getSchemaType()); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAssociationGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAssociationGet.java index 69f57ca180..115e8421b6 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAssociationGet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvAssociationGet.java @@ -70,7 +70,7 @@ public abstract class GqlvAssociationGet<T extends ObjectAssociation> extends Gq return null; } - val association = holder.getObjectAssociation(); + val association = holder.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); val resultManagedObject = association.get(managedObject); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvCollectionGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvCollectionGet.java index a891858c1b..dcf87fdc08 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvCollectionGet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvCollectionGet.java @@ -36,7 +36,7 @@ public class GqlvCollectionGet extends GqlvAssociationGet<OneToManyAssociation> @Override GraphQLOutputType outputTypeFor(Holder<OneToManyAssociation> holder) { - val oneToManyAssociation = holder.getObjectAssociation(); + val oneToManyAssociation = holder.getObjectMember(); return context.typeMapper.listTypeForElementTypeOf(oneToManyAssociation, holder.getSchemaType()); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvProperty.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvProperty.java index dc605f953a..abca3ebf3b 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvProperty.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvProperty.java @@ -150,7 +150,7 @@ public class GqlvProperty } public OneToOneAssociation getOneToOneAssociation() { - return getObjectAssociation(); + return getObjectMember(); } @Override diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGet.java index 88fc85bfbb..e26cfaf8f5 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGet.java @@ -36,7 +36,7 @@ public class GqlvPropertyGet extends GqlvAssociationGet<OneToOneAssociation> { @Override GraphQLOutputType outputTypeFor(GqlvAssociationGet.Holder<OneToOneAssociation> holder) { - val oneToOneAssociation = holder.getObjectAssociation(); + val oneToOneAssociation = holder.getObjectMember(); return context.typeMapper.outputTypeFor(oneToOneAssociation, holder.getSchemaType()); } @@ -44,7 +44,5 @@ public class GqlvPropertyGet extends GqlvAssociationGet<OneToOneAssociation> { extends GqlvAssociationGet.Holder<OneToOneAssociation>, SchemaTypeProvider { - @Override - OneToOneAssociation getObjectAssociation(); } } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlob.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlob.java index 0ad0fa145d..a363e478d8 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlob.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlob.java @@ -93,11 +93,6 @@ public class GqlvPropertyGetBlob } } - @Override - public OneToOneAssociation getObjectAssociation() { - return holder.getObjectAssociation(); - } - @Override public OneToOneAssociation getObjectMember() { return holder.getObjectMember(); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlobAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlobAbstract.java index ba474712ad..b39c131bbc 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlobAbstract.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlobAbstract.java @@ -60,7 +60,7 @@ public abstract class GqlvPropertyGetBlobAbstract extends GqlvAbstract { return null; } - val association = holder.getObjectAssociation(); + val association = holder.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); val resultManagedObject = association.get(managedObject); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlobBytes.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlobBytes.java index ff16402cf4..d4c976bc44 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlobBytes.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetBlobBytes.java @@ -43,7 +43,7 @@ public class GqlvPropertyGetBlobBytes extends GqlvPropertyGetBlobAbstract { val bookmarkIfAny = context.bookmarkService.bookmarkFor(sourcePojo); return bookmarkIfAny.map(x -> String.format( - "//%s/object/%s:%s/%s/blobBytes", graphqlPath, x.getLogicalTypeName(), x.getIdentifier(), holder.getObjectAssociation().getId())).orElse(null); + "//%s/object/%s:%s/%s/blobBytes", graphqlPath, x.getLogicalTypeName(), x.getIdentifier(), holder.getObjectMember().getId())).orElse(null); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClob.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClob.java index 8fafe181c8..a341627984 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClob.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClob.java @@ -93,11 +93,6 @@ public class GqlvPropertyGetClob } } - @Override - public OneToOneAssociation getObjectAssociation() { - return holder.getObjectAssociation(); - } - @Override public OneToOneAssociation getObjectMember() { return holder.getObjectMember(); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClobAbstract.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClobAbstract.java index 8fad937fad..e156befd5f 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClobAbstract.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClobAbstract.java @@ -60,7 +60,7 @@ public abstract class GqlvPropertyGetClobAbstract extends GqlvAbstract { return null; } - val association = holder.getObjectAssociation(); + val association = holder.getObjectMember(); val managedObject = ManagedObject.adaptSingular(objectSpecification, sourcePojo); val resultManagedObject = association.get(managedObject); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClobChars.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClobChars.java index 2fa5a37d37..1e9ce215a1 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClobChars.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/GqlvPropertyGetClobChars.java @@ -43,7 +43,7 @@ public class GqlvPropertyGetClobChars extends GqlvPropertyGetClobAbstract { val bookmarkIfAny = context.bookmarkService.bookmarkFor(sourcePojo); return bookmarkIfAny.map(x -> String.format( - "//%s/object/%s:%s/%s/clobChars", graphqlPath, x.getLogicalTypeName(), x.getIdentifier(), holder.getObjectAssociation().getId())).orElse(null); + "//%s/object/%s:%s/%s/clobChars", graphqlPath, x.getLogicalTypeName(), x.getIdentifier(), holder.getObjectMember().getId())).orElse(null); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/mmproviders/ObjectAssociationProvider.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/mmproviders/ObjectAssociationProvider.java index 9c7c88fcc0..58205435cf 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/mmproviders/ObjectAssociationProvider.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/mmproviders/ObjectAssociationProvider.java @@ -21,5 +21,4 @@ package org.apache.causeway.viewer.graphql.model.mmproviders; import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation; public interface ObjectAssociationProvider<T extends ObjectAssociation> extends ObjectMemberProvider<T> { - T getObjectAssociation(); }
