(causeway) branch CAUSEWAY-3676 updated: CAUSEWAY-3676: wip, also reinstate test for surefire...

[danhaywood]

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


The following commit(s) were added to refs/heads/CAUSEWAY-3676 by this push:
     new d2c953a693 CAUSEWAY-3676: wip, also reinstate test for surefire...
d2c953a693 is described below

commit d2c953a6932f333a9aae5cb526b24df4facc7f3f
Author: danhaywood <d...@haywood-associates.co.uk>
AuthorDate: Fri Jan 19 17:29:28 2024 +0000

    CAUSEWAY-3676: wip, also reinstate test for surefire...
---
 .../graphql/viewer/test/e2e/Schema_IntegTest.java  |  2 +-
 .../viewer/source/GqlvServiceStructure.java        | 22 ++++++++++++++++++++++
 .../graphql/viewer/source/QueryFieldFactory.java   |  2 --
 3 files changed, 23 insertions(+), 3 deletions(-)

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 718ae6d79f..21a402fcb8 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
@@ -42,7 +42,7 @@ import static 
org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 public class Schema_IntegTest extends 
CausewayViewerGraphqlTestModuleIntegTestAbstract {
 
     @Test
-    @DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = 
"true")
+    // @DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = 
"true")
     @UseReporter(DiffReporter.class)
     void schema() throws Exception {
         Approvals.verify(submit(), jsonOptions());
diff --git 
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvServiceStructure.java
 
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvServiceStructure.java
index 64a65ae39e..f01f75f129 100644
--- 
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvServiceStructure.java
+++ 
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvServiceStructure.java
@@ -1,10 +1,17 @@
 package org.apache.causeway.viewer.graphql.viewer.source;
 
+import graphql.schema.GraphQLFieldDefinition;
 import graphql.schema.GraphQLObjectType;
 
 import lombok.Getter;
 
+import java.util.Map;
+
 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.OneToManyAssociation;
+import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.causeway.viewer.graphql.viewer.util._BiMap;
 
 import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
 import static graphql.schema.GraphQLObjectType.newObject;
@@ -49,6 +56,21 @@ public class GqlvServiceStructure {
                 .build());
     }
 
+
+    private final _BiMap<ObjectAction, GraphQLFieldDefinition> 
safeActionToField = new _BiMap<>();
+    private final _BiMap<ObjectAction, GraphQLFieldDefinition> 
mutatorActionToField = new _BiMap<>();
+
+
+    Map<ObjectAction, GraphQLFieldDefinition> getSafeActions() {
+        return safeActionToField.getForwardMapAsImmutable();
+    }
+
+    Map<ObjectAction, GraphQLFieldDefinition> getMutatorActions() {
+        return mutatorActionToField.getForwardMapAsImmutable();
+    }
+
+
+
     /**
      * @see #getGqlObjectType()
      */
diff --git 
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/QueryFieldFactory.java
 
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/QueryFieldFactory.java
index 43945ccbe8..8a78ac7c75 100644
--- 
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/QueryFieldFactory.java
+++ 
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/QueryFieldFactory.java
@@ -81,10 +81,8 @@ public class QueryFieldFactory {
         List<ObjectAction> objectActionList = 
serviceSpec.streamRuntimeActions(MixedIn.INCLUDED)
                 .map(ObjectAction.class::cast)
                 .filter((final ObjectAction x) -> 
x.containsFacet(ActionSemanticsFacet.class))
-//              .filter(x -> x.getFacet(ActionSemanticsFacet.class).value() == 
SemanticsOf.SAFE)
                 .collect(Collectors.toList());
 
-        // for now filters when no safe actions
         if (!objectActionList.isEmpty()) {
 
             val serviceAsGraphQlType = 
gqlvServiceStructure.getGraphQlTypeBuilder();