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 25afb0d5493743ad43ed8a9f1d12f5e29e88307a Author: danhaywood <[email protected]> AuthorDate: Sun Jan 21 14:25:15 2024 +0000 CAUSEWAY-3676: trivial inlining --- .../viewer/graphql/model/domain/GqlvDomainObject.java | 3 +-- .../apache/causeway/viewer/graphql/model/util/TypeNames.java | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java index 7ec803d3f2..6b3eab8272 100644 --- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java +++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainObject.java @@ -98,8 +98,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G objectTypeBuilder.field(meta.getMetaField()); // input object type - String inputTypeName = GQL_INPUTTYPE_PREFIX + getLogicalTypeNameSanitized(); - GraphQLInputObjectType.Builder inputTypeBuilder = newInputObject().name(inputTypeName); + GraphQLInputObjectType.Builder inputTypeBuilder = newInputObject().name(TypeNames.inputTypeNameFor(objectSpecification)); inputTypeBuilder .field(newInputObjectField() .name("id") diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/util/TypeNames.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/util/TypeNames.java index 076d344eab..416ad74e28 100644 --- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/util/TypeNames.java +++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/util/TypeNames.java @@ -21,24 +21,24 @@ package org.apache.causeway.viewer.graphql.model.util; import lombok.experimental.UtilityClass; import org.apache.causeway.core.metamodel.spec.ObjectSpecification; -import org.apache.causeway.viewer.graphql.model.types._Constants; @UtilityClass public final class TypeNames { + public static String objectTypeNameFor(ObjectSpecification objectSpecification) { return sanitized(objectSpecification.getLogicalTypeName()); } + public static String metaTypeNameFor(ObjectSpecification objectSpecification) { + return objectTypeNameFor(objectSpecification) + "__meta"; + } + public static String mutatorTypeNameFor(ObjectSpecification objectSpecification) { return objectTypeNameFor(objectSpecification) + "__mutators"; } public static String inputTypeNameFor(ObjectSpecification objectSpecification) { - return _Constants.GQL_INPUTTYPE_PREFIX + objectTypeNameFor(objectSpecification); - } - - public static String metaTypeNameFor(ObjectSpecification objectSpecification) { - return objectTypeNameFor(objectSpecification) + "__meta"; + return "_gql_input__" + objectTypeNameFor(objectSpecification); } private static String sanitized(final String name) {
