(causeway) branch CAUSEWAY-3676 updated: CAUSEWAY-3676: trivial clean up

[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 4d35473fc3 CAUSEWAY-3676: trivial clean up
4d35473fc3 is described below

commit 4d35473fc3fba2971cc3bd0ef537b12f9c2cd9fc
Author: danhaywood <d...@haywood-associates.co.uk>
AuthorDate: Fri Jan 19 13:39:06 2024 +0000

    CAUSEWAY-3676: trivial clean up
---
 .../graphql/viewer/source/GqlvObjectStructure.java |  2 +-
 .../graphql/viewer/source/ObjectTypeFactory.java   | 28 ++++------------------
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git 
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvObjectStructure.java
 
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvObjectStructure.java
index e6d6d00fed..179662d604 100644
--- 
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvObjectStructure.java
+++ 
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlvObjectStructure.java
@@ -285,7 +285,7 @@ public class GqlvObjectStructure {
                 : Optional.empty();
     }
 
-    void addActions() {
+    void addActionsAsFields() {
 
         getObjectSpec().streamActions(ActionScope.PRODUCTION, MixedIn.INCLUDED)
                 .forEach(this::addAction);
diff --git 
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java
 
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java
index d9930f1bcb..343c92aabc 100644
--- 
a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java
+++ 
b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/ObjectTypeFactory.java
@@ -23,9 +23,6 @@ import static 
graphql.schema.GraphQLInputObjectType.newInputObject;
 import static graphql.schema.GraphQLNonNull.nonNull;
 import static graphql.schema.GraphQLObjectType.newObject;
 
-import java.util.List;
-import java.util.Set;
-
 import javax.inject.Inject;
 
 import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
@@ -33,24 +30,14 @@ import 
org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
 import org.springframework.stereotype.Component;
 
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
-import org.apache.causeway.applib.services.metamodel.BeanSort;
-import org.apache.causeway.core.metamodel.object.ManagedObject;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
-import org.apache.causeway.core.metamodel.spec.feature.MixedIn;
-import org.apache.causeway.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
 
 import graphql.Scalars;
-import graphql.schema.DataFetcher;
-import graphql.schema.FieldCoordinates;
 import graphql.schema.GraphQLCodeRegistry;
 import graphql.schema.GraphQLFieldDefinition;
-import graphql.schema.GraphQLInputType;
 import graphql.schema.GraphQLObjectType;
-import graphql.schema.GraphQLType;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.UtilityClass;
 import lombok.extern.log4j.Log4j2;
@@ -94,21 +81,14 @@ public class ObjectTypeFactory {
         val gqlvObjectStructure = new GqlvObjectStructure(objectSpec);
 
         
graphQLTypeRegistry.addTypeIfNotAlreadyPresent(gqlvObjectStructure.getMetaField().getType());
-
-
-        // create input type
-        GraphQLInputType inputType = 
gqlvObjectStructure.getGqlInputObjectType();
-        graphQLTypeRegistry.addTypeIfNotAlreadyPresent(inputType);
+        
graphQLTypeRegistry.addTypeIfNotAlreadyPresent(gqlvObjectStructure.getGqlInputObjectType());
 
         gqlvObjectStructure.addPropertiesAsFields();
-
         gqlvObjectStructure.addCollectionsAsLists();
+        gqlvObjectStructure.addActionsAsFields();
 
-        // add actions
-        gqlvObjectStructure.addActions();
-        if(gqlvObjectStructure.hasMutators()) {
-            
gqlvObjectStructure.getMutatorsTypeIfAny().ifPresent(graphQLTypeRegistry::addTypeIfNotAlreadyPresent);
-        }
+        gqlvObjectStructure.getMutatorsTypeIfAny()
+                .ifPresent(graphQLTypeRegistry::addTypeIfNotAlreadyPresent);
 
         // build and register object type
         GraphQLObjectType graphQLObjectType = 
gqlvObjectStructure.buildGqlObjectType();