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 779ea7118dd88665a88bf4b1a482840ce41c48e5 Author: danhaywood <[email protected]> AuthorDate: Fri Feb 23 07:04:39 2024 +0000 CAUSEWAY-3676: simplifies holders (12) --- .../model/domain/rich/query/GqlvProperty.java | 17 +++++++++------ .../rich/query/HolderAssociationDatatype.java | 5 ++++- .../domain/rich/query/HolderAssociationGet.java | 9 +++++--- .../model/domain/rich/query/HolderPropertyGet.java | 4 +--- .../domain/rich/query/HolderPropertyGetXlob.java | 5 ++++- .../simple/query/GqlvAssociationDatatype.java | 3 ++- .../domain/simple/query/GqlvAssociationGet.java | 5 ++++- .../domain/simple/query/GqlvPropertyGetBlob.java | 5 ++++- .../domain/simple/query/GqlvPropertyGetClob.java | 5 ++++- .../mmproviders/ObjectAssociationProvider.java | 3 ++- .../mmproviders/OneToManyAssociationProvider.java | 25 ---------------------- .../mmproviders/OneToOneAssociationProvider.java | 4 +++- 12 files changed, 44 insertions(+), 46 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 b59840e300..62e963645a 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 @@ -30,6 +30,9 @@ 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.mmproviders.ObjectMemberProvider; +import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; +import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; import org.apache.causeway.viewer.graphql.model.types.TypeMapper; import lombok.val; @@ -37,13 +40,13 @@ import lombok.val; public class GqlvProperty extends GqlvAssociation<OneToOneAssociation, org.apache.causeway.viewer.graphql.model.domain.common.query.GqlvMemberHolder> implements - HolderMember<OneToOneAssociation>, - HolderPropertyGet, - HolderPropertyAutoComplete, - HolderPropertySet, - HolderAssociationDatatype<OneToOneAssociation>, - 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> { + HolderMember<OneToOneAssociation>, + HolderPropertyGet, + HolderPropertyAutoComplete, + HolderPropertySet, + HolderAssociationDatatype<OneToOneAssociation>, + HolderPropertyGetXlob, + 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/HolderAssociationDatatype.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/HolderAssociationDatatype.java index 73d86ea872..d11601baa5 100644 --- 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 @@ -2,9 +2,12 @@ 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.ObjectAssociationProvider; +import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider; import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; +import org.springframework.beans.factory.ObjectProvider; + public interface HolderAssociationDatatype<T extends ObjectAssociation> - extends ObjectAssociationProvider<T>, + 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 index 878d21ce33..be320123ae 100644 --- 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 @@ -2,12 +2,15 @@ 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.ObjectAssociationProvider; +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; +import org.springframework.beans.factory.ObjectProvider; + public interface HolderAssociationGet<T extends ObjectAssociation> - extends ObjectSpecificationProvider, - ObjectAssociationProvider<T>, - SchemaTypeProvider { + extends SchemaTypeProvider, + ObjectSpecificationProvider, + ObjectMemberProvider<T> { } 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 e0019a3552..a07ff50921 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 @@ -1,10 +1,8 @@ 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.SchemaTypeProvider; public interface HolderPropertyGet - extends HolderAssociationGet<OneToOneAssociation>, - SchemaTypeProvider { + extends HolderAssociationGet<OneToOneAssociation> { } 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 index 62e88f5df9..e3fcdbf5c3 100644 --- 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 @@ -2,12 +2,15 @@ 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.ObjectMemberProvider; import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectSpecificationProvider; import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; +import org.springframework.beans.factory.ObjectProvider; + public interface HolderPropertyGetXlob extends ObjectSpecificationProvider, - ObjectAssociationProvider<OneToOneAssociation>, + ObjectMemberProvider<OneToOneAssociation>, SchemaTypeProvider { } 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 d3fe0ffa07..13e07ba5ce 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 @@ -28,6 +28,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.TypeNames; import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectAssociationProvider; +import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectMemberProvider; import org.apache.causeway.viewer.graphql.model.mmproviders.SchemaTypeProvider; import lombok.val; @@ -55,7 +56,7 @@ public abstract class GqlvAssociationDatatype<T extends ObjectAssociation> exten } public interface Holder<T extends ObjectAssociation> - extends ObjectAssociationProvider<T>, + extends ObjectMemberProvider<T>, SchemaTypeProvider { } 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 115e8421b6..4831fa2e6d 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 @@ -29,9 +29,12 @@ 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.fetcher.BookmarkedPojo; import org.apache.causeway.viewer.graphql.model.mmproviders.ObjectAssociationProvider; +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; +import org.springframework.beans.factory.ObjectProvider; + import lombok.val; public abstract class GqlvAssociationGet<T extends ObjectAssociation> extends GqlvAbstract { @@ -81,7 +84,7 @@ public abstract class GqlvAssociationGet<T extends ObjectAssociation> extends Gq public interface Holder<T extends ObjectAssociation> extends ObjectSpecificationProvider, - ObjectAssociationProvider<T>, + ObjectMemberProvider<T>, SchemaTypeProvider { } 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 a363e478d8..58e3fd8589 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 @@ -31,9 +31,12 @@ 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.ObjectAssociationProvider; +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; +import org.springframework.beans.factory.ObjectProvider; + public class GqlvPropertyGetBlob extends GqlvAbstractCustom implements GqlvPropertyGetBlobBytes.Holder @@ -110,7 +113,7 @@ public class GqlvPropertyGetBlob public interface Holder extends ObjectSpecificationProvider, - ObjectAssociationProvider<OneToOneAssociation>, + ObjectMemberProvider<OneToOneAssociation>, SchemaTypeProvider { } 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 a341627984..76db4648ed 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 @@ -31,9 +31,12 @@ 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.ObjectAssociationProvider; +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; +import org.springframework.beans.factory.ObjectProvider; + public class GqlvPropertyGetClob extends GqlvAbstractCustom implements GqlvPropertyGetClobChars.Holder @@ -110,7 +113,7 @@ public class GqlvPropertyGetClob public interface Holder extends ObjectSpecificationProvider, - ObjectAssociationProvider<OneToOneAssociation>, + ObjectMemberProvider<OneToOneAssociation>, SchemaTypeProvider { } 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 58205435cf..edc530c2b5 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 @@ -20,5 +20,6 @@ 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> { +public interface ObjectAssociationProvider<T extends ObjectAssociation> + extends ObjectMemberProvider<T> { } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/mmproviders/OneToManyAssociationProvider.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/mmproviders/OneToManyAssociationProvider.java deleted file mode 100644 index 08c3b62939..0000000000 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/mmproviders/OneToManyAssociationProvider.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.causeway.viewer.graphql.model.mmproviders; - -import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation; - -public interface OneToManyAssociationProvider extends ObjectAssociationProvider<OneToManyAssociation> { - OneToManyAssociation getOneToManyAssociation(); -} diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/mmproviders/OneToOneAssociationProvider.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/mmproviders/OneToOneAssociationProvider.java index ff97cad20f..5e1f74cf49 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/mmproviders/OneToOneAssociationProvider.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/mmproviders/OneToOneAssociationProvider.java @@ -20,6 +20,8 @@ package org.apache.causeway.viewer.graphql.model.mmproviders; import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation; -public interface OneToOneAssociationProvider extends ObjectAssociationProvider<OneToOneAssociation> { +import org.springframework.beans.factory.ObjectProvider; + +public interface OneToOneAssociationProvider extends ObjectMemberProvider<OneToOneAssociation> { OneToOneAssociation getOneToOneAssociation(); }
