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 7c84bb809b69bbfd26cce92b1c723d20b0f13484 Author: danhaywood <[email protected]> AuthorDate: Thu Jan 18 19:14:04 2024 +0000 CAUSEWAY-3676: renames GQLMeta to GqlMeta --- .../graphql/viewer/source/{GQLMeta.java => GqlMeta.java} | 2 +- .../viewer/graphql/viewer/source/ObjectTypeFactory.java | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GQLMeta.java b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlMeta.java similarity index 98% rename from incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GQLMeta.java rename to incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlMeta.java index 508af3e0c9..4a464fb620 100644 --- a/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GQLMeta.java +++ b/incubator/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/source/GqlMeta.java @@ -29,7 +29,7 @@ import java.util.Objects; import java.util.Optional; @Data -public class GQLMeta { +public class GqlMeta { private final Bookmark bookmark; private final BookmarkService bookmarkService; 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 172fe20914..55b43e5780 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 @@ -34,7 +34,6 @@ import org.apache.causeway.core.metamodel.objectmanager.ObjectManager; import org.springframework.stereotype.Component; -import org.apache.causeway.applib.services.bookmark.Bookmark; import org.apache.causeway.applib.services.bookmark.BookmarkService; import org.apache.causeway.applib.services.metamodel.BeanSort; import org.apache.causeway.core.metamodel.object.ManagedObject; @@ -366,7 +365,7 @@ public class ObjectTypeFactory { // @Override // public Object get(DataFetchingEnvironment environment) throws Exception { // -// GQLMeta gqlMeta = environment.getSource(); +// GqlMeta gqlMeta = environment.getSource(); // // return gqlMeta.id(); // } @@ -466,23 +465,23 @@ public class ObjectTypeFactory { codeRegistryBuilder.dataFetcher(FieldCoordinates.coordinates(graphQLObjectType, gql_meta), (DataFetcher<Object>) environment -> { return bookmarkService.bookmarkFor(environment.getSource()) - .map(bookmark -> new GQLMeta(bookmark, bookmarkService, objectManager)) + .map(bookmark -> new GqlMeta(bookmark, bookmarkService, objectManager)) .orElse(null); //TODO: is this correct ? }); codeRegistryBuilder.dataFetcher(FieldCoordinates.coordinates(metaType, idField), (DataFetcher<Object>) environment -> { - GQLMeta gqlMeta = environment.getSource(); + GqlMeta gqlMeta = environment.getSource(); return gqlMeta.id(); }); codeRegistryBuilder.dataFetcher(FieldCoordinates.coordinates(metaType, logicalTypeNameField), (DataFetcher<Object>) environment -> { - GQLMeta gqlMeta = environment.getSource(); + GqlMeta gqlMeta = environment.getSource(); return gqlMeta.logicalTypeName(); }); if (objectSpecificationBeanSort == BeanSort.ENTITY) { codeRegistryBuilder.dataFetcher(FieldCoordinates.coordinates(metaType, versionField), (DataFetcher<Object>) environment -> { - GQLMeta gqlMeta = environment.getSource(); + GqlMeta gqlMeta = environment.getSource(); return gqlMeta.version(); });
