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 91e4552c64b5c7f04242e66d6fab80e03fe42e29 Author: danhaywood <[email protected]> AuthorDate: Mon Feb 12 23:04:55 2024 +0000 CAUSEWAY-3676: removes some redundant code is all --- .../causeway/viewer/graphql/model/domain/GqlvAssociation.java | 3 ++- .../apache/causeway/viewer/graphql/model/domain/GqlvCollection.java | 6 +----- .../causeway/viewer/graphql/model/domain/GqlvCollectionGet.java | 4 ---- .../causeway/viewer/graphql/model/domain/GqlvDomainService.java | 2 +- .../viewer/graphql/model/domain/GqlvMutationForProperty.java | 2 -- .../apache/causeway/viewer/graphql/model/domain/GqlvScenario.java | 1 - .../causeway/viewer/graphql/model/domain/GqlvScenarioGiven.java | 1 - 7 files changed, 4 insertions(+), 15 deletions(-) diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociation.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociation.java index 831ec97398..9388956587 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociation.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociation.java @@ -26,7 +26,8 @@ import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojo; -public abstract class GqlvAssociation<T extends ObjectAssociation, H extends GqlvMember.Holder> extends GqlvMember<T, H> { +public abstract class GqlvAssociation<T extends ObjectAssociation, H extends GqlvMember.Holder> + extends GqlvMember<T, H> { public GqlvAssociation( final H holder, diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java index 1b9d20ad9b..bef436a356 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java @@ -31,7 +31,7 @@ import org.apache.causeway.viewer.graphql.model.fetcher.BookmarkedPojoFetcher; public class GqlvCollection extends GqlvAssociation<OneToManyAssociation, GqlvCollection.Holder> - implements GqlvCollectionGet.Holder, + implements GqlvAssociationGet.Holder<OneToManyAssociation>, GqlvMemberHidden.Holder<OneToManyAssociation>, GqlvMemberDisabled.Holder<OneToManyAssociation> { @@ -62,10 +62,6 @@ public class GqlvCollection return holder.getObjectSpecification(); } - @Override - public OneToManyAssociation getOneToManyAssociation() { - return getObjectAssociation(); - } @Override protected void addDataFetchersForChildren() { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollectionGet.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollectionGet.java index 2cc7b7f605..c26f803680 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollectionGet.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollectionGet.java @@ -39,8 +39,4 @@ public class GqlvCollectionGet extends GqlvAssociationGet<OneToManyAssociation> return context.typeMapper.listTypeForElementTypeOf(oneToManyAssociation); } - public interface Holder - extends GqlvAssociationGet.Holder<OneToManyAssociation> { - OneToManyAssociation getOneToManyAssociation(); - } } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java index 11d65ec680..8ffe5a6c85 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java @@ -81,7 +81,7 @@ public class GqlvDomainService } private void addAction(final ObjectAction objectAction) { - GqlvAction gqlvAction = new GqlvAction(this, objectAction, context); + val gqlvAction = new GqlvAction(this, objectAction, context); addChildField(gqlvAction.getField()); actions.put(objectAction.getId(), gqlvAction); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutationForProperty.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutationForProperty.java index 4826ee7ce2..358f68d88c 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutationForProperty.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutationForProperty.java @@ -127,6 +127,4 @@ public class GqlvMutationForProperty extends GqlvAbstract { .type(context.typeMapper.inputTypeFor(oneToOneAssociation, TypeMapper.InputContext.INVOKE)) .build()); } - - } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenario.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenario.java index df8dcc0d18..945bb77fd0 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenario.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenario.java @@ -71,5 +71,4 @@ public class GqlvScenario environment.getGraphQlContext().put(KEY_SCENARIO_NAME, scenarioName); return environment; } - } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenarioGiven.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenarioGiven.java index c5d3cae20b..a5f535a275 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenarioGiven.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvScenarioGiven.java @@ -49,7 +49,6 @@ public class GqlvScenarioGiven addChildField(domainObject.getField()); } - buildObjectTypeAndField("Given"); }
