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

(causeway) 09/10: CAUSEWAY-3676: moves stuff out of TypesMapper, renames to ScalarMapper

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 49942b6eb61a676c95faf17a404fa83ba1938953
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Jan 22 22:47:18 2024 +0000

    CAUSEWAY-3676: moves stuff out of TypesMapper, renames to ScalarMapper
---
 .../viewer/graphql/model/domain/GqlvAction.java    | 18 ++++++---
 .../graphql/model/domain/GqlvActionParameter.java  | 33 ++++++++++++++++
 .../graphql/model/domain/GqlvCollection.java       |  4 +-
 .../viewer/graphql/model/domain/GqlvMutations.java |  3 +-
 .../types/{TypeMapper.java => ScalarMapper.java}   | 44 +++++-----------------
 .../viewer/graphql/model/types/_Constants.java     |  9 -----
 6 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
index 8366538513..f70c4ac5e1 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java
@@ -8,7 +8,7 @@ import org.apache.causeway.core.metamodel.object.ManagedObject;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
+import org.apache.causeway.viewer.graphql.model.types.ScalarMapper;
 import org.apache.causeway.viewer.graphql.model.util.TypeNames;
 
 import org.springframework.lang.Nullable;
@@ -24,6 +24,7 @@ import graphql.schema.GraphQLOutputType;
 import graphql.schema.GraphQLType;
 import graphql.schema.GraphQLTypeReference;
 
+import lombok.extern.log4j.Log4j2;
 import lombok.val;
 
 import java.util.Map;
@@ -32,6 +33,7 @@ import java.util.stream.Collectors;
 import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
 import static graphql.schema.GraphQLNonNull.nonNull;
 
+@Log4j2
 public class GqlvAction extends GqlvMember<ObjectAction, GqlvActionHolder> {
 
     public GqlvAction(
@@ -69,10 +71,16 @@ public class GqlvAction extends GqlvMember<ObjectAction, GqlvActionHolder> {
             case COLLECTION:
 
                 TypeOfFacet facet = objectAction.getFacet(TypeOfFacet.class);
-                if (facet == null) return GraphQLList.list(Scalars.GraphQLString); // TODO: for now ... Investigate why this can happen
+                if (facet == null) {
+                    log.warn("Unable to locate TypeOfFacet for {}", objectAction.getFeatureIdentifier().getFullIdentityString());
+                    return null;
+                }
                 ObjectSpecification objectSpecificationForElementWhenCollection = facet.elementSpec();
                 GraphQLType wrappedType = outputTypeFor(objectSpecificationForElementWhenCollection);
                 if (wrappedType == null) {
+                    log.warn("Unable to create wrapped type of for {} for action {}",
+                            objectSpecificationForElementWhenCollection.getFullIdentifier(),
+                            objectAction.getFeatureIdentifier().getFullIdentityString());
                     return null;
                 }
                 return GraphQLList.list(wrappedType);
@@ -97,7 +105,7 @@ public class GqlvAction extends GqlvMember<ObjectAction, GqlvActionHolder> {
                 return GraphQLTypeReference.typeRef(TypeNames.objectTypeNameFor(objectSpecification));
 
             case VALUE:
-                return TypeMapper.typeFor(objectSpecification.getCorrespondingClass());
+                return ScalarMapper.typeFor(objectSpecification.getCorrespondingClass());
 
             case COLLECTION:
                 // should be noop
@@ -174,8 +182,8 @@ public class GqlvAction extends GqlvMember<ObjectAction, GqlvActionHolder> {
         return GraphQLArgument.newArgument()
                 .name(objectActionParameter.getId())
                 .type(objectActionParameter.isOptional()
-                        ? TypeMapper.inputTypeFor(objectActionParameter)
-                        : nonNull(TypeMapper.inputTypeFor(objectActionParameter)))
+                        ? GqlvActionParameter.inputTypeFor(objectActionParameter)
+                        : nonNull(GqlvActionParameter.inputTypeFor(objectActionParameter)))
                 .build();
     }
 }
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParameter.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParameter.java
new file mode 100644
index 0000000000..b70fd4bf47
--- /dev/null
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionParameter.java
@@ -0,0 +1,33 @@
+package org.apache.causeway.viewer.graphql.model.domain;
+
+import graphql.Scalars;
+import graphql.schema.GraphQLInputType;
+import graphql.schema.GraphQLTypeReference;
+
+import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
+import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
+import org.apache.causeway.viewer.graphql.model.types.ScalarMapper;
+import org.apache.causeway.viewer.graphql.model.util.TypeNames;
+
+public class GqlvActionParameter {
+    public static GraphQLInputType inputTypeFor(final ObjectActionParameter objectActionParameter){
+        ObjectSpecification elementType = objectActionParameter.getElementType();
+        switch (elementType.getBeanSort()) {
+            case ABSTRACT:
+            case ENTITY:
+            case VIEW_MODEL:
+
+                return GraphQLTypeReference.typeRef(TypeNames.inputTypeNameFor(elementType));
+
+            case VALUE:
+                return (GraphQLInputType) ScalarMapper.typeFor(elementType.getCorrespondingClass());
+
+            case COLLECTION:
+                // TODO ...
+            default:
+                // for now
+                return Scalars.GraphQLString;
+        }
+
+    }
+}
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java
index 151f195add..e043dac36a 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvCollection.java
@@ -6,7 +6,7 @@ import graphql.schema.GraphQLList;
 
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.causeway.viewer.graphql.model.types.TypeMapper;
+import org.apache.causeway.viewer.graphql.model.types.ScalarMapper;
 import org.apache.causeway.viewer.graphql.model.util.TypeNames;
 
 import org.springframework.lang.Nullable;
@@ -46,7 +46,7 @@ public class GqlvCollection extends GqlvAssociation<OneToManyAssociation, GqlvCo
             case ENTITY:
                 return GraphQLList.list(typeRef(TypeNames.objectTypeNameFor(elementType)));
             case VALUE:
-                return GraphQLList.list(TypeMapper.typeFor(elementType.getCorrespondingClass()));
+                return GraphQLList.list(ScalarMapper.typeFor(elementType.getCorrespondingClass()));
         }
         return null;
     }
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutations.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutations.java
index acde7dd8f5..fc0b9b90ab 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutations.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutations.java
@@ -16,7 +16,6 @@ import org.apache.causeway.applib.services.bookmark.BookmarkService;
 import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
-import org.apache.causeway.viewer.graphql.model.types._Constants;
 import org.apache.causeway.viewer.graphql.model.util.TypeNames;
 
 import static graphql.schema.FieldCoordinates.coordinates;
@@ -106,7 +105,7 @@ public class GqlvMutations implements GqlvActionHolder {
 
             // create the field
             GraphQLFieldDefinition mutationsField = newFieldDefinition()
-                    .name(_Constants.GQL_MUTATIONS_FIELDNAME)
+                    .name("_gql_mutations")
                     .type(mutationsType)
                     .build();
             mutationsFieldIfAny = Optional.of(mutationsField);
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/ScalarMapper.java
similarity index 50%
rename from incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java
rename to incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/ScalarMapper.java
index e83d22b66e..e71f2256fa 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/TypeMapper.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/ScalarMapper.java
@@ -23,55 +23,31 @@ import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
-import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.causeway.viewer.graphql.model.util.TypeNames;
-
 import graphql.Scalars;
-import graphql.schema.GraphQLInputType;
 import graphql.schema.GraphQLType;
-import graphql.schema.GraphQLTypeReference;
 
-public class TypeMapper {
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class ScalarMapper {
 
-    private static List<Class<?>> mapToInteger = Arrays.asList(
+    private static List<Class<?>> integerEquivalents = Arrays.asList(
             int.class, Integer.class, Short.class, short.class, BigInteger.class);
-    private static List<Class<?>> mapToLong = Arrays.asList(Long.class, long.class, BigDecimal.class);
-    private static List<Class<?>> mapToBoolean = Arrays.asList(Boolean.class, boolean.class);
+    private static List<Class<?>> longEquivalents = Arrays.asList(Long.class, long.class, BigDecimal.class);
+    private static List<Class<?>> booleanEquivalents = Arrays.asList(Boolean.class, boolean.class);
 
     public static GraphQLType typeFor(final Class<?> c){
-        if (mapToInteger.contains(c)){
+        if (integerEquivalents.contains(c)){
             return Scalars.GraphQLInt;
         }
-        if (mapToLong.contains(c)){
+        if (longEquivalents.contains(c)){
             return Scalars.GraphQLFloat;
         }
-        if (mapToBoolean.contains(c)){
+        if (booleanEquivalents.contains(c)){
             return Scalars.GraphQLBoolean;
         }
         return Scalars.GraphQLString;
     }
 
-    public static GraphQLInputType inputTypeFor(final ObjectActionParameter objectActionParameter){
-        ObjectSpecification elementType = objectActionParameter.getElementType();
-        switch (elementType.getBeanSort()) {
-            case ABSTRACT:
-            case ENTITY:
-            case VIEW_MODEL:
-
-                return GraphQLTypeReference.typeRef(TypeNames.inputTypeNameFor(elementType));
-
-            case VALUE:
-                return (GraphQLInputType) typeFor(elementType.getCorrespondingClass());
-
-            case COLLECTION:
-                // TODO ...
-            default:
-                // for now
-                return Scalars.GraphQLString;
-        }
-
-    }
-
 
 }
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/_Constants.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/_Constants.java
deleted file mode 100644
index d938063869..0000000000
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/types/_Constants.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.apache.causeway.viewer.graphql.model.types;
-
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public class _Constants {
-    public final static String GQL_INPUTTYPE_PREFIX = "_gql_input__";
-    public final static String GQL_MUTATIONS_FIELDNAME = "_gql_mutations";
-}