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 c6623b93168048613287e495908d53c43e7bf0d5 Author: danhaywood <[email protected]> AuthorDate: Tue Jan 23 08:25:46 2024 +0000 CAUSEWAY-3676: renames GqlvAction to ...ActionSimple; reduce visibility of methods in GqlvMutations --- .../{GqlvAction.java => GqlvActionSimple.java} | 6 +-- .../graphql/model/domain/GqlvDomainObject.java | 11 ++---- .../graphql/model/domain/GqlvDomainService.java | 13 +++--- .../viewer/graphql/model/domain/GqlvMutations.java | 46 +++++++--------------- .../integration/GraphQlSourceForCauseway.java | 1 - .../graphql/viewer/toplevel/GqlvTopLevelQuery.java | 6 +-- 6 files changed, 31 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/GqlvActionSimple.java similarity index 97% rename from incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvAction.java rename to incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvActionSimple.java index e06dbc7bc0..bd05b13a35 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/GqlvActionSimple.java @@ -33,9 +33,9 @@ import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition; import static graphql.schema.GraphQLNonNull.nonNull; @Log4j2 -public class GqlvAction extends GqlvMember<ObjectAction, GqlvActionHolder> { +public class GqlvActionSimple extends GqlvMember<ObjectAction, GqlvActionHolder> { - public GqlvAction( + public GqlvActionSimple( final GqlvActionHolder holder, final ObjectAction objectAction, final GraphQLCodeRegistry.Builder codeRegistryBuilder @@ -172,7 +172,7 @@ public class GqlvAction extends GqlvMember<ObjectAction, GqlvActionHolder> { if (parameters.isNotEmpty()) { builder.arguments(parameters.stream() - .map(GqlvAction::gqlArgumentFor) + .map(GqlvActionSimple::gqlArgumentFor) .collect(Collectors.toList())); } } 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 e44acaed6f..4731fcd07c 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 @@ -45,11 +45,8 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G private final List<GqlvProperty> properties = new ArrayList<>(); private final List<GqlvCollection> collections = new ArrayList<>(); - private final List<GqlvAction> safeActions = new ArrayList<>(); + private final List<GqlvActionSimple> safeActionSimples = new ArrayList<>(); - /** - * Built using {@link #buildGqlObjectType()} - */ private GraphQLObjectType gqlObjectType; @Getter private final GraphQLInputObjectType gqlInputObjectType; @@ -90,7 +87,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G addAction(objectAction); }); - mutations.buildMutationsTypeAndFieldIfRequired(); + mutations.buildObjectTypeAndFieldIfRequired(); anyActions.get(); } @@ -111,7 +108,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G private void addAction(final ObjectAction objectAction) { if (objectAction.getSemantics().isSafeInNature()) { - safeActions.add(new GqlvAction(this, objectAction, codeRegistryBuilder)); + safeActionSimples.add(new GqlvActionSimple(this, objectAction, codeRegistryBuilder)); } else { mutations.addAction(objectAction); } @@ -141,7 +138,7 @@ public class GqlvDomainObject implements GqlvActionHolder, GqlvPropertyHolder, G meta.addDataFetchers(); properties.forEach(GqlvAssociation::addDataFetcher); collections.forEach(GqlvCollection::addDataFetcher); - safeActions.forEach(GqlvAction::addDataFetcher); + safeActionSimples.forEach(GqlvActionSimple::addDataFetcher); mutations.addDataFetchers(); } diff --git a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java index 0bd2f60695..b9caba2a3a 100644 --- a/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java +++ b/incubator/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/GqlvDomainService.java @@ -43,8 +43,8 @@ public class GqlvDomainService implements GqlvActionHolder, GqlvMutationsHolder return objectSpecification.getLogicalTypeName(); } - private final List<GqlvAction> safeActions = new ArrayList<>(); - public List<GqlvAction> getSafeActions() {return Collections.unmodifiableList(safeActions);} + private final List<GqlvActionSimple> safeActions = new ArrayList<>(); + public List<GqlvActionSimple> getSafeActions() {return Collections.unmodifiableList(safeActions);} /** * Built using {@link #buildGqlObjectType()} @@ -79,14 +79,14 @@ public class GqlvDomainService implements GqlvActionHolder, GqlvMutationsHolder addAction(objectAction); }); - mutations.buildMutationsTypeAndFieldIfRequired(); + mutations.buildObjectTypeAndFieldIfRequired(); return anyActions.get(); } void addAction(final ObjectAction objectAction) { if (objectAction.getSemantics().isSafeInNature()) { - safeActions.add(new GqlvAction(this, objectAction, codeRegistryBuilder)); + safeActions.add(new GqlvActionSimple(this, objectAction, codeRegistryBuilder)); } else { mutations.addAction(objectAction); } @@ -101,14 +101,13 @@ public class GqlvDomainService implements GqlvActionHolder, GqlvMutationsHolder public void registerTypesInto(GraphQLTypeRegistry graphQLTypeRegistry) { gqlObjectType = gqlObjectTypeBuilder.build(); - // TODO: unlike GqlvDomainObject, not sure why gqlObjectType doesn't need to be registered... - // graphQLTypeRegistry.addTypeIfNotAlreadyPresent(gqlObjectType); + // TODO: unlike GqlvDomainObject, not sure where gqlObjectType is already registered mutations.registerTypesInto(graphQLTypeRegistry); } public void addDataFetchers() { - getSafeActions().forEach(GqlvAction::addDataFetcher); + getSafeActions().forEach(GqlvActionSimple::addDataFetcher); getMutations().addDataFetchers(); } 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 2ceac2256c..917317e812 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 @@ -1,7 +1,6 @@ package org.apache.causeway.viewer.graphql.model.domain; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Optional; @@ -30,18 +29,18 @@ public class GqlvMutations implements GqlvActionHolder { private final ObjectManager objectManager; /** - * Used to build {@link #mutationsTypeIfAny}. + * Used to build {@link #objectTypeIfAny}. */ final GraphQLObjectType.Builder gqlObjectTypeBuilder; /** - * Built lazily using {@link #buildMutationsTypeAndFieldIfRequired()} + * Built lazily using {@link #buildObjectTypeAndFieldIfRequired()} */ @SuppressWarnings("OptionalUsedAsFieldOrParameterType") - private Optional<GraphQLObjectType> mutationsTypeIfAny; + private Optional<GraphQLObjectType> objectTypeIfAny; /** - * Built lazily using {@link #buildMutationsTypeAndFieldIfRequired()} + * Built lazily using {@link #buildObjectTypeAndFieldIfRequired()} */ @SuppressWarnings("OptionalUsedAsFieldOrParameterType") private Optional<GraphQLFieldDefinition> mutationsFieldIfAny; @@ -66,34 +65,19 @@ public class GqlvMutations implements GqlvActionHolder { } public void addAction(final ObjectAction objectAction) { - actions.add(new GqlvAction(this, objectAction, codeRegistryBuilder)); + actionSimples.add(new GqlvActionSimple(this, objectAction, codeRegistryBuilder)); } - private final List<GqlvAction> actions = new ArrayList<>(); - public List<GqlvAction> getActions() {return Collections.unmodifiableList(actions);} + private final List<GqlvActionSimple> actionSimples = new ArrayList<>(); boolean hasActions() { - return !actions.isEmpty(); + return !actionSimples.isEmpty(); } - /** - * @see #buildMutationsTypeAndFieldIfRequired() - */ - public Optional<GraphQLObjectType> getMutationsTypeIfAny() { - //noinspection OptionalAssignedToNull - if (mutationsTypeIfAny == null) { - throw new IllegalArgumentException(String.format("Gql mutators type and field has not yet been built for %s", holder.getObjectSpecification().getLogicalTypeName())); - } - return mutationsTypeIfAny; - } - - /** - * @see #getMutationsTypeIfAny() - */ - public Optional<GraphQLObjectType> buildMutationsTypeAndFieldIfRequired() { + public Optional<GraphQLObjectType> buildObjectTypeAndFieldIfRequired() { //noinspection OptionalAssignedToNull - if (mutationsTypeIfAny != null) { + if (objectTypeIfAny != null) { throw new IllegalArgumentException("Gql mutations type and field has already been built for " + holder.getObjectSpecification().getLogicalTypeName()); } @@ -101,7 +85,7 @@ public class GqlvMutations implements GqlvActionHolder { // create the type GraphQLObjectType mutationsType = gqlObjectTypeBuilder.build(); - this.mutationsTypeIfAny = Optional.of(mutationsType); + this.objectTypeIfAny = Optional.of(mutationsType); // create the field GraphQLFieldDefinition mutationsField = newFieldDefinition() @@ -115,9 +99,9 @@ public class GqlvMutations implements GqlvActionHolder { } else { mutationsFieldIfAny = Optional.empty(); - mutationsTypeIfAny = Optional.empty(); + objectTypeIfAny = Optional.empty(); } - return mutationsTypeIfAny; + return objectTypeIfAny; } public void addDataFetchers() { @@ -129,7 +113,7 @@ public class GqlvMutations implements GqlvActionHolder { .map(bookmark -> new Fetcher(bookmark, bookmarkService)) .orElseThrow()); - getActions().forEach(GqlvAction::addDataFetcher); + actionSimples.forEach(GqlvActionSimple::addDataFetcher); } } @@ -139,12 +123,12 @@ public class GqlvMutations implements GqlvActionHolder { } public void registerTypesInto(GraphQLTypeRegistry graphQLTypeRegistry) { - getMutationsTypeIfAny().ifPresent(graphQLTypeRegistry::addTypeIfNotAlreadyPresent); + objectTypeIfAny.ifPresent(graphQLTypeRegistry::addTypeIfNotAlreadyPresent); } @Override public FieldCoordinates coordinatesFor(GraphQLFieldDefinition fieldDefinition) { - return FieldCoordinates.coordinates(mutationsTypeIfAny.orElseThrow(), fieldDefinition); + return FieldCoordinates.coordinates(objectTypeIfAny.orElseThrow(), fieldDefinition); } diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java index ccc7c35c6d..4345553bf2 100644 --- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java +++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java @@ -195,7 +195,6 @@ public class GraphQlSourceForCauseway implements GraphQlSource { domainService.addDataFetchers(); - topLevelQueryStructure.addFieldFor(domainService, codeRegistryBuilder); } diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java index 054cf2e23a..e595a98590 100644 --- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java +++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java @@ -81,9 +81,9 @@ public class GqlvTopLevelQuery { public void addFetchers() { codeRegistryBuilder - .dataFetcher( - coordinates(getQueryType(), getNumServicesField()), - (DataFetcher<Object>) environment -> this.serviceRegistry.streamRegisteredBeans().count()); + .dataFetcher( + coordinates(getQueryType(), getNumServicesField()), + (DataFetcher<Object>) environment -> this.serviceRegistry.streamRegisteredBeans().count()); } }
