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 8d62afc619693282eddf30d4ba385afb7b38ac4d
Author: danhaywood <[email protected]>
AuthorDate: Wed Jan 17 23:39:57 2024 +0000

    CAUSEWAY-3676: moves test domain into a 'university' namespace
---
 ...ayViewerGraphqlTestModuleIntegTestAbstract.java |    4 +-
 .../graphql/viewer/test/domain/Department.java     |   14 +-
 .../{TopLevelMenu.java => DepartmentMenu.java}     |   21 +-
 .../graphql/viewer/test/domain/DeptHead.java       |   10 +-
 .../{WithNameRepository.java => DeptHeadMenu.java} |   36 +-
 ...TestDomainModule.java => UniversityModule.java} |    4 +-
 .../graphql/viewer/test/domain/WithName.java       |   25 -
 .../e2e/Domain_IntegTest.create_department._.gql   |    2 +-
 ...omain_IntegTest.create_department.approved.json |    2 +-
 .../Domain_IntegTest.find_all_departments._.gql    |    2 +-
 ...in_IntegTest.find_all_departments.approved.json |    6 +-
 ...IntegTest.find_department_and_change_name._.gql |    2 +-
 .../graphql/viewer/test/e2e/Domain_IntegTest.java  |    7 +-
 .../graphql/viewer/test/e2e/Schema_IntegTest.java  |   18 -
 .../test/e2e/Schema_IntegTest.schema.approved.json | 1321 +++++++++-----------
 ...chema_IntegTest.schema_types_name.approved.json |   34 +-
 .../graphql/test/src/test/resources/schema.gql     |   91 +-
 17 files changed, 722 insertions(+), 877 deletions(-)

diff --git 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java
 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java
index f0ceb8a16c..6f88728dbf 100644
--- 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java
+++ 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java
@@ -65,7 +65,7 @@ import 
org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistence
 import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
 import 
org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
 import 
org.apache.causeway.viewer.graphql.viewer.CausewayModuleIncViewerGraphqlViewer;
-import org.apache.causeway.viewer.graphql.viewer.test.domain.TestDomainModule;
+import org.apache.causeway.viewer.graphql.viewer.test.domain.UniversityModule;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -99,7 +99,7 @@ public abstract class 
CausewayViewerGraphqlTestModuleIntegTestAbstract {
             CausewayModuleTestingFixturesApplib.class,
             CausewayModuleIncViewerGraphqlViewer.class,
 
-            TestDomainModule.class
+            UniversityModule.class
     })
     @PropertySources({
             @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema),
diff --git 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/Department.java
 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/Department.java
index c9779a8921..4e0ca243e3 100644
--- 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/Department.java
+++ 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/Department.java
@@ -33,16 +33,17 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-//@Profile("demo-jpa")
+import java.util.Comparator;
+
 @Entity
 @Table(
         schema = "public",
         name = "Department"
 )
[email protected]("gql.test.domain.Department")
[email protected]("university.dept.Department")
 @NoArgsConstructor
 @DomainObject(nature = Nature.ENTITY)
-public class Department implements WithName, Comparable {
+public class Department implements Comparable<Department> {
 
     public Department(String name, DeptHead deptHead) {
         this.name = name;
@@ -59,12 +60,11 @@ public class Department implements WithName, Comparable {
     @Getter @Setter
     @Property
     @OneToOne(optional = true)
-    @JoinColumn(name = "employee_id")
+    @JoinColumn(name = "deptHead_id")
     private DeptHead deptHead;
 
     @Override
-    public int compareTo(final Object o) {
-        Department department = (Department) o;
-        return this.getName().compareTo(department.getName());
+    public int compareTo(final Department o) {
+        return Comparator.comparing(Department::getName).compare(this, o);
     }
 }
diff --git 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/TopLevelMenu.java
 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/DepartmentMenu.java
similarity index 76%
rename from 
incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/TopLevelMenu.java
rename to 
incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/DepartmentMenu.java
index baab6cca13..b4e2f22d97 100644
--- 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/TopLevelMenu.java
+++ 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/DepartmentMenu.java
@@ -33,16 +33,14 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
 
 import lombok.RequiredArgsConstructor;
 
-@Named("gql.test.domain.TopLevelMenu")
+@Named("university.dept.DepartmentMenu")
 @DomainService(
         nature=NatureOfService.VIEW)
 @javax.annotation.Priority(PriorityPrecedence.EARLY)
 @RequiredArgsConstructor(onConstructor_ = {@Inject})
-public class TopLevelMenu {
+public class DepartmentMenu {
 
     final DepartmentRepository departmentRepository;
-    final DeptHeadRepository deptHeadRepository;
-    final WithNameRepository withNameRepository;
 
     @Action(semantics = SemanticsOf.NON_IDEMPOTENT)
     public Department createDepartment(
@@ -57,20 +55,5 @@ public class TopLevelMenu {
         return departmentRepository.findAll();
     }
 
-    @Action(semantics = SemanticsOf.SAFE)
-    public List<DeptHead> findAllDeptHeads(){
-        return deptHeadRepository.findAll();
-    }
-
-    @Action(semantics = SemanticsOf.SAFE)
-    public List<WithName> findAllEntitiesWithName(){
-        return withNameRepository.findAll();
-    }
-
-    @Action(semantics = SemanticsOf.SAFE)
-    public DeptHead findDeptHeadByName(final String name){
-        return deptHeadRepository.findByName(name);
-    }
-
 
 }
diff --git 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/DeptHead.java
 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/DeptHead.java
index a919bfe645..f42f4812e7 100644
--- 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/DeptHead.java
+++ 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/DeptHead.java
@@ -18,6 +18,7 @@
  */
 package org.apache.causeway.viewer.graphql.viewer.test.domain;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,9 +47,9 @@ import lombok.Setter;
         schema = "public",
         name = "DeptHead"
 )
[email protected]("gql.test.domain.DeptHead")
[email protected]("university.dept.DeptHead")
 @DomainObject(nature = Nature.ENTITY, bounding = Bounding.BOUNDED)
-public class DeptHead implements WithName {
+public class DeptHead implements Comparable<DeptHead> {
 
     @Id
     @GeneratedValue
@@ -99,7 +100,12 @@ public class DeptHead implements WithName {
         }
     }
 
+    @Override
+    public int compareTo(final DeptHead o) {
+        return Comparator.comparing(DeptHead::getName).compare(this, o);
+    }
 
     @Inject @Transient DepartmentRepository departmentRepository;
 
+
 }
diff --git 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/WithNameRepository.java
 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/DeptHeadMenu.java
similarity index 50%
rename from 
incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/WithNameRepository.java
rename to 
incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/DeptHeadMenu.java
index fe5bf15b0c..a0434e76e4 100644
--- 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/WithNameRepository.java
+++ 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/DeptHeadMenu.java
@@ -18,29 +18,37 @@
  */
 package org.apache.causeway.viewer.graphql.viewer.test.domain;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 
-import org.springframework.stereotype.Repository;
+import org.springframework.lang.Nullable;
 
-@Repository
-public class WithNameRepository {
+import org.apache.causeway.applib.annotation.Action;
+import org.apache.causeway.applib.annotation.DomainService;
+import org.apache.causeway.applib.annotation.NatureOfService;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.annotation.SemanticsOf;
 
-    @Inject private DepartmentRepository departmentRepository;
-    @Inject private DeptHeadRepository deptHeadRepository;
+import lombok.RequiredArgsConstructor;
 
-    public List<WithName> findAll() {
-        final List<WithName> result = new ArrayList<>();
-        result.addAll(departmentRepository.findAll());
-        result.addAll(deptHeadRepository.findAll());
-        return result;
+@Named("university.dept.DeptHeadMenu")
+@DomainService(nature=NatureOfService.VIEW)
[email protected](PriorityPrecedence.EARLY)
+@RequiredArgsConstructor(onConstructor_ = {@Inject})
+public class DeptHeadMenu {
+
+    final DeptHeadRepository deptHeadRepository;
+
+    @Action(semantics = SemanticsOf.SAFE)
+    public List<DeptHead> findAllDeptHeads(){
+        return deptHeadRepository.findAll();
     }
 
-    public void removeAll(){
-        departmentRepository.removeAll();
-        deptHeadRepository.removeAll();
+    @Action(semantics = SemanticsOf.SAFE)
+    public DeptHead findDeptHeadByName(final String name){
+        return deptHeadRepository.findByName(name);
     }
 
 
diff --git 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/TestDomainModule.java
 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/UniversityModule.java
similarity index 93%
rename from 
incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/TestDomainModule.java
rename to 
incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/UniversityModule.java
index 537ef8fe12..d1e7cf2fb2 100644
--- 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/TestDomainModule.java
+++ 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/UniversityModule.java
@@ -29,8 +29,8 @@ import 
org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
 @Configuration
 @ComponentScan
 @EnableJpaRepositories
-@EntityScan(basePackageClasses = {TestDomainModule.class})
-public class TestDomainModule implements ModuleWithFixtures {
+@EntityScan(basePackageClasses = {UniversityModule.class})
+public class UniversityModule implements ModuleWithFixtures {
 
     @Override
     public FixtureScript getTeardownFixture() {
diff --git 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/WithName.java
 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/WithName.java
deleted file mode 100644
index aeb7dabdec..0000000000
--- 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/WithName.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.causeway.viewer.graphql.viewer.test.domain;
-
-public interface WithName {
-
-    public String getName();
-
-}
diff --git 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.create_department._.gql
 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.create_department._.gql
index ab95101b5c..f9f5a62d19 100644
--- 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.create_department._.gql
+++ 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.create_department._.gql
@@ -1,5 +1,5 @@
 {
-    gql_test_domain_TopLevelMenu {
+    university_dept_DepartmentMenu {
         createDepartment(name: "newbie") {
             name
         }
diff --git 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.create_department.approved.json
 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.create_department.approved.json
index 90328010f5..7625e509e7 100644
--- 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.create_department.approved.json
+++ 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.create_department.approved.json
@@ -1,6 +1,6 @@
 {
   "data" : {
-    "gql_test_domain_TopLevelMenu" : {
+    "university_dept_DepartmentMenu" : {
       "createDepartment" : {
         "name" : "newbie"
       }
diff --git 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.find_all_departments._.gql
 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.find_all_departments._.gql
index c921e5677d..a9024b45f3 100644
--- 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.find_all_departments._.gql
+++ 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.find_all_departments._.gql
@@ -1,5 +1,5 @@
 {
-  gql_test_domain_TopLevelMenu {
+  university_dept_DepartmentMenu {
     findAllDepartments {
       name
       _gql_meta {
diff --git 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.find_all_departments.approved.json
 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.find_all_departments.approved.json
index 56ffa2f775..f3645a3aa0 100644
--- 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.find_all_departments.approved.json
+++ 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.find_all_departments.approved.json
@@ -1,18 +1,18 @@
 {
   "data" : {
-    "gql_test_domain_TopLevelMenu" : {
+    "university_dept_DepartmentMenu" : {
       "findAllDepartments" : [ {
         "name" : "foo",
         "_gql_meta" : {
           "id" : "2",
-          "logicalTypeName" : "gql.test.domain.Department",
+          "logicalTypeName" : "university.dept.Department",
           "version" : null
         }
       }, {
         "name" : "bar",
         "_gql_meta" : {
           "id" : "3",
-          "logicalTypeName" : "gql.test.domain.Department",
+          "logicalTypeName" : "university.dept.Department",
           "version" : null
         }
       } ]
diff --git 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.find_department_and_change_name._.gql
 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.find_department_and_change_name._.gql
index 9d90107009..c9814de893 100644
--- 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.find_department_and_change_name._.gql
+++ 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.find_department_and_change_name._.gql
@@ -1,5 +1,5 @@
 {
-    gql_test_domain_TopLevelMenu {
+    university_dept_DeptHeadMenu {
         findDeptHeadByName(name: "foo") {
             _gql_mutations {
                 changeName(newName: "bar") {
diff --git 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.java
 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.java
index 352f653784..1ce01e458d 100644
--- 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.java
+++ 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Domain_IntegTest.java
@@ -20,19 +20,16 @@ package org.apache.causeway.viewer.graphql.viewer.test.e2e;
 
 import lombok.val;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
 
 import org.approvaltests.Approvals;
 import org.approvaltests.reporters.DiffReporter;
-import org.approvaltests.reporters.TextWebReporter;
 import org.approvaltests.reporters.UseReporter;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
@@ -44,7 +41,7 @@ import 
org.apache.causeway.viewer.graphql.viewer.test.domain.Department;
 import 
org.apache.causeway.viewer.graphql.viewer.test.domain.DepartmentRepository;
 import org.apache.causeway.viewer.graphql.viewer.test.domain.DeptHead;
 import 
org.apache.causeway.viewer.graphql.viewer.test.domain.DeptHeadRepository;
-import org.apache.causeway.viewer.graphql.viewer.test.domain.TopLevelMenu;
+import org.apache.causeway.viewer.graphql.viewer.test.domain.DepartmentMenu;
 
 import static 
org.apache.causeway.commons.internal.assertions._Assert.assertEquals;
 import static 
org.apache.causeway.commons.internal.assertions._Assert.assertTrue;
@@ -56,7 +53,7 @@ public class Domain_IntegTest extends 
CausewayViewerGraphqlTestModuleIntegTestAb
 
     @Inject DepartmentRepository departmentRepository;
     @Inject DeptHeadRepository deptHeadRepository;
-    @Inject TopLevelMenu topLevelMenu;
+    @Inject DepartmentMenu departmentMenu;
 
     @AfterEach
     void afterEach(){
diff --git 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Schema_IntegTest.java
 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Schema_IntegTest.java
index 816f43ae16..cfda766e7a 100644
--- 
a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Schema_IntegTest.java
+++ 
b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/Schema_IntegTest.java
@@ -18,32 +18,14 @@
  */
 package org.apache.causeway.viewer.graphql.viewer.test.e2e;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
 import 
org.apache.causeway.viewer.graphql.viewer.test.CausewayViewerGraphqlTestModuleIntegTestAbstract;
 
-import org.apache.causeway.viewer.graphql.viewer.test.domain.Department;
-
-import org.apache.causeway.viewer.graphql.viewer.test.domain.DeptHead;
-import 
org.apache.causeway.viewer.graphql.viewer.test.domain.DepartmentRepository;
-
-import 
org.apache.causeway.viewer.graphql.viewer.test.domain.DeptHeadRepository;
-
 import org.approvaltests.Approvals;
 import org.approvaltests.reporters.DiffReporter;
-import org.approvaltests.reporters.TextWebReporter;
 import org.approvaltests.reporters.UseReporter;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.transaction.annotation.Propagation;
-
-import org.apache.causeway.viewer.graphql.viewer.test.domain.TopLevelMenu;
 
 import static 
org.apache.causeway.commons.internal.assertions._Assert.assertEquals;
 import static 
org.apache.causeway.commons.internal.assertions._Assert.assertNotNull;
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 cafdedb247..447ff3cb33 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
@@ -71,12 +71,23 @@
           "isDeprecated" : false,
           "deprecationReason" : null
         }, {
-          "name" : "gql_test_domain_TopLevelMenu",
+          "name" : "university_dept_DepartmentMenu",
           "description" : null,
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "gql_test_domain_TopLevelMenu",
+            "name" : "university_dept_DepartmentMenu",
+            "ofType" : null
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        }, {
+          "name" : "university_dept_DeptHeadMenu",
+          "description" : null,
+          "args" : [ ],
+          "type" : {
+            "kind" : "OBJECT",
+            "name" : "university_dept_DeptHeadMenu",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -1450,29 +1461,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : "_gql_input__gql_test_domain_Department",
-        "description" : null,
-        "fields" : null,
-        "inputFields" : [ {
-          "name" : "id",
-          "description" : null,
-          "type" : {
-            "kind" : "NON_NULL",
-            "name" : null,
-            "ofType" : {
-              "kind" : "SCALAR",
-              "name" : "ID",
-              "ofType" : null
-            }
-          },
-          "defaultValue" : null
-        } ],
-        "interfaces" : null,
-        "enumValues" : null,
-        "possibleTypes" : null
-      }, {
-        "kind" : "INPUT_OBJECT",
-        "name" : "_gql_input__gql_test_domain_DeptHead",
+        "name" : "_gql_input__java_lang_Runnable",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1494,7 +1483,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : "_gql_input__java_lang_Runnable",
+        "name" : "_gql_input__java_util_Map",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1516,7 +1505,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : "_gql_input__java_util_Map",
+        "name" : "_gql_input__java_util_SortedMap",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1538,7 +1527,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : "_gql_input__java_util_SortedMap",
+        "name" : "_gql_input__java_util_concurrent_Callable",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1560,7 +1549,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : "_gql_input__java_util_concurrent_Callable",
+        "name" : "_gql_input__java_util_function_BiFunction",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1582,7 +1571,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : "_gql_input__java_util_function_BiFunction",
+        "name" : "_gql_input__java_util_function_Consumer",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1604,7 +1593,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : "_gql_input__java_util_function_Consumer",
+        "name" : "_gql_input__java_util_function_Function",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1626,7 +1615,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : "_gql_input__java_util_function_Function",
+        "name" : "_gql_input__java_util_stream_Stream",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1648,7 +1637,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : "_gql_input__java_util_stream_Stream",
+        "name" : "_gql_input__org_apache_causeway_commons_functional_Either",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1670,7 +1659,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : "_gql_input__org_apache_causeway_commons_functional_Either",
+        "name" : "_gql_input__org_apache_causeway_commons_functional_Railway",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1692,7 +1681,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : "_gql_input__org_apache_causeway_commons_functional_Railway",
+        "name" : 
"_gql_input__org_apache_causeway_commons_functional_ThrowingConsumer",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1714,7 +1703,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : 
"_gql_input__org_apache_causeway_commons_functional_ThrowingConsumer",
+        "name" : 
"_gql_input__org_apache_causeway_commons_functional_ThrowingFunction",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1736,7 +1725,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : 
"_gql_input__org_apache_causeway_commons_functional_ThrowingFunction",
+        "name" : 
"_gql_input__org_apache_causeway_commons_functional_ThrowingRunnable",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1758,7 +1747,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : 
"_gql_input__org_apache_causeway_commons_functional_ThrowingRunnable",
+        "name" : "_gql_input__org_apache_causeway_commons_functional_Try",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1780,7 +1769,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : "_gql_input__org_apache_causeway_commons_functional_Try",
+        "name" : 
"_gql_input__org_apache_causeway_core_metamodel_inspect_model_MMNode",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1802,7 +1791,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : 
"_gql_input__org_apache_causeway_core_metamodel_inspect_model_MMNode",
+        "name" : 
"_gql_input__org_apache_causeway_core_metamodel_inspect_model_MemberNode",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1824,7 +1813,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : 
"_gql_input__org_apache_causeway_core_metamodel_inspect_model_MemberNode",
+        "name" : 
"_gql_input__org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1846,7 +1835,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : 
"_gql_input__org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript",
+        "name" : "_gql_input__university_dept_Department",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -1868,7 +1857,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "INPUT_OBJECT",
-        "name" : 
"_gql_input__org_apache_causeway_viewer_graphql_viewer_test_domain_WithName",
+        "name" : "_gql_input__university_dept_DeptHead",
         "description" : null,
         "fields" : null,
         "inputFields" : [ {
@@ -4604,7 +4593,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "gql_test_domain_Department",
+        "name" : "java_lang_Runnable",
         "description" : null,
         "fields" : [ {
           "name" : "_gql_meta",
@@ -4612,24 +4601,37 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "gql_test_domain_Department__DomainObject_meta",
+            "name" : "java_lang_Runnable__DomainObject_meta",
             "ofType" : null
           },
           "isDeprecated" : false,
           "deprecationReason" : null
-        }, {
-          "name" : "deptHead",
+        } ],
+        "inputFields" : null,
+        "interfaces" : [ ],
+        "enumValues" : null,
+        "possibleTypes" : null
+      }, {
+        "kind" : "OBJECT",
+        "name" : "java_lang_Runnable__DomainObject_meta",
+        "description" : null,
+        "fields" : [ {
+          "name" : "id",
           "description" : null,
           "args" : [ ],
           "type" : {
-            "kind" : "OBJECT",
-            "name" : "gql_test_domain_DeptHead",
-            "ofType" : null
+            "kind" : "NON_NULL",
+            "name" : null,
+            "ofType" : {
+              "kind" : "SCALAR",
+              "name" : "String",
+              "ofType" : null
+            }
           },
           "isDeprecated" : false,
           "deprecationReason" : null
         }, {
-          "name" : "name",
+          "name" : "logicalTypeName",
           "description" : null,
           "args" : [ ],
           "type" : {
@@ -4650,7 +4652,27 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "gql_test_domain_Department__DomainObject_meta",
+        "name" : "java_util_Map",
+        "description" : null,
+        "fields" : [ {
+          "name" : "_gql_meta",
+          "description" : null,
+          "args" : [ ],
+          "type" : {
+            "kind" : "OBJECT",
+            "name" : "java_util_Map__DomainObject_meta",
+            "ofType" : null
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        } ],
+        "inputFields" : null,
+        "interfaces" : [ ],
+        "enumValues" : null,
+        "possibleTypes" : null
+      }, {
+        "kind" : "OBJECT",
+        "name" : "java_util_Map__DomainObject_meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -4682,17 +4704,6 @@
           },
           "isDeprecated" : false,
           "deprecationReason" : null
-        }, {
-          "name" : "version",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "SCALAR",
-            "name" : "String",
-            "ofType" : null
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
         } ],
         "inputFields" : null,
         "interfaces" : [ ],
@@ -4700,7 +4711,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "gql_test_domain_DeptHead",
+        "name" : "java_util_SortedMap",
         "description" : null,
         "fields" : [ {
           "name" : "_gql_meta",
@@ -4708,40 +4719,66 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "gql_test_domain_DeptHead__DomainObject_meta",
+            "name" : "java_util_SortedMap__DomainObject_meta",
             "ofType" : null
           },
           "isDeprecated" : false,
           "deprecationReason" : null
-        }, {
-          "name" : "department",
+        } ],
+        "inputFields" : null,
+        "interfaces" : [ ],
+        "enumValues" : null,
+        "possibleTypes" : null
+      }, {
+        "kind" : "OBJECT",
+        "name" : "java_util_SortedMap__DomainObject_meta",
+        "description" : null,
+        "fields" : [ {
+          "name" : "id",
           "description" : null,
           "args" : [ ],
           "type" : {
-            "kind" : "OBJECT",
-            "name" : "gql_test_domain_Department",
-            "ofType" : null
+            "kind" : "NON_NULL",
+            "name" : null,
+            "ofType" : {
+              "kind" : "SCALAR",
+              "name" : "String",
+              "ofType" : null
+            }
           },
           "isDeprecated" : false,
           "deprecationReason" : null
         }, {
-          "name" : "name",
+          "name" : "logicalTypeName",
           "description" : null,
           "args" : [ ],
           "type" : {
-            "kind" : "SCALAR",
-            "name" : "String",
-            "ofType" : null
+            "kind" : "NON_NULL",
+            "name" : null,
+            "ofType" : {
+              "kind" : "SCALAR",
+              "name" : "String",
+              "ofType" : null
+            }
           },
           "isDeprecated" : false,
           "deprecationReason" : null
-        }, {
-          "name" : "_gql_mutations",
+        } ],
+        "inputFields" : null,
+        "interfaces" : [ ],
+        "enumValues" : null,
+        "possibleTypes" : null
+      }, {
+        "kind" : "OBJECT",
+        "name" : "java_util_concurrent_Callable",
+        "description" : null,
+        "fields" : [ {
+          "name" : "_gql_meta",
           "description" : null,
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "gql_test_domain_DeptHead__DomainObject_mutators",
+            "name" : "java_util_concurrent_Callable__DomainObject_meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -4753,7 +4790,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "gql_test_domain_DeptHead__DomainObject_meta",
+        "name" : "java_util_concurrent_Callable__DomainObject_meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -4785,17 +4822,6 @@
           },
           "isDeprecated" : false,
           "deprecationReason" : null
-        }, {
-          "name" : "version",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "SCALAR",
-            "name" : "String",
-            "ofType" : null
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
         } ],
         "inputFields" : null,
         "interfaces" : [ ],
@@ -4803,52 +4829,15 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "gql_test_domain_DeptHead__DomainObject_mutators",
+        "name" : "java_util_function_BiFunction",
         "description" : null,
         "fields" : [ {
-          "name" : "changeDepartment",
-          "description" : null,
-          "args" : [ {
-            "name" : "department",
-            "description" : null,
-            "type" : {
-              "kind" : "NON_NULL",
-              "name" : null,
-              "ofType" : {
-                "kind" : "INPUT_OBJECT",
-                "name" : "_gql_input__gql_test_domain_Department",
-                "ofType" : null
-              }
-            },
-            "defaultValue" : null
-          } ],
-          "type" : {
-            "kind" : "OBJECT",
-            "name" : "gql_test_domain_DeptHead",
-            "ofType" : null
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        }, {
-          "name" : "changeName",
+          "name" : "_gql_meta",
           "description" : null,
-          "args" : [ {
-            "name" : "newName",
-            "description" : null,
-            "type" : {
-              "kind" : "NON_NULL",
-              "name" : null,
-              "ofType" : {
-                "kind" : "SCALAR",
-                "name" : "String",
-                "ofType" : null
-              }
-            },
-            "defaultValue" : null
-          } ],
+          "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "gql_test_domain_DeptHead",
+            "name" : "java_util_function_BiFunction__DomainObject_meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -4860,99 +4849,35 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "gql_test_domain_TopLevelMenu",
+        "name" : "java_util_function_BiFunction__DomainObject_meta",
         "description" : null,
         "fields" : [ {
-          "name" : "createDepartment",
+          "name" : "id",
           "description" : null,
-          "args" : [ {
-            "name" : "name",
-            "description" : null,
-            "type" : {
+          "args" : [ ],
+          "type" : {
+            "kind" : "NON_NULL",
+            "name" : null,
+            "ofType" : {
               "kind" : "SCALAR",
               "name" : "String",
               "ofType" : null
-            },
-            "defaultValue" : null
-          }, {
-            "name" : "deptHead",
-            "description" : null,
-            "type" : {
-              "kind" : "INPUT_OBJECT",
-              "name" : "_gql_input__gql_test_domain_DeptHead",
-              "ofType" : null
-            },
-            "defaultValue" : null
-          } ],
-          "type" : {
-            "kind" : "OBJECT",
-            "name" : "gql_test_domain_Department",
-            "ofType" : null
+            }
           },
           "isDeprecated" : false,
           "deprecationReason" : null
         }, {
-          "name" : "findAllDepartments",
+          "name" : "logicalTypeName",
           "description" : null,
           "args" : [ ],
           "type" : {
-            "kind" : "LIST",
+            "kind" : "NON_NULL",
             "name" : null,
             "ofType" : {
-              "kind" : "OBJECT",
-              "name" : "gql_test_domain_Department",
-              "ofType" : null
-            }
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        }, {
-          "name" : "findAllDeptHeads",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "LIST",
-            "name" : null,
-            "ofType" : {
-              "kind" : "OBJECT",
-              "name" : "gql_test_domain_DeptHead",
-              "ofType" : null
-            }
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        }, {
-          "name" : "findAllEntitiesWithName",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "LIST",
-            "name" : null,
-            "ofType" : {
-              "kind" : "OBJECT",
-              "name" : 
"org_apache_causeway_viewer_graphql_viewer_test_domain_WithName",
-              "ofType" : null
-            }
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        }, {
-          "name" : "findDeptHeadByName",
-          "description" : null,
-          "args" : [ {
-            "name" : "name",
-            "description" : null,
-            "type" : {
               "kind" : "SCALAR",
               "name" : "String",
               "ofType" : null
-            },
-            "defaultValue" : null
-          } ],
-          "type" : {
-            "kind" : "OBJECT",
-            "name" : "gql_test_domain_DeptHead",
-            "ofType" : null
+            }
           },
           "isDeprecated" : false,
           "deprecationReason" : null
@@ -4963,7 +4888,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_lang_Runnable",
+        "name" : "java_util_function_Consumer",
         "description" : null,
         "fields" : [ {
           "name" : "_gql_meta",
@@ -4971,7 +4896,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "java_lang_Runnable__DomainObject_meta",
+            "name" : "java_util_function_Consumer__DomainObject_meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -4983,7 +4908,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_lang_Runnable__DomainObject_meta",
+        "name" : "java_util_function_Consumer__DomainObject_meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -5022,7 +4947,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_util_Map",
+        "name" : "java_util_function_Function",
         "description" : null,
         "fields" : [ {
           "name" : "_gql_meta",
@@ -5030,7 +4955,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "java_util_Map__DomainObject_meta",
+            "name" : "java_util_function_Function__DomainObject_meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -5042,7 +4967,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_util_Map__DomainObject_meta",
+        "name" : "java_util_function_Function__DomainObject_meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -5081,7 +5006,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_util_SortedMap",
+        "name" : "java_util_stream_Stream",
         "description" : null,
         "fields" : [ {
           "name" : "_gql_meta",
@@ -5089,7 +5014,7 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "java_util_SortedMap__DomainObject_meta",
+            "name" : "java_util_stream_Stream__DomainObject_meta",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -5101,7 +5026,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_util_SortedMap__DomainObject_meta",
+        "name" : "java_util_stream_Stream__DomainObject_meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -5140,7 +5065,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_util_concurrent_Callable",
+        "name" : "org_apache_causeway_commons_functional_Either",
         "description" : null,
         "fields" : [ {
           "name" : "_gql_meta",
@@ -5148,22 +5073,13 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "java_util_concurrent_Callable__DomainObject_meta",
+            "name" : 
"org_apache_causeway_commons_functional_Either__DomainObject_meta",
             "ofType" : null
           },
           "isDeprecated" : false,
           "deprecationReason" : null
-        } ],
-        "inputFields" : null,
-        "interfaces" : [ ],
-        "enumValues" : null,
-        "possibleTypes" : null
-      }, {
-        "kind" : "OBJECT",
-        "name" : "java_util_concurrent_Callable__DomainObject_meta",
-        "description" : null,
-        "fields" : [ {
-          "name" : "id",
+        }, {
+          "name" : "left",
           "description" : null,
           "args" : [ ],
           "type" : {
@@ -5178,7 +5094,7 @@
           "isDeprecated" : false,
           "deprecationReason" : null
         }, {
-          "name" : "logicalTypeName",
+          "name" : "right",
           "description" : null,
           "args" : [ ],
           "type" : {
@@ -5192,22 +5108,13 @@
           },
           "isDeprecated" : false,
           "deprecationReason" : null
-        } ],
-        "inputFields" : null,
-        "interfaces" : [ ],
-        "enumValues" : null,
-        "possibleTypes" : null
-      }, {
-        "kind" : "OBJECT",
-        "name" : "java_util_function_BiFunction",
-        "description" : null,
-        "fields" : [ {
-          "name" : "_gql_meta",
+        }, {
+          "name" : "_gql_mutations",
           "description" : null,
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "java_util_function_BiFunction__DomainObject_meta",
+            "name" : 
"org_apache_causeway_commons_functional_Either__DomainObject_mutators",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -5219,7 +5126,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_util_function_BiFunction__DomainObject_meta",
+        "name" : 
"org_apache_causeway_commons_functional_Either__DomainObject_meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -5258,15 +5165,148 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_util_function_Consumer",
+        "name" : 
"org_apache_causeway_commons_functional_Either__DomainObject_mutators",
         "description" : null,
         "fields" : [ {
-          "name" : "_gql_meta",
+          "name" : "accept",
+          "description" : null,
+          "args" : [ {
+            "name" : "leftConsumer",
+            "description" : null,
+            "type" : {
+              "kind" : "NON_NULL",
+              "name" : null,
+              "ofType" : {
+                "kind" : "INPUT_OBJECT",
+                "name" : "_gql_input__java_util_function_Consumer",
+                "ofType" : null
+              }
+            },
+            "defaultValue" : null
+          }, {
+            "name" : "rightConsumer",
+            "description" : null,
+            "type" : {
+              "kind" : "NON_NULL",
+              "name" : null,
+              "ofType" : {
+                "kind" : "INPUT_OBJECT",
+                "name" : "_gql_input__java_util_function_Consumer",
+                "ofType" : null
+              }
+            },
+            "defaultValue" : null
+          } ],
+          "type" : {
+            "kind" : "SCALAR",
+            "name" : "String",
+            "ofType" : null
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        }, {
+          "name" : "left",
           "description" : null,
           "args" : [ ],
+          "type" : {
+            "kind" : "SCALAR",
+            "name" : "String",
+            "ofType" : null
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        }, {
+          "name" : "map",
+          "description" : null,
+          "args" : [ {
+            "name" : "leftMapper",
+            "description" : null,
+            "type" : {
+              "kind" : "NON_NULL",
+              "name" : null,
+              "ofType" : {
+                "kind" : "INPUT_OBJECT",
+                "name" : "_gql_input__java_util_function_Function",
+                "ofType" : null
+              }
+            },
+            "defaultValue" : null
+          }, {
+            "name" : "rightMapper",
+            "description" : null,
+            "type" : {
+              "kind" : "NON_NULL",
+              "name" : null,
+              "ofType" : {
+                "kind" : "INPUT_OBJECT",
+                "name" : "_gql_input__java_util_function_Function",
+                "ofType" : null
+              }
+            },
+            "defaultValue" : null
+          } ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "java_util_function_Consumer__DomainObject_meta",
+            "name" : "org_apache_causeway_commons_functional_Either",
+            "ofType" : null
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        }, {
+          "name" : "mapLeft",
+          "description" : null,
+          "args" : [ {
+            "name" : "leftMapper",
+            "description" : null,
+            "type" : {
+              "kind" : "NON_NULL",
+              "name" : null,
+              "ofType" : {
+                "kind" : "INPUT_OBJECT",
+                "name" : "_gql_input__java_util_function_Function",
+                "ofType" : null
+              }
+            },
+            "defaultValue" : null
+          } ],
+          "type" : {
+            "kind" : "OBJECT",
+            "name" : "org_apache_causeway_commons_functional_Either",
+            "ofType" : null
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        }, {
+          "name" : "mapRight",
+          "description" : null,
+          "args" : [ {
+            "name" : "rightMapper",
+            "description" : null,
+            "type" : {
+              "kind" : "NON_NULL",
+              "name" : null,
+              "ofType" : {
+                "kind" : "INPUT_OBJECT",
+                "name" : "_gql_input__java_util_function_Function",
+                "ofType" : null
+              }
+            },
+            "defaultValue" : null
+          } ],
+          "type" : {
+            "kind" : "OBJECT",
+            "name" : "org_apache_causeway_commons_functional_Either",
+            "ofType" : null
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        }, {
+          "name" : "right",
+          "description" : null,
+          "args" : [ ],
+          "type" : {
+            "kind" : "SCALAR",
+            "name" : "String",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -5278,431 +5318,21 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "java_util_function_Consumer__DomainObject_meta",
+        "name" : "org_apache_causeway_commons_functional_Railway",
         "description" : null,
         "fields" : [ {
-          "name" : "id",
+          "name" : "_gql_meta",
           "description" : null,
           "args" : [ ],
           "type" : {
-            "kind" : "NON_NULL",
-            "name" : null,
-            "ofType" : {
-              "kind" : "SCALAR",
-              "name" : "String",
-              "ofType" : null
-            }
+            "kind" : "OBJECT",
+            "name" : 
"org_apache_causeway_commons_functional_Railway__DomainObject_meta",
+            "ofType" : null
           },
           "isDeprecated" : false,
           "deprecationReason" : null
         }, {
-          "name" : "logicalTypeName",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "NON_NULL",
-            "name" : null,
-            "ofType" : {
-              "kind" : "SCALAR",
-              "name" : "String",
-              "ofType" : null
-            }
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        } ],
-        "inputFields" : null,
-        "interfaces" : [ ],
-        "enumValues" : null,
-        "possibleTypes" : null
-      }, {
-        "kind" : "OBJECT",
-        "name" : "java_util_function_Function",
-        "description" : null,
-        "fields" : [ {
-          "name" : "_gql_meta",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "OBJECT",
-            "name" : "java_util_function_Function__DomainObject_meta",
-            "ofType" : null
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        } ],
-        "inputFields" : null,
-        "interfaces" : [ ],
-        "enumValues" : null,
-        "possibleTypes" : null
-      }, {
-        "kind" : "OBJECT",
-        "name" : "java_util_function_Function__DomainObject_meta",
-        "description" : null,
-        "fields" : [ {
-          "name" : "id",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "NON_NULL",
-            "name" : null,
-            "ofType" : {
-              "kind" : "SCALAR",
-              "name" : "String",
-              "ofType" : null
-            }
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        }, {
-          "name" : "logicalTypeName",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "NON_NULL",
-            "name" : null,
-            "ofType" : {
-              "kind" : "SCALAR",
-              "name" : "String",
-              "ofType" : null
-            }
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        } ],
-        "inputFields" : null,
-        "interfaces" : [ ],
-        "enumValues" : null,
-        "possibleTypes" : null
-      }, {
-        "kind" : "OBJECT",
-        "name" : "java_util_stream_Stream",
-        "description" : null,
-        "fields" : [ {
-          "name" : "_gql_meta",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "OBJECT",
-            "name" : "java_util_stream_Stream__DomainObject_meta",
-            "ofType" : null
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        } ],
-        "inputFields" : null,
-        "interfaces" : [ ],
-        "enumValues" : null,
-        "possibleTypes" : null
-      }, {
-        "kind" : "OBJECT",
-        "name" : "java_util_stream_Stream__DomainObject_meta",
-        "description" : null,
-        "fields" : [ {
-          "name" : "id",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "NON_NULL",
-            "name" : null,
-            "ofType" : {
-              "kind" : "SCALAR",
-              "name" : "String",
-              "ofType" : null
-            }
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        }, {
-          "name" : "logicalTypeName",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "NON_NULL",
-            "name" : null,
-            "ofType" : {
-              "kind" : "SCALAR",
-              "name" : "String",
-              "ofType" : null
-            }
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        } ],
-        "inputFields" : null,
-        "interfaces" : [ ],
-        "enumValues" : null,
-        "possibleTypes" : null
-      }, {
-        "kind" : "OBJECT",
-        "name" : "org_apache_causeway_commons_functional_Either",
-        "description" : null,
-        "fields" : [ {
-          "name" : "_gql_meta",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "OBJECT",
-            "name" : 
"org_apache_causeway_commons_functional_Either__DomainObject_meta",
-            "ofType" : null
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        }, {
-          "name" : "left",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "NON_NULL",
-            "name" : null,
-            "ofType" : {
-              "kind" : "SCALAR",
-              "name" : "String",
-              "ofType" : null
-            }
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        }, {
-          "name" : "right",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "NON_NULL",
-            "name" : null,
-            "ofType" : {
-              "kind" : "SCALAR",
-              "name" : "String",
-              "ofType" : null
-            }
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        }, {
-          "name" : "_gql_mutations",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "OBJECT",
-            "name" : 
"org_apache_causeway_commons_functional_Either__DomainObject_mutators",
-            "ofType" : null
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        } ],
-        "inputFields" : null,
-        "interfaces" : [ ],
-        "enumValues" : null,
-        "possibleTypes" : null
-      }, {
-        "kind" : "OBJECT",
-        "name" : 
"org_apache_causeway_commons_functional_Either__DomainObject_meta",
-        "description" : null,
-        "fields" : [ {
-          "name" : "id",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "NON_NULL",
-            "name" : null,
-            "ofType" : {
-              "kind" : "SCALAR",
-              "name" : "String",
-              "ofType" : null
-            }
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        }, {
-          "name" : "logicalTypeName",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "NON_NULL",
-            "name" : null,
-            "ofType" : {
-              "kind" : "SCALAR",
-              "name" : "String",
-              "ofType" : null
-            }
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        } ],
-        "inputFields" : null,
-        "interfaces" : [ ],
-        "enumValues" : null,
-        "possibleTypes" : null
-      }, {
-        "kind" : "OBJECT",
-        "name" : 
"org_apache_causeway_commons_functional_Either__DomainObject_mutators",
-        "description" : null,
-        "fields" : [ {
-          "name" : "accept",
-          "description" : null,
-          "args" : [ {
-            "name" : "leftConsumer",
-            "description" : null,
-            "type" : {
-              "kind" : "NON_NULL",
-              "name" : null,
-              "ofType" : {
-                "kind" : "INPUT_OBJECT",
-                "name" : "_gql_input__java_util_function_Consumer",
-                "ofType" : null
-              }
-            },
-            "defaultValue" : null
-          }, {
-            "name" : "rightConsumer",
-            "description" : null,
-            "type" : {
-              "kind" : "NON_NULL",
-              "name" : null,
-              "ofType" : {
-                "kind" : "INPUT_OBJECT",
-                "name" : "_gql_input__java_util_function_Consumer",
-                "ofType" : null
-              }
-            },
-            "defaultValue" : null
-          } ],
-          "type" : {
-            "kind" : "SCALAR",
-            "name" : "String",
-            "ofType" : null
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        }, {
-          "name" : "left",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "SCALAR",
-            "name" : "String",
-            "ofType" : null
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        }, {
-          "name" : "map",
-          "description" : null,
-          "args" : [ {
-            "name" : "leftMapper",
-            "description" : null,
-            "type" : {
-              "kind" : "NON_NULL",
-              "name" : null,
-              "ofType" : {
-                "kind" : "INPUT_OBJECT",
-                "name" : "_gql_input__java_util_function_Function",
-                "ofType" : null
-              }
-            },
-            "defaultValue" : null
-          }, {
-            "name" : "rightMapper",
-            "description" : null,
-            "type" : {
-              "kind" : "NON_NULL",
-              "name" : null,
-              "ofType" : {
-                "kind" : "INPUT_OBJECT",
-                "name" : "_gql_input__java_util_function_Function",
-                "ofType" : null
-              }
-            },
-            "defaultValue" : null
-          } ],
-          "type" : {
-            "kind" : "OBJECT",
-            "name" : "org_apache_causeway_commons_functional_Either",
-            "ofType" : null
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        }, {
-          "name" : "mapLeft",
-          "description" : null,
-          "args" : [ {
-            "name" : "leftMapper",
-            "description" : null,
-            "type" : {
-              "kind" : "NON_NULL",
-              "name" : null,
-              "ofType" : {
-                "kind" : "INPUT_OBJECT",
-                "name" : "_gql_input__java_util_function_Function",
-                "ofType" : null
-              }
-            },
-            "defaultValue" : null
-          } ],
-          "type" : {
-            "kind" : "OBJECT",
-            "name" : "org_apache_causeway_commons_functional_Either",
-            "ofType" : null
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        }, {
-          "name" : "mapRight",
-          "description" : null,
-          "args" : [ {
-            "name" : "rightMapper",
-            "description" : null,
-            "type" : {
-              "kind" : "NON_NULL",
-              "name" : null,
-              "ofType" : {
-                "kind" : "INPUT_OBJECT",
-                "name" : "_gql_input__java_util_function_Function",
-                "ofType" : null
-              }
-            },
-            "defaultValue" : null
-          } ],
-          "type" : {
-            "kind" : "OBJECT",
-            "name" : "org_apache_causeway_commons_functional_Either",
-            "ofType" : null
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        }, {
-          "name" : "right",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "SCALAR",
-            "name" : "String",
-            "ofType" : null
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        } ],
-        "inputFields" : null,
-        "interfaces" : [ ],
-        "enumValues" : null,
-        "possibleTypes" : null
-      }, {
-        "kind" : "OBJECT",
-        "name" : "org_apache_causeway_commons_functional_Railway",
-        "description" : null,
-        "fields" : [ {
-          "name" : "_gql_meta",
-          "description" : null,
-          "args" : [ ],
-          "type" : {
-            "kind" : "OBJECT",
-            "name" : 
"org_apache_causeway_commons_functional_Railway__DomainObject_meta",
-            "ofType" : null
-          },
-          "isDeprecated" : false,
-          "deprecationReason" : null
-        }, {
-          "name" : "failure",
+          "name" : "failure",
           "description" : null,
           "args" : [ ],
           "type" : {
@@ -6913,7 +6543,107 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : 
"org_apache_causeway_core_metamodel_inspect_model_MMNode__DomainObject_meta",
+            "name" : 
"org_apache_causeway_core_metamodel_inspect_model_MMNode__DomainObject_meta",
+            "ofType" : null
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        } ],
+        "inputFields" : null,
+        "interfaces" : [ ],
+        "enumValues" : null,
+        "possibleTypes" : null
+      }, {
+        "kind" : "OBJECT",
+        "name" : 
"org_apache_causeway_core_metamodel_inspect_model_MMNode__DomainObject_meta",
+        "description" : null,
+        "fields" : [ {
+          "name" : "id",
+          "description" : null,
+          "args" : [ ],
+          "type" : {
+            "kind" : "NON_NULL",
+            "name" : null,
+            "ofType" : {
+              "kind" : "SCALAR",
+              "name" : "String",
+              "ofType" : null
+            }
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        }, {
+          "name" : "logicalTypeName",
+          "description" : null,
+          "args" : [ ],
+          "type" : {
+            "kind" : "NON_NULL",
+            "name" : null,
+            "ofType" : {
+              "kind" : "SCALAR",
+              "name" : "String",
+              "ofType" : null
+            }
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        } ],
+        "inputFields" : null,
+        "interfaces" : [ ],
+        "enumValues" : null,
+        "possibleTypes" : null
+      }, {
+        "kind" : "OBJECT",
+        "name" : "org_apache_causeway_core_metamodel_inspect_model_MemberNode",
+        "description" : null,
+        "fields" : [ {
+          "name" : "_gql_meta",
+          "description" : null,
+          "args" : [ ],
+          "type" : {
+            "kind" : "OBJECT",
+            "name" : 
"org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_meta",
+            "ofType" : null
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        }, {
+          "name" : "parentNode",
+          "description" : null,
+          "args" : [ ],
+          "type" : {
+            "kind" : "NON_NULL",
+            "name" : null,
+            "ofType" : {
+              "kind" : "OBJECT",
+              "name" : "causeway_applib_TypeNode",
+              "ofType" : null
+            }
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        }, {
+          "name" : "mixedIn",
+          "description" : null,
+          "args" : [ ],
+          "type" : {
+            "kind" : "NON_NULL",
+            "name" : null,
+            "ofType" : {
+              "kind" : "SCALAR",
+              "name" : "String",
+              "ofType" : null
+            }
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        }, {
+          "name" : "_gql_mutations",
+          "description" : null,
+          "args" : [ ],
+          "type" : {
+            "kind" : "OBJECT",
+            "name" : 
"org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_mutators",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -6925,7 +6655,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : 
"org_apache_causeway_core_metamodel_inspect_model_MMNode__DomainObject_meta",
+        "name" : 
"org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -6964,36 +6694,41 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : "org_apache_causeway_core_metamodel_inspect_model_MemberNode",
+        "name" : 
"org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_mutators",
         "description" : null,
         "fields" : [ {
-          "name" : "_gql_meta",
+          "name" : "streamChildNodes",
           "description" : null,
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : 
"org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_meta",
+            "name" : "java_util_stream_Stream",
             "ofType" : null
           },
           "isDeprecated" : false,
           "deprecationReason" : null
-        }, {
-          "name" : "parentNode",
+        } ],
+        "inputFields" : null,
+        "interfaces" : [ ],
+        "enumValues" : null,
+        "possibleTypes" : null
+      }, {
+        "kind" : "OBJECT",
+        "name" : 
"org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript",
+        "description" : null,
+        "fields" : [ {
+          "name" : "_gql_meta",
           "description" : null,
           "args" : [ ],
           "type" : {
-            "kind" : "NON_NULL",
-            "name" : null,
-            "ofType" : {
-              "kind" : "OBJECT",
-              "name" : "causeway_applib_TypeNode",
-              "ofType" : null
-            }
+            "kind" : "OBJECT",
+            "name" : 
"org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript__DomainObject_meta",
+            "ofType" : null
           },
           "isDeprecated" : false,
           "deprecationReason" : null
         }, {
-          "name" : "mixedIn",
+          "name" : "friendlyName",
           "description" : null,
           "args" : [ ],
           "type" : {
@@ -7008,13 +6743,17 @@
           "isDeprecated" : false,
           "deprecationReason" : null
         }, {
-          "name" : "_gql_mutations",
+          "name" : "qualifiedName",
           "description" : null,
           "args" : [ ],
           "type" : {
-            "kind" : "OBJECT",
-            "name" : 
"org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_mutators",
-            "ofType" : null
+            "kind" : "NON_NULL",
+            "name" : null,
+            "ofType" : {
+              "kind" : "SCALAR",
+              "name" : "String",
+              "ofType" : null
+            }
           },
           "isDeprecated" : false,
           "deprecationReason" : null
@@ -7025,7 +6764,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : 
"org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_meta",
+        "name" : 
"org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript__DomainObject_meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -7064,41 +6803,32 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : 
"org_apache_causeway_core_metamodel_inspect_model_MemberNode__DomainObject_mutators",
+        "name" : "university_dept_Department",
         "description" : null,
         "fields" : [ {
-          "name" : "streamChildNodes",
+          "name" : "_gql_meta",
           "description" : null,
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : "java_util_stream_Stream",
+            "name" : "university_dept_Department__DomainObject_meta",
             "ofType" : null
           },
           "isDeprecated" : false,
           "deprecationReason" : null
-        } ],
-        "inputFields" : null,
-        "interfaces" : [ ],
-        "enumValues" : null,
-        "possibleTypes" : null
-      }, {
-        "kind" : "OBJECT",
-        "name" : 
"org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript",
-        "description" : null,
-        "fields" : [ {
-          "name" : "_gql_meta",
+        }, {
+          "name" : "deptHead",
           "description" : null,
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : 
"org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript__DomainObject_meta",
+            "name" : "university_dept_DeptHead",
             "ofType" : null
           },
           "isDeprecated" : false,
           "deprecationReason" : null
         }, {
-          "name" : "friendlyName",
+          "name" : "name",
           "description" : null,
           "args" : [ ],
           "type" : {
@@ -7112,16 +6842,54 @@
           },
           "isDeprecated" : false,
           "deprecationReason" : null
+        } ],
+        "inputFields" : null,
+        "interfaces" : [ ],
+        "enumValues" : null,
+        "possibleTypes" : null
+      }, {
+        "kind" : "OBJECT",
+        "name" : "university_dept_DepartmentMenu",
+        "description" : null,
+        "fields" : [ {
+          "name" : "createDepartment",
+          "description" : null,
+          "args" : [ {
+            "name" : "name",
+            "description" : null,
+            "type" : {
+              "kind" : "SCALAR",
+              "name" : "String",
+              "ofType" : null
+            },
+            "defaultValue" : null
+          }, {
+            "name" : "deptHead",
+            "description" : null,
+            "type" : {
+              "kind" : "INPUT_OBJECT",
+              "name" : "_gql_input__university_dept_DeptHead",
+              "ofType" : null
+            },
+            "defaultValue" : null
+          } ],
+          "type" : {
+            "kind" : "OBJECT",
+            "name" : "university_dept_Department",
+            "ofType" : null
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
         }, {
-          "name" : "qualifiedName",
+          "name" : "findAllDepartments",
           "description" : null,
           "args" : [ ],
           "type" : {
-            "kind" : "NON_NULL",
+            "kind" : "LIST",
             "name" : null,
             "ofType" : {
-              "kind" : "SCALAR",
-              "name" : "String",
+              "kind" : "OBJECT",
+              "name" : "university_dept_Department",
               "ofType" : null
             }
           },
@@ -7134,7 +6902,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : 
"org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript__DomainObject_meta",
+        "name" : "university_dept_Department__DomainObject_meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -7166,6 +6934,17 @@
           },
           "isDeprecated" : false,
           "deprecationReason" : null
+        }, {
+          "name" : "version",
+          "description" : null,
+          "args" : [ ],
+          "type" : {
+            "kind" : "SCALAR",
+            "name" : "String",
+            "ofType" : null
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
         } ],
         "inputFields" : null,
         "interfaces" : [ ],
@@ -7173,7 +6952,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : 
"org_apache_causeway_viewer_graphql_viewer_test_domain_WithName",
+        "name" : "university_dept_DeptHead",
         "description" : null,
         "fields" : [ {
           "name" : "_gql_meta",
@@ -7181,7 +6960,18 @@
           "args" : [ ],
           "type" : {
             "kind" : "OBJECT",
-            "name" : 
"org_apache_causeway_viewer_graphql_viewer_test_domain_WithName__DomainObject_meta",
+            "name" : "university_dept_DeptHead__DomainObject_meta",
+            "ofType" : null
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        }, {
+          "name" : "department",
+          "description" : null,
+          "args" : [ ],
+          "type" : {
+            "kind" : "OBJECT",
+            "name" : "university_dept_Department",
             "ofType" : null
           },
           "isDeprecated" : false,
@@ -7191,13 +6981,64 @@
           "description" : null,
           "args" : [ ],
           "type" : {
-            "kind" : "NON_NULL",
+            "kind" : "SCALAR",
+            "name" : "String",
+            "ofType" : null
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        }, {
+          "name" : "_gql_mutations",
+          "description" : null,
+          "args" : [ ],
+          "type" : {
+            "kind" : "OBJECT",
+            "name" : "university_dept_DeptHead__DomainObject_mutators",
+            "ofType" : null
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        } ],
+        "inputFields" : null,
+        "interfaces" : [ ],
+        "enumValues" : null,
+        "possibleTypes" : null
+      }, {
+        "kind" : "OBJECT",
+        "name" : "university_dept_DeptHeadMenu",
+        "description" : null,
+        "fields" : [ {
+          "name" : "findAllDeptHeads",
+          "description" : null,
+          "args" : [ ],
+          "type" : {
+            "kind" : "LIST",
             "name" : null,
             "ofType" : {
+              "kind" : "OBJECT",
+              "name" : "university_dept_DeptHead",
+              "ofType" : null
+            }
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        }, {
+          "name" : "findDeptHeadByName",
+          "description" : null,
+          "args" : [ {
+            "name" : "name",
+            "description" : null,
+            "type" : {
               "kind" : "SCALAR",
               "name" : "String",
               "ofType" : null
-            }
+            },
+            "defaultValue" : null
+          } ],
+          "type" : {
+            "kind" : "OBJECT",
+            "name" : "university_dept_DeptHead",
+            "ofType" : null
           },
           "isDeprecated" : false,
           "deprecationReason" : null
@@ -7208,7 +7049,7 @@
         "possibleTypes" : null
       }, {
         "kind" : "OBJECT",
-        "name" : 
"org_apache_causeway_viewer_graphql_viewer_test_domain_WithName__DomainObject_meta",
+        "name" : "university_dept_DeptHead__DomainObject_meta",
         "description" : null,
         "fields" : [ {
           "name" : "id",
@@ -7240,6 +7081,74 @@
           },
           "isDeprecated" : false,
           "deprecationReason" : null
+        }, {
+          "name" : "version",
+          "description" : null,
+          "args" : [ ],
+          "type" : {
+            "kind" : "SCALAR",
+            "name" : "String",
+            "ofType" : null
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        } ],
+        "inputFields" : null,
+        "interfaces" : [ ],
+        "enumValues" : null,
+        "possibleTypes" : null
+      }, {
+        "kind" : "OBJECT",
+        "name" : "university_dept_DeptHead__DomainObject_mutators",
+        "description" : null,
+        "fields" : [ {
+          "name" : "changeDepartment",
+          "description" : null,
+          "args" : [ {
+            "name" : "department",
+            "description" : null,
+            "type" : {
+              "kind" : "NON_NULL",
+              "name" : null,
+              "ofType" : {
+                "kind" : "INPUT_OBJECT",
+                "name" : "_gql_input__university_dept_Department",
+                "ofType" : null
+              }
+            },
+            "defaultValue" : null
+          } ],
+          "type" : {
+            "kind" : "OBJECT",
+            "name" : "university_dept_DeptHead",
+            "ofType" : null
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
+        }, {
+          "name" : "changeName",
+          "description" : null,
+          "args" : [ {
+            "name" : "newName",
+            "description" : null,
+            "type" : {
+              "kind" : "NON_NULL",
+              "name" : null,
+              "ofType" : {
+                "kind" : "SCALAR",
+                "name" : "String",
+                "ofType" : null
+              }
+            },
+            "defaultValue" : null
+          } ],
+          "type" : {
+            "kind" : "OBJECT",
+            "name" : "university_dept_DeptHead",
+            "ofType" : null
+          },
+          "isDeprecated" : false,
+          "deprecationReason" : null
         } ],
         "inputFields" : null,
         "interfaces" : [ ],
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 fd14945df3..ca37cd5bb3 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
@@ -73,10 +73,6 @@
         "name" : "_gql_input__causeway_security_LoginRedirect"
       }, {
         "name" : "_gql_input__causeway_testing_fixtures_FixtureResult"
-      }, {
-        "name" : "_gql_input__gql_test_domain_Department"
-      }, {
-        "name" : "_gql_input__gql_test_domain_DeptHead"
       }, {
         "name" : "_gql_input__java_lang_Runnable"
       }, {
@@ -112,7 +108,9 @@
       }, {
         "name" : 
"_gql_input__org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript"
       }, {
-        "name" : 
"_gql_input__org_apache_causeway_viewer_graphql_viewer_test_domain_WithName"
+        "name" : "_gql_input__university_dept_Department"
+      }, {
+        "name" : "_gql_input__university_dept_DeptHead"
       }, {
         "name" : "causeway_applib_DomainObjectList"
       }, {
@@ -217,18 +215,6 @@
         "name" : "causeway_testing_fixtures_FixtureResult"
       }, {
         "name" : "causeway_testing_fixtures_FixtureResult__DomainObject_meta"
-      }, {
-        "name" : "gql_test_domain_Department"
-      }, {
-        "name" : "gql_test_domain_Department__DomainObject_meta"
-      }, {
-        "name" : "gql_test_domain_DeptHead"
-      }, {
-        "name" : "gql_test_domain_DeptHead__DomainObject_meta"
-      }, {
-        "name" : "gql_test_domain_DeptHead__DomainObject_mutators"
-      }, {
-        "name" : "gql_test_domain_TopLevelMenu"
       }, {
         "name" : "java_lang_Runnable"
       }, {
@@ -312,9 +298,19 @@
       }, {
         "name" : 
"org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript__DomainObject_meta"
       }, {
-        "name" : 
"org_apache_causeway_viewer_graphql_viewer_test_domain_WithName"
+        "name" : "university_dept_Department"
+      }, {
+        "name" : "university_dept_DepartmentMenu"
+      }, {
+        "name" : "university_dept_Department__DomainObject_meta"
+      }, {
+        "name" : "university_dept_DeptHead"
+      }, {
+        "name" : "university_dept_DeptHeadMenu"
+      }, {
+        "name" : "university_dept_DeptHead__DomainObject_meta"
       }, {
-        "name" : 
"org_apache_causeway_viewer_graphql_viewer_test_domain_WithName__DomainObject_meta"
+        "name" : "university_dept_DeptHead__DomainObject_mutators"
       } ]
     }
   }
diff --git a/incubator/viewers/graphql/test/src/test/resources/schema.gql 
b/incubator/viewers/graphql/test/src/test/resources/schema.gql
index 06fd0676ee..3e029c4ddd 100644
--- a/incubator/viewers/graphql/test/src/test/resources/schema.gql
+++ b/incubator/viewers/graphql/test/src/test/resources/schema.gql
@@ -26,8 +26,9 @@ type Query {
   causeway_applib_UserMenu: causeway_applib_UserMenu
   causeway_conf_ConfigurationMenu: causeway_conf_ConfigurationMenu
   causeway_security_LogoutMenu: causeway_security_LogoutMenu
-  gql_test_domain_TopLevelMenu: gql_test_domain_TopLevelMenu
   numServices: Int
+  university_dept_DepartmentMenu: university_dept_DepartmentMenu
+  university_dept_DeptHeadMenu: university_dept_DeptHeadMenu
 }
 
 type causeway_applib_DomainObjectList {
@@ -348,44 +349,6 @@ type 
causeway_testing_fixtures_FixtureResult__DomainObject_meta {
   logicalTypeName: String!
 }
 
-type gql_test_domain_Department {
-  _gql_meta: gql_test_domain_Department__DomainObject_meta
-  deptHead: gql_test_domain_DeptHead
-  name: String!
-}
-
-type gql_test_domain_Department__DomainObject_meta {
-  id: String!
-  logicalTypeName: String!
-  version: String
-}
-
-type gql_test_domain_DeptHead {
-  _gql_meta: gql_test_domain_DeptHead__DomainObject_meta
-  _gql_mutations: gql_test_domain_DeptHead__DomainObject_mutators
-  department: gql_test_domain_Department
-  name: String
-}
-
-type gql_test_domain_DeptHead__DomainObject_meta {
-  id: String!
-  logicalTypeName: String!
-  version: String
-}
-
-type gql_test_domain_DeptHead__DomainObject_mutators {
-  changeDepartment(department: _gql_input__gql_test_domain_Department!): 
gql_test_domain_DeptHead
-  changeName(newName: String!): gql_test_domain_DeptHead
-}
-
-type gql_test_domain_TopLevelMenu {
-  createDepartment(deptHead: _gql_input__gql_test_domain_DeptHead, name: 
String): gql_test_domain_Department
-  findAllDepartments: [gql_test_domain_Department]
-  findAllDeptHeads: [gql_test_domain_DeptHead]
-  findAllEntitiesWithName: 
[org_apache_causeway_viewer_graphql_viewer_test_domain_WithName]
-  findDeptHeadByName(name: String): gql_test_domain_DeptHead
-}
-
 type java_lang_Runnable {
   _gql_meta: java_lang_Runnable__DomainObject_meta
 }
@@ -619,14 +582,44 @@ type 
org_apache_causeway_testing_fixtures_applib_fixturescripts_FixtureScript__D
   logicalTypeName: String!
 }
 
-type org_apache_causeway_viewer_graphql_viewer_test_domain_WithName {
-  _gql_meta: 
org_apache_causeway_viewer_graphql_viewer_test_domain_WithName__DomainObject_meta
+type university_dept_Department {
+  _gql_meta: university_dept_Department__DomainObject_meta
+  deptHead: university_dept_DeptHead
   name: String!
 }
 
-type 
org_apache_causeway_viewer_graphql_viewer_test_domain_WithName__DomainObject_meta
 {
+type university_dept_DepartmentMenu {
+  createDepartment(deptHead: _gql_input__university_dept_DeptHead, name: 
String): university_dept_Department
+  findAllDepartments: [university_dept_Department]
+}
+
+type university_dept_Department__DomainObject_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
+  department: university_dept_Department
+  name: String
+}
+
+type university_dept_DeptHeadMenu {
+  findAllDeptHeads: [university_dept_DeptHead]
+  findDeptHeadByName(name: String): university_dept_DeptHead
+}
+
+type university_dept_DeptHead__DomainObject_meta {
+  id: String!
+  logicalTypeName: String!
+  version: String
+}
+
+type university_dept_DeptHead__DomainObject_mutators {
+  changeDepartment(department: _gql_input__university_dept_Department!): 
university_dept_DeptHead
+  changeName(newName: String!): university_dept_DeptHead
 }
 
 input _gql_input__causeway_applib_DomainObjectList {
@@ -721,14 +714,6 @@ input _gql_input__causeway_testing_fixtures_FixtureResult {
   id: ID!
 }
 
-input _gql_input__gql_test_domain_Department {
-  id: ID!
-}
-
-input _gql_input__gql_test_domain_DeptHead {
-  id: ID!
-}
-
 input _gql_input__java_lang_Runnable {
   id: ID!
 }
@@ -797,6 +782,10 @@ input 
_gql_input__org_apache_causeway_testing_fixtures_applib_fixturescripts_Fix
   id: ID!
 }
 
-input 
_gql_input__org_apache_causeway_viewer_graphql_viewer_test_domain_WithName {
+input _gql_input__university_dept_Department {
+  id: ID!
+}
+
+input _gql_input__university_dept_DeptHead {
   id: ID!
 }


Reply via email to