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 b549a191d64f9d4d7316b7016590590dbde2c87b Author: danhaywood <[email protected]> AuthorDate: Mon Feb 12 22:33:40 2024 +0000 CAUSEWAY-3676: extracts out 'addDataFetchersForChildren' --- .../org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java | 4 ++++ .../apache/causeway/viewer/graphql/model/domain/GqlvActionParam.java | 4 ++++ .../apache/causeway/viewer/graphql/model/domain/GqlvActionParams.java | 4 ++++ .../apache/causeway/viewer/graphql/model/domain/GqlvCollection.java | 4 ++++ .../apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java | 4 ++++ .../causeway/viewer/graphql/model/domain/GqlvDomainService.java | 4 ++++ .../org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java | 4 ++++ .../org/apache/causeway/viewer/graphql/model/domain/GqlvScenario.java | 4 ++++ .../causeway/viewer/graphql/model/domain/GqlvScenarioGiven.java | 4 ++++ 9 files changed, 36 insertions(+) diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java index ad2b0d472c..f9ec43c853 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java @@ -254,6 +254,10 @@ public class GqlvAction parent.coordinatesFor(getField()), this::fetchData); + addDataFetchersForChildren(); + } + + protected void addDataFetchersForChildren() { hidden.addDataFetcher(this); disabled.addDataFetcher(this); validate.addDataFetcher(this); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParam.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParam.java index a79aeb3a6c..9402fb38e0 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParam.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParam.java @@ -132,6 +132,10 @@ public class GqlvActionParam parent.coordinatesFor(getField()), this::fetchData); + addDataFetchersForChildren(); + } + + protected void addDataFetchersForChildren() { hidden.addDataFetcher(this); disabled.addDataFetcher(this); if (choices != null) { diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParams.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParams.java index 4d656ede8e..8615c91972 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParams.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParams.java @@ -100,6 +100,10 @@ public class GqlvActionParams parent.coordinatesFor(getField()), this::fetchData); + addDataFetchersForChildren(); + } + + private void addDataFetchersForChildren() { params.forEach((id, param) -> param.addDataFetcher(this)); } 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 69e98cde4d..6a5eb2c607 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 @@ -71,6 +71,10 @@ public class GqlvCollection parent.coordinatesFor(getField()), this::fetchData); + addDataFetchersForChildren(); + } + + protected void addDataFetchersForChildren() { hidden.addDataFetcher(this); disabled.addDataFetcher(this); get.addDataFetcher(this); diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java index 1fa4767f53..8c4264deb0 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java @@ -162,6 +162,10 @@ public class GqlvDomainObject parent.coordinatesFor(getLookupField()), this::fetchData); + addDataFetchersForChildren(); + } + + protected void addDataFetchersForChildren() { meta.addDataFetchers(this); properties.forEach((id, property) -> property.addDataFetcher(this)); collections.forEach((id, collection) -> collection.addDataFetcher(this)); 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 d0467925fc..ba91bbbafe 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 @@ -93,6 +93,10 @@ public class GqlvDomainService context.codeRegistryBuilder.dataFetcher( parent.coordinatesFor(getField()), this::fetchData); + addDataFetchersForChildren(); + } + + protected void addDataFetchersForChildren() { if (hasActions()) { actions.forEach((id, gqlva) -> gqlva.addDataFetcher(this)); } diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java index f60c262077..2375a53ea1 100644 --- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java @@ -133,6 +133,10 @@ public class GqlvProperty parent.coordinatesFor(getField()), this::fetchData); + addDataFetchersForChildren(); + } + + protected void addDataFetchersForChildren() { hidden.addDataFetcher(this); disabled.addDataFetcher(this); get.addDataFetcher(this); 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 f6dcfe9b9c..0db7d3456c 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 @@ -64,6 +64,10 @@ public class GqlvScenario parent.coordinatesFor(getField()), this::fetchData); + addDataFetchersForChildren(); + } + + protected void addDataFetchersForChildren() { scenarioName.addDataFetchers(this); scenarioGiven.addDataFetchers(this); } 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 52430791e3..8ff9cff420 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 @@ -59,6 +59,10 @@ public class GqlvScenarioGiven parent.coordinatesFor(getField()), this::fetchData); + addDataFetchersForChildren(); + } + + protected void addDataFetchersForChildren() { domainServices.forEach(domainService -> { boolean actionsAdded = domainService.hasActions(); if (actionsAdded) {
