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/21 12:49:39 UTC
(causeway) 10/18: CAUSEWAY-3676: towards moving FieldDefinition creation within GqlvAction
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 e1f401fd65435d220008aa12cc8ddd5b3237aa17
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 20 18:29:27 2024 +0000
CAUSEWAY-3676: towards moving FieldDefinition creation within GqlvAction
---
.../viewer/graphql/model/domain/GqlvDomainObject.java | 19 +++----------------
.../viewer/graphql/model/domain/GqlvMutators.java | 8 ++++----
2 files changed, 7 insertions(+), 20 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 7747e5e7fe..33bf28fef4 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
@@ -209,9 +209,10 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
GraphQLFieldDefinition fieldDefinition = fieldBuilder.build();
if (objectAction.getSemantics().isSafeInNature()) {
- addSafeActionAsField(objectAction, fieldDefinition);
+ getGqlObjectTypeBuilder().field(fieldDefinition);
+ safeActions.add(new GqlvAction(this, objectAction, fieldDefinition, codeRegistryBuilder));
} else {
- addNonSafeActionAsMutatorField(objectAction, fieldDefinition);
+ mutators.addActionAsField(objectAction, fieldDefinition);
}
}
@@ -238,20 +239,6 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G
}
- public void addSafeActionAsField(
- final ObjectAction objectAction,
- final GraphQLFieldDefinition fieldDefinition) {
- getGqlObjectTypeBuilder().field(fieldDefinition);
- safeActions.add(new GqlvAction(this, objectAction, fieldDefinition, codeRegistryBuilder));
- }
-
- public void addNonSafeActionAsMutatorField(
- final ObjectAction objectAction,
- final GraphQLFieldDefinition fieldDefinition) {
-
- mutators.addActionAsField(objectAction, fieldDefinition);
- }
-
boolean hasMutators() {
return mutators.hasActions();
}
diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
index 3632357a4f..958bf6bbb3 100644
--- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
+++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvMutators.java
@@ -19,7 +19,7 @@ public class GqlvMutators implements GqlvActionHolder {
private final GqlvMutatorsHolder holder;
private final GraphQLCodeRegistry.Builder codeRegistryBuilder;
- final GraphQLObjectType.Builder mutatorsTypeBuilder;
+ final GraphQLObjectType.Builder objectTypeBuilder;
/**
* Built lazily using {@link #buildMutatorsTypeIfAny()}
@@ -34,7 +34,7 @@ public class GqlvMutators implements GqlvActionHolder {
this.holder = holder;
this.codeRegistryBuilder = codeRegistryBuilder;
- mutatorsTypeBuilder = newObject().name(_LTN.sanitized(this.holder.getObjectSpecification()) + "__mutators");
+ objectTypeBuilder = newObject().name(_LTN.sanitized(this.holder.getObjectSpecification()) + "__mutators");
}
@@ -42,7 +42,7 @@ public class GqlvMutators implements GqlvActionHolder {
final ObjectAction objectAction,
final GraphQLFieldDefinition fieldDefinition) {
- mutatorsTypeBuilder.field(fieldDefinition);
+ objectTypeBuilder.field(fieldDefinition);
actions.add(new GqlvAction(holder, objectAction, fieldDefinition, codeRegistryBuilder));
}
@@ -74,7 +74,7 @@ public class GqlvMutators implements GqlvActionHolder {
throw new IllegalArgumentException("Gql MutatorsType has already been built for " + holder.getObjectSpecification().getLogicalTypeName());
}
return mutatorsTypeIfAny = hasActions()
- ? Optional.of(mutatorsTypeBuilder.build())
+ ? Optional.of(objectTypeBuilder.build())
: Optional.empty();
}