You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2024/01/21 12:49:29 UTC

(causeway) branch CAUSEWAY-3676 updated (028ae52761 -> 032b38f042)

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to branch CAUSEWAY-3676
in repository https://gitbox.apache.org/repos/asf/causeway.git


    from 028ae52761 CAUSEWAY-3676: deletes _BiMap, not required
     new 024ff34a45 CAUSEWAY-3676: factors out GqlvDomainObjectMutators
     new 3e7166db6e CAUSEWAY-3676: factors out more into GqlvDomainObjectMeta
     new de325e89c4 CAUSEWAY-3676: minor reordering
     new 2bf2c4f1c5 CAUSEWAY-3676: minor reordering of registering types
     new 10d9430124 CAUSEWAY-3676: refactor registering object's types
     new a680b35aff CAUSEWAY-3676: introduces GqlvMemberHolder and subclasses; starting to move fetcher logic to members
     new c469e0501f CAUSEWAY-3676: moves responsibility from GqlvDomainService
     new 5e0103e4f1 CAUSEWAY-3676: makes names of types slightly shorter
     new d93ffb5e69 CAUSEWAY-3676: towards introducing mutators type for domain service
     new e1f401fd65 CAUSEWAY-3676: towards moving FieldDefinition creation within GqlvAction
     new 0dfb9b3a10 CAUSEWAY-3676: towards moving FieldDefinition creation within GqlvAction (2)
     new 95cd298dfb CAUSEWAY-3676: moves responsibility to creating fieldDefinition into GqlvAction
     new 72c4600f39 CAUSEWAY-3676: moves responsibility to creating fieldDefinition into GqlvAction, removes redundant code
     new b5c5b4ec9f CAUSEWAY-3676: rationalizing mutator actions for domain service vis-a-vis domain object
     new 5d611e73c2 introduces addActions on GqlvDomainService
     new e6201b20e0 CAUSEWAY-3676: rationalizes DomainObject and DomainService's addActions
     new db5d4d5c66 CAUSEWAY-3676: still attempting to add mutator actions to DomainService
     new 032b38f042 CAUSEWAY-3676: rationalizing domain object vs service; logical type names

The 18 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../viewer/graphql/model/domain/GqlvAction.java    | 107 ++++++-
 .../graphql/model/domain/GqlvActionHolder.java     |   4 +
 .../graphql/model/domain/GqlvAssociation.java      |  56 +++-
 .../model/domain/GqlvAssociationHolder.java        |   4 +
 .../graphql/model/domain/GqlvCollection.java       |  12 +-
 .../graphql/model/domain/GqlvCollectionHolder.java |   4 +
 .../graphql/model/domain/GqlvDomainObject.java     | 310 +++++----------------
 .../graphql/model/domain/GqlvDomainService.java    | 169 +++++------
 .../viewer/graphql/model/domain/GqlvMember.java    |  17 +-
 .../graphql/model/domain/GqlvMemberHolder.java     |   7 +
 .../viewer/graphql/model/domain/GqlvMeta.java      | 113 ++++++++
 .../viewer/graphql/model/domain/GqlvMutators.java  |  90 ++++++
 .../graphql/model/domain/GqlvMutatorsHolder.java   |   9 +
 .../viewer/graphql/model/domain/GqlvProperty.java  |  11 +-
 .../graphql/model/domain/GqlvPropertyHolder.java   |   4 +
 .../viewer/graphql/model/types/TypeMapper.java     |   6 +-
 .../model/util/{_LTN.java => TypeNames.java}       |  15 +-
 .../test/e2e/Schema_IntegTest.schema.approved.json | 232 +++++++--------
 ...chema_IntegTest.schema_types_name.approved.json | 106 +++----
 .../graphql/test/src/test/resources/schema.gql     | 216 +++++++-------
 .../integration/GraphQlSourceForCauseway.java      |  51 ++--
 .../graphql/viewer/toplevel/GqlvTopLevelQuery.java |   2 +-
 22 files changed, 877 insertions(+), 668 deletions(-)
 create mode 100644 incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionHolder.java
 create mode 100644 incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociationHolder.java
 create mode 100644 incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollectionHolder.java
 create mode 100644 incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMemberHolder.java
 create mode 100644 incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMeta.java
 create mode 100644 incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
 create mode 100644 incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutatorsHolder.java
 create mode 100644 incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyHolder.java
 rename incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/util/{_LTN.java => TypeNames.java} (69%)


(causeway) 13/18: CAUSEWAY-3676: moves responsibility to creating fieldDefinition into GqlvAction, removes redundant code

Posted by da...@apache.org.
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 72c4600f39ad888b5fbfc15a64274f95117acc68
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 18:39:44 2024 +0000

    CAUSEWAY-3676: moves responsibility to creating fieldDefinition into GqlvAction, removes redundant code
---
 .../viewer/graphql/model/domain/GqlvDomainService.java   | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
index 39aa4e4e34..bdfae8f113 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
@@ -89,22 +89,6 @@ public class GqlvDomainService implements GqlvActionHolder, GqlvMutatorsHolder {
 
     public void addAction(final ObjectAction objectAction) {
 
-        String fieldName = objectAction.getId();
-
-        GraphQLFieldDefinition.Builder fieldBuilder = newFieldDefinition()
-                .name(fieldName)
-                .type((GraphQLOutputType) TypeMapper.typeForObjectAction(objectAction));
-        if (objectAction.getParameters().isNotEmpty()) {
-            fieldBuilder.arguments(objectAction.getParameters().stream()
-                    .map(objectActionParameter -> GraphQLArgument.newArgument()
-                            .name(objectActionParameter.getId())
-                            .type(TypeMapper.inputTypeFor(objectActionParameter))
-                            .build())
-                    .collect(Collectors.toList()));
-        }
-        GraphQLFieldDefinition fieldDefinition = fieldBuilder.build();
-        objectTypeBuilder.field(fieldDefinition);
-
         // TODO: either safe or mutator
         safeActions.add(new GqlvAction(this, objectAction, objectTypeBuilder, codeRegistryBuilder));
     }


(causeway) 12/18: CAUSEWAY-3676: moves responsibility to creating fieldDefinition into GqlvAction

Posted by da...@apache.org.
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 95cd298dfbc33744b924250ca5b159c52f3318bf
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 18:38:30 2024 +0000

    CAUSEWAY-3676: moves responsibility to creating fieldDefinition into GqlvAction
---
 .../viewer/graphql/model/domain/GqlvAction.java    | 28 ++++++++++++++++++----
 .../graphql/model/domain/GqlvDomainObject.java     | 18 ++------------
 .../graphql/model/domain/GqlvDomainService.java    | 12 +++++-----
 .../viewer/graphql/model/domain/GqlvMutators.java  |  2 +-
 .../test/e2e/Schema_IntegTest.schema.approved.json | 20 +++++++++++-----
 .../graphql/test/src/test/resources/schema.gql     |  4 ++--
 6 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
index 07e920e4a2..7b3811658b 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
@@ -7,30 +7,50 @@ import org.apache.causeway.core.metamodel.object.ManagedObject;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
 import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
 
-import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import graphql.schema.FieldCoordinates;
 import graphql.schema.GraphQLArgument;
 import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLOutputType;
+
+import lombok.val;
 
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
 import static graphql.schema.GraphQLNonNull.nonNull;
 
 public class GqlvAction extends GqlvMember<ObjectAction, GqlvActionHolder> {
 
+    private final GraphQLObjectType.Builder objectTypeBuilder;
+
     public GqlvAction(
             final GqlvActionHolder holder,
             final ObjectAction objectAction,
-            final GraphQLFieldDefinition fieldDefinition,
+            final GraphQLObjectType.Builder objectTypeBuilder,
             final GraphQLCodeRegistry.Builder codeRegistryBuilder
             ) {
-        super(holder, objectAction, fieldDefinition, codeRegistryBuilder);
+        super(holder, objectAction, fieldDefinition(objectAction, objectTypeBuilder), codeRegistryBuilder);
+        this.objectTypeBuilder = objectTypeBuilder;
+    }
+
+    private static GraphQLFieldDefinition fieldDefinition(
+            final ObjectAction objectAction,
+            final GraphQLObjectType.Builder objectTypeBuilder) {
+        val fieldName = objectAction.getId();
+        GraphQLFieldDefinition.Builder fieldBuilder = newFieldDefinition()
+                .name(fieldName)
+                .type((GraphQLOutputType) TypeMapper.typeForObjectAction(objectAction));
+        addGqlArguments(objectAction, fieldBuilder);
+        GraphQLFieldDefinition fieldDefinition = fieldBuilder.build();
+
+        objectTypeBuilder.field(fieldDefinition);
+        return fieldDefinition;
     }
 
     public ObjectAction getObjectAction() {
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
index 35d9a9a98f..5fa061b1bb 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
@@ -5,17 +5,14 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
 import org.apache.causeway.applib.services.metamodel.BeanSort;
-import org.apache.causeway.commons.collections.Can;
 import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
 import org.apache.causeway.core.metamodel.spec.ActionScope;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
-import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
 import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry;
@@ -23,20 +20,16 @@ import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
 import org.apache.causeway.viewer.graphql.model.types._Constants;
 import org.apache.causeway.viewer.graphql.model.util._LTN;
 
-import static org.apache.causeway.viewer.graphql.model.domain.GqlvAction.addGqlArguments;
 import static org.apache.causeway.viewer.graphql.model.types._Constants.GQL_INPUTTYPE_PREFIX;
 
 import lombok.Getter;
-import lombok.val;
 
 import graphql.Scalars;
-import graphql.schema.GraphQLArgument;
 import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLInputObjectType;
 import graphql.schema.GraphQLList;
 import graphql.schema.GraphQLObjectType;
-import graphql.schema.GraphQLOutputType;
 import graphql.schema.GraphQLType;
 import graphql.schema.GraphQLTypeReference;
 
@@ -202,17 +195,10 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
 
     void addAction(final ObjectAction objectAction) {
 
-
         if (objectAction.getSemantics().isSafeInNature()) {
+            GraphQLObjectType.Builder objectTypeBuilder = getGqlObjectTypeBuilder();
 
-            val fieldName = objectAction.getId();
-            GraphQLFieldDefinition.Builder fieldBuilder = newFieldDefinition()
-                    .name(fieldName)
-                    .type((GraphQLOutputType) TypeMapper.typeForObjectAction(objectAction));
-            addGqlArguments(objectAction, fieldBuilder);
-            GraphQLFieldDefinition fieldDefinition = fieldBuilder.build();
-            getGqlObjectTypeBuilder().field(fieldDefinition);
-            safeActions.add(new GqlvAction(this, objectAction, fieldDefinition, codeRegistryBuilder));
+            safeActions.add(new GqlvAction(this, objectAction, objectTypeBuilder, codeRegistryBuilder));
         } else {
 
             mutators.addActionAsField(objectAction);
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
index 5afe4b6ccf..39aa4e4e34 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
@@ -33,7 +33,7 @@ public class GqlvDomainService implements GqlvActionHolder, GqlvMutatorsHolder {
         return objectSpecification.getLogicalTypeName();
     }
 
-    private final GraphQLObjectType.Builder gqlObjectTypeBuilder;
+    private final GraphQLObjectType.Builder objectTypeBuilder;
 
     private GraphQLObjectType gqlObjectType;
 
@@ -48,7 +48,7 @@ public class GqlvDomainService implements GqlvActionHolder, GqlvMutatorsHolder {
 
         this.mutators = new GqlvMutators(this, codeRegistryBuilder);
 
-        this.gqlObjectTypeBuilder = newObject().name(_LTN.sanitized(objectSpecification));
+        this.objectTypeBuilder = newObject().name(_LTN.sanitized(objectSpecification));
     }
 
 
@@ -65,7 +65,7 @@ public class GqlvDomainService implements GqlvActionHolder, GqlvMutatorsHolder {
         if (gqlObjectType != null) {
             throw new IllegalArgumentException(String.format("GqlObjectType has already been built for %s", getLogicalTypeName()));
         }
-        return gqlObjectType = gqlObjectTypeBuilder.build();
+        return gqlObjectType = objectTypeBuilder.build();
     }
 
     /**
@@ -82,7 +82,7 @@ public class GqlvDomainService implements GqlvActionHolder, GqlvMutatorsHolder {
     public GraphQLFieldDefinition createTopLevelQueryField() {
         return newFieldDefinition()
                 .name(_LTN.sanitized(objectSpecification))
-                .type(gqlObjectTypeBuilder)
+                .type(objectTypeBuilder)
                 .build();
     }
 
@@ -103,10 +103,10 @@ public class GqlvDomainService implements GqlvActionHolder, GqlvMutatorsHolder {
                     .collect(Collectors.toList()));
         }
         GraphQLFieldDefinition fieldDefinition = fieldBuilder.build();
-        gqlObjectTypeBuilder.field(fieldDefinition);
+        objectTypeBuilder.field(fieldDefinition);
 
         // TODO: either safe or mutator
-        safeActions.add(new GqlvAction(this, objectAction, fieldDefinition, codeRegistryBuilder));
+        safeActions.add(new GqlvAction(this, objectAction, objectTypeBuilder, codeRegistryBuilder));
     }
 
 
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
index 49def43364..912704705c 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
@@ -56,7 +56,7 @@ public class GqlvMutators implements GqlvActionHolder {
         GraphQLFieldDefinition fieldDefinition = fieldBuilder.build();
 
         objectTypeBuilder.field(fieldDefinition);
-        actions.add(new GqlvAction(holder, objectAction, fieldDefinition, codeRegistryBuilder));
+        actions.add(new GqlvAction(holder, objectAction, objectTypeBuilder, codeRegistryBuilder));
     }
 
     private final List<GqlvAction> actions = new ArrayList<>();
diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Schema_IntegTest.schema.approved.json b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Schema_IntegTest.schema.approved.json
index de2b263869..e39e7c964c 100644
--- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Schema_IntegTest.schema.approved.json
+++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Schema_IntegTest.schema.approved.json
@@ -6858,9 +6858,13 @@
             "name" : "name",
             "description" : null,
             "type" : {
-              "kind" : "SCALAR",
-              "name" : "String",
-              "ofType" : null
+              "kind" : "NON_NULL",
+              "name" : null,
+              "ofType" : {
+                "kind" : "SCALAR",
+                "name" : "String",
+                "ofType" : null
+              }
             },
             "defaultValue" : null
           }, {
@@ -7029,9 +7033,13 @@
             "name" : "name",
             "description" : null,
             "type" : {
-              "kind" : "SCALAR",
-              "name" : "String",
-              "ofType" : null
+              "kind" : "NON_NULL",
+              "name" : null,
+              "ofType" : {
+                "kind" : "SCALAR",
+                "name" : "String",
+                "ofType" : null
+              }
             },
             "defaultValue" : null
           } ],
diff --git a/incubator/viewers/graphql/test/src/test/resources/schema.gql b/incubator/viewers/graphql/test/src/test/resources/schema.gql
index 1086e5bcc4..21aca7cbaa 100644
--- a/incubator/viewers/graphql/test/src/test/resources/schema.gql
+++ b/incubator/viewers/graphql/test/src/test/resources/schema.gql
@@ -589,7 +589,7 @@ type university_dept_Department {
 }
 
 type university_dept_DepartmentMenu {
-  createDepartment(deptHead: _gql_input__university_dept_DeptHead, name: String): university_dept_Department
+  createDepartment(deptHead: _gql_input__university_dept_DeptHead, name: String!): university_dept_Department
   findAllDepartments: [university_dept_Department]
 }
 
@@ -608,7 +608,7 @@ type university_dept_DeptHead {
 
 type university_dept_DeptHeadMenu {
   findAllDeptHeads: [university_dept_DeptHead]
-  findDeptHeadByName(name: String): university_dept_DeptHead
+  findDeptHeadByName(name: String!): university_dept_DeptHead
 }
 
 type university_dept_DeptHead__meta {


(causeway) 01/18: CAUSEWAY-3676: factors out GqlvDomainObjectMutators

Posted by da...@apache.org.
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 024ff34a45869d4db4b97aaecf7478dbc90f9066
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 16:29:51 2024 +0000

    CAUSEWAY-3676: factors out GqlvDomainObjectMutators
---
 .../graphql/model/domain/GqlvDomainObject.java     | 38 +++--------
 .../model/domain/GqlvDomainObjectMutators.java     | 75 ++++++++++++++++++++++
 2 files changed, 85 insertions(+), 28 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
index 838c76fa5b..cf814cda4f 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
@@ -59,6 +59,8 @@ import static graphql.schema.GraphQLTypeReference.typeRef;
  */
 public class GqlvDomainObject {
 
+    private final GqlvDomainObjectMutators mutators;
+
     @UtilityClass
     static class Fields {
         static GraphQLFieldDefinition id =
@@ -87,7 +89,7 @@ public class GqlvDomainObject {
     @Getter private final GraphQLObjectType.Builder gqlObjectTypeBuilder;
     @Getter private final GraphQLInputObjectType gqlInputObjectType;
 
-    private String getLogicalTypeName() {
+    String getLogicalTypeName() {
         return objectSpec.getLogicalTypeName();
     }
 
@@ -103,11 +105,8 @@ public class GqlvDomainObject {
         return (GraphQLObjectType) metaField.getType();
     }
 
-    String getMutatorsTypeName() {
-        return getLogicalTypeNameSanitized() + "__DomainObject_mutators";
-    }
 
-    final GraphQLObjectType.Builder mutatorsTypeBuilder;
+
 
     private final List<GqlvProperty> properties = new ArrayList<>();
     public List<GqlvProperty> getProperties() {return Collections.unmodifiableList(properties);}
@@ -118,19 +117,12 @@ public class GqlvDomainObject {
     private final List<GqlvAction> safeActions = new ArrayList<>();
     public List<GqlvAction> getSafeActions() {return Collections.unmodifiableList(safeActions);}
 
-    private final List<GqlvAction> mutatorActions = new ArrayList<>();
-    public List<GqlvAction> getMutatorActions() {return Collections.unmodifiableList(mutatorActions);}
 
     /**
      * Built using {@link #buildGqlObjectType()}
      */
     private GraphQLObjectType gqlObjectType;
 
-    /**
-     * Built lazily using {@link #buildMutatorsTypeIfAny()}
-     */
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    private Optional<GraphQLObjectType> mutatorsTypeIfAny;
 
 
     public GqlvDomainObject(
@@ -160,7 +152,7 @@ public class GqlvDomainObject {
                         .build());
         gqlInputObjectType = inputTypeBuilder.build();
 
-        mutatorsTypeBuilder = newObject().name(getMutatorsTypeName());
+        mutators = new GqlvDomainObjectMutators(this);
     }
 
 
@@ -304,12 +296,12 @@ public class GqlvDomainObject {
     public void addNonSafeActionAsMutatorField(
             final ObjectAction objectAction,
             final GraphQLFieldDefinition fieldDefinition) {
-        mutatorsTypeBuilder.field(fieldDefinition);
-        mutatorActions.add(new GqlvAction(objectAction, fieldDefinition));
+
+        mutators.addActionAsField(objectAction, fieldDefinition);
     }
 
     boolean hasMutators() {
-        return !mutatorActions.isEmpty();
+        return mutators.hasActions();
     }
 
 
@@ -341,24 +333,14 @@ public class GqlvDomainObject {
      * @see #buildMutatorsTypeIfAny()
      */
     public Optional<GraphQLObjectType> getMutatorsTypeIfAny() {
-        //noinspection OptionalAssignedToNull
-        if (mutatorsTypeIfAny == null) {
-            throw new IllegalArgumentException(String.format("Gql MutatorsType has not yet been built for %s", getLogicalTypeName()));
-        }
-        return mutatorsTypeIfAny;
+        return mutators.getMutatorsTypeIfAny();
     }
 
     /**
      * @see #getMutatorsTypeIfAny()
      */
     public Optional<GraphQLObjectType> buildMutatorsTypeIfAny() {
-        //noinspection OptionalAssignedToNull
-        if (mutatorsTypeIfAny != null) {
-            throw new IllegalArgumentException("Gql MutatorsType has already been built for " + getLogicalTypeName());
-        }
-        return mutatorsTypeIfAny = hasMutators()
-                ? Optional.of(mutatorsTypeBuilder.build())
-                : Optional.empty();
+        return mutators.buildMutatorsTypeIfAny();
     }
 
     public void addActionsAsFields() {
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMutators.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMutators.java
new file mode 100644
index 0000000000..71986cce55
--- /dev/null
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMutators.java
@@ -0,0 +1,75 @@
+package org.apache.causeway.viewer.graphql.model.domain;
+
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLObjectType;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
+
+import static graphql.schema.GraphQLObjectType.newObject;
+
+public class GqlvDomainObjectMutators {
+
+    private final GqlvDomainObject domainObject;
+
+    final GraphQLObjectType.Builder mutatorsTypeBuilder;
+
+    /**
+     * Built lazily using {@link #buildMutatorsTypeIfAny()}
+     */
+    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+    private Optional<GraphQLObjectType> mutatorsTypeIfAny;
+
+    public GqlvDomainObjectMutators(
+            final GqlvDomainObject domainObject) {
+        this.domainObject = domainObject;
+
+        mutatorsTypeBuilder = newObject().name(this.domainObject.getLogicalTypeNameSanitized() + "__DomainObject_mutators");
+
+    }
+
+    public void addActionAsField(
+            final ObjectAction objectAction,
+            final GraphQLFieldDefinition fieldDefinition) {
+
+        mutatorsTypeBuilder.field(fieldDefinition);
+        actions.add(new GqlvAction(objectAction, fieldDefinition));
+    }
+
+    private final List<GqlvAction> actions = new ArrayList<>();
+    public List<GqlvAction> getActions() {return Collections.unmodifiableList(actions);}
+
+    boolean hasActions() {
+        return !actions.isEmpty();
+    }
+
+
+    /**
+     * @see #buildMutatorsTypeIfAny()
+     */
+    public Optional<GraphQLObjectType> getMutatorsTypeIfAny() {
+        //noinspection OptionalAssignedToNull
+        if (mutatorsTypeIfAny == null) {
+            throw new IllegalArgumentException(String.format("Gql MutatorsType has not yet been built for %s", domainObject.getLogicalTypeName()));
+        }
+        return mutatorsTypeIfAny;
+    }
+
+    /**
+     * @see #getMutatorsTypeIfAny()
+     */
+    public Optional<GraphQLObjectType> buildMutatorsTypeIfAny() {
+        //noinspection OptionalAssignedToNull
+        if (mutatorsTypeIfAny != null) {
+            throw new IllegalArgumentException("Gql MutatorsType has already been built for " + domainObject.getLogicalTypeName());
+        }
+        return mutatorsTypeIfAny = hasActions()
+                ? Optional.of(mutatorsTypeBuilder.build())
+                : Optional.empty();
+    }
+
+}


(causeway) 18/18: CAUSEWAY-3676: rationalizing domain object vs service; logical type names

Posted by da...@apache.org.
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 032b38f0422e1c0bbf89cc2c5de30dcc7bce9011
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Jan 21 12:45:11 2024 +0000

    CAUSEWAY-3676: rationalizing domain object vs service; logical type names
---
 .../graphql/model/domain/GqlvDomainObject.java     | 38 ++++++++--------
 .../graphql/model/domain/GqlvDomainService.java    | 50 +++++++++++++---------
 .../viewer/graphql/model/domain/GqlvMutators.java  | 11 +----
 .../viewer/graphql/model/types/TypeMapper.java     |  6 +--
 .../model/util/{_LTN.java => TypeNames.java}       | 15 ++++++-
 .../graphql/viewer/toplevel/GqlvTopLevelQuery.java |  2 +-
 6 files changed, 65 insertions(+), 57 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
index 293e405a18..48f4ec8dec 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
@@ -18,7 +18,7 @@ import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry;
 import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
 import org.apache.causeway.viewer.graphql.model.types._Constants;
-import org.apache.causeway.viewer.graphql.model.util._LTN;
+import org.apache.causeway.viewer.graphql.model.util.TypeNames;
 
 import static org.apache.causeway.viewer.graphql.model.types._Constants.GQL_INPUTTYPE_PREFIX;
 
@@ -41,7 +41,7 @@ import static graphql.schema.GraphQLObjectType.newObject;
 import static graphql.schema.GraphQLTypeReference.typeRef;
 
 /**
- * A wrapper around {@link ObjectSpecification}
+ * Exposes a domain object (view model or entity) via the GQL viewer.
  */
 public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, GqlvCollectionHolder, GqlvMutatorsHolder {
 
@@ -50,16 +50,13 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
 
     @Getter private final GqlvMeta meta;
     @Getter private final GqlvMutators mutators;
-
-    @Getter private final GraphQLObjectType.Builder objectTypeBuilder;
-    @Getter private final GraphQLInputObjectType gqlInputObjectType;
+    private final GraphQLObjectType.Builder objectTypeBuilder;
 
     String getLogicalTypeName() {
         return objectSpecification.getLogicalTypeName();
     }
-
     public String getLogicalTypeNameSanitized() {
-        return _LTN.sanitized(objectSpecification);
+        return TypeNames.objectTypeNameFor(objectSpecification);
     }
 
     public BeanSort getBeanSort() {
@@ -75,13 +72,12 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
     private final List<GqlvAction> safeActions = new ArrayList<>();
     public List<GqlvAction> getSafeActions() {return Collections.unmodifiableList(safeActions);}
 
-
     /**
      * Built using {@link #buildGqlObjectType()}
      */
     private GraphQLObjectType gqlObjectType;
 
-
+    @Getter private final GraphQLInputObjectType gqlInputObjectType;
 
     public GqlvDomainObject(
             final ObjectSpecification objectSpecification,
@@ -90,10 +86,13 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
             final ObjectManager objectManager) {
         this.objectSpecification = objectSpecification;
         this.codeRegistryBuilder = codeRegistryBuilder;
-        this.objectTypeBuilder = newObject().name(getLogicalTypeNameSanitized());
 
-        meta = new GqlvMeta(this, codeRegistryBuilder, bookmarkService, objectManager);
-        mutators = new GqlvMutators(this, codeRegistryBuilder);
+        this.objectTypeBuilder = newObject().name(TypeNames.objectTypeNameFor(objectSpecification));
+
+        this.meta = new GqlvMeta(this, codeRegistryBuilder, bookmarkService, objectManager);
+        this.mutators = new GqlvMutators(this, codeRegistryBuilder);
+
+        objectTypeBuilder.field(meta.getMetaField());
 
         // input object type
         String inputTypeName = GQL_INPUTTYPE_PREFIX + getLogicalTypeNameSanitized();
@@ -105,9 +104,6 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
                         .build());
         gqlInputObjectType = inputTypeBuilder.build();
 
-        // object type's meta field
-        objectTypeBuilder.field(meta.getMetaField());
-
     }
 
 
@@ -127,11 +123,11 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
             case VIEW_MODEL:
             case ENTITY:
 
-                GraphQLTypeReference fieldTypeRef = typeRef(_LTN.sanitized(otoaObjectSpec));
+                GraphQLTypeReference fieldTypeRef = typeRef(TypeNames.objectTypeNameFor(otoaObjectSpec));
                 fieldDefinition = newFieldDefinition()
                         .name(otoa.getId())
                         .type(otoa.isOptional() ? fieldTypeRef : nonNull(fieldTypeRef)).build();
-                getObjectTypeBuilder().field(
+                objectTypeBuilder.field(
                         fieldDefinition
                         );
 
@@ -147,7 +143,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
                                 ? Scalars.GraphQLString
                                 : nonNull(Scalars.GraphQLString));
                 fieldDefinition = valueBuilder.build();
-                getObjectTypeBuilder().field(fieldDefinition);
+                objectTypeBuilder.field(fieldDefinition);
 
                 break;
         }
@@ -170,7 +166,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
 
             case VIEW_MODEL:
             case ENTITY:
-                GraphQLTypeReference typeRef = typeRef(_LTN.sanitized(elementType));
+                GraphQLTypeReference typeRef = typeRef(TypeNames.objectTypeNameFor(elementType));
                 fieldDefinition = newFieldDefinition()
                         .name(otom.getId())
                         .type(GraphQLList.list(typeRef)).build();
@@ -211,7 +207,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
         if (gqlObjectType != null) {
             throw new IllegalArgumentException(String.format("GqlObjectType has already been built for %s", getLogicalTypeName()));
         }
-        return gqlObjectType = getObjectTypeBuilder().name(getLogicalTypeNameSanitized()).build();
+        return gqlObjectType = objectTypeBuilder.name(getLogicalTypeNameSanitized()).build();
     }
 
     /**
@@ -252,7 +248,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
                     .name(_Constants.GQL_MUTATIONS_FIELDNAME)
                     .type(mutatorsType)
                     .build();
-            getObjectTypeBuilder().field(gql_mutations);
+            objectTypeBuilder.field(gql_mutations);
 
         });
 
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
index d1b1bb5777..2e6654a925 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
@@ -1,11 +1,5 @@
 package org.apache.causeway.viewer.graphql.model.domain;
 
-import graphql.schema.GraphQLCodeRegistry;
-import graphql.schema.GraphQLFieldDefinition;
-import graphql.schema.GraphQLObjectType;
-
-import lombok.Getter;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -18,47 +12,61 @@ import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
 import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry;
 import org.apache.causeway.viewer.graphql.model.types._Constants;
-import org.apache.causeway.viewer.graphql.model.util._LTN;
+import org.apache.causeway.viewer.graphql.model.util.TypeNames;
+
+import lombok.Getter;
+
+import graphql.schema.GraphQLCodeRegistry;
+import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLObjectType;
 
 import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
 import static graphql.schema.GraphQLObjectType.newObject;
 
+/**
+ * Exposes a domain service (view model or entity) via the GQL viewer.
+ */
 public class GqlvDomainService implements GqlvActionHolder, GqlvMutatorsHolder {
 
     @Getter private final ObjectSpecification objectSpecification;
-    @Getter private final Object pojo;
+    @Getter private final Object servicePojo;
     private final GraphQLCodeRegistry.Builder codeRegistryBuilder;
-    private final GqlvMutators mutators;
 
-    private String getLogicalTypeName() {
+    @Getter private final GqlvMutators mutators;
+    private final GraphQLObjectType.Builder objectTypeBuilder;
+
+    String getLogicalTypeName() {
         return objectSpecification.getLogicalTypeName();
     }
+    public String getLogicalTypeNameSanitized() {
+        return TypeNames.objectTypeNameFor(objectSpecification);
+    }
 
-    private final GraphQLObjectType.Builder objectTypeBuilder;
 
+    private final List<GqlvAction> safeActions = new ArrayList<>();
+    public List<GqlvAction> getSafeActions() {return Collections.unmodifiableList(safeActions);}
+
+    /**
+     * Built using {@link #buildGqlObjectType()}
+     */
     private GraphQLObjectType gqlObjectType;
 
     public GqlvDomainService(
             final ObjectSpecification objectSpecification,
-            final Object pojo,
+            final Object servicePojo,
             final GraphQLCodeRegistry.Builder codeRegistryBuilder
     ) {
         this.objectSpecification = objectSpecification;
-        this.pojo = pojo;
+        this.servicePojo = servicePojo;
         this.codeRegistryBuilder = codeRegistryBuilder;
 
+        this.objectTypeBuilder = newObject().name(TypeNames.objectTypeNameFor(objectSpecification));
+
         this.mutators = new GqlvMutators(this, codeRegistryBuilder);
 
-        this.objectTypeBuilder = newObject().name(_LTN.sanitized(objectSpecification));
     }
 
 
-    private final List<GqlvAction> safeActions = new ArrayList<>();
-    public List<GqlvAction> getSafeActions() {return Collections.unmodifiableList(safeActions);}
-
-    private final List<GqlvAction> mutatorActions = new ArrayList<>();
-    public List<GqlvAction> getMutatorActions() {return Collections.unmodifiableList(mutatorActions);}
-
     /**
      * @see #getGqlObjectType()
      */
@@ -82,7 +90,7 @@ public class GqlvDomainService implements GqlvActionHolder, GqlvMutatorsHolder {
 
     public GraphQLFieldDefinition createTopLevelQueryField() {
         return newFieldDefinition()
-                .name(_LTN.sanitized(objectSpecification))
+                .name(TypeNames.objectTypeNameFor(objectSpecification))
                 .type(objectTypeBuilder)
                 .build();
     }
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
index 9c1c273111..a940286da6 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
@@ -1,11 +1,7 @@
 package org.apache.causeway.viewer.graphql.model.domain;
 
 import graphql.schema.GraphQLCodeRegistry;
-import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLObjectType;
-import graphql.schema.GraphQLOutputType;
-
-import lombok.val;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -13,14 +9,11 @@ import java.util.List;
 import java.util.Optional;
 
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
-import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-import org.apache.causeway.viewer.graphql.model.util._LTN;
+import org.apache.causeway.viewer.graphql.model.util.TypeNames;
 
 import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
 import static graphql.schema.GraphQLObjectType.newObject;
 
-import static org.apache.causeway.viewer.graphql.model.domain.GqlvAction.addGqlArguments;
-
 public class GqlvMutators implements GqlvActionHolder {
 
     private final GqlvMutatorsHolder holder;
@@ -41,7 +34,7 @@ public class GqlvMutators implements GqlvActionHolder {
         this.holder = holder;
         this.codeRegistryBuilder = codeRegistryBuilder;
 
-        objectTypeBuilder = newObject().name(_LTN.sanitized(this.holder.getObjectSpecification()) + "__mutators");
+        objectTypeBuilder = newObject().name(TypeNames.mutatorTypeNameFor(this.holder.getObjectSpecification()));
 
     }
 
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java
index ec7dd3d233..be8467cd5e 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java
@@ -27,7 +27,7 @@ import org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.causeway.viewer.graphql.model.util._LTN;
+import org.apache.causeway.viewer.graphql.model.util.TypeNames;
 
 import graphql.Scalars;
 import graphql.schema.GraphQLInputType;
@@ -62,7 +62,7 @@ public class TypeMapper {
             case ENTITY:
             case VIEW_MODEL:
 
-                return GraphQLTypeReference.typeRef(_Constants.GQL_INPUTTYPE_PREFIX + _LTN.sanitized(elementType));
+                return GraphQLTypeReference.typeRef(TypeNames.inputTypeNameFor(elementType));
 
             case VALUE:
                 return (GraphQLInputType) typeFor(elementType.getCorrespondingClass());
@@ -102,7 +102,7 @@ public class TypeMapper {
             case ABSTRACT:
             case ENTITY:
             case VIEW_MODEL:
-                return GraphQLTypeReference.typeRef(_LTN.sanitized(objectSpecification));
+                return GraphQLTypeReference.typeRef(TypeNames.objectTypeNameFor(objectSpecification));
 
             case VALUE:
                 return typeFor(objectSpecification.getCorrespondingClass());
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/util/_LTN.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/util/TypeNames.java
similarity index 69%
rename from incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/util/_LTN.java
rename to incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/util/TypeNames.java
index e3206f8651..2438a65226 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/util/_LTN.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/util/TypeNames.java
@@ -21,13 +21,24 @@ package org.apache.causeway.viewer.graphql.model.util;
 import lombok.experimental.UtilityClass;
 
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
+import org.apache.causeway.viewer.graphql.model.types._Constants;
 
 @UtilityClass
-public final class _LTN {
-    public static String sanitized(ObjectSpecification objectSpecification) {
+public final class TypeNames {
+    public static String objectTypeNameFor(ObjectSpecification objectSpecification) {
         return sanitized(objectSpecification.getLogicalTypeName());
     }
+
+    public static String mutatorTypeNameFor(ObjectSpecification objectSpecification) {
+        return objectTypeNameFor(objectSpecification) + "__mutators";
+    }
+
+    public static String inputTypeNameFor(ObjectSpecification objectSpecification) {
+        return _Constants.GQL_INPUTTYPE_PREFIX + objectTypeNameFor(objectSpecification);
+    }
+
     private static String sanitized(final String name) {
         return name.replace('.', '_');
     }
+
 }
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java
index bf350109cf..054cf2e23a 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java
@@ -75,7 +75,7 @@ public class GqlvTopLevelQuery {
         codeRegistryBuilder.dataFetcher(
                 // TODO: it would be nice to make these typesafe...
                 FieldCoordinates.coordinates("Query", topLevelQueryField.getName()),
-                (DataFetcher<Object>) environment -> domainService.getPojo());
+                (DataFetcher<Object>) environment -> domainService.getServicePojo());
 
     }
 


(causeway) 15/18: introduces addActions on GqlvDomainService

Posted by da...@apache.org.
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 5d611e73c24e1be4c2142897573e92e1eb259a48
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 19:17:33 2024 +0000

    introduces addActions on GqlvDomainService
---
 .../viewer/graphql/model/domain/GqlvDomainService.java   | 14 ++++++++++++++
 .../viewer/integration/GraphQlSourceForCauseway.java     | 16 ++++------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
index 9bb7fea2da..1cc57e783e 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
@@ -15,6 +15,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
+import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
 import org.apache.causeway.viewer.graphql.model.util._LTN;
 import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
@@ -93,5 +94,18 @@ public class GqlvDomainService implements GqlvActionHolder, GqlvMutatorsHolder {
     }
 
 
+    /**
+     * @return <code>true</code> if any (at least one) actions were added
+     */
+    public boolean addActions() {
+        List<ObjectAction> objectActionList = getObjectSpecification().streamRuntimeActions(MixedIn.INCLUDED)
+                .map(ObjectAction.class::cast)
+                .collect(Collectors.toList());
+
 
+        objectActionList.forEach(this::addAction);
+
+
+        return !objectActionList.isEmpty();
+    }
 }
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
index 6a815581b3..a3dc60c3bb 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
@@ -23,8 +23,6 @@ import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
 import static graphql.schema.GraphQLObjectType.newObject;
 
 import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -35,8 +33,7 @@ import org.apache.causeway.applib.services.bookmark.BookmarkService;
 import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 
-import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
-import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
+import org.apache.causeway.viewer.graphql.model.domain.GqlvAction;
 import org.apache.causeway.viewer.graphql.model.domain.GqlvDomainObject;
 import org.apache.causeway.viewer.graphql.model.domain.GqlvDomainService;
 import org.apache.causeway.viewer.graphql.viewer.toplevel.GqlvTopLevelQuery;
@@ -174,19 +171,14 @@ public class GraphQlSourceForCauseway implements GraphQlSource {
 
         val domainService = new GqlvDomainService(objectSpec, service, codeRegistryBuilder);
 
-        List<ObjectAction> objectActionList = objectSpec.streamRuntimeActions(MixedIn.INCLUDED)
-                .map(ObjectAction.class::cast)
-                .collect(Collectors.toList());
-
-        if (objectActionList.isEmpty()) {
+        boolean actionsAdded = domainService.addActions();
+        if (!actionsAdded) {
             return;
         }
 
-        objectActionList.forEach(domainService::addAction);
-
         domainService.buildObjectGqlType();
 
-        domainService.getSafeActions().forEach(gqlvAction -> gqlvAction.addDataFetcher());
+        domainService.getSafeActions().forEach(GqlvAction::addDataFetcher);
 
         topLevelQueryStructure.addFieldFor(domainService, codeRegistryBuilder);
     }


(causeway) 03/18: CAUSEWAY-3676: minor reordering

Posted by da...@apache.org.
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 de325e89c427cfd864d2f7a607dc062959ab8095
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 16:45:54 2024 +0000

    CAUSEWAY-3676: minor reordering
---
 .../graphql/viewer/integration/GraphQlSourceForCauseway.java       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
index b5c803eab6..8b111b96a1 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
@@ -199,13 +199,14 @@ public class GraphQlSourceForCauseway implements GraphQlSource {
 
         val gqlvDomainObject = new GqlvDomainObject(objectSpec, codeRegistryBuilder, bookmarkService, objectManager, specificationLoader);
 
-        graphQLTypeRegistry.addTypeIfNotAlreadyPresent(gqlvDomainObject.getMeta().getMetaField().getType());
-        graphQLTypeRegistry.addTypeIfNotAlreadyPresent(gqlvDomainObject.getGqlInputObjectType());
-
         gqlvDomainObject.addPropertiesAsFields();
         gqlvDomainObject.addCollectionsAsLists();
         gqlvDomainObject.addActionsAsFields();
 
+
+        graphQLTypeRegistry.addTypeIfNotAlreadyPresent(gqlvDomainObject.getMeta().getMetaField().getType());
+        graphQLTypeRegistry.addTypeIfNotAlreadyPresent(gqlvDomainObject.getGqlInputObjectType());
+
         gqlvDomainObject.getMutatorsTypeIfAny()
                 .ifPresent(graphQLTypeRegistry::addTypeIfNotAlreadyPresent);
 


(causeway) 07/18: CAUSEWAY-3676: moves responsibility from GqlvDomainService

Posted by da...@apache.org.
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 c469e0501fd6160a661cebc4f0d44ad7236c6448
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 17:45:27 2024 +0000

    CAUSEWAY-3676: moves responsibility from GqlvDomainService
---
 .../viewer/graphql/model/domain/GqlvAction.java    | 51 +++++++++++++++++++++-
 .../graphql/model/domain/GqlvAssociation.java      |  7 +--
 .../graphql/model/domain/GqlvCollection.java       |  8 +---
 .../graphql/model/domain/GqlvDomainObject.java     |  8 ++--
 .../graphql/model/domain/GqlvDomainService.java    | 46 -------------------
 .../viewer/graphql/model/domain/GqlvMember.java    |  3 ++
 .../viewer/graphql/model/domain/GqlvProperty.java  |  5 +--
 .../integration/GraphQlSourceForCauseway.java      |  2 +-
 8 files changed, 63 insertions(+), 67 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
index 5048fba08c..6549c53d61 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
@@ -1,10 +1,22 @@
 package org.apache.causeway.viewer.graphql.model.domain;
 
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.causeway.core.metamodel.interactions.managed.ActionInteractionHead;
+import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
+import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
+import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
 
+import graphql.schema.DataFetcher;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.FieldCoordinates;
 import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
 
+import java.util.Map;
+
 public class GqlvAction extends GqlvMember<ObjectAction, GqlvActionHolder> {
 
     public GqlvAction(
@@ -12,11 +24,48 @@ public class GqlvAction extends GqlvMember<ObjectAction, GqlvActionHolder> {
             final ObjectAction objectAction,
             final GraphQLFieldDefinition fieldDefinition,
             final GraphQLCodeRegistry.Builder codeRegistryBuilder
-    ) {
+            ) {
         super(holder, objectAction, fieldDefinition, codeRegistryBuilder);
     }
 
     public ObjectAction getObjectAction() {
         return getObjectMember();
     }
+
+    public void addDataFetcher() {
+
+        codeRegistryBuilder.dataFetcher(
+                FieldCoordinates.coordinates(getHolder().getGqlObjectType(), getFieldDefinition()),
+                this::invoke
+        );
+    }
+
+    private Object invoke(
+            final DataFetchingEnvironment dataFetchingEnvironment) {
+        final ObjectAction objectAction = getObjectAction();
+
+        Object domainObjectInstance = dataFetchingEnvironment.getSource();
+
+        Class<?> domainObjectInstanceClass = domainObjectInstance.getClass();
+        ObjectSpecification specification = specificationLoader
+                .loadSpecification(domainObjectInstanceClass);
+
+        ManagedObject owner = ManagedObject.adaptSingular(specification, domainObjectInstance);
+
+        ActionInteractionHead actionInteractionHead = objectAction.interactionHead(owner);
+
+        Map<String, Object> arguments = dataFetchingEnvironment.getArguments();
+        Can<ObjectActionParameter> parameters = objectAction.getParameters();
+        Can<ManagedObject> canOfParams = parameters
+                .map(oap -> {
+                    Object argumentValue = arguments.get(oap.getId());
+                    return ManagedObject.adaptParameter(oap, argumentValue);
+                });
+
+        ManagedObject managedObject = objectAction
+                .execute(actionInteractionHead, canOfParams, InteractionInitiatedBy.USER);
+
+        return managedObject.getPojo();
+    }
+
 }
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociation.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociation.java
index 1e38e89de8..c8c08fdff9 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociation.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociation.java
@@ -15,18 +15,13 @@ import static graphql.schema.FieldCoordinates.coordinates;
 
 public abstract class GqlvAssociation<T extends ObjectAssociation, H extends GqlvAssociationHolder> extends GqlvMember<T, H> {
 
-
-    private final SpecificationLoader specificationLoader;
-
     public GqlvAssociation(
             final H holder,
             final T objectAssociation,
             final GraphQLFieldDefinition fieldDefinition,
-            final GraphQLCodeRegistry.Builder codeRegistryBuilder,
-            final SpecificationLoader specificationLoader
+            final GraphQLCodeRegistry.Builder codeRegistryBuilder
             ) {
         super(holder, objectAssociation, fieldDefinition, codeRegistryBuilder);
-        this.specificationLoader = specificationLoader;
     }
 
     /**
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java
index edd22e2c1a..d8aa958b08 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java
@@ -12,17 +12,13 @@ public class GqlvCollection extends GqlvAssociation<OneToManyAssociation, GqlvCo
             final GqlvCollectionHolder domainObject,
             final OneToManyAssociation oneToManyAssociation,
             final GraphQLFieldDefinition fieldDefinition,
-            final GraphQLCodeRegistry.Builder codeRegistryBuilder,
-            final SpecificationLoader specificationLoader
+            final GraphQLCodeRegistry.Builder codeRegistryBuilder
     ) {
-        super(domainObject, oneToManyAssociation, fieldDefinition, codeRegistryBuilder, specificationLoader);
+        super(domainObject, oneToManyAssociation, fieldDefinition, codeRegistryBuilder);
     }
 
     public OneToManyAssociation getOneToManyAssociation() {
         return getObjectAssociation();
     }
 
-    public void addDataFetcher() {
-
-    }
 }
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
index 9712762d5b..d673811f8d 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
@@ -169,7 +169,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
                 break;
         }
         if (fieldDefinition != null) {
-            properties.add(new GqlvProperty(this, otoa, fieldDefinition, codeRegistryBuilder, specificationLoader));
+            properties.add(new GqlvProperty(this, otoa, fieldDefinition, codeRegistryBuilder));
         }
     }
 
@@ -204,7 +204,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
         }
 
         if (fieldDefinition != null) {
-            collections.add(new GqlvCollection(this, otom, fieldDefinition, codeRegistryBuilder, specificationLoader));
+            collections.add(new GqlvCollection(this, otom, fieldDefinition, codeRegistryBuilder));
         }
     }
 
@@ -329,11 +329,11 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
     }
 
     public void addDataFetchersForProperties() {
-        getProperties().forEach(property -> property.addDataFetcher());
+        getProperties().forEach(GqlvAssociation::addDataFetcher);
     }
 
     public void addDataFetchersForCollections() {
-        getCollections().forEach(collection -> collection.addDataFetcher());
+        getCollections().forEach(GqlvCollection::addDataFetcher);
     }
 
 
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
index ddbf1159fb..35a15d9b95 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
@@ -1,8 +1,5 @@
 package org.apache.causeway.viewer.graphql.model.domain;
 
-import graphql.schema.DataFetcher;
-import graphql.schema.DataFetchingEnvironment;
-import graphql.schema.FieldCoordinates;
 import graphql.schema.GraphQLArgument;
 import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
@@ -15,16 +12,10 @@ import lombok.Getter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.causeway.core.metamodel.interactions.managed.ActionInteractionHead;
-import org.apache.causeway.core.metamodel.object.ManagedObject;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
-import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
 import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
 import org.apache.causeway.viewer.graphql.model.util._LTN;
 import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
@@ -125,42 +116,5 @@ public class GqlvDomainService implements GqlvActionHolder {
     }
 
 
-    public void addDataFetcher(final GqlvAction gqlvAction) {
-        GraphQLFieldDefinition fieldDefinition = gqlvAction.getFieldDefinition();
-
-        codeRegistryBuilder.dataFetcher(
-                FieldCoordinates.coordinates(getGqlObjectType(), fieldDefinition),
-                (DataFetcher<Object>) dataFetchingEnvironment -> invoke(gqlvAction, dataFetchingEnvironment)
-        );
-    }
-
-    private Object invoke(
-            final GqlvAction gqlvAction,
-            final DataFetchingEnvironment dataFetchingEnvironment) {
-        final ObjectAction objectAction = gqlvAction.getObjectAction();
-
-        Object domainObjectInstance = dataFetchingEnvironment.getSource();
-
-        Class<?> domainObjectInstanceClass = domainObjectInstance.getClass();
-        ObjectSpecification specification = specificationLoader
-                .loadSpecification(domainObjectInstanceClass);
-
-        ManagedObject owner = ManagedObject.adaptSingular(specification, domainObjectInstance);
-
-        ActionInteractionHead actionInteractionHead = objectAction.interactionHead(owner);
-
-        Map<String, Object> arguments = dataFetchingEnvironment.getArguments();
-        Can<ObjectActionParameter> parameters = objectAction.getParameters();
-        Can<ManagedObject> canOfParams = parameters
-                .map(oap -> {
-                    Object argumentValue = arguments.get(oap.getId());
-                    return ManagedObject.adaptParameter(oap, argumentValue);
-                });
-
-        ManagedObject managedObject = objectAction
-                .execute(actionInteractionHead, canOfParams, InteractionInitiatedBy.USER);
-
-        return managedObject.getPojo();
-    }
 
 }
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMember.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMember.java
index ee0179dedf..3db8cf753c 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMember.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMember.java
@@ -1,6 +1,7 @@
 package org.apache.causeway.viewer.graphql.model.domain;
 
 import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
+import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
 
 import graphql.schema.GraphQLCodeRegistry;
 
@@ -14,6 +15,7 @@ public abstract class GqlvMember<T extends ObjectMember, H extends GqlvMemberHol
     @Getter private final T objectMember;
     @Getter private final GraphQLFieldDefinition fieldDefinition;
     final GraphQLCodeRegistry.Builder codeRegistryBuilder;
+    final SpecificationLoader specificationLoader;
 
     public GqlvMember(
             final H holder,
@@ -25,6 +27,7 @@ public abstract class GqlvMember<T extends ObjectMember, H extends GqlvMemberHol
         this.objectMember = objectMember;
         this.fieldDefinition = fieldDefinition;
         this.codeRegistryBuilder = codeRegistryBuilder;
+        this.specificationLoader = objectMember.getSpecificationLoader();
     }
 
     public String getId() {
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java
index a58b926ada..c9e11c0be1 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java
@@ -12,10 +12,9 @@ public class GqlvProperty extends GqlvAssociation<OneToOneAssociation, GqlvPrope
             final GqlvPropertyHolder domainObject,
             final OneToOneAssociation oneToOneAssociation,
             final GraphQLFieldDefinition fieldDefinition,
-            final GraphQLCodeRegistry.Builder codeRegistryBuilder,
-            final SpecificationLoader specificationLoader
+            final GraphQLCodeRegistry.Builder codeRegistryBuilder
     ) {
-        super(domainObject, oneToOneAssociation, fieldDefinition, codeRegistryBuilder, specificationLoader);
+        super(domainObject, oneToOneAssociation, fieldDefinition, codeRegistryBuilder);
     }
 
     public OneToOneAssociation getOneToOneAssociation() {
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
index 5693f6a8fa..dba564d034 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
@@ -186,7 +186,7 @@ public class GraphQlSourceForCauseway implements GraphQlSource {
 
         domainService.buildObjectGqlType();
 
-        domainService.getSafeActions().forEach(domainService::addDataFetcher);
+        domainService.getSafeActions().forEach(gqlvAction -> gqlvAction.addDataFetcher());
 
         topLevelQueryStructure.addFieldFor(domainService, codeRegistryBuilder);
     }


(causeway) 14/18: CAUSEWAY-3676: rationalizing mutator actions for domain service vis-a-vis domain object

Posted by da...@apache.org.
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 b5c5b4ec9ffa9e9258d7b38c24f51961effcce31
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 18:54:38 2024 +0000

    CAUSEWAY-3676: rationalizing mutator actions for domain service vis-a-vis domain object
---
 .../graphql/model/domain/GqlvDomainObject.java     | 23 ++++++++++------------
 .../graphql/model/domain/GqlvDomainService.java    |  1 -
 .../viewer/graphql/model/domain/GqlvMutators.java  | 21 ++++++++++----------
 3 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
index 5fa061b1bb..0e529038e9 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
@@ -51,7 +51,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
     @Getter private final GqlvMeta meta;
     @Getter private final GqlvMutators mutators;
 
-    @Getter private final GraphQLObjectType.Builder gqlObjectTypeBuilder;
+    @Getter private final GraphQLObjectType.Builder objectTypeBuilder;
     @Getter private final GraphQLInputObjectType gqlInputObjectType;
 
     String getLogicalTypeName() {
@@ -90,7 +90,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
             final ObjectManager objectManager) {
         this.objectSpecification = objectSpecification;
         this.codeRegistryBuilder = codeRegistryBuilder;
-        this.gqlObjectTypeBuilder = newObject().name(getLogicalTypeNameSanitized());
+        this.objectTypeBuilder = newObject().name(getLogicalTypeNameSanitized());
 
         meta = new GqlvMeta(this, codeRegistryBuilder, bookmarkService, objectManager);
         mutators = new GqlvMutators(this, codeRegistryBuilder);
@@ -106,7 +106,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
         gqlInputObjectType = inputTypeBuilder.build();
 
         // object type's meta field
-        gqlObjectTypeBuilder.field(meta.getMetaField());
+        objectTypeBuilder.field(meta.getMetaField());
 
     }
 
@@ -131,7 +131,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
                 fieldDefinition = newFieldDefinition()
                         .name(otoa.getId())
                         .type(otoa.isOptional() ? fieldTypeRef : nonNull(fieldTypeRef)).build();
-                getGqlObjectTypeBuilder().field(
+                getObjectTypeBuilder().field(
                         fieldDefinition
                         );
 
@@ -147,7 +147,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
                                 ? Scalars.GraphQLString
                                 : nonNull(Scalars.GraphQLString));
                 fieldDefinition = valueBuilder.build();
-                getGqlObjectTypeBuilder().field(fieldDefinition);
+                getObjectTypeBuilder().field(fieldDefinition);
 
                 break;
         }
@@ -174,7 +174,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
                 fieldDefinition = newFieldDefinition()
                         .name(otom.getId())
                         .type(GraphQLList.list(typeRef)).build();
-                gqlObjectTypeBuilder.field(fieldDefinition);
+                objectTypeBuilder.field(fieldDefinition);
                 break;
 
             case VALUE:
@@ -182,7 +182,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
                 fieldDefinition = newFieldDefinition()
                         .name(otom.getId())
                         .type(GraphQLList.list(wrappedType)).build();
-                gqlObjectTypeBuilder.field(fieldDefinition);
+                objectTypeBuilder.field(fieldDefinition);
                 break;
         }
 
@@ -196,12 +196,9 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
     void addAction(final ObjectAction objectAction) {
 
         if (objectAction.getSemantics().isSafeInNature()) {
-            GraphQLObjectType.Builder objectTypeBuilder = getGqlObjectTypeBuilder();
-
             safeActions.add(new GqlvAction(this, objectAction, objectTypeBuilder, codeRegistryBuilder));
         } else {
-
-            mutators.addActionAsField(objectAction);
+            mutators.addAction(objectAction);
         }
     }
 
@@ -220,7 +217,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
         if (gqlObjectType != null) {
             throw new IllegalArgumentException(String.format("GqlObjectType has already been built for %s", getLogicalTypeName()));
         }
-        return gqlObjectType = getGqlObjectTypeBuilder().name(getLogicalTypeNameSanitized()).build();
+        return gqlObjectType = getObjectTypeBuilder().name(getLogicalTypeNameSanitized()).build();
     }
 
     /**
@@ -261,7 +258,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
                     .name(_Constants.GQL_MUTATIONS_FIELDNAME)
                     .type(mutatorsType)
                     .build();
-            getGqlObjectTypeBuilder().field(gql_mutations);
+            getObjectTypeBuilder().field(gql_mutations);
 
         });
 
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
index bdfae8f113..9bb7fea2da 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
@@ -88,7 +88,6 @@ public class GqlvDomainService implements GqlvActionHolder, GqlvMutatorsHolder {
 
 
     public void addAction(final ObjectAction objectAction) {
-
         // TODO: either safe or mutator
         safeActions.add(new GqlvAction(this, objectAction, objectTypeBuilder, codeRegistryBuilder));
     }
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
index 912704705c..9c1c273111 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
@@ -45,17 +45,16 @@ public class GqlvMutators implements GqlvActionHolder {
 
     }
 
-    public void addActionAsField(
-            final ObjectAction objectAction) {
-
-        val fieldName = objectAction.getId();
-        GraphQLFieldDefinition.Builder fieldBuilder = newFieldDefinition()
-                .name(fieldName)
-                .type((GraphQLOutputType) TypeMapper.typeForObjectAction(objectAction));
-        addGqlArguments(objectAction, fieldBuilder);
-        GraphQLFieldDefinition fieldDefinition = fieldBuilder.build();
-
-        objectTypeBuilder.field(fieldDefinition);
+    public void addAction(final ObjectAction objectAction) {
+
+//        val fieldName = objectAction.getId();
+//        GraphQLFieldDefinition.Builder fieldBuilder = newFieldDefinition()
+//                .name(fieldName)
+//                .type((GraphQLOutputType) TypeMapper.typeForObjectAction(objectAction));
+//        addGqlArguments(objectAction, fieldBuilder);
+//        GraphQLFieldDefinition fieldDefinition = fieldBuilder.build();
+//
+//        objectTypeBuilder.field(fieldDefinition);
         actions.add(new GqlvAction(holder, objectAction, objectTypeBuilder, codeRegistryBuilder));
     }
 


(causeway) 11/18: CAUSEWAY-3676: towards moving FieldDefinition creation within GqlvAction (2)

Posted by da...@apache.org.
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 0dfb9b3a104fde67ae4d74b54f6c9cc895fcb2e0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 18:32:27 2024 +0000

    CAUSEWAY-3676: towards moving FieldDefinition creation within GqlvAction (2)
---
 .../viewer/graphql/model/domain/GqlvAction.java    | 28 ++++++++++++++++
 .../graphql/model/domain/GqlvDomainObject.java     | 37 ++++++----------------
 .../viewer/graphql/model/domain/GqlvMutators.java  | 17 ++++++++--
 3 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
index 6549c53d61..07e920e4a2 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
@@ -8,14 +8,19 @@ import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
 import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
+import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
 
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import graphql.schema.FieldCoordinates;
+import graphql.schema.GraphQLArgument;
 import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
 
 import java.util.Map;
+import java.util.stream.Collectors;
+
+import static graphql.schema.GraphQLNonNull.nonNull;
 
 public class GqlvAction extends GqlvMember<ObjectAction, GqlvActionHolder> {
 
@@ -68,4 +73,27 @@ public class GqlvAction extends GqlvMember<ObjectAction, GqlvActionHolder> {
         return managedObject.getPojo();
     }
 
+    static void addGqlArguments(
+            final ObjectAction objectAction,
+            final GraphQLFieldDefinition.Builder builder) {
+
+        Can<ObjectActionParameter> parameters = objectAction.getParameters();
+
+        if (parameters.isNotEmpty()) {
+            builder.arguments(parameters.stream()
+                    .map(GqlvAction::gqlArgumentFor)
+                    .collect(Collectors.toList()));
+        }
+    }
+
+    private static GraphQLArgument gqlArgumentFor(final ObjectActionParameter objectActionParameter) {
+        return GraphQLArgument.newArgument()
+                .name(objectActionParameter.getId())
+                .type(objectActionParameter.isOptional()
+                        ? TypeMapper.inputTypeFor(objectActionParameter)
+                        : nonNull(TypeMapper.inputTypeFor(objectActionParameter)))
+                .build();
+    }
+
+
 }
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
index 33bf28fef4..35d9a9a98f 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
@@ -23,6 +23,7 @@ import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
 import org.apache.causeway.viewer.graphql.model.types._Constants;
 import org.apache.causeway.viewer.graphql.model.util._LTN;
 
+import static org.apache.causeway.viewer.graphql.model.domain.GqlvAction.addGqlArguments;
 import static org.apache.causeway.viewer.graphql.model.types._Constants.GQL_INPUTTYPE_PREFIX;
 
 import lombok.Getter;
@@ -201,43 +202,23 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
 
     void addAction(final ObjectAction objectAction) {
 
-        val fieldName = objectAction.getId();
-        GraphQLFieldDefinition.Builder fieldBuilder = newFieldDefinition()
-                .name(fieldName)
-                .type((GraphQLOutputType) TypeMapper.typeForObjectAction(objectAction));
-        addGqlArguments(objectAction, fieldBuilder);
-        GraphQLFieldDefinition fieldDefinition = fieldBuilder.build();
 
         if (objectAction.getSemantics().isSafeInNature()) {
+
+            val fieldName = objectAction.getId();
+            GraphQLFieldDefinition.Builder fieldBuilder = newFieldDefinition()
+                    .name(fieldName)
+                    .type((GraphQLOutputType) TypeMapper.typeForObjectAction(objectAction));
+            addGqlArguments(objectAction, fieldBuilder);
+            GraphQLFieldDefinition fieldDefinition = fieldBuilder.build();
             getGqlObjectTypeBuilder().field(fieldDefinition);
             safeActions.add(new GqlvAction(this, objectAction, fieldDefinition, codeRegistryBuilder));
         } else {
-            mutators.addActionAsField(objectAction, fieldDefinition);
-        }
-    }
-
-    private static void addGqlArguments(
-            final ObjectAction objectAction,
-            final GraphQLFieldDefinition.Builder builder) {
 
-        Can<ObjectActionParameter> parameters = objectAction.getParameters();
-
-        if (parameters.isNotEmpty()) {
-            builder.arguments(parameters.stream()
-                    .map(GqlvDomainObject::gqlArgumentFor)
-                    .collect(Collectors.toList()));
+            mutators.addActionAsField(objectAction);
         }
     }
 
-    private static GraphQLArgument gqlArgumentFor(final ObjectActionParameter objectActionParameter) {
-        return GraphQLArgument.newArgument()
-                .name(objectActionParameter.getId())
-                .type(objectActionParameter.isOptional()
-                        ? TypeMapper.inputTypeFor(objectActionParameter)
-                        : nonNull(TypeMapper.inputTypeFor(objectActionParameter)))
-                .build();
-    }
-
 
     boolean hasMutators() {
         return mutators.hasActions();
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
index 958bf6bbb3..49def43364 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
@@ -3,6 +3,9 @@ package org.apache.causeway.viewer.graphql.model.domain;
 import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLOutputType;
+
+import lombok.val;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -10,10 +13,14 @@ import java.util.List;
 import java.util.Optional;
 
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
+import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
 import org.apache.causeway.viewer.graphql.model.util._LTN;
 
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
 import static graphql.schema.GraphQLObjectType.newObject;
 
+import static org.apache.causeway.viewer.graphql.model.domain.GqlvAction.addGqlArguments;
+
 public class GqlvMutators implements GqlvActionHolder {
 
     private final GqlvMutatorsHolder holder;
@@ -39,8 +46,14 @@ public class GqlvMutators implements GqlvActionHolder {
     }
 
     public void addActionAsField(
-            final ObjectAction objectAction,
-            final GraphQLFieldDefinition fieldDefinition) {
+            final ObjectAction objectAction) {
+
+        val fieldName = objectAction.getId();
+        GraphQLFieldDefinition.Builder fieldBuilder = newFieldDefinition()
+                .name(fieldName)
+                .type((GraphQLOutputType) TypeMapper.typeForObjectAction(objectAction));
+        addGqlArguments(objectAction, fieldBuilder);
+        GraphQLFieldDefinition fieldDefinition = fieldBuilder.build();
 
         objectTypeBuilder.field(fieldDefinition);
         actions.add(new GqlvAction(holder, objectAction, fieldDefinition, codeRegistryBuilder));


(causeway) 16/18: CAUSEWAY-3676: rationalizes DomainObject and DomainService's addActions

Posted by da...@apache.org.
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 e6201b20e0abde81d5a8d33215badd5f6c436a24
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 19:21:22 2024 +0000

    CAUSEWAY-3676: rationalizes DomainObject and DomainService's addActions
---
 .../graphql/model/domain/GqlvDomainObject.java     |  2 +-
 .../graphql/model/domain/GqlvDomainService.java    | 22 +++++++++++++++++++---
 .../integration/GraphQlSourceForCauseway.java      |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
index 0e529038e9..65a5603c13 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
@@ -246,7 +246,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
         return mutators.buildMutatorsTypeIfAny();
     }
 
-    public void addActionsAsFields() {
+    public void addActions() {
 
         objectSpecification.streamActions(ActionScope.PRODUCTION, MixedIn.INCLUDED)
                 .forEach(this::addAction);
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
index 1cc57e783e..350ec76dfa 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
@@ -12,11 +12,14 @@ import lombok.Getter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
+import org.apache.causeway.core.metamodel.spec.ActionScope;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
+import org.apache.causeway.viewer.graphql.model.types._Constants;
 import org.apache.causeway.viewer.graphql.model.util._LTN;
 import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
 
@@ -93,19 +96,32 @@ public class GqlvDomainService implements GqlvActionHolder, GqlvMutatorsHolder {
         safeActions.add(new GqlvAction(this, objectAction, objectTypeBuilder, codeRegistryBuilder));
     }
 
+    public Optional<GraphQLObjectType> buildMutatorsTypeIfAny() {
+        return mutators.buildMutatorsTypeIfAny();
+    }
 
     /**
      * @return <code>true</code> if any (at least one) actions were added
      */
     public boolean addActions() {
-        List<ObjectAction> objectActionList = getObjectSpecification().streamRuntimeActions(MixedIn.INCLUDED)
-                .map(ObjectAction.class::cast)
-                .collect(Collectors.toList());
 
+        List<ObjectAction> objectActionList = objectSpecification.streamActions(ActionScope.PRODUCTION, MixedIn.INCLUDED)
+                .collect(Collectors.toList());
 
         objectActionList.forEach(this::addAction);
 
 
+        Optional<GraphQLObjectType> mutatorsTypeIfAny = buildMutatorsTypeIfAny();
+        mutatorsTypeIfAny.ifPresent(mutatorsType -> {
+
+            GraphQLFieldDefinition gql_mutations = newFieldDefinition()
+                    .name(_Constants.GQL_MUTATIONS_FIELDNAME)
+                    .type(mutatorsType)
+                    .build();
+            objectTypeBuilder.field(gql_mutations);
+
+        });
+
         return !objectActionList.isEmpty();
     }
 }
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
index a3dc60c3bb..8fe0391daf 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
@@ -192,7 +192,7 @@ public class GraphQlSourceForCauseway implements GraphQlSource {
 
         gqlvDomainObject.addPropertiesAsFields();
         gqlvDomainObject.addCollectionsAsLists();
-        gqlvDomainObject.addActionsAsFields();
+        gqlvDomainObject.addActions();
 
         // build
         gqlvDomainObject.registerTypesInto(graphQLTypeRegistry);


(causeway) 08/18: CAUSEWAY-3676: makes names of types slightly shorter

Posted by da...@apache.org.
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 5e0103e4f113427938e410318fbc283c9b86066b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 17:55:56 2024 +0000

    CAUSEWAY-3676: makes names of types slightly shorter
---
 .../graphql/model/domain/GqlvDomainObjectMeta.java |   2 +-
 .../model/domain/GqlvDomainObjectMutators.java     |   2 +-
 .../test/e2e/Schema_IntegTest.schema.approved.json | 212 ++++++++++-----------
 ...chema_IntegTest.schema_types_name.approved.json | 106 +++++------
 .../graphql/test/src/test/resources/schema.gql     | 212 ++++++++++-----------
 5 files changed, 267 insertions(+), 267 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMeta.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMeta.java
index d5319ead92..ea43a45056 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMeta.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMeta.java
@@ -69,7 +69,7 @@ public class GqlvDomainObjectMeta {
     }
 
     private GraphQLObjectType metaType() {
-        val metaTypeBuilder = newObject().name(domainObject.getLogicalTypeNameSanitized() + "__DomainObject_meta");
+        val metaTypeBuilder = newObject().name(domainObject.getLogicalTypeNameSanitized() + "__meta");
         metaTypeBuilder.field(GqlvDomainObjectMeta.Fields.id);
         metaTypeBuilder.field(GqlvDomainObjectMeta.Fields.logicalTypeName);
         if (domainObject.getBeanSort() == BeanSort.ENTITY) {
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMutators.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMutators.java
index b523344b82..c64d0cf46b 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMutators.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMutators.java
@@ -33,7 +33,7 @@ public class GqlvDomainObjectMutators implements GqlvActionHolder {
         this.domainObject = domainObject;
         this.codeRegistryBuilder = codeRegistryBuilder;
 
-        mutatorsTypeBuilder = newObject().name(this.domainObject.getLogicalTypeNameSanitized() + "__DomainObject_mutators");
+        mutatorsTypeBuilder = newObject().name(this.domainObject.getLogicalTypeNameSanitized() + "__mutators");
 
     }
 
diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Schema_IntegTest.schema.approved.json b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Schema_IntegTest.schema.approved.json
index 8156430cfb..de2b263869 100644
--- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Schema_IntegTest.schema.approved.json
+++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Schema_IntegTest.schema.approved.json
@@ -1887,7 +1887,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_applib_DomainObjectList__DomainObject_meta",
+            "name" : "causeway_applib_DomainObjectList__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -1962,7 +1962,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_applib_DomainObjectList__DomainObject_meta",
+        "name" : "causeway_applib_DomainObjectList__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -2009,7 +2009,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_applib_FacetGroupNode__DomainObject_meta",
+            "name" : "causeway_applib_FacetGroupNode__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -2036,7 +2036,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_applib_FacetGroupNode__DomainObject_meta",
+        "name" : "causeway_applib_FacetGroupNode__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -2083,7 +2083,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_applib_ParameterNode__DomainObject_meta",
+            "name" : "causeway_applib_ParameterNode__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -2125,7 +2125,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_applib_ParameterNode__DomainObject_meta",
+        "name" : "causeway_applib_ParameterNode__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -2172,7 +2172,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_applib_PropertyNode__DomainObject_meta",
+            "name" : "causeway_applib_PropertyNode__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -2228,7 +2228,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_applib_PropertyNode__DomainObject_mutators",
+            "name" : "causeway_applib_PropertyNode__mutators",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -2240,7 +2240,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_applib_PropertyNode__DomainObject_meta",
+        "name" : "causeway_applib_PropertyNode__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -2279,7 +2279,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_applib_PropertyNode__DomainObject_mutators",
+        "name" : "causeway_applib_PropertyNode__mutators",
         "description" : null,
         "fields" : [ {
           "name" : "streamChildNodes",
@@ -2307,7 +2307,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_applib_RoleMemento__DomainObject_meta",
+            "name" : "causeway_applib_RoleMemento__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -2349,7 +2349,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_applib_RoleMemento__DomainObject_meta",
+        "name" : "causeway_applib_RoleMemento__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -2396,7 +2396,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_applib_TypeNode__DomainObject_meta",
+            "name" : "causeway_applib_TypeNode__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -2423,7 +2423,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_applib_TypeNode__DomainObject_meta",
+        "name" : "causeway_applib_TypeNode__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -2470,7 +2470,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_applib_UserMemento__DomainObject_meta",
+            "name" : "causeway_applib_UserMemento__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -2623,7 +2623,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_applib_UserMemento__DomainObject_meta",
+        "name" : "causeway_applib_UserMemento__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -2690,7 +2690,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_applib_node_ActionNode__DomainObject_meta",
+            "name" : "causeway_applib_node_ActionNode__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -2746,7 +2746,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_applib_node_ActionNode__DomainObject_mutators",
+            "name" : "causeway_applib_node_ActionNode__mutators",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -2758,7 +2758,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_applib_node_ActionNode__DomainObject_meta",
+        "name" : "causeway_applib_node_ActionNode__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -2797,7 +2797,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_applib_node_ActionNode__DomainObject_mutators",
+        "name" : "causeway_applib_node_ActionNode__mutators",
         "description" : null,
         "fields" : [ {
           "name" : "streamChildNodes",
@@ -2825,7 +2825,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_applib_node_CollectionNode__DomainObject_meta",
+            "name" : "causeway_applib_node_CollectionNode__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -2881,7 +2881,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_applib_node_CollectionNode__DomainObject_mutators",
+            "name" : "causeway_applib_node_CollectionNode__mutators",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -2893,7 +2893,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_applib_node_CollectionNode__DomainObject_meta",
+        "name" : "causeway_applib_node_CollectionNode__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -2932,7 +2932,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_applib_node_CollectionNode__DomainObject_mutators",
+        "name" : "causeway_applib_node_CollectionNode__mutators",
         "description" : null,
         "fields" : [ {
           "name" : "streamChildNodes",
@@ -2960,7 +2960,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_applib_node_FacetAttrNode__DomainObject_meta",
+            "name" : "causeway_applib_node_FacetAttrNode__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -3002,7 +3002,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_applib_node_FacetAttrNode__DomainObject_meta",
+        "name" : "causeway_applib_node_FacetAttrNode__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -3049,7 +3049,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_applib_node_FacetNode__DomainObject_meta",
+            "name" : "causeway_applib_node_FacetNode__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -3091,7 +3091,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_applib_node_FacetNode__DomainObject_meta",
+        "name" : "causeway_applib_node_FacetNode__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -3158,7 +3158,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_conf_ConfigurationProperty__DomainObject_meta",
+            "name" : "causeway_conf_ConfigurationProperty__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -3200,7 +3200,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_conf_ConfigurationProperty__DomainObject_meta",
+        "name" : "causeway_conf_ConfigurationProperty__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -3247,7 +3247,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_conf_ConfigurationViewmodel__DomainObject_meta",
+            "name" : "causeway_conf_ConfigurationViewmodel__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -3304,7 +3304,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_conf_ConfigurationViewmodel__DomainObject_meta",
+        "name" : "causeway_conf_ConfigurationViewmodel__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -3351,7 +3351,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_feat_ApplicationFeatureViewModel__DomainObject_meta",
+            "name" : "causeway_feat_ApplicationFeatureViewModel__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -3408,7 +3408,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_feat_ApplicationFeatureViewModel__DomainObject_meta",
+        "name" : "causeway_feat_ApplicationFeatureViewModel__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -3455,7 +3455,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_feat_ApplicationNamespace__DomainObject_meta",
+            "name" : "causeway_feat_ApplicationNamespace__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -3512,7 +3512,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_feat_ApplicationNamespace__DomainObject_meta",
+        "name" : "causeway_feat_ApplicationNamespace__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -3559,7 +3559,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_feat_ApplicationType__DomainObject_meta",
+            "name" : "causeway_feat_ApplicationType__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -3669,7 +3669,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_feat_ApplicationTypeAction__DomainObject_meta",
+            "name" : "causeway_feat_ApplicationTypeAction__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -3756,7 +3756,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_feat_ApplicationTypeAction__DomainObject_meta",
+        "name" : "causeway_feat_ApplicationTypeAction__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -3803,7 +3803,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_feat_ApplicationTypeCollection__DomainObject_meta",
+            "name" : "causeway_feat_ApplicationTypeCollection__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -3890,7 +3890,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_feat_ApplicationTypeCollection__DomainObject_meta",
+        "name" : "causeway_feat_ApplicationTypeCollection__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -3937,7 +3937,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_feat_ApplicationTypeMember__DomainObject_meta",
+            "name" : "causeway_feat_ApplicationTypeMember__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -3994,7 +3994,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_feat_ApplicationTypeMember__DomainObject_meta",
+        "name" : "causeway_feat_ApplicationTypeMember__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -4041,7 +4041,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_feat_ApplicationTypeProperty__DomainObject_meta",
+            "name" : "causeway_feat_ApplicationTypeProperty__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -4150,7 +4150,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_feat_ApplicationTypeProperty__DomainObject_meta",
+        "name" : "causeway_feat_ApplicationTypeProperty__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -4189,7 +4189,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_feat_ApplicationType__DomainObject_meta",
+        "name" : "causeway_feat_ApplicationType__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -4236,7 +4236,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_schema_metamodel_v2_DomainClassDto__DomainObject_meta",
+            "name" : "causeway_schema_metamodel_v2_DomainClassDto__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -4375,7 +4375,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_schema_metamodel_v2_DomainClassDto__DomainObject_meta",
+        "name" : "causeway_schema_metamodel_v2_DomainClassDto__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -4422,7 +4422,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_security_LoginRedirect__DomainObject_meta",
+            "name" : "causeway_security_LoginRedirect__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -4434,7 +4434,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_security_LoginRedirect__DomainObject_meta",
+        "name" : "causeway_security_LoginRedirect__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -4501,7 +4501,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "causeway_testing_fixtures_FixtureResult__DomainObject_meta",
+            "name" : "causeway_testing_fixtures_FixtureResult__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -4554,7 +4554,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "causeway_testing_fixtures_FixtureResult__DomainObject_meta",
+        "name" : "causeway_testing_fixtures_FixtureResult__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -4601,7 +4601,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "java_lang_Runnable__DomainObject_meta",
+            "name" : "java_lang_Runnable__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -4613,7 +4613,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_lang_Runnable__DomainObject_meta",
+        "name" : "java_lang_Runnable__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -4660,7 +4660,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "java_util_Map__DomainObject_meta",
+            "name" : "java_util_Map__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -4672,7 +4672,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_util_Map__DomainObject_meta",
+        "name" : "java_util_Map__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -4719,7 +4719,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "java_util_SortedMap__DomainObject_meta",
+            "name" : "java_util_SortedMap__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -4731,7 +4731,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_util_SortedMap__DomainObject_meta",
+        "name" : "java_util_SortedMap__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -4778,7 +4778,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "java_util_concurrent_Callable__DomainObject_meta",
+            "name" : "java_util_concurrent_Callable__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -4790,7 +4790,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_util_concurrent_Callable__DomainObject_meta",
+        "name" : "java_util_concurrent_Callable__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -4837,7 +4837,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "java_util_function_BiFunction__DomainObject_meta",
+            "name" : "java_util_function_BiFunction__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -4849,7 +4849,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_util_function_BiFunction__DomainObject_meta",
+        "name" : "java_util_function_BiFunction__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -4896,7 +4896,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "java_util_function_Consumer__DomainObject_meta",
+            "name" : "java_util_function_Consumer__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -4908,7 +4908,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_util_function_Consumer__DomainObject_meta",
+        "name" : "java_util_function_Consumer__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -4955,7 +4955,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "java_util_function_Function__DomainObject_meta",
+            "name" : "java_util_function_Function__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -4967,7 +4967,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_util_function_Function__DomainObject_meta",
+        "name" : "java_util_function_Function__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -5014,7 +5014,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "java_util_stream_Stream__DomainObject_meta",
+            "name" : "java_util_stream_Stream__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -5026,7 +5026,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_util_stream_Stream__DomainObject_meta",
+        "name" : "java_util_stream_Stream__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -5073,7 +5073,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "org_apache_causeway_commons_functional_Either__DomainObject_meta",
+            "name" : "org_apache_causeway_commons_functional_Either__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -5114,7 +5114,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "org_apache_causeway_commons_functional_Either__DomainObject_mutators",
+            "name" : "org_apache_causeway_commons_functional_Either__mutators",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -5126,7 +5126,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "org_apache_causeway_commons_functional_Either__DomainObject_meta",
+        "name" : "org_apache_causeway_commons_functional_Either__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -5165,7 +5165,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "org_apache_causeway_commons_functional_Either__DomainObject_mutators",
+        "name" : "org_apache_causeway_commons_functional_Either__mutators",
         "description" : null,
         "fields" : [ {
           "name" : "accept",
@@ -5326,7 +5326,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "org_apache_causeway_commons_functional_Railway__DomainObject_meta",
+            "name" : "org_apache_causeway_commons_functional_Railway__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -5367,7 +5367,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "org_apache_causeway_commons_functional_Railway__DomainObject_mutators",
+            "name" : "org_apache_causeway_commons_functional_Railway__mutators",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -5379,7 +5379,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "org_apache_causeway_commons_functional_Railway__DomainObject_meta",
+        "name" : "org_apache_causeway_commons_functional_Railway__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -5418,7 +5418,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "org_apache_causeway_commons_functional_Railway__DomainObject_mutators",
+        "name" : "org_apache_causeway_commons_functional_Railway__mutators",
         "description" : null,
         "fields" : [ {
           "name" : "chain",
@@ -5555,7 +5555,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "org_apache_causeway_commons_functional_ThrowingConsumer__DomainObject_meta",
+            "name" : "org_apache_causeway_commons_functional_ThrowingConsumer__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -5566,7 +5566,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "org_apache_causeway_commons_functional_ThrowingConsumer__DomainObject_mutators",
+            "name" : "org_apache_causeway_commons_functional_ThrowingConsumer__mutators",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -5578,7 +5578,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "org_apache_causeway_commons_functional_ThrowingConsumer__DomainObject_meta",
+        "name" : "org_apache_causeway_commons_functional_ThrowingConsumer__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -5617,7 +5617,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "org_apache_causeway_commons_functional_ThrowingConsumer__DomainObject_mutators",
+        "name" : "org_apache_causeway_commons_functional_ThrowingConsumer__mutators",
         "description" : null,
         "fields" : [ {
           "name" : "andThen",
@@ -5682,7 +5682,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "org_apache_causeway_commons_functional_ThrowingFunction__DomainObject_meta",
+            "name" : "org_apache_causeway_commons_functional_ThrowingFunction__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -5693,7 +5693,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "org_apache_causeway_commons_functional_ThrowingFunction__DomainObject_mutators",
+            "name" : "org_apache_causeway_commons_functional_ThrowingFunction__mutators",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -5705,7 +5705,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "org_apache_causeway_commons_functional_ThrowingFunction__DomainObject_meta",
+        "name" : "org_apache_causeway_commons_functional_ThrowingFunction__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -5744,7 +5744,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "org_apache_causeway_commons_functional_ThrowingFunction__DomainObject_mutators",
+        "name" : "org_apache_causeway_commons_functional_ThrowingFunction__mutators",
         "description" : null,
         "fields" : [ {
           "name" : "andThen",
@@ -5833,7 +5833,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "org_apache_causeway_commons_functional_ThrowingRunnable__DomainObject_meta",
+            "name" : "org_apache_causeway_commons_functional_ThrowingRunnable__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -5844,7 +5844,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "org_apache_causeway_commons_functional_ThrowingRunnable__DomainObject_mutators",
+            "name" : "org_apache_causeway_commons_functional_ThrowingRunnable__mutators",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -5856,7 +5856,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "org_apache_causeway_commons_functional_ThrowingRunnable__DomainObject_meta",
+        "name" : "org_apache_causeway_commons_functional_ThrowingRunnable__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -5895,7 +5895,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "org_apache_causeway_commons_functional_ThrowingRunnable__DomainObject_mutators",
+        "name" : "org_apache_causeway_commons_functional_ThrowingRunnable__mutators",
         "description" : null,
         "fields" : [ {
           "name" : "callUncatched",
@@ -5967,7 +5967,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "org_apache_causeway_commons_functional_Try__DomainObject_meta",
+            "name" : "org_apache_causeway_commons_functional_Try__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -6008,7 +6008,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "org_apache_causeway_commons_functional_Try__DomainObject_mutators",
+            "name" : "org_apache_causeway_commons_functional_Try__mutators",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -6020,7 +6020,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "org_apache_causeway_commons_functional_Try__DomainObject_meta",
+        "name" : "org_apache_causeway_commons_functional_Try__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -6059,7 +6059,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "org_apache_causeway_commons_functional_Try__DomainObject_mutators",
+        "name" : "org_apache_causeway_commons_functional_Try__mutators",
         "description" : null,
         "fields" : [ {
           "name" : "accept",
@@ -6543,7 +6543,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "org_apache_causeway_core_metamodel_inspect_model_MMNode__DomainObject_meta",
+            "name" : "org_apache_causeway_core_metamodel_inspect_model_MMNode__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -6555,7 +6555,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "org_apache_causeway_core_metamodel_inspect_model_MMNode__DomainObject_meta",
+        "name" : "org_apache_causeway_core_metamodel_inspect_model_MMNode__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -6602,7 +6602,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_meta",
+            "name" : "org_apache_causeway_core_metamodel_inspect_model_MemberNode__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -6643,7 +6643,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_mutators",
+            "name" : "org_apache_causeway_core_metamodel_inspect_model_MemberNode__mutators",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -6655,7 +6655,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_meta",
+        "name" : "org_apache_causeway_core_metamodel_inspect_model_MemberNode__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -6694,7 +6694,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_mutators",
+        "name" : "org_apache_causeway_core_metamodel_inspect_model_MemberNode__mutators",
         "description" : null,
         "fields" : [ {
           "name" : "streamChildNodes",
@@ -6722,7 +6722,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript__DomainObject_meta",
+            "name" : "org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -6764,7 +6764,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript__DomainObject_meta",
+        "name" : "org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -6811,7 +6811,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "university_dept_Department__DomainObject_meta",
+            "name" : "university_dept_Department__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -6902,7 +6902,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "university_dept_Department__DomainObject_meta",
+        "name" : "university_dept_Department__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -6960,7 +6960,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "university_dept_DeptHead__DomainObject_meta",
+            "name" : "university_dept_DeptHead__meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -6993,7 +6993,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "university_dept_DeptHead__DomainObject_mutators",
+            "name" : "university_dept_DeptHead__mutators",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -7049,7 +7049,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "university_dept_DeptHead__DomainObject_meta",
+        "name" : "university_dept_DeptHead__meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -7099,7 +7099,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "university_dept_DeptHead__DomainObject_mutators",
+        "name" : "university_dept_DeptHead__mutators",
         "description" : null,
         "fields" : [ {
           "name" : "changeDepartment",
diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Schema_IntegTest.schema_types_name.approved.json b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Schema_IntegTest.schema_types_name.approved.json
index ca37cd5bb3..5129aa023f 100644
--- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Schema_IntegTest.schema_types_name.approved.json
+++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Schema_IntegTest.schema_types_name.approved.json
@@ -114,203 +114,203 @@
       }, {
         "name" : "causeway_applib_DomainObjectList"
       }, {
-        "name" : "causeway_applib_DomainObjectList__DomainObject_meta"
+        "name" : "causeway_applib_DomainObjectList__meta"
       }, {
         "name" : "causeway_applib_FacetGroupNode"
       }, {
-        "name" : "causeway_applib_FacetGroupNode__DomainObject_meta"
+        "name" : "causeway_applib_FacetGroupNode__meta"
       }, {
         "name" : "causeway_applib_ParameterNode"
       }, {
-        "name" : "causeway_applib_ParameterNode__DomainObject_meta"
+        "name" : "causeway_applib_ParameterNode__meta"
       }, {
         "name" : "causeway_applib_PropertyNode"
       }, {
-        "name" : "causeway_applib_PropertyNode__DomainObject_meta"
+        "name" : "causeway_applib_PropertyNode__meta"
       }, {
-        "name" : "causeway_applib_PropertyNode__DomainObject_mutators"
+        "name" : "causeway_applib_PropertyNode__mutators"
       }, {
         "name" : "causeway_applib_RoleMemento"
       }, {
-        "name" : "causeway_applib_RoleMemento__DomainObject_meta"
+        "name" : "causeway_applib_RoleMemento__meta"
       }, {
         "name" : "causeway_applib_TypeNode"
       }, {
-        "name" : "causeway_applib_TypeNode__DomainObject_meta"
+        "name" : "causeway_applib_TypeNode__meta"
       }, {
         "name" : "causeway_applib_UserMemento"
       }, {
-        "name" : "causeway_applib_UserMemento__DomainObject_meta"
+        "name" : "causeway_applib_UserMemento__meta"
       }, {
         "name" : "causeway_applib_UserMenu"
       }, {
         "name" : "causeway_applib_node_ActionNode"
       }, {
-        "name" : "causeway_applib_node_ActionNode__DomainObject_meta"
+        "name" : "causeway_applib_node_ActionNode__meta"
       }, {
-        "name" : "causeway_applib_node_ActionNode__DomainObject_mutators"
+        "name" : "causeway_applib_node_ActionNode__mutators"
       }, {
         "name" : "causeway_applib_node_CollectionNode"
       }, {
-        "name" : "causeway_applib_node_CollectionNode__DomainObject_meta"
+        "name" : "causeway_applib_node_CollectionNode__meta"
       }, {
-        "name" : "causeway_applib_node_CollectionNode__DomainObject_mutators"
+        "name" : "causeway_applib_node_CollectionNode__mutators"
       }, {
         "name" : "causeway_applib_node_FacetAttrNode"
       }, {
-        "name" : "causeway_applib_node_FacetAttrNode__DomainObject_meta"
+        "name" : "causeway_applib_node_FacetAttrNode__meta"
       }, {
         "name" : "causeway_applib_node_FacetNode"
       }, {
-        "name" : "causeway_applib_node_FacetNode__DomainObject_meta"
+        "name" : "causeway_applib_node_FacetNode__meta"
       }, {
         "name" : "causeway_conf_ConfigurationMenu"
       }, {
         "name" : "causeway_conf_ConfigurationProperty"
       }, {
-        "name" : "causeway_conf_ConfigurationProperty__DomainObject_meta"
+        "name" : "causeway_conf_ConfigurationProperty__meta"
       }, {
         "name" : "causeway_conf_ConfigurationViewmodel"
       }, {
-        "name" : "causeway_conf_ConfigurationViewmodel__DomainObject_meta"
+        "name" : "causeway_conf_ConfigurationViewmodel__meta"
       }, {
         "name" : "causeway_feat_ApplicationFeatureViewModel"
       }, {
-        "name" : "causeway_feat_ApplicationFeatureViewModel__DomainObject_meta"
+        "name" : "causeway_feat_ApplicationFeatureViewModel__meta"
       }, {
         "name" : "causeway_feat_ApplicationNamespace"
       }, {
-        "name" : "causeway_feat_ApplicationNamespace__DomainObject_meta"
+        "name" : "causeway_feat_ApplicationNamespace__meta"
       }, {
         "name" : "causeway_feat_ApplicationType"
       }, {
         "name" : "causeway_feat_ApplicationTypeAction"
       }, {
-        "name" : "causeway_feat_ApplicationTypeAction__DomainObject_meta"
+        "name" : "causeway_feat_ApplicationTypeAction__meta"
       }, {
         "name" : "causeway_feat_ApplicationTypeCollection"
       }, {
-        "name" : "causeway_feat_ApplicationTypeCollection__DomainObject_meta"
+        "name" : "causeway_feat_ApplicationTypeCollection__meta"
       }, {
         "name" : "causeway_feat_ApplicationTypeMember"
       }, {
-        "name" : "causeway_feat_ApplicationTypeMember__DomainObject_meta"
+        "name" : "causeway_feat_ApplicationTypeMember__meta"
       }, {
         "name" : "causeway_feat_ApplicationTypeProperty"
       }, {
-        "name" : "causeway_feat_ApplicationTypeProperty__DomainObject_meta"
+        "name" : "causeway_feat_ApplicationTypeProperty__meta"
       }, {
-        "name" : "causeway_feat_ApplicationType__DomainObject_meta"
+        "name" : "causeway_feat_ApplicationType__meta"
       }, {
         "name" : "causeway_schema_metamodel_v2_DomainClassDto"
       }, {
-        "name" : "causeway_schema_metamodel_v2_DomainClassDto__DomainObject_meta"
+        "name" : "causeway_schema_metamodel_v2_DomainClassDto__meta"
       }, {
         "name" : "causeway_security_LoginRedirect"
       }, {
-        "name" : "causeway_security_LoginRedirect__DomainObject_meta"
+        "name" : "causeway_security_LoginRedirect__meta"
       }, {
         "name" : "causeway_security_LogoutMenu"
       }, {
         "name" : "causeway_testing_fixtures_FixtureResult"
       }, {
-        "name" : "causeway_testing_fixtures_FixtureResult__DomainObject_meta"
+        "name" : "causeway_testing_fixtures_FixtureResult__meta"
       }, {
         "name" : "java_lang_Runnable"
       }, {
-        "name" : "java_lang_Runnable__DomainObject_meta"
+        "name" : "java_lang_Runnable__meta"
       }, {
         "name" : "java_util_Map"
       }, {
-        "name" : "java_util_Map__DomainObject_meta"
+        "name" : "java_util_Map__meta"
       }, {
         "name" : "java_util_SortedMap"
       }, {
-        "name" : "java_util_SortedMap__DomainObject_meta"
+        "name" : "java_util_SortedMap__meta"
       }, {
         "name" : "java_util_concurrent_Callable"
       }, {
-        "name" : "java_util_concurrent_Callable__DomainObject_meta"
+        "name" : "java_util_concurrent_Callable__meta"
       }, {
         "name" : "java_util_function_BiFunction"
       }, {
-        "name" : "java_util_function_BiFunction__DomainObject_meta"
+        "name" : "java_util_function_BiFunction__meta"
       }, {
         "name" : "java_util_function_Consumer"
       }, {
-        "name" : "java_util_function_Consumer__DomainObject_meta"
+        "name" : "java_util_function_Consumer__meta"
       }, {
         "name" : "java_util_function_Function"
       }, {
-        "name" : "java_util_function_Function__DomainObject_meta"
+        "name" : "java_util_function_Function__meta"
       }, {
         "name" : "java_util_stream_Stream"
       }, {
-        "name" : "java_util_stream_Stream__DomainObject_meta"
+        "name" : "java_util_stream_Stream__meta"
       }, {
         "name" : "org_apache_causeway_commons_functional_Either"
       }, {
-        "name" : "org_apache_causeway_commons_functional_Either__DomainObject_meta"
+        "name" : "org_apache_causeway_commons_functional_Either__meta"
       }, {
-        "name" : "org_apache_causeway_commons_functional_Either__DomainObject_mutators"
+        "name" : "org_apache_causeway_commons_functional_Either__mutators"
       }, {
         "name" : "org_apache_causeway_commons_functional_Railway"
       }, {
-        "name" : "org_apache_causeway_commons_functional_Railway__DomainObject_meta"
+        "name" : "org_apache_causeway_commons_functional_Railway__meta"
       }, {
-        "name" : "org_apache_causeway_commons_functional_Railway__DomainObject_mutators"
+        "name" : "org_apache_causeway_commons_functional_Railway__mutators"
       }, {
         "name" : "org_apache_causeway_commons_functional_ThrowingConsumer"
       }, {
-        "name" : "org_apache_causeway_commons_functional_ThrowingConsumer__DomainObject_meta"
+        "name" : "org_apache_causeway_commons_functional_ThrowingConsumer__meta"
       }, {
-        "name" : "org_apache_causeway_commons_functional_ThrowingConsumer__DomainObject_mutators"
+        "name" : "org_apache_causeway_commons_functional_ThrowingConsumer__mutators"
       }, {
         "name" : "org_apache_causeway_commons_functional_ThrowingFunction"
       }, {
-        "name" : "org_apache_causeway_commons_functional_ThrowingFunction__DomainObject_meta"
+        "name" : "org_apache_causeway_commons_functional_ThrowingFunction__meta"
       }, {
-        "name" : "org_apache_causeway_commons_functional_ThrowingFunction__DomainObject_mutators"
+        "name" : "org_apache_causeway_commons_functional_ThrowingFunction__mutators"
       }, {
         "name" : "org_apache_causeway_commons_functional_ThrowingRunnable"
       }, {
-        "name" : "org_apache_causeway_commons_functional_ThrowingRunnable__DomainObject_meta"
+        "name" : "org_apache_causeway_commons_functional_ThrowingRunnable__meta"
       }, {
-        "name" : "org_apache_causeway_commons_functional_ThrowingRunnable__DomainObject_mutators"
+        "name" : "org_apache_causeway_commons_functional_ThrowingRunnable__mutators"
       }, {
         "name" : "org_apache_causeway_commons_functional_Try"
       }, {
-        "name" : "org_apache_causeway_commons_functional_Try__DomainObject_meta"
+        "name" : "org_apache_causeway_commons_functional_Try__meta"
       }, {
-        "name" : "org_apache_causeway_commons_functional_Try__DomainObject_mutators"
+        "name" : "org_apache_causeway_commons_functional_Try__mutators"
       }, {
         "name" : "org_apache_causeway_core_metamodel_inspect_model_MMNode"
       }, {
-        "name" : "org_apache_causeway_core_metamodel_inspect_model_MMNode__DomainObject_meta"
+        "name" : "org_apache_causeway_core_metamodel_inspect_model_MMNode__meta"
       }, {
         "name" : "org_apache_causeway_core_metamodel_inspect_model_MemberNode"
       }, {
-        "name" : "org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_meta"
+        "name" : "org_apache_causeway_core_metamodel_inspect_model_MemberNode__meta"
       }, {
-        "name" : "org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_mutators"
+        "name" : "org_apache_causeway_core_metamodel_inspect_model_MemberNode__mutators"
       }, {
         "name" : "org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript"
       }, {
-        "name" : "org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript__DomainObject_meta"
+        "name" : "org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript__meta"
       }, {
         "name" : "university_dept_Department"
       }, {
         "name" : "university_dept_DepartmentMenu"
       }, {
-        "name" : "university_dept_Department__DomainObject_meta"
+        "name" : "university_dept_Department__meta"
       }, {
         "name" : "university_dept_DeptHead"
       }, {
         "name" : "university_dept_DeptHeadMenu"
       }, {
-        "name" : "university_dept_DeptHead__DomainObject_meta"
+        "name" : "university_dept_DeptHead__meta"
       }, {
-        "name" : "university_dept_DeptHead__DomainObject_mutators"
+        "name" : "university_dept_DeptHead__mutators"
       } ]
     }
   }
diff --git a/incubator/viewers/graphql/test/src/test/resources/schema.gql b/incubator/viewers/graphql/test/src/test/resources/schema.gql
index 3e029c4ddd..1086e5bcc4 100644
--- a/incubator/viewers/graphql/test/src/test/resources/schema.gql
+++ b/incubator/viewers/graphql/test/src/test/resources/schema.gql
@@ -32,7 +32,7 @@ type Query {
 }
 
 type causeway_applib_DomainObjectList {
-  _gql_meta: causeway_applib_DomainObjectList__DomainObject_meta
+  _gql_meta: causeway_applib_DomainObjectList__meta
   actionArguments: String
   actionId: String
   actionOwningFqcn: String
@@ -40,72 +40,72 @@ type causeway_applib_DomainObjectList {
   title: String!
 }
 
-type causeway_applib_DomainObjectList__DomainObject_meta {
+type causeway_applib_DomainObjectList__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type causeway_applib_FacetGroupNode {
-  _gql_meta: causeway_applib_FacetGroupNode__DomainObject_meta
+  _gql_meta: causeway_applib_FacetGroupNode__meta
   facets: String!
 }
 
-type causeway_applib_FacetGroupNode__DomainObject_meta {
+type causeway_applib_FacetGroupNode__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type causeway_applib_ParameterNode {
-  _gql_meta: causeway_applib_ParameterNode__DomainObject_meta
+  _gql_meta: causeway_applib_ParameterNode__meta
   parameter: String!
   parentNode: causeway_applib_node_ActionNode!
 }
 
-type causeway_applib_ParameterNode__DomainObject_meta {
+type causeway_applib_ParameterNode__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type causeway_applib_PropertyNode {
-  _gql_meta: causeway_applib_PropertyNode__DomainObject_meta
-  _gql_mutations: causeway_applib_PropertyNode__DomainObject_mutators
+  _gql_meta: causeway_applib_PropertyNode__meta
+  _gql_mutations: causeway_applib_PropertyNode__mutators
   mixedIn: String!
   parentNode: causeway_applib_TypeNode!
   property: String!
 }
 
-type causeway_applib_PropertyNode__DomainObject_meta {
+type causeway_applib_PropertyNode__meta {
   id: String!
   logicalTypeName: String!
 }
 
-type causeway_applib_PropertyNode__DomainObject_mutators {
+type causeway_applib_PropertyNode__mutators {
   streamChildNodes: java_util_stream_Stream
 }
 
 type causeway_applib_RoleMemento {
-  _gql_meta: causeway_applib_RoleMemento__DomainObject_meta
+  _gql_meta: causeway_applib_RoleMemento__meta
   description: String!
   name: String!
 }
 
-type causeway_applib_RoleMemento__DomainObject_meta {
+type causeway_applib_RoleMemento__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type causeway_applib_TypeNode {
-  _gql_meta: causeway_applib_TypeNode__DomainObject_meta
+  _gql_meta: causeway_applib_TypeNode__meta
   domainClassDto: causeway_schema_metamodel_v2_DomainClassDto!
 }
 
-type causeway_applib_TypeNode__DomainObject_meta {
+type causeway_applib_TypeNode__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type causeway_applib_UserMemento {
-  _gql_meta: causeway_applib_UserMemento__DomainObject_meta
+  _gql_meta: causeway_applib_UserMemento__meta
   authenticationCode: String!
   authenticationSource: String!
   avatarUrl: String
@@ -119,7 +119,7 @@ type causeway_applib_UserMemento {
   timeFormatLocale: String
 }
 
-type causeway_applib_UserMemento__DomainObject_meta {
+type causeway_applib_UserMemento__meta {
   id: String!
   logicalTypeName: String!
 }
@@ -129,57 +129,57 @@ type causeway_applib_UserMenu {
 }
 
 type causeway_applib_node_ActionNode {
-  _gql_meta: causeway_applib_node_ActionNode__DomainObject_meta
-  _gql_mutations: causeway_applib_node_ActionNode__DomainObject_mutators
+  _gql_meta: causeway_applib_node_ActionNode__meta
+  _gql_mutations: causeway_applib_node_ActionNode__mutators
   action: String!
   mixedIn: String!
   parentNode: causeway_applib_TypeNode!
 }
 
-type causeway_applib_node_ActionNode__DomainObject_meta {
+type causeway_applib_node_ActionNode__meta {
   id: String!
   logicalTypeName: String!
 }
 
-type causeway_applib_node_ActionNode__DomainObject_mutators {
+type causeway_applib_node_ActionNode__mutators {
   streamChildNodes: java_util_stream_Stream
 }
 
 type causeway_applib_node_CollectionNode {
-  _gql_meta: causeway_applib_node_CollectionNode__DomainObject_meta
-  _gql_mutations: causeway_applib_node_CollectionNode__DomainObject_mutators
+  _gql_meta: causeway_applib_node_CollectionNode__meta
+  _gql_mutations: causeway_applib_node_CollectionNode__mutators
   collection: String!
   mixedIn: String!
   parentNode: causeway_applib_TypeNode!
 }
 
-type causeway_applib_node_CollectionNode__DomainObject_meta {
+type causeway_applib_node_CollectionNode__meta {
   id: String!
   logicalTypeName: String!
 }
 
-type causeway_applib_node_CollectionNode__DomainObject_mutators {
+type causeway_applib_node_CollectionNode__mutators {
   streamChildNodes: java_util_stream_Stream
 }
 
 type causeway_applib_node_FacetAttrNode {
-  _gql_meta: causeway_applib_node_FacetAttrNode__DomainObject_meta
+  _gql_meta: causeway_applib_node_FacetAttrNode__meta
   facetAttr: String!
   parentNode: causeway_applib_node_FacetNode!
 }
 
-type causeway_applib_node_FacetAttrNode__DomainObject_meta {
+type causeway_applib_node_FacetAttrNode__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type causeway_applib_node_FacetNode {
-  _gql_meta: causeway_applib_node_FacetNode__DomainObject_meta
+  _gql_meta: causeway_applib_node_FacetNode__meta
   facet: String!
   shadowed: String!
 }
 
-type causeway_applib_node_FacetNode__DomainObject_meta {
+type causeway_applib_node_FacetNode__meta {
   id: String!
   logicalTypeName: String!
 }
@@ -189,54 +189,54 @@ type causeway_conf_ConfigurationMenu {
 }
 
 type causeway_conf_ConfigurationProperty {
-  _gql_meta: causeway_conf_ConfigurationProperty__DomainObject_meta
+  _gql_meta: causeway_conf_ConfigurationProperty__meta
   key: String!
   value: String!
 }
 
-type causeway_conf_ConfigurationProperty__DomainObject_meta {
+type causeway_conf_ConfigurationProperty__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type causeway_conf_ConfigurationViewmodel {
-  _gql_meta: causeway_conf_ConfigurationViewmodel__DomainObject_meta
+  _gql_meta: causeway_conf_ConfigurationViewmodel__meta
   environment: [causeway_conf_ConfigurationProperty]
   primary: [causeway_conf_ConfigurationProperty]
   secondary: [causeway_conf_ConfigurationProperty]
 }
 
-type causeway_conf_ConfigurationViewmodel__DomainObject_meta {
+type causeway_conf_ConfigurationViewmodel__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type causeway_feat_ApplicationFeatureViewModel {
-  _gql_meta: causeway_feat_ApplicationFeatureViewModel__DomainObject_meta
+  _gql_meta: causeway_feat_ApplicationFeatureViewModel__meta
   memberName: String!
   namespaceName: String!
   typeSimpleName: String!
 }
 
-type causeway_feat_ApplicationFeatureViewModel__DomainObject_meta {
+type causeway_feat_ApplicationFeatureViewModel__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type causeway_feat_ApplicationNamespace {
-  _gql_meta: causeway_feat_ApplicationNamespace__DomainObject_meta
+  _gql_meta: causeway_feat_ApplicationNamespace__meta
   memberName: String!
   namespaceName: String!
   typeSimpleName: String!
 }
 
-type causeway_feat_ApplicationNamespace__DomainObject_meta {
+type causeway_feat_ApplicationNamespace__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type causeway_feat_ApplicationType {
-  _gql_meta: causeway_feat_ApplicationType__DomainObject_meta
+  _gql_meta: causeway_feat_ApplicationType__meta
   actions: [causeway_feat_ApplicationTypeAction]
   collections: [causeway_feat_ApplicationTypeCollection]
   memberName: String!
@@ -246,7 +246,7 @@ type causeway_feat_ApplicationType {
 }
 
 type causeway_feat_ApplicationTypeAction {
-  _gql_meta: causeway_feat_ApplicationTypeAction__DomainObject_meta
+  _gql_meta: causeway_feat_ApplicationTypeAction__meta
   actionSemantics: String!
   memberName: String!
   namespaceName: String!
@@ -254,13 +254,13 @@ type causeway_feat_ApplicationTypeAction {
   typeSimpleName: String!
 }
 
-type causeway_feat_ApplicationTypeAction__DomainObject_meta {
+type causeway_feat_ApplicationTypeAction__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type causeway_feat_ApplicationTypeCollection {
-  _gql_meta: causeway_feat_ApplicationTypeCollection__DomainObject_meta
+  _gql_meta: causeway_feat_ApplicationTypeCollection__meta
   derived: String!
   elementType: String!
   memberName: String!
@@ -268,25 +268,25 @@ type causeway_feat_ApplicationTypeCollection {
   typeSimpleName: String!
 }
 
-type causeway_feat_ApplicationTypeCollection__DomainObject_meta {
+type causeway_feat_ApplicationTypeCollection__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type causeway_feat_ApplicationTypeMember {
-  _gql_meta: causeway_feat_ApplicationTypeMember__DomainObject_meta
+  _gql_meta: causeway_feat_ApplicationTypeMember__meta
   memberName: String!
   namespaceName: String!
   typeSimpleName: String!
 }
 
-type causeway_feat_ApplicationTypeMember__DomainObject_meta {
+type causeway_feat_ApplicationTypeMember__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type causeway_feat_ApplicationTypeProperty {
-  _gql_meta: causeway_feat_ApplicationTypeProperty__DomainObject_meta
+  _gql_meta: causeway_feat_ApplicationTypeProperty__meta
   derived: String!
   maxLength: String
   memberName: String!
@@ -296,18 +296,18 @@ type causeway_feat_ApplicationTypeProperty {
   typicalLength: String
 }
 
-type causeway_feat_ApplicationTypeProperty__DomainObject_meta {
+type causeway_feat_ApplicationTypeProperty__meta {
   id: String!
   logicalTypeName: String!
 }
 
-type causeway_feat_ApplicationType__DomainObject_meta {
+type causeway_feat_ApplicationType__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type causeway_schema_metamodel_v2_DomainClassDto {
-  _gql_meta: causeway_schema_metamodel_v2_DomainClassDto__DomainObject_meta
+  _gql_meta: causeway_schema_metamodel_v2_DomainClassDto__meta
   actions: String!
   annotations: String!
   collections: String!
@@ -319,16 +319,16 @@ type causeway_schema_metamodel_v2_DomainClassDto {
   service: String!
 }
 
-type causeway_schema_metamodel_v2_DomainClassDto__DomainObject_meta {
+type causeway_schema_metamodel_v2_DomainClassDto__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type causeway_security_LoginRedirect {
-  _gql_meta: causeway_security_LoginRedirect__DomainObject_meta
+  _gql_meta: causeway_security_LoginRedirect__meta
 }
 
-type causeway_security_LoginRedirect__DomainObject_meta {
+type causeway_security_LoginRedirect__meta {
   id: String!
   logicalTypeName: String!
 }
@@ -338,102 +338,102 @@ type causeway_security_LogoutMenu {
 }
 
 type causeway_testing_fixtures_FixtureResult {
-  _gql_meta: causeway_testing_fixtures_FixtureResult__DomainObject_meta
+  _gql_meta: causeway_testing_fixtures_FixtureResult__meta
   className: String!
   fixtureScriptClassName: String
   key: String!
 }
 
-type causeway_testing_fixtures_FixtureResult__DomainObject_meta {
+type causeway_testing_fixtures_FixtureResult__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type java_lang_Runnable {
-  _gql_meta: java_lang_Runnable__DomainObject_meta
+  _gql_meta: java_lang_Runnable__meta
 }
 
-type java_lang_Runnable__DomainObject_meta {
+type java_lang_Runnable__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type java_util_Map {
-  _gql_meta: java_util_Map__DomainObject_meta
+  _gql_meta: java_util_Map__meta
 }
 
-type java_util_Map__DomainObject_meta {
+type java_util_Map__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type java_util_SortedMap {
-  _gql_meta: java_util_SortedMap__DomainObject_meta
+  _gql_meta: java_util_SortedMap__meta
 }
 
-type java_util_SortedMap__DomainObject_meta {
+type java_util_SortedMap__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type java_util_concurrent_Callable {
-  _gql_meta: java_util_concurrent_Callable__DomainObject_meta
+  _gql_meta: java_util_concurrent_Callable__meta
 }
 
-type java_util_concurrent_Callable__DomainObject_meta {
+type java_util_concurrent_Callable__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type java_util_function_BiFunction {
-  _gql_meta: java_util_function_BiFunction__DomainObject_meta
+  _gql_meta: java_util_function_BiFunction__meta
 }
 
-type java_util_function_BiFunction__DomainObject_meta {
+type java_util_function_BiFunction__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type java_util_function_Consumer {
-  _gql_meta: java_util_function_Consumer__DomainObject_meta
+  _gql_meta: java_util_function_Consumer__meta
 }
 
-type java_util_function_Consumer__DomainObject_meta {
+type java_util_function_Consumer__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type java_util_function_Function {
-  _gql_meta: java_util_function_Function__DomainObject_meta
+  _gql_meta: java_util_function_Function__meta
 }
 
-type java_util_function_Function__DomainObject_meta {
+type java_util_function_Function__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type java_util_stream_Stream {
-  _gql_meta: java_util_stream_Stream__DomainObject_meta
+  _gql_meta: java_util_stream_Stream__meta
 }
 
-type java_util_stream_Stream__DomainObject_meta {
+type java_util_stream_Stream__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type org_apache_causeway_commons_functional_Either {
-  _gql_meta: org_apache_causeway_commons_functional_Either__DomainObject_meta
-  _gql_mutations: org_apache_causeway_commons_functional_Either__DomainObject_mutators
+  _gql_meta: org_apache_causeway_commons_functional_Either__meta
+  _gql_mutations: org_apache_causeway_commons_functional_Either__mutators
   left: String!
   right: String!
 }
 
-type org_apache_causeway_commons_functional_Either__DomainObject_meta {
+type org_apache_causeway_commons_functional_Either__meta {
   id: String!
   logicalTypeName: String!
 }
 
-type org_apache_causeway_commons_functional_Either__DomainObject_mutators {
+type org_apache_causeway_commons_functional_Either__mutators {
   accept(leftConsumer: _gql_input__java_util_function_Consumer!, rightConsumer: _gql_input__java_util_function_Consumer!): String
   left: String
   map(leftMapper: _gql_input__java_util_function_Function!, rightMapper: _gql_input__java_util_function_Function!): org_apache_causeway_commons_functional_Either
@@ -443,18 +443,18 @@ type org_apache_causeway_commons_functional_Either__DomainObject_mutators {
 }
 
 type org_apache_causeway_commons_functional_Railway {
-  _gql_meta: org_apache_causeway_commons_functional_Railway__DomainObject_meta
-  _gql_mutations: org_apache_causeway_commons_functional_Railway__DomainObject_mutators
+  _gql_meta: org_apache_causeway_commons_functional_Railway__meta
+  _gql_mutations: org_apache_causeway_commons_functional_Railway__mutators
   failure: String!
   success: String!
 }
 
-type org_apache_causeway_commons_functional_Railway__DomainObject_meta {
+type org_apache_causeway_commons_functional_Railway__meta {
   id: String!
   logicalTypeName: String!
 }
 
-type org_apache_causeway_commons_functional_Railway__DomainObject_mutators {
+type org_apache_causeway_commons_functional_Railway__mutators {
   chain(chainingFunction: _gql_input__org_apache_causeway_commons_functional_ThrowingFunction!): org_apache_causeway_commons_functional_Railway
   ifFailure(failureConsumer: _gql_input__org_apache_causeway_commons_functional_ThrowingConsumer!): org_apache_causeway_commons_functional_Railway
   ifSuccess(successConsumer: _gql_input__org_apache_causeway_commons_functional_ThrowingConsumer!): org_apache_causeway_commons_functional_Railway
@@ -463,47 +463,47 @@ type org_apache_causeway_commons_functional_Railway__DomainObject_mutators {
 }
 
 type org_apache_causeway_commons_functional_ThrowingConsumer {
-  _gql_meta: org_apache_causeway_commons_functional_ThrowingConsumer__DomainObject_meta
-  _gql_mutations: org_apache_causeway_commons_functional_ThrowingConsumer__DomainObject_mutators
+  _gql_meta: org_apache_causeway_commons_functional_ThrowingConsumer__meta
+  _gql_mutations: org_apache_causeway_commons_functional_ThrowingConsumer__mutators
 }
 
-type org_apache_causeway_commons_functional_ThrowingConsumer__DomainObject_meta {
+type org_apache_causeway_commons_functional_ThrowingConsumer__meta {
   id: String!
   logicalTypeName: String!
 }
 
-type org_apache_causeway_commons_functional_ThrowingConsumer__DomainObject_mutators {
+type org_apache_causeway_commons_functional_ThrowingConsumer__mutators {
   andThen(arg0: _gql_input__java_util_function_Consumer!): java_util_function_Consumer
   throwing(exceptionWrapper: _gql_input__java_util_function_BiFunction!): org_apache_causeway_commons_functional_ThrowingConsumer
 }
 
 type org_apache_causeway_commons_functional_ThrowingFunction {
-  _gql_meta: org_apache_causeway_commons_functional_ThrowingFunction__DomainObject_meta
-  _gql_mutations: org_apache_causeway_commons_functional_ThrowingFunction__DomainObject_mutators
+  _gql_meta: org_apache_causeway_commons_functional_ThrowingFunction__meta
+  _gql_mutations: org_apache_causeway_commons_functional_ThrowingFunction__mutators
 }
 
-type org_apache_causeway_commons_functional_ThrowingFunction__DomainObject_meta {
+type org_apache_causeway_commons_functional_ThrowingFunction__meta {
   id: String!
   logicalTypeName: String!
 }
 
-type org_apache_causeway_commons_functional_ThrowingFunction__DomainObject_mutators {
+type org_apache_causeway_commons_functional_ThrowingFunction__mutators {
   andThen(arg0: _gql_input__java_util_function_Function!): java_util_function_Function
   compose(arg0: _gql_input__java_util_function_Function!): java_util_function_Function
   throwing(exceptionWrapper: _gql_input__java_util_function_BiFunction!): org_apache_causeway_commons_functional_ThrowingFunction
 }
 
 type org_apache_causeway_commons_functional_ThrowingRunnable {
-  _gql_meta: org_apache_causeway_commons_functional_ThrowingRunnable__DomainObject_meta
-  _gql_mutations: org_apache_causeway_commons_functional_ThrowingRunnable__DomainObject_mutators
+  _gql_meta: org_apache_causeway_commons_functional_ThrowingRunnable__meta
+  _gql_mutations: org_apache_causeway_commons_functional_ThrowingRunnable__mutators
 }
 
-type org_apache_causeway_commons_functional_ThrowingRunnable__DomainObject_meta {
+type org_apache_causeway_commons_functional_ThrowingRunnable__meta {
   id: String!
   logicalTypeName: String!
 }
 
-type org_apache_causeway_commons_functional_ThrowingRunnable__DomainObject_mutators {
+type org_apache_causeway_commons_functional_ThrowingRunnable__mutators {
   callUncatched: String
   run: String
   runUncatched: String
@@ -512,18 +512,18 @@ type org_apache_causeway_commons_functional_ThrowingRunnable__DomainObject_mutat
 }
 
 type org_apache_causeway_commons_functional_Try {
-  _gql_meta: org_apache_causeway_commons_functional_Try__DomainObject_meta
-  _gql_mutations: org_apache_causeway_commons_functional_Try__DomainObject_mutators
+  _gql_meta: org_apache_causeway_commons_functional_Try__meta
+  _gql_mutations: org_apache_causeway_commons_functional_Try__mutators
   failure: String!
   success: String!
 }
 
-type org_apache_causeway_commons_functional_Try__DomainObject_meta {
+type org_apache_causeway_commons_functional_Try__meta {
   id: String!
   logicalTypeName: String!
 }
 
-type org_apache_causeway_commons_functional_Try__DomainObject_mutators {
+type org_apache_causeway_commons_functional_Try__mutators {
   accept(failureConsumer: _gql_input__org_apache_causeway_commons_functional_ThrowingConsumer!, successConsumer: _gql_input__org_apache_causeway_commons_functional_ThrowingConsumer!): org_apache_causeway_commons_functional_Try
   flatMapSuccess(successMapper: _gql_input__org_apache_causeway_commons_functional_ThrowingFunction!): org_apache_causeway_commons_functional_Try
   flatMapSuccessAsNullable(successMapper: _gql_input__org_apache_causeway_commons_functional_ThrowingFunction!): org_apache_causeway_commons_functional_Try
@@ -547,43 +547,43 @@ type org_apache_causeway_commons_functional_Try__DomainObject_mutators {
 }
 
 type org_apache_causeway_core_metamodel_inspect_model_MMNode {
-  _gql_meta: org_apache_causeway_core_metamodel_inspect_model_MMNode__DomainObject_meta
+  _gql_meta: org_apache_causeway_core_metamodel_inspect_model_MMNode__meta
 }
 
-type org_apache_causeway_core_metamodel_inspect_model_MMNode__DomainObject_meta {
+type org_apache_causeway_core_metamodel_inspect_model_MMNode__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type org_apache_causeway_core_metamodel_inspect_model_MemberNode {
-  _gql_meta: org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_meta
-  _gql_mutations: org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_mutators
+  _gql_meta: org_apache_causeway_core_metamodel_inspect_model_MemberNode__meta
+  _gql_mutations: org_apache_causeway_core_metamodel_inspect_model_MemberNode__mutators
   mixedIn: String!
   parentNode: causeway_applib_TypeNode!
 }
 
-type org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_meta {
+type org_apache_causeway_core_metamodel_inspect_model_MemberNode__meta {
   id: String!
   logicalTypeName: String!
 }
 
-type org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_mutators {
+type org_apache_causeway_core_metamodel_inspect_model_MemberNode__mutators {
   streamChildNodes: java_util_stream_Stream
 }
 
 type org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript {
-  _gql_meta: org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript__DomainObject_meta
+  _gql_meta: org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript__meta
   friendlyName: String!
   qualifiedName: String!
 }
 
-type org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript__DomainObject_meta {
+type org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript__meta {
   id: String!
   logicalTypeName: String!
 }
 
 type university_dept_Department {
-  _gql_meta: university_dept_Department__DomainObject_meta
+  _gql_meta: university_dept_Department__meta
   deptHead: university_dept_DeptHead
   name: String!
 }
@@ -593,15 +593,15 @@ type university_dept_DepartmentMenu {
   findAllDepartments: [university_dept_Department]
 }
 
-type university_dept_Department__DomainObject_meta {
+type university_dept_Department__meta {
   id: String!
   logicalTypeName: String!
   version: String
 }
 
 type university_dept_DeptHead {
-  _gql_meta: university_dept_DeptHead__DomainObject_meta
-  _gql_mutations: university_dept_DeptHead__DomainObject_mutators
+  _gql_meta: university_dept_DeptHead__meta
+  _gql_mutations: university_dept_DeptHead__mutators
   department: university_dept_Department
   name: String
 }
@@ -611,13 +611,13 @@ type university_dept_DeptHeadMenu {
   findDeptHeadByName(name: String): university_dept_DeptHead
 }
 
-type university_dept_DeptHead__DomainObject_meta {
+type university_dept_DeptHead__meta {
   id: String!
   logicalTypeName: String!
   version: String
 }
 
-type university_dept_DeptHead__DomainObject_mutators {
+type university_dept_DeptHead__mutators {
   changeDepartment(department: _gql_input__university_dept_Department!): university_dept_DeptHead
   changeName(newName: String!): university_dept_DeptHead
 }


(causeway) 05/18: CAUSEWAY-3676: refactor registering object's types

Posted by da...@apache.org.
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 10d943012472641d4e8cc003c2632e7c97286b5b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 16:50:20 2024 +0000

    CAUSEWAY-3676: refactor registering object's types
---
 .../causeway/viewer/graphql/model/domain/GqlvDomainObject.java    | 7 +++++--
 .../graphql/viewer/integration/GraphQlSourceForCauseway.java      | 8 ++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
index ee447335e5..2cad9f1198 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
@@ -276,7 +276,7 @@ public class GqlvDomainObject {
      *
      * @see #getGqlObjectType()
      */
-    public GraphQLObjectType buildGqlObjectType() {
+    private GraphQLObjectType buildGqlObjectType() {
         if (gqlObjectType != null) {
             throw new IllegalArgumentException(String.format("GqlObjectType has already been built for %s", getLogicalTypeName()));
         }
@@ -418,7 +418,10 @@ public class GqlvDomainObject {
         return mutatorsType;
     }
 
-    public void addTypesInto(GraphQLTypeRegistry graphQLTypeRegistry) {
+    public void registerTypesInto(GraphQLTypeRegistry graphQLTypeRegistry) {
+
+        GraphQLObjectType graphQLObjectType = buildGqlObjectType();
+        graphQLTypeRegistry.addTypeIfNotAlreadyPresent(graphQLObjectType);
 
         graphQLTypeRegistry.addTypeIfNotAlreadyPresent(getMeta().getMetaField().getType());
         graphQLTypeRegistry.addTypeIfNotAlreadyPresent(getGqlInputObjectType());
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
index 353e911cc5..5693f6a8fa 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
@@ -53,7 +53,6 @@ import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
 
 import graphql.GraphQL;
 import graphql.schema.GraphQLCodeRegistry;
-import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
 
 import lombok.RequiredArgsConstructor;
@@ -203,11 +202,8 @@ public class GraphQlSourceForCauseway implements GraphQlSource {
         gqlvDomainObject.addCollectionsAsLists();
         gqlvDomainObject.addActionsAsFields();
 
-        // build and register object type
-        GraphQLObjectType graphQLObjectType = gqlvDomainObject.buildGqlObjectType();
-        graphQLTypeRegistry.addTypeIfNotAlreadyPresent(graphQLObjectType);
-
-        gqlvDomainObject.addTypesInto(graphQLTypeRegistry);
+        // build
+        gqlvDomainObject.registerTypesInto(graphQLTypeRegistry);
 
         // create and register data fetchers
         gqlvDomainObject.addDataFetchersForMetaData();


(causeway) 06/18: CAUSEWAY-3676: introduces GqlvMemberHolder and subclasses; starting to move fetcher logic to members

Posted by da...@apache.org.
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 a680b35aff34fd9842f25209782612705beecc45
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 17:35:35 2024 +0000

    CAUSEWAY-3676: introduces GqlvMemberHolder and subclasses; starting to move fetcher logic to members
---
 .../viewer/graphql/model/domain/GqlvAction.java    | 10 ++--
 .../graphql/model/domain/GqlvActionHolder.java     |  4 ++
 .../graphql/model/domain/GqlvAssociation.java      | 61 ++++++++++++++++++++--
 .../model/domain/GqlvAssociationHolder.java        |  4 ++
 .../graphql/model/domain/GqlvCollection.java       | 16 ++++--
 .../graphql/model/domain/GqlvCollectionHolder.java |  4 ++
 .../graphql/model/domain/GqlvDomainObject.java     | 55 +++----------------
 .../model/domain/GqlvDomainObjectMutators.java     | 15 ++++--
 .../graphql/model/domain/GqlvDomainService.java    |  4 +-
 .../viewer/graphql/model/domain/GqlvMember.java    | 14 +++--
 .../graphql/model/domain/GqlvMemberHolder.java     |  7 +++
 .../viewer/graphql/model/domain/GqlvProperty.java  | 12 +++--
 .../graphql/model/domain/GqlvPropertyHolder.java   |  4 ++
 13 files changed, 143 insertions(+), 67 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
index 46680c1a42..5048fba08c 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
@@ -2,14 +2,18 @@ package org.apache.causeway.viewer.graphql.model.domain;
 
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
 
+import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
 
-public class GqlvAction extends GqlvMember<ObjectAction> {
+public class GqlvAction extends GqlvMember<ObjectAction, GqlvActionHolder> {
 
     public GqlvAction(
+            final GqlvActionHolder holder,
             final ObjectAction objectAction,
-            final GraphQLFieldDefinition fieldDefinition) {
-        super(objectAction, fieldDefinition);
+            final GraphQLFieldDefinition fieldDefinition,
+            final GraphQLCodeRegistry.Builder codeRegistryBuilder
+    ) {
+        super(holder, objectAction, fieldDefinition, codeRegistryBuilder);
     }
 
     public ObjectAction getObjectAction() {
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionHolder.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionHolder.java
new file mode 100644
index 0000000000..00293a11be
--- /dev/null
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionHolder.java
@@ -0,0 +1,4 @@
+package org.apache.causeway.viewer.graphql.model.domain;
+
+public interface GqlvActionHolder extends GqlvMemberHolder {
+}
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociation.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociation.java
index a20feed24c..1e38e89de8 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociation.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociation.java
@@ -1,15 +1,32 @@
 package org.apache.causeway.viewer.graphql.model.domain;
 
+import org.apache.causeway.applib.services.metamodel.BeanSort;
+import org.apache.causeway.core.metamodel.object.ManagedObject;
+import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
 
+import graphql.schema.DataFetcher;
+import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
+import graphql.schema.GraphQLObjectType;
 
-public abstract class GqlvAssociation<T extends ObjectAssociation> extends GqlvMember<T> {
+import static graphql.schema.FieldCoordinates.coordinates;
+
+public abstract class GqlvAssociation<T extends ObjectAssociation, H extends GqlvAssociationHolder> extends GqlvMember<T, H> {
+
+
+    private final SpecificationLoader specificationLoader;
 
     public GqlvAssociation(
+            final H holder,
             final T objectAssociation,
-            final GraphQLFieldDefinition fieldDefinition) {
-        super(objectAssociation, fieldDefinition);
+            final GraphQLFieldDefinition fieldDefinition,
+            final GraphQLCodeRegistry.Builder codeRegistryBuilder,
+            final SpecificationLoader specificationLoader
+            ) {
+        super(holder, objectAssociation, fieldDefinition, codeRegistryBuilder);
+        this.specificationLoader = specificationLoader;
     }
 
     /**
@@ -18,4 +35,42 @@ public abstract class GqlvAssociation<T extends ObjectAssociation> extends GqlvM
     public T getObjectAssociation() {
         return getObjectMember();
     }
+
+    public void addDataFetcher() {
+
+        final ObjectAssociation association = getObjectMember();
+        final GraphQLFieldDefinition field = getFieldDefinition();
+
+        final GraphQLObjectType graphQLObjectType = getHolder().getGqlObjectType();
+
+        ObjectSpecification fieldObjectSpecification = association.getElementType();
+        BeanSort beanSort = fieldObjectSpecification.getBeanSort();
+        switch (beanSort) {
+
+            case VALUE: //TODO: does this work for values as well?
+
+            case VIEW_MODEL:
+
+            case ENTITY:
+
+                codeRegistryBuilder.dataFetcher(
+                        coordinates(graphQLObjectType, field),
+                        (DataFetcher<Object>) environment -> {
+
+                            Object domainObjectInstance = environment.getSource();
+
+                            Class<?> domainObjectInstanceClass = domainObjectInstance.getClass();
+                            ObjectSpecification specification = specificationLoader.loadSpecification(domainObjectInstanceClass);
+
+                            ManagedObject owner = ManagedObject.adaptSingular(specification, domainObjectInstance);
+                            ManagedObject managedObject = association.get(owner);
+
+                            return managedObject!=null ? managedObject.getPojo() : null;
+                        });
+
+                break;
+
+        }
+    }
+
 }
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociationHolder.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociationHolder.java
new file mode 100644
index 0000000000..ff635928a1
--- /dev/null
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAssociationHolder.java
@@ -0,0 +1,4 @@
+package org.apache.causeway.viewer.graphql.model.domain;
+
+public interface GqlvAssociationHolder extends GqlvMemberHolder {
+}
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java
index 051ffaab0c..edd22e2c1a 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java
@@ -1,18 +1,28 @@
 package org.apache.causeway.viewer.graphql.model.domain;
 
+import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
 
 import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
 
-public class GqlvCollection extends GqlvAssociation<OneToManyAssociation> {
+public class GqlvCollection extends GqlvAssociation<OneToManyAssociation, GqlvCollectionHolder> {
 
     public GqlvCollection(
+            final GqlvCollectionHolder domainObject,
             final OneToManyAssociation oneToManyAssociation,
-            final GraphQLFieldDefinition fieldDefinition) {
-        super(oneToManyAssociation, fieldDefinition);
+            final GraphQLFieldDefinition fieldDefinition,
+            final GraphQLCodeRegistry.Builder codeRegistryBuilder,
+            final SpecificationLoader specificationLoader
+    ) {
+        super(domainObject, oneToManyAssociation, fieldDefinition, codeRegistryBuilder, specificationLoader);
     }
 
     public OneToManyAssociation getOneToManyAssociation() {
         return getObjectAssociation();
     }
+
+    public void addDataFetcher() {
+
+    }
 }
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollectionHolder.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollectionHolder.java
new file mode 100644
index 0000000000..9ceb6c471f
--- /dev/null
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollectionHolder.java
@@ -0,0 +1,4 @@
+package org.apache.causeway.viewer.graphql.model.domain;
+
+public interface    GqlvCollectionHolder extends GqlvAssociationHolder {
+}
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
index 2cad9f1198..9712762d5b 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
@@ -10,14 +10,12 @@ import java.util.stream.Collectors;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
 import org.apache.causeway.applib.services.metamodel.BeanSort;
 import org.apache.causeway.commons.collections.Can;
-import org.apache.causeway.core.metamodel.object.ManagedObject;
 import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
 import org.apache.causeway.core.metamodel.spec.ActionScope;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
@@ -30,7 +28,6 @@ import static graphql.schema.FieldCoordinates.coordinates;
 
 import static org.apache.causeway.viewer.graphql.model.types._Constants.GQL_INPUTTYPE_PREFIX;
 
-import graphql.schema.DataFetcher;
 import graphql.schema.GraphQLCodeRegistry;
 
 import lombok.Getter;
@@ -56,7 +53,7 @@ import static graphql.schema.GraphQLTypeReference.typeRef;
 /**
  * A wrapper around {@link ObjectSpecification}
  */
-public class GqlvDomainObject {
+public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, GqlvCollectionHolder {
 
     @Getter private final GqlvDomainObjectMeta meta;
     @Getter private final GqlvDomainObjectMutators mutators;
@@ -113,7 +110,7 @@ public class GqlvDomainObject {
         this.gqlObjectTypeBuilder = newObject().name(getLogicalTypeNameSanitized());
 
         meta = new GqlvDomainObjectMeta(this, codeRegistryBuilder, bookmarkService, objectManager);
-        mutators = new GqlvDomainObjectMutators(this);
+        mutators = new GqlvDomainObjectMutators(this, codeRegistryBuilder);
 
         // input object type
         String inputTypeName = GQL_INPUTTYPE_PREFIX + getLogicalTypeNameSanitized();
@@ -172,7 +169,7 @@ public class GqlvDomainObject {
                 break;
         }
         if (fieldDefinition != null) {
-            properties.add(new GqlvProperty(otoa, fieldDefinition));
+            properties.add(new GqlvProperty(this, otoa, fieldDefinition, codeRegistryBuilder, specificationLoader));
         }
     }
 
@@ -207,7 +204,7 @@ public class GqlvDomainObject {
         }
 
         if (fieldDefinition != null) {
-            collections.add(new GqlvCollection(otom, fieldDefinition));
+            collections.add(new GqlvCollection(this, otom, fieldDefinition, codeRegistryBuilder, specificationLoader));
         }
     }
 
@@ -256,7 +253,7 @@ public class GqlvDomainObject {
             final ObjectAction objectAction,
             final GraphQLFieldDefinition fieldDefinition) {
         getGqlObjectTypeBuilder().field(fieldDefinition);
-        safeActions.add(new GqlvAction(objectAction, fieldDefinition));
+        safeActions.add(new GqlvAction(this, objectAction, fieldDefinition, codeRegistryBuilder));
     }
 
     public void addNonSafeActionAsMutatorField(
@@ -286,7 +283,7 @@ public class GqlvDomainObject {
     /**
      * @see #buildGqlObjectType()
      */
-    GraphQLObjectType getGqlObjectType() {
+    public GraphQLObjectType getGqlObjectType() {
         if (gqlObjectType == null) {
             throw new IllegalStateException(String.format(
                     "GraphQLObjectType has not yet been built for %s", getLogicalTypeName()));
@@ -332,49 +329,13 @@ public class GqlvDomainObject {
     }
 
     public void addDataFetchersForProperties() {
-        getProperties().forEach(this::addDataFetcherForAssociation);
+        getProperties().forEach(property -> property.addDataFetcher());
     }
 
     public void addDataFetchersForCollections() {
-        getCollections().forEach(this::addDataFetcherForAssociation);
+        getCollections().forEach(collection -> collection.addDataFetcher());
     }
 
-    private void addDataFetcherForAssociation(final GqlvAssociation<?> property) {
-
-        final ObjectAssociation association = property.getObjectMember();
-        final GraphQLFieldDefinition field = property.getFieldDefinition();
-
-        final GraphQLObjectType graphQLObjectType = getGqlObjectType();
-
-        ObjectSpecification fieldObjectSpecification = association.getElementType();
-        BeanSort beanSort = fieldObjectSpecification.getBeanSort();
-        switch (beanSort) {
-
-            case VALUE: //TODO: does this work for values as well?
-
-            case VIEW_MODEL:
-
-            case ENTITY:
-
-                codeRegistryBuilder.dataFetcher(
-                        coordinates(graphQLObjectType, field),
-                        (DataFetcher<Object>) environment -> {
-
-                            Object domainObjectInstance = environment.getSource();
-
-                            Class<?> domainObjectInstanceClass = domainObjectInstance.getClass();
-                            ObjectSpecification specification = specificationLoader.loadSpecification(domainObjectInstanceClass);
-
-                            ManagedObject owner = ManagedObject.adaptSingular(specification, domainObjectInstance);
-                            ManagedObject managedObject = association.get(owner);
-
-                            return managedObject!=null ? managedObject.getPojo() : null;
-                        });
-
-                break;
-
-        }
-    }
 
     public void addDataFetchersForMutators() {
 
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMutators.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMutators.java
index 71986cce55..b523344b82 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMutators.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMutators.java
@@ -1,5 +1,6 @@
 package org.apache.causeway.viewer.graphql.model.domain;
 
+import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLObjectType;
 
@@ -12,9 +13,10 @@ import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
 
 import static graphql.schema.GraphQLObjectType.newObject;
 
-public class GqlvDomainObjectMutators {
+public class GqlvDomainObjectMutators implements GqlvActionHolder {
 
     private final GqlvDomainObject domainObject;
+    private final GraphQLCodeRegistry.Builder codeRegistryBuilder;
 
     final GraphQLObjectType.Builder mutatorsTypeBuilder;
 
@@ -25,8 +27,11 @@ public class GqlvDomainObjectMutators {
     private Optional<GraphQLObjectType> mutatorsTypeIfAny;
 
     public GqlvDomainObjectMutators(
-            final GqlvDomainObject domainObject) {
+            final GqlvDomainObject domainObject,
+            final GraphQLCodeRegistry.Builder codeRegistryBuilder
+    ) {
         this.domainObject = domainObject;
+        this.codeRegistryBuilder = codeRegistryBuilder;
 
         mutatorsTypeBuilder = newObject().name(this.domainObject.getLogicalTypeNameSanitized() + "__DomainObject_mutators");
 
@@ -37,7 +42,7 @@ public class GqlvDomainObjectMutators {
             final GraphQLFieldDefinition fieldDefinition) {
 
         mutatorsTypeBuilder.field(fieldDefinition);
-        actions.add(new GqlvAction(objectAction, fieldDefinition));
+        actions.add(new GqlvAction(domainObject, objectAction, fieldDefinition, codeRegistryBuilder));
     }
 
     private final List<GqlvAction> actions = new ArrayList<>();
@@ -72,4 +77,8 @@ public class GqlvDomainObjectMutators {
                 : Optional.empty();
     }
 
+    @Override
+    public GraphQLObjectType getGqlObjectType() {
+        return mutatorsTypeIfAny.orElse(null);
+    }
 }
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
index 5e70388021..ddbf1159fb 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
@@ -32,7 +32,7 @@ import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
 import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
 import static graphql.schema.GraphQLObjectType.newObject;
 
-public class GqlvDomainService {
+public class GqlvDomainService implements GqlvActionHolder {
 
     private final ObjectSpecification serviceSpec;
     @Getter private final Object pojo;
@@ -121,7 +121,7 @@ public class GqlvDomainService {
         gqlObjectTypeBuilder.field(fieldDefinition);
 
         // TODO: either safe or mutator
-        safeActions.add(new GqlvAction(objectAction, fieldDefinition));
+        safeActions.add(new GqlvAction(this, objectAction, fieldDefinition, codeRegistryBuilder));
     }
 
 
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMember.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMember.java
index b94d93bef1..ee0179dedf 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMember.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMember.java
@@ -1,22 +1,30 @@
 package org.apache.causeway.viewer.graphql.model.domain;
 
 import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
-import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
+
+import graphql.schema.GraphQLCodeRegistry;
 
 import lombok.Getter;
 
 import graphql.schema.GraphQLFieldDefinition;
 
-public abstract class GqlvMember<T extends ObjectMember> {
+public abstract class GqlvMember<T extends ObjectMember, H extends GqlvMemberHolder> {
 
+    @Getter private final H holder;
     @Getter private final T objectMember;
     @Getter private final GraphQLFieldDefinition fieldDefinition;
+    final GraphQLCodeRegistry.Builder codeRegistryBuilder;
 
     public GqlvMember(
+            final H holder,
             final T objectMember,
-            final GraphQLFieldDefinition fieldDefinition) {
+            final GraphQLFieldDefinition fieldDefinition,
+            final GraphQLCodeRegistry.Builder codeRegistryBuilder
+    ) {
+        this.holder = holder;
         this.objectMember = objectMember;
         this.fieldDefinition = fieldDefinition;
+        this.codeRegistryBuilder = codeRegistryBuilder;
     }
 
     public String getId() {
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMemberHolder.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMemberHolder.java
new file mode 100644
index 0000000000..4d29b59656
--- /dev/null
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMemberHolder.java
@@ -0,0 +1,7 @@
+package org.apache.causeway.viewer.graphql.model.domain;
+
+import graphql.schema.GraphQLObjectType;
+
+public interface GqlvMemberHolder  {
+    GraphQLObjectType getGqlObjectType();
+}
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java
index ff990ad41b..a58b926ada 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvProperty.java
@@ -1,15 +1,21 @@
 package org.apache.causeway.viewer.graphql.model.domain;
 
+import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
 
 import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
 
-public class GqlvProperty extends GqlvAssociation<OneToOneAssociation> {
+public class GqlvProperty extends GqlvAssociation<OneToOneAssociation, GqlvPropertyHolder> {
 
     public GqlvProperty(
+            final GqlvPropertyHolder domainObject,
             final OneToOneAssociation oneToOneAssociation,
-            final GraphQLFieldDefinition fieldDefinition) {
-        super(oneToOneAssociation, fieldDefinition);
+            final GraphQLFieldDefinition fieldDefinition,
+            final GraphQLCodeRegistry.Builder codeRegistryBuilder,
+            final SpecificationLoader specificationLoader
+    ) {
+        super(domainObject, oneToOneAssociation, fieldDefinition, codeRegistryBuilder, specificationLoader);
     }
 
     public OneToOneAssociation getOneToOneAssociation() {
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyHolder.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyHolder.java
new file mode 100644
index 0000000000..51d0c328ad
--- /dev/null
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvPropertyHolder.java
@@ -0,0 +1,4 @@
+package org.apache.causeway.viewer.graphql.model.domain;
+
+public interface GqlvPropertyHolder extends GqlvAssociationHolder {
+}


(causeway) 17/18: CAUSEWAY-3676: still attempting to add mutator actions to DomainService

Posted by da...@apache.org.
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 db5d4d5c66ab4d23642beff33c67642ac14b00a8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 19:38:53 2024 +0000

    CAUSEWAY-3676: still attempting to add mutator actions to DomainService
---
 .../graphql/model/domain/GqlvDomainObject.java     |  7 -----
 .../graphql/model/domain/GqlvDomainService.java    | 34 +++++++++++++++-------
 .../integration/GraphQlSourceForCauseway.java      | 11 ++++---
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
index 65a5603c13..293e405a18 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
@@ -194,7 +194,6 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
 
 
     void addAction(final ObjectAction objectAction) {
-
         if (objectAction.getSemantics().isSafeInNature()) {
             safeActions.add(new GqlvAction(this, objectAction, objectTypeBuilder, codeRegistryBuilder));
         } else {
@@ -203,11 +202,6 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
     }
 
 
-    boolean hasMutators() {
-        return mutators.hasActions();
-    }
-
-
     /**
      * Should be called only after fields etc have been added.
      *
@@ -304,7 +298,6 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
 //                }
 //            });
 
-
     }
 
 
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
index 350ec76dfa..d1b1bb5777 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
@@ -1,12 +1,9 @@
 package org.apache.causeway.viewer.graphql.model.domain;
 
-import graphql.schema.GraphQLArgument;
 import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLObjectType;
 
-import graphql.schema.GraphQLOutputType;
-
 import lombok.Getter;
 
 import java.util.ArrayList;
@@ -19,9 +16,9 @@ import org.apache.causeway.core.metamodel.spec.ActionScope;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
+import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry;
 import org.apache.causeway.viewer.graphql.model.types._Constants;
 import org.apache.causeway.viewer.graphql.model.util._LTN;
-import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
 
 import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
 import static graphql.schema.GraphQLObjectType.newObject;
@@ -65,7 +62,7 @@ public class GqlvDomainService implements GqlvActionHolder, GqlvMutatorsHolder {
     /**
      * @see #getGqlObjectType()
      */
-    public GraphQLObjectType buildObjectGqlType() {
+    public GraphQLObjectType buildGqlObjectType() {
         if (gqlObjectType != null) {
             throw new IllegalArgumentException(String.format("GqlObjectType has already been built for %s", getLogicalTypeName()));
         }
@@ -73,7 +70,7 @@ public class GqlvDomainService implements GqlvActionHolder, GqlvMutatorsHolder {
     }
 
     /**
-     * @see #buildObjectGqlType()
+     * @see #buildGqlObjectType()
      */
     public GraphQLObjectType getGqlObjectType() {
         if (gqlObjectType == null) {
@@ -92,8 +89,13 @@ public class GqlvDomainService implements GqlvActionHolder, GqlvMutatorsHolder {
 
 
     public void addAction(final ObjectAction objectAction) {
-        // TODO: either safe or mutator
-        safeActions.add(new GqlvAction(this, objectAction, objectTypeBuilder, codeRegistryBuilder));
+        if (objectAction.getSemantics().isSafeInNature()) {
+            safeActions.add(new GqlvAction(this, objectAction, objectTypeBuilder, codeRegistryBuilder));
+        } else {
+            // TODO: should register with mutators instead ...
+//            mutators.addAction(objectAction);
+            safeActions.add(new GqlvAction(this, objectAction, objectTypeBuilder, codeRegistryBuilder));
+        }
     }
 
     public Optional<GraphQLObjectType> buildMutatorsTypeIfAny() {
@@ -110,18 +112,28 @@ public class GqlvDomainService implements GqlvActionHolder, GqlvMutatorsHolder {
 
         objectActionList.forEach(this::addAction);
 
-
         Optional<GraphQLObjectType> mutatorsTypeIfAny = buildMutatorsTypeIfAny();
         mutatorsTypeIfAny.ifPresent(mutatorsType -> {
-
             GraphQLFieldDefinition gql_mutations = newFieldDefinition()
                     .name(_Constants.GQL_MUTATIONS_FIELDNAME)
                     .type(mutatorsType)
                     .build();
             objectTypeBuilder.field(gql_mutations);
-
         });
 
         return !objectActionList.isEmpty();
     }
+
+    public void registerTypesInto(GraphQLTypeRegistry graphQLTypeRegistry) {
+
+        GraphQLObjectType graphQLObjectType = buildGqlObjectType();
+        //graphQLTypeRegistry.addTypeIfNotAlreadyPresent(graphQLObjectType);
+
+        getMutatorsTypeIfAny().ifPresent(graphQLTypeRegistry::addTypeIfNotAlreadyPresent);
+    }
+
+    public Optional<GraphQLObjectType> getMutatorsTypeIfAny() {
+        return mutators.getMutatorsTypeIfAny();
+    }
+
 }
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
index 8fe0391daf..f26ff4d2a6 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
@@ -158,25 +158,24 @@ public class GraphQlSourceForCauseway implements GraphQlSource {
             final GraphQLCodeRegistry.Builder codeRegistryBuilder) {
 
         serviceRegistry.lookupBeanById(objectSpec.getLogicalTypeName())
-                .ifPresent(service -> {
-                    addDomainServiceToTopLevelQuery(service, objectSpec, topLevelQueryStructure, codeRegistryBuilder);
-                });
+            .ifPresent(servicePojo ->
+                addDomainServiceToTopLevelQuery(servicePojo, objectSpec, topLevelQueryStructure, codeRegistryBuilder));
     }
 
     private void addDomainServiceToTopLevelQuery(
-            final Object service,
+            final Object servicePojo,
             final ObjectSpecification objectSpec,
             final GqlvTopLevelQuery topLevelQueryStructure,
             final GraphQLCodeRegistry.Builder codeRegistryBuilder) {
 
-        val domainService = new GqlvDomainService(objectSpec, service, codeRegistryBuilder);
+        val domainService = new GqlvDomainService(objectSpec, servicePojo, codeRegistryBuilder);
 
         boolean actionsAdded = domainService.addActions();
         if (!actionsAdded) {
             return;
         }
 
-        domainService.buildObjectGqlType();
+        domainService.registerTypesInto(graphQLTypeRegistry);
 
         domainService.getSafeActions().forEach(GqlvAction::addDataFetcher);
 


(causeway) 10/18: CAUSEWAY-3676: towards moving FieldDefinition creation within GqlvAction

Posted by da...@apache.org.
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 e1f401fd65435d220008aa12cc8ddd5b3237aa17
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 18:29:27 2024 +0000

    CAUSEWAY-3676: towards moving FieldDefinition creation within GqlvAction
---
 .../viewer/graphql/model/domain/GqlvDomainObject.java | 19 +++----------------
 .../viewer/graphql/model/domain/GqlvMutators.java     |  8 ++++----
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
index 7747e5e7fe..33bf28fef4 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
@@ -209,9 +209,10 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
         GraphQLFieldDefinition fieldDefinition = fieldBuilder.build();
 
         if (objectAction.getSemantics().isSafeInNature()) {
-            addSafeActionAsField(objectAction, fieldDefinition);
+            getGqlObjectTypeBuilder().field(fieldDefinition);
+            safeActions.add(new GqlvAction(this, objectAction, fieldDefinition, codeRegistryBuilder));
         } else {
-            addNonSafeActionAsMutatorField(objectAction, fieldDefinition);
+            mutators.addActionAsField(objectAction, fieldDefinition);
         }
     }
 
@@ -238,20 +239,6 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
     }
 
 
-    public void addSafeActionAsField(
-            final ObjectAction objectAction,
-            final GraphQLFieldDefinition fieldDefinition) {
-        getGqlObjectTypeBuilder().field(fieldDefinition);
-        safeActions.add(new GqlvAction(this, objectAction, fieldDefinition, codeRegistryBuilder));
-    }
-
-    public void addNonSafeActionAsMutatorField(
-            final ObjectAction objectAction,
-            final GraphQLFieldDefinition fieldDefinition) {
-
-        mutators.addActionAsField(objectAction, fieldDefinition);
-    }
-
     boolean hasMutators() {
         return mutators.hasActions();
     }
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
index 3632357a4f..958bf6bbb3 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
@@ -19,7 +19,7 @@ public class GqlvMutators implements GqlvActionHolder {
     private final GqlvMutatorsHolder holder;
     private final GraphQLCodeRegistry.Builder codeRegistryBuilder;
 
-    final GraphQLObjectType.Builder mutatorsTypeBuilder;
+    final GraphQLObjectType.Builder objectTypeBuilder;
 
     /**
      * Built lazily using {@link #buildMutatorsTypeIfAny()}
@@ -34,7 +34,7 @@ public class GqlvMutators implements GqlvActionHolder {
         this.holder = holder;
         this.codeRegistryBuilder = codeRegistryBuilder;
 
-        mutatorsTypeBuilder = newObject().name(_LTN.sanitized(this.holder.getObjectSpecification()) + "__mutators");
+        objectTypeBuilder = newObject().name(_LTN.sanitized(this.holder.getObjectSpecification()) + "__mutators");
 
     }
 
@@ -42,7 +42,7 @@ public class GqlvMutators implements GqlvActionHolder {
             final ObjectAction objectAction,
             final GraphQLFieldDefinition fieldDefinition) {
 
-        mutatorsTypeBuilder.field(fieldDefinition);
+        objectTypeBuilder.field(fieldDefinition);
         actions.add(new GqlvAction(holder, objectAction, fieldDefinition, codeRegistryBuilder));
     }
 
@@ -74,7 +74,7 @@ public class GqlvMutators implements GqlvActionHolder {
             throw new IllegalArgumentException("Gql MutatorsType has already been built for " + holder.getObjectSpecification().getLogicalTypeName());
         }
         return mutatorsTypeIfAny = hasActions()
-                ? Optional.of(mutatorsTypeBuilder.build())
+                ? Optional.of(objectTypeBuilder.build())
                 : Optional.empty();
     }
 


(causeway) 09/18: CAUSEWAY-3676: towards introducing mutators type for domain service

Posted by da...@apache.org.
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 d93ffb5e69f00e59d0567d1600a09f76726b9f89
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 18:05:18 2024 +0000

    CAUSEWAY-3676: towards introducing mutators type for domain service
---
 .../graphql/model/domain/GqlvDomainObject.java     | 49 +++++++++-------------
 .../graphql/model/domain/GqlvDomainService.java    | 28 +++++--------
 .../{GqlvDomainObjectMeta.java => GqlvMeta.java}   | 25 ++++++-----
 ...DomainObjectMutators.java => GqlvMutators.java} | 19 +++++----
 .../graphql/model/domain/GqlvMutatorsHolder.java   |  9 ++++
 .../integration/GraphQlSourceForCauseway.java      |  4 +-
 6 files changed, 63 insertions(+), 71 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
index d673811f8d..7747e5e7fe 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
@@ -18,23 +18,19 @@ import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
 import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
 import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry;
+import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
 import org.apache.causeway.viewer.graphql.model.types._Constants;
 import org.apache.causeway.viewer.graphql.model.util._LTN;
-import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
-
-import static graphql.schema.FieldCoordinates.coordinates;
 
 import static org.apache.causeway.viewer.graphql.model.types._Constants.GQL_INPUTTYPE_PREFIX;
 
-import graphql.schema.GraphQLCodeRegistry;
-
 import lombok.Getter;
 import lombok.val;
 
 import graphql.Scalars;
 import graphql.schema.GraphQLArgument;
+import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLInputObjectType;
 import graphql.schema.GraphQLList;
@@ -53,34 +49,29 @@ import static graphql.schema.GraphQLTypeReference.typeRef;
 /**
  * A wrapper around {@link ObjectSpecification}
  */
-public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, GqlvCollectionHolder {
+public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, GqlvCollectionHolder, GqlvMutatorsHolder {
 
-    @Getter private final GqlvDomainObjectMeta meta;
-    @Getter private final GqlvDomainObjectMutators mutators;
-
-    private final ObjectSpecification objectSpec;
+    @Getter private final ObjectSpecification objectSpecification;
     private final GraphQLCodeRegistry.Builder codeRegistryBuilder;
-    private final SpecificationLoader specificationLoader;
+
+    @Getter private final GqlvMeta meta;
+    @Getter private final GqlvMutators mutators;
 
     @Getter private final GraphQLObjectType.Builder gqlObjectTypeBuilder;
     @Getter private final GraphQLInputObjectType gqlInputObjectType;
 
     String getLogicalTypeName() {
-        return objectSpec.getLogicalTypeName();
+        return objectSpecification.getLogicalTypeName();
     }
 
     public String getLogicalTypeNameSanitized() {
-        return _LTN.sanitized(objectSpec);
+        return _LTN.sanitized(objectSpecification);
     }
 
     public BeanSort getBeanSort() {
-        return objectSpec.getBeanSort();
+        return objectSpecification.getBeanSort();
     }
 
-
-
-
-
     private final List<GqlvProperty> properties = new ArrayList<>();
     public List<GqlvProperty> getProperties() {return Collections.unmodifiableList(properties);}
 
@@ -99,18 +90,16 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
 
 
     public GqlvDomainObject(
-            final ObjectSpecification objectSpec,
+            final ObjectSpecification objectSpecification,
             final GraphQLCodeRegistry.Builder codeRegistryBuilder,
             final BookmarkService bookmarkService,
-            final ObjectManager objectManager,
-            final SpecificationLoader specificationLoader) {
-        this.objectSpec = objectSpec;
+            final ObjectManager objectManager) {
+        this.objectSpecification = objectSpecification;
         this.codeRegistryBuilder = codeRegistryBuilder;
-        this.specificationLoader = specificationLoader;
         this.gqlObjectTypeBuilder = newObject().name(getLogicalTypeNameSanitized());
 
-        meta = new GqlvDomainObjectMeta(this, codeRegistryBuilder, bookmarkService, objectManager);
-        mutators = new GqlvDomainObjectMutators(this, codeRegistryBuilder);
+        meta = new GqlvMeta(this, codeRegistryBuilder, bookmarkService, objectManager);
+        mutators = new GqlvMutators(this, codeRegistryBuilder);
 
         // input object type
         String inputTypeName = GQL_INPUTTYPE_PREFIX + getLogicalTypeNameSanitized();
@@ -131,7 +120,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
 
 
     public void addPropertiesAsFields() {
-        objectSpec.streamProperties(MixedIn.INCLUDED).forEach(this::addPropertyAsField);
+        objectSpecification.streamProperties(MixedIn.INCLUDED).forEach(this::addPropertyAsField);
     }
 
 
@@ -175,7 +164,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
 
 
     public void addCollectionsAsLists() {
-        objectSpec.streamCollections(MixedIn.INCLUDED).forEach(this::addCollection);
+        objectSpecification.streamCollections(MixedIn.INCLUDED).forEach(this::addCollection);
     }
 
     private void addCollection(OneToManyAssociation otom) {
@@ -308,7 +297,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
 
     public void addActionsAsFields() {
 
-        objectSpec.streamActions(ActionScope.PRODUCTION, MixedIn.INCLUDED)
+        objectSpecification.streamActions(ActionScope.PRODUCTION, MixedIn.INCLUDED)
                 .forEach(this::addAction);
 
         Optional<GraphQLObjectType> mutatorsTypeIfAny = buildMutatorsTypeIfAny();
@@ -339,7 +328,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
 
     public void addDataFetchersForMutators() {
 
-        // TODO: something similar to addFetchers for safe actions, but applied to GqlvDomainObjectMutators instead; perhaps they share a common interface?
+        // TODO: something similar to addFetchers for safe actions, but applied to GqlvMutators instead; perhaps they share a common interface?
 
         // earlier code...
 
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
index 35a15d9b95..5afe4b6ccf 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java
@@ -16,27 +16,21 @@ import java.util.stream.Collectors;
 
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
-import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
 import org.apache.causeway.viewer.graphql.model.util._LTN;
 import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
 
 import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
 import static graphql.schema.GraphQLObjectType.newObject;
 
-public class GqlvDomainService implements GqlvActionHolder {
+public class GqlvDomainService implements GqlvActionHolder, GqlvMutatorsHolder {
 
-    private final ObjectSpecification serviceSpec;
+    @Getter private final ObjectSpecification objectSpecification;
     @Getter private final Object pojo;
     private final GraphQLCodeRegistry.Builder codeRegistryBuilder;
-    private final SpecificationLoader specificationLoader;
-
+    private final GqlvMutators mutators;
 
     private String getLogicalTypeName() {
-        return serviceSpec.getLogicalTypeName();
-    }
-
-    public String getLogicalTypeNameSanitized() {
-        return _LTN.sanitized(serviceSpec);
+        return objectSpecification.getLogicalTypeName();
     }
 
     private final GraphQLObjectType.Builder gqlObjectTypeBuilder;
@@ -44,17 +38,17 @@ public class GqlvDomainService implements GqlvActionHolder {
     private GraphQLObjectType gqlObjectType;
 
     public GqlvDomainService(
-            final ObjectSpecification serviceSpec,
+            final ObjectSpecification objectSpecification,
             final Object pojo,
-            final GraphQLCodeRegistry.Builder codeRegistryBuilder,
-            final SpecificationLoader specificationLoader
+            final GraphQLCodeRegistry.Builder codeRegistryBuilder
     ) {
-        this.serviceSpec = serviceSpec;
+        this.objectSpecification = objectSpecification;
         this.pojo = pojo;
         this.codeRegistryBuilder = codeRegistryBuilder;
-        this.specificationLoader = specificationLoader;
 
-        this.gqlObjectTypeBuilder = newObject().name(_LTN.sanitized(serviceSpec));
+        this.mutators = new GqlvMutators(this, codeRegistryBuilder);
+
+        this.gqlObjectTypeBuilder = newObject().name(_LTN.sanitized(objectSpecification));
     }
 
 
@@ -87,7 +81,7 @@ public class GqlvDomainService implements GqlvActionHolder {
 
     public GraphQLFieldDefinition createTopLevelQueryField() {
         return newFieldDefinition()
-                .name(_LTN.sanitized(serviceSpec))
+                .name(_LTN.sanitized(objectSpecification))
                 .type(gqlObjectTypeBuilder)
                 .build();
     }
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMeta.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMeta.java
similarity index 79%
rename from incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMeta.java
rename to incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMeta.java
index ea43a45056..f3f7cc9724 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMeta.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMeta.java
@@ -14,14 +14,13 @@ import lombok.val;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
 import org.apache.causeway.applib.services.metamodel.BeanSort;
 import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
-import org.apache.causeway.viewer.graphql.model.parts.GqlvMeta;
 
 import static graphql.schema.FieldCoordinates.coordinates;
 import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
 import static graphql.schema.GraphQLNonNull.nonNull;
 import static graphql.schema.GraphQLObjectType.newObject;
 
-public class GqlvDomainObjectMeta {
+public class GqlvMeta {
 
     @UtilityClass
     static class Fields {
@@ -49,7 +48,7 @@ public class GqlvDomainObjectMeta {
 
     @Getter private final GraphQLFieldDefinition metaField;
 
-    public GqlvDomainObjectMeta(
+    public GqlvMeta(
             final GqlvDomainObject domainObject,
             final GraphQLCodeRegistry.Builder codeRegistryBuilder,
             final BookmarkService bookmarkService,
@@ -70,10 +69,10 @@ public class GqlvDomainObjectMeta {
 
     private GraphQLObjectType metaType() {
         val metaTypeBuilder = newObject().name(domainObject.getLogicalTypeNameSanitized() + "__meta");
-        metaTypeBuilder.field(GqlvDomainObjectMeta.Fields.id);
-        metaTypeBuilder.field(GqlvDomainObjectMeta.Fields.logicalTypeName);
+        metaTypeBuilder.field(GqlvMeta.Fields.id);
+        metaTypeBuilder.field(GqlvMeta.Fields.logicalTypeName);
         if (domainObject.getBeanSort() == BeanSort.ENTITY) {
-            metaTypeBuilder.field(GqlvDomainObjectMeta.Fields.version);
+            metaTypeBuilder.field(GqlvMeta.Fields.version);
         }
         return metaTypeBuilder.build();
     }
@@ -84,29 +83,29 @@ public class GqlvDomainObjectMeta {
                 coordinates(domainObject.getGqlObjectType(), getMetaField()),
                 (DataFetcher<Object>) environment -> {
                     return bookmarkService.bookmarkFor(environment.getSource())
-                            .map(bookmark -> new GqlvMeta(bookmark, bookmarkService, objectManager))
+                            .map(bookmark -> new org.apache.causeway.viewer.graphql.model.parts.GqlvMeta(bookmark, bookmarkService, objectManager))
                             .orElse(null); //TODO: is this correct ?
                 });
 
         codeRegistryBuilder.dataFetcher(
-                coordinates(getMetaType(), GqlvDomainObjectMeta.Fields.id),
+                coordinates(getMetaType(), GqlvMeta.Fields.id),
                 (DataFetcher<Object>) environment -> {
-                    GqlvMeta gqlvMeta = environment.getSource();
+                    org.apache.causeway.viewer.graphql.model.parts.GqlvMeta gqlvMeta = environment.getSource();
                     return gqlvMeta.id();
                 });
 
         codeRegistryBuilder.dataFetcher(
-                coordinates(getMetaType(), GqlvDomainObjectMeta.Fields.logicalTypeName),
+                coordinates(getMetaType(), GqlvMeta.Fields.logicalTypeName),
                 (DataFetcher<Object>) environment -> {
-                    GqlvMeta gqlvMeta = environment.getSource();
+                    org.apache.causeway.viewer.graphql.model.parts.GqlvMeta gqlvMeta = environment.getSource();
                     return gqlvMeta.logicalTypeName();
                 });
 
         if (domainObject.getBeanSort() == BeanSort.ENTITY) {
             codeRegistryBuilder.dataFetcher(
-                    coordinates(getMetaType(), GqlvDomainObjectMeta.Fields.version),
+                    coordinates(getMetaType(), GqlvMeta.Fields.version),
                     (DataFetcher<Object>) environment -> {
-                        GqlvMeta gqlvMeta = environment.getSource();
+                        org.apache.causeway.viewer.graphql.model.parts.GqlvMeta gqlvMeta = environment.getSource();
                         return gqlvMeta.version();
                     });
         }
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMutators.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
similarity index 76%
rename from incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMutators.java
rename to incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
index c64d0cf46b..3632357a4f 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMutators.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
@@ -10,12 +10,13 @@ import java.util.List;
 import java.util.Optional;
 
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
+import org.apache.causeway.viewer.graphql.model.util._LTN;
 
 import static graphql.schema.GraphQLObjectType.newObject;
 
-public class GqlvDomainObjectMutators implements GqlvActionHolder {
+public class GqlvMutators implements GqlvActionHolder {
 
-    private final GqlvDomainObject domainObject;
+    private final GqlvMutatorsHolder holder;
     private final GraphQLCodeRegistry.Builder codeRegistryBuilder;
 
     final GraphQLObjectType.Builder mutatorsTypeBuilder;
@@ -26,14 +27,14 @@ public class GqlvDomainObjectMutators implements GqlvActionHolder {
     @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
     private Optional<GraphQLObjectType> mutatorsTypeIfAny;
 
-    public GqlvDomainObjectMutators(
-            final GqlvDomainObject domainObject,
+    public GqlvMutators(
+            final GqlvMutatorsHolder holder,
             final GraphQLCodeRegistry.Builder codeRegistryBuilder
     ) {
-        this.domainObject = domainObject;
+        this.holder = holder;
         this.codeRegistryBuilder = codeRegistryBuilder;
 
-        mutatorsTypeBuilder = newObject().name(this.domainObject.getLogicalTypeNameSanitized() + "__mutators");
+        mutatorsTypeBuilder = newObject().name(_LTN.sanitized(this.holder.getObjectSpecification()) + "__mutators");
 
     }
 
@@ -42,7 +43,7 @@ public class GqlvDomainObjectMutators implements GqlvActionHolder {
             final GraphQLFieldDefinition fieldDefinition) {
 
         mutatorsTypeBuilder.field(fieldDefinition);
-        actions.add(new GqlvAction(domainObject, objectAction, fieldDefinition, codeRegistryBuilder));
+        actions.add(new GqlvAction(holder, objectAction, fieldDefinition, codeRegistryBuilder));
     }
 
     private final List<GqlvAction> actions = new ArrayList<>();
@@ -59,7 +60,7 @@ public class GqlvDomainObjectMutators implements GqlvActionHolder {
     public Optional<GraphQLObjectType> getMutatorsTypeIfAny() {
         //noinspection OptionalAssignedToNull
         if (mutatorsTypeIfAny == null) {
-            throw new IllegalArgumentException(String.format("Gql MutatorsType has not yet been built for %s", domainObject.getLogicalTypeName()));
+            throw new IllegalArgumentException(String.format("Gql MutatorsType has not yet been built for %s", holder.getObjectSpecification().getLogicalTypeName()));
         }
         return mutatorsTypeIfAny;
     }
@@ -70,7 +71,7 @@ public class GqlvDomainObjectMutators implements GqlvActionHolder {
     public Optional<GraphQLObjectType> buildMutatorsTypeIfAny() {
         //noinspection OptionalAssignedToNull
         if (mutatorsTypeIfAny != null) {
-            throw new IllegalArgumentException("Gql MutatorsType has already been built for " + domainObject.getLogicalTypeName());
+            throw new IllegalArgumentException("Gql MutatorsType has already been built for " + holder.getObjectSpecification().getLogicalTypeName());
         }
         return mutatorsTypeIfAny = hasActions()
                 ? Optional.of(mutatorsTypeBuilder.build())
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutatorsHolder.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutatorsHolder.java
new file mode 100644
index 0000000000..f87df03c4b
--- /dev/null
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutatorsHolder.java
@@ -0,0 +1,9 @@
+package org.apache.causeway.viewer.graphql.model.domain;
+
+import graphql.schema.GraphQLObjectType;
+
+import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
+
+public interface GqlvMutatorsHolder extends GqlvActionHolder {
+    ObjectSpecification getObjectSpecification();
+}
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
index dba564d034..6a815581b3 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
@@ -172,7 +172,7 @@ public class GraphQlSourceForCauseway implements GraphQlSource {
             final GqlvTopLevelQuery topLevelQueryStructure,
             final GraphQLCodeRegistry.Builder codeRegistryBuilder) {
 
-        val domainService = new GqlvDomainService(objectSpec, service, codeRegistryBuilder, specificationLoader);
+        val domainService = new GqlvDomainService(objectSpec, service, codeRegistryBuilder);
 
         List<ObjectAction> objectActionList = objectSpec.streamRuntimeActions(MixedIn.INCLUDED)
                 .map(ObjectAction.class::cast)
@@ -196,7 +196,7 @@ public class GraphQlSourceForCauseway implements GraphQlSource {
             final ObjectSpecification objectSpec,
             final GraphQLCodeRegistry.Builder codeRegistryBuilder) {
 
-        val gqlvDomainObject = new GqlvDomainObject(objectSpec, codeRegistryBuilder, bookmarkService, objectManager, specificationLoader);
+        val gqlvDomainObject = new GqlvDomainObject(objectSpec, codeRegistryBuilder, bookmarkService, objectManager);
 
         gqlvDomainObject.addPropertiesAsFields();
         gqlvDomainObject.addCollectionsAsLists();


(causeway) 02/18: CAUSEWAY-3676: factors out more into GqlvDomainObjectMeta

Posted by da...@apache.org.
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 3e7166db6e3dc769c4e7b02c8bc61348840318f6
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 16:44:45 2024 +0000

    CAUSEWAY-3676: factors out more into GqlvDomainObjectMeta
---
 .../graphql/model/domain/GqlvDomainObject.java     | 102 ++++--------------
 .../graphql/model/domain/GqlvDomainObjectMeta.java | 114 +++++++++++++++++++++
 .../integration/GraphQlSourceForCauseway.java      |  10 +-
 3 files changed, 137 insertions(+), 89 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
index cf814cda4f..8916e4d46f 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
@@ -21,7 +21,6 @@ import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
-import org.apache.causeway.viewer.graphql.model.parts.GqlvMeta;
 import org.apache.causeway.viewer.graphql.model.types._Constants;
 import org.apache.causeway.viewer.graphql.model.util._LTN;
 import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
@@ -35,7 +34,6 @@ import graphql.schema.GraphQLCodeRegistry;
 
 import lombok.Getter;
 import lombok.val;
-import lombok.experimental.UtilityClass;
 
 import graphql.Scalars;
 import graphql.schema.GraphQLArgument;
@@ -59,33 +57,13 @@ import static graphql.schema.GraphQLTypeReference.typeRef;
  */
 public class GqlvDomainObject {
 
-    private final GqlvDomainObjectMutators mutators;
-
-    @UtilityClass
-    static class Fields {
-        static GraphQLFieldDefinition id =
-                newFieldDefinition()
-                        .name("id")
-                        .type(nonNull(Scalars.GraphQLString))
-                        .build();
-        static GraphQLFieldDefinition logicalTypeName =
-                newFieldDefinition()
-                        .name("logicalTypeName")
-                        .type(nonNull(Scalars.GraphQLString))
-                        .build();
-        static GraphQLFieldDefinition version =
-                newFieldDefinition()
-                        .name("version")
-                        .type(Scalars.GraphQLString).build();
-    }
+    @Getter private final GqlvDomainObjectMeta meta;
+    @Getter private final GqlvDomainObjectMutators mutators;
 
     private final ObjectSpecification objectSpec;
     private final GraphQLCodeRegistry.Builder codeRegistryBuilder;
-    private final BookmarkService bookmarkService;
-    private final ObjectManager objectManager;
     private final SpecificationLoader specificationLoader;
 
-    @Getter private final GraphQLFieldDefinition metaField;
     @Getter private final GraphQLObjectType.Builder gqlObjectTypeBuilder;
     @Getter private final GraphQLInputObjectType gqlInputObjectType;
 
@@ -101,9 +79,6 @@ public class GqlvDomainObject {
         return objectSpec.getBeanSort();
     }
 
-    public GraphQLObjectType getMetaType() {
-        return (GraphQLObjectType) metaField.getType();
-    }
 
 
 
@@ -133,14 +108,11 @@ public class GqlvDomainObject {
             final SpecificationLoader specificationLoader) {
         this.objectSpec = objectSpec;
         this.codeRegistryBuilder = codeRegistryBuilder;
-        this.bookmarkService = bookmarkService;
-        this.objectManager = objectManager;
         this.specificationLoader = specificationLoader;
         this.gqlObjectTypeBuilder = newObject().name(getLogicalTypeNameSanitized());
 
-        // object type's meta field
-        metaField = newFieldDefinition().name("_gql_meta").type(metaType()).build();
-        gqlObjectTypeBuilder.field(metaField);
+        meta = new GqlvDomainObjectMeta(this, codeRegistryBuilder, bookmarkService, objectManager);
+        mutators = new GqlvDomainObjectMutators(this);
 
         // input object type
         String inputTypeName = GQL_INPUTTYPE_PREFIX + getLogicalTypeNameSanitized();
@@ -152,19 +124,12 @@ public class GqlvDomainObject {
                         .build());
         gqlInputObjectType = inputTypeBuilder.build();
 
-        mutators = new GqlvDomainObjectMutators(this);
+        // object type's meta field
+        gqlObjectTypeBuilder.field(meta.getMetaField());
+
     }
 
 
-    private GraphQLObjectType metaType() {
-        val metaTypeBuilder = newObject().name(getLogicalTypeNameSanitized() + "__DomainObject_meta");
-        metaTypeBuilder.field(Fields.id);
-        metaTypeBuilder.field(Fields.logicalTypeName);
-        if (getBeanSort() == BeanSort.ENTITY) {
-            metaTypeBuilder.field(Fields.version);
-        }
-        return metaTypeBuilder.build();
-    }
 
 
     public void addPropertiesAsFields() {
@@ -361,52 +326,19 @@ public class GqlvDomainObject {
 
     }
 
-    public void createAndRegisterDataFetchersForMetaData() {
-
-        codeRegistryBuilder.dataFetcher(
-                coordinates(getGqlObjectType(), getMetaField()),
-                (DataFetcher<Object>) environment -> {
-                    return bookmarkService.bookmarkFor(environment.getSource())
-                            .map(bookmark -> new GqlvMeta(bookmark, bookmarkService, objectManager))
-                            .orElse(null); //TODO: is this correct ?
-                });
-
-        codeRegistryBuilder.dataFetcher(
-                coordinates(getMetaType(), GqlvDomainObject.Fields.id),
-                (DataFetcher<Object>) environment -> {
-                    GqlvMeta gqlvMeta = environment.getSource();
-                    return gqlvMeta.id();
-                });
-
-        codeRegistryBuilder.dataFetcher(
-                coordinates(getMetaType(), GqlvDomainObject.Fields.logicalTypeName),
-                (DataFetcher<Object>) environment -> {
-                    GqlvMeta gqlvMeta = environment.getSource();
-                    return gqlvMeta.logicalTypeName();
-                });
-
-        if (getBeanSort() == BeanSort.ENTITY) {
-            codeRegistryBuilder.dataFetcher(
-                    coordinates(getMetaType(), GqlvDomainObject.Fields.version),
-                    (DataFetcher<Object>) environment -> {
-                        GqlvMeta gqlvMeta = environment.getSource();
-                        return gqlvMeta.version();
-                    });
-        }
-
+    public void addDataFetchersForMetaData() {
+        meta.addDataFetchers();
     }
 
-
-    public void createAndRegisterDataFetchersForField() {
-        getProperties().forEach(this::createAndRegisterDataFetcherForAssociation);
+    public void addDataFetchersForProperties() {
+        getProperties().forEach(this::addDataFetcherForAssociation);
     }
 
-    public void createAndRegisterDataFetchersForCollection() {
-        getCollections().forEach(
-                this::createAndRegisterDataFetcherForAssociation);
+    public void addDataFetchersForCollections() {
+        getCollections().forEach(this::addDataFetcherForAssociation);
     }
 
-    private void createAndRegisterDataFetcherForAssociation(final GqlvAssociation<?> property) {
+    private void addDataFetcherForAssociation(final GqlvAssociation<?> property) {
 
         final ObjectAssociation association = property.getObjectMember();
         final GraphQLFieldDefinition field = property.getFieldDefinition();
@@ -443,9 +375,11 @@ public class GqlvDomainObject {
         }
     }
 
-    public void createAndRegisterDataFetchersForMutators() {
+    public void addDataFetchersForMutators() {
+
+        // TODO: something similar to addFetchers for safe actions, but applied to GqlvDomainObjectMutators instead; perhaps they share a common interface?
 
-        // something like:
+        // earlier code...
 
 //            codeRegistryBuilder.dataFetcher(FieldCoordinates.coordinates(graphQLTypeReference, gql_mutations), new DataFetcher<Object>() {
 //                @Override
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMeta.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMeta.java
new file mode 100644
index 0000000000..d5319ead92
--- /dev/null
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObjectMeta.java
@@ -0,0 +1,114 @@
+package org.apache.causeway.viewer.graphql.model.domain;
+
+import graphql.Scalars;
+import graphql.schema.DataFetcher;
+import graphql.schema.GraphQLCodeRegistry;
+import graphql.schema.GraphQLFieldDefinition;
+
+import graphql.schema.GraphQLObjectType;
+
+import lombok.Getter;
+import lombok.experimental.UtilityClass;
+import lombok.val;
+
+import org.apache.causeway.applib.services.bookmark.BookmarkService;
+import org.apache.causeway.applib.services.metamodel.BeanSort;
+import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
+import org.apache.causeway.viewer.graphql.model.parts.GqlvMeta;
+
+import static graphql.schema.FieldCoordinates.coordinates;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLNonNull.nonNull;
+import static graphql.schema.GraphQLObjectType.newObject;
+
+public class GqlvDomainObjectMeta {
+
+    @UtilityClass
+    static class Fields {
+        static GraphQLFieldDefinition id =
+                newFieldDefinition()
+                        .name("id")
+                        .type(nonNull(Scalars.GraphQLString))
+                        .build();
+        static GraphQLFieldDefinition logicalTypeName =
+                newFieldDefinition()
+                        .name("logicalTypeName")
+                        .type(nonNull(Scalars.GraphQLString))
+                        .build();
+        static GraphQLFieldDefinition version =
+                newFieldDefinition()
+                        .name("version")
+                        .type(Scalars.GraphQLString).build();
+    }
+
+    private final GqlvDomainObject domainObject;
+
+    private final GraphQLCodeRegistry.Builder codeRegistryBuilder;
+    private final BookmarkService bookmarkService;
+    private final ObjectManager objectManager;
+
+    @Getter private final GraphQLFieldDefinition metaField;
+
+    public GqlvDomainObjectMeta(
+            final GqlvDomainObject domainObject,
+            final GraphQLCodeRegistry.Builder codeRegistryBuilder,
+            final BookmarkService bookmarkService,
+            final ObjectManager objectManager
+    ) {
+        this.domainObject = domainObject;
+
+        this.codeRegistryBuilder = codeRegistryBuilder;
+        this.bookmarkService = bookmarkService;
+        this.objectManager = objectManager;
+
+        metaField = newFieldDefinition().name("_gql_meta").type(metaType()).build();
+    }
+
+    public GraphQLObjectType getMetaType() {
+        return (GraphQLObjectType) metaField.getType();
+    }
+
+    private GraphQLObjectType metaType() {
+        val metaTypeBuilder = newObject().name(domainObject.getLogicalTypeNameSanitized() + "__DomainObject_meta");
+        metaTypeBuilder.field(GqlvDomainObjectMeta.Fields.id);
+        metaTypeBuilder.field(GqlvDomainObjectMeta.Fields.logicalTypeName);
+        if (domainObject.getBeanSort() == BeanSort.ENTITY) {
+            metaTypeBuilder.field(GqlvDomainObjectMeta.Fields.version);
+        }
+        return metaTypeBuilder.build();
+    }
+
+    public void addDataFetchers() {
+
+        codeRegistryBuilder.dataFetcher(
+                coordinates(domainObject.getGqlObjectType(), getMetaField()),
+                (DataFetcher<Object>) environment -> {
+                    return bookmarkService.bookmarkFor(environment.getSource())
+                            .map(bookmark -> new GqlvMeta(bookmark, bookmarkService, objectManager))
+                            .orElse(null); //TODO: is this correct ?
+                });
+
+        codeRegistryBuilder.dataFetcher(
+                coordinates(getMetaType(), GqlvDomainObjectMeta.Fields.id),
+                (DataFetcher<Object>) environment -> {
+                    GqlvMeta gqlvMeta = environment.getSource();
+                    return gqlvMeta.id();
+                });
+
+        codeRegistryBuilder.dataFetcher(
+                coordinates(getMetaType(), GqlvDomainObjectMeta.Fields.logicalTypeName),
+                (DataFetcher<Object>) environment -> {
+                    GqlvMeta gqlvMeta = environment.getSource();
+                    return gqlvMeta.logicalTypeName();
+                });
+
+        if (domainObject.getBeanSort() == BeanSort.ENTITY) {
+            codeRegistryBuilder.dataFetcher(
+                    coordinates(getMetaType(), GqlvDomainObjectMeta.Fields.version),
+                    (DataFetcher<Object>) environment -> {
+                        GqlvMeta gqlvMeta = environment.getSource();
+                        return gqlvMeta.version();
+                    });
+        }
+    }
+}
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
index 4d5617f1f9..b5c803eab6 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
@@ -199,7 +199,7 @@ public class GraphQlSourceForCauseway implements GraphQlSource {
 
         val gqlvDomainObject = new GqlvDomainObject(objectSpec, codeRegistryBuilder, bookmarkService, objectManager, specificationLoader);
 
-        graphQLTypeRegistry.addTypeIfNotAlreadyPresent(gqlvDomainObject.getMetaField().getType());
+        graphQLTypeRegistry.addTypeIfNotAlreadyPresent(gqlvDomainObject.getMeta().getMetaField().getType());
         graphQLTypeRegistry.addTypeIfNotAlreadyPresent(gqlvDomainObject.getGqlInputObjectType());
 
         gqlvDomainObject.addPropertiesAsFields();
@@ -214,11 +214,11 @@ public class GraphQlSourceForCauseway implements GraphQlSource {
         graphQLTypeRegistry.addTypeIfNotAlreadyPresent(graphQLObjectType);
 
         // create and register data fetchers
-        gqlvDomainObject.createAndRegisterDataFetchersForMetaData();
-        gqlvDomainObject.createAndRegisterDataFetchersForMutators();
+        gqlvDomainObject.addDataFetchersForMetaData();
+        gqlvDomainObject.addDataFetchersForMutators();
 
-        gqlvDomainObject.createAndRegisterDataFetchersForField();
-        gqlvDomainObject.createAndRegisterDataFetchersForCollection();
+        gqlvDomainObject.addDataFetchersForProperties();
+        gqlvDomainObject.addDataFetchersForCollections();
     }
 
 }


(causeway) 04/18: CAUSEWAY-3676: minor reordering of registering types

Posted by da...@apache.org.
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 2bf2c4f1c541fa0e197d646137d1c402da750d71
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 16:48:34 2024 +0000

    CAUSEWAY-3676: minor reordering of registering types
---
 .../causeway/viewer/graphql/model/domain/GqlvDomainObject.java   | 9 +++++++++
 .../graphql/viewer/integration/GraphQlSourceForCauseway.java     | 9 ++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
index 8916e4d46f..ee447335e5 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java
@@ -21,6 +21,7 @@ import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
 import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
+import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry;
 import org.apache.causeway.viewer.graphql.model.types._Constants;
 import org.apache.causeway.viewer.graphql.model.util._LTN;
 import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
@@ -417,4 +418,12 @@ public class GqlvDomainObject {
         return mutatorsType;
     }
 
+    public void addTypesInto(GraphQLTypeRegistry graphQLTypeRegistry) {
+
+        graphQLTypeRegistry.addTypeIfNotAlreadyPresent(getMeta().getMetaField().getType());
+        graphQLTypeRegistry.addTypeIfNotAlreadyPresent(getGqlInputObjectType());
+
+        getMutatorsTypeIfAny().ifPresent(graphQLTypeRegistry::addTypeIfNotAlreadyPresent);
+    }
+
 }
diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
index 8b111b96a1..353e911cc5 100644
--- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
+++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java
@@ -203,17 +203,12 @@ public class GraphQlSourceForCauseway implements GraphQlSource {
         gqlvDomainObject.addCollectionsAsLists();
         gqlvDomainObject.addActionsAsFields();
 
-
-        graphQLTypeRegistry.addTypeIfNotAlreadyPresent(gqlvDomainObject.getMeta().getMetaField().getType());
-        graphQLTypeRegistry.addTypeIfNotAlreadyPresent(gqlvDomainObject.getGqlInputObjectType());
-
-        gqlvDomainObject.getMutatorsTypeIfAny()
-                .ifPresent(graphQLTypeRegistry::addTypeIfNotAlreadyPresent);
-
         // build and register object type
         GraphQLObjectType graphQLObjectType = gqlvDomainObject.buildGqlObjectType();
         graphQLTypeRegistry.addTypeIfNotAlreadyPresent(graphQLObjectType);
 
+        gqlvDomainObject.addTypesInto(graphQLTypeRegistry);
+
         // create and register data fetchers
         gqlvDomainObject.addDataFetchersForMetaData();
         gqlvDomainObject.addDataFetchersForMutators();